Conflict resolution 1floyd_book

12 files changed, 0 insertions, 72 deletions

diff --git a/items/equip-ring/_include.xml b/items/equip-ring/_include.xml
index b16c79b3..71518519 100644
--- a/items/equip-ring/_include.xml
+++ b/items/equip-ring/_include.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0"?>
 <items>
-  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
-    <its:translateRule selector="//item/@name" translate="yes"/>
-    <its:translateRule selector="//item/@description" translate="yes"/>
-    <its:translateRule selector="//item/@effect" translate="yes"/>
-    <its:translateRule selector="//*" translate="no"/>
-  </its:rules>
   <include name="items/equip-ring/item702_WeddingRing.xml"/>
   <include name="items/equip-ring/item4008_DiamondRing.xml"/>
   <include name="items/equip-ring/item4009_RubyRing.xml"/>
diff --git a/items/equip-ring/item4008_DiamondRing.xml b/items/equip-ring/item4008_DiamondRing.xml
index cfaf4333..e23a044a 100644
--- a/items/equip-ring/item4008_DiamondRing.xml
+++ b/items/equip-ring/item4008_DiamondRing.xml
@@ -1,10 +1,4 @@
 <?xml version="1.0"?>
 <items>
-  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
-    <its:translateRule selector="//item/@name" translate="yes"/>
-    <its:translateRule selector="//item/@description" translate="yes"/>
-    <its:translateRule selector="//item/@effect" translate="yes"/>
-    <its:translateRule selector="//*" translate="no"/>
-  </its:rules>
   <item id="4008" image="equipment/rings/gem.png" name="Diamond Ring" description="A diamond ring." type="equip-ring" vit="1" weight="1" sellProtected="true"/>
 </items>
diff --git a/items/equip-ring/item4009_RubyRing.xml b/items/equip-ring/item4009_RubyRing.xml
index bde57d7d..e45dfd2f 100644
--- a/items/equip-ring/item4009_RubyRing.xml
+++ b/items/equip-ring/item4009_RubyRing.xml
@@ -1,10 +1,4 @@
 <?xml version="1.0"?>
 <items>
-  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
-    <its:translateRule selector="//item/@name" translate="yes"/>
-    <its:translateRule selector="//item/@description" translate="yes"/>
-    <its:translateRule selector="//item/@effect" translate="yes"/>
-    <its:translateRule selector="//*" translate="no"/>
-  </its:rules>
   <item id="4009" image="equipment/rings/gem.png|W:#581a1a,a41111,c03a3a,ff6060" name="Ruby Ring" description="A ruby ring." type="equip-ring" str="1" weight="1" sellProtected="true"/>
 </items>
diff --git a/items/equip-ring/item4010_EmeraldRing.xml b/items/equip-ring/item4010_EmeraldRing.xml
index eca0019c..ac4c6891 100644
--- a/items/equip-ring/item4010_EmeraldRing.xml
+++ b/items/equip-ring/item4010_EmeraldRing.xml
@@ -1,10 +1,4 @@
 <?xml version="1.0"?>
 <items>
-  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
-    <its:translateRule selector="//item/@name" translate="yes"/>
-    <its:translateRule selector="//item/@description" translate="yes"/>
-    <its:translateRule selector="//item/@effect" translate="yes"/>
-    <its:translateRule selector="//*" translate="no"/>
-  </its:rules>
   <item id="4010" image="equipment/rings/gem.png|W:#1f9c1f,89d689" name="Emerald Ring" description="An emerald ring." type="equip-ring" luk="1" weight="1" sellProtected="true"/>
 </items>
diff --git a/items/equip-ring/item4011_SapphireRing.xml b/items/equip-ring/item4011_SapphireRing.xml
index e1ecafff..fef7e509 100644
--- a/items/equip-ring/item4011_SapphireRing.xml
+++ b/items/equip-ring/item4011_SapphireRing.xml
@@ -1,10 +1,4 @@
 <?xml version="1.0"?>
 <items>
-  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
-    <its:translateRule selector="//item/@name" translate="yes"/>
-    <its:translateRule selector="//item/@description" translate="yes"/>
-    <its:translateRule selector="//item/@effect" translate="yes"/>
-    <its:translateRule selector="//*" translate="no"/>
-  </its:rules>
   <item id="4011" image="equipment/rings/gem.png|W:#4b4bbd,888af4" name="Sapphire Ring" description="A sapphire ring." type="equip-ring" int="1" weight="1" sellProtected="true"/>
 </items>
diff --git a/items/equip-ring/item4012_TopazRing.xml b/items/equip-ring/item4012_TopazRing.xml
index 7d5e5e5b..80f22c6e 100644
--- a/items/equip-ring/item4012_TopazRing.xml
+++ b/items/equip-ring/item4012_TopazRing.xml
@@ -1,10 +1,4 @@
 <?xml version="1.0"?>
 <items>
-  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
-    <its:translateRule selector="//item/@name" translate="yes"/>
-    <its:translateRule selector="//item/@description" translate="yes"/>
-    <its:translateRule selector="//item/@effect" translate="yes"/>
-    <its:translateRule selector="//*" translate="no"/>
-  </its:rules>
   <item id="4012" image="equipment/rings/gem.png|W:#ccb534,f1ea8e,ffffaa" name="Topaz Ring" description="A topaz ring." type="equip-ring" agi="1" weight="1" sellProtected="true"/>
 </items>
diff --git a/items/equip-ring/item4013_AmethystRing.xml b/items/equip-ring/item4013_AmethystRing.xml
index b88cc3df..2112faa5 100644
--- a/items/equip-ring/item4013_AmethystRing.xml
+++ b/items/equip-ring/item4013_AmethystRing.xml
@@ -1,10 +1,4 @@
 <?xml version="1.0"?>
 <items>
-  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
-    <its:translateRule selector="//item/@name" translate="yes"/>
-    <its:translateRule selector="//item/@description" translate="yes"/>
-    <its:translateRule selector="//item/@effect" translate="yes"/>
-    <its:translateRule selector="//*" translate="no"/>
-  </its:rules>
   <item id="4013" image="equipment/rings/gem.png|W:#530a7c,b362e1,ca87ef" name="Amethyst Ring" description="An amethyst ring." type="equip-ring" dex="1" weight="1" sellProtected="true"/>
 </items>
diff --git a/items/equip-ring/item4014_SimpleRing.xml b/items/equip-ring/item4014_SimpleRing.xml
index 55c65189..2e6564e3 100644
--- a/items/equip-ring/item4014_SimpleRing.xml
+++ b/items/equip-ring/item4014_SimpleRing.xml
@@ -1,10 +1,4 @@
 <?xml version="1.0"?>
 <items>
-  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
-    <its:translateRule selector="//item/@name" translate="yes"/>
-    <its:translateRule selector="//item/@description" translate="yes"/>
-    <its:translateRule selector="//item/@effect" translate="yes"/>
-    <its:translateRule selector="//*" translate="no"/>
-  </its:rules>
   <item id="4014" image="equipment/rings/simple.png" name="Simple Ring" description="A simple ring." type="equip-ring" weight="1" sellProtected="true"/>
 </items>
diff --git a/items/equip-ring/item5252_GuardianWings.xml b/items/equip-ring/item5252_GuardianWings.xml
index 83b29237..dd9b9663 100644
--- a/items/equip-ring/item5252_GuardianWings.xml
+++ b/items/equip-ring/item5252_GuardianWings.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0"?>
 <items>
-  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
-    <its:translateRule selector="//item/@name" translate="yes"/>
-    <its:translateRule selector="//item/@description" translate="yes"/>
-    <its:translateRule selector="//item/@effect" translate="yes"/>
-    <its:translateRule selector="//*" translate="no"/>
-  </its:rules>
   <item id="5252" image="equipment/rings/wedding.png" name="Guardian Wings" description="Powerful guardian wings, which watches over the horizon, guarding mana." type="equip-ring" weight="1">
     <sprite>equipment/angel-wings.xml</sprite>
     <particlefx>graphics/particles/angel.particle.xml</particlefx>
diff --git a/items/equip-ring/item5253_MagicRing.xml b/items/equip-ring/item5253_MagicRing.xml
index e996e369..b16e193e 100644
--- a/items/equip-ring/item5253_MagicRing.xml
+++ b/items/equip-ring/item5253_MagicRing.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0"?>
 <items>
-  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
-    <its:translateRule selector="//item/@name" translate="yes"/>
-    <its:translateRule selector="//item/@description" translate="yes"/>
-    <its:translateRule selector="//item/@effect" translate="yes"/>
-    <its:translateRule selector="//*" translate="no"/>
-  </its:rules>
   <item id="5253" image="equipment/rings/magic.png" name="Magic Ring" description="A powerful ring for spellcasters." effect="#ingrav delay -20% " int="1" type="equip-ring" weight="1">
   </item>
 </items>
diff --git a/items/equip-ring/item5268_AssassinRing.xml b/items/equip-ring/item5268_AssassinRing.xml
index 0e332a91..32e221db 100644
--- a/items/equip-ring/item5268_AssassinRing.xml
+++ b/items/equip-ring/item5268_AssassinRing.xml
@@ -1,10 +1,4 @@
 <?xml version="1.0"?>
 <items>
-  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
-    <its:translateRule selector="//item/@name" translate="yes"/>
-    <its:translateRule selector="//item/@description" translate="yes"/>
-    <its:translateRule selector="//item/@effect" translate="yes"/>
-    <its:translateRule selector="//*" translate="no"/>
-  </its:rules>
   <item id="5268" image="equipment/rings/assassin-ring.png" name="Assassin Ring" description="Ring for a master assassin. (Brawler only: Strength +2 / Dexterity +1)" effect="Attack Speed +5%" agi="1" criticalattack="5" type="equip-ring" weight="1" sellProtected="true"/>
 </items>
diff --git a/items/equip-ring/item702_WeddingRing.xml b/items/equip-ring/item702_WeddingRing.xml
index 231d0a11..a027fcb6 100644
--- a/items/equip-ring/item702_WeddingRing.xml
+++ b/items/equip-ring/item702_WeddingRing.xml
@@ -1,10 +1,4 @@
 <?xml version="1.0"?>
 <items>
-  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
-    <its:translateRule selector="//item/@name" translate="yes"/>
-    <its:translateRule selector="//item/@description" translate="yes"/>
-    <its:translateRule selector="//item/@effect" translate="yes"/>
-    <its:translateRule selector="//*" translate="no"/>
-  </its:rules>
   <item id="702" image="equipment/rings/wedding.png" name="Wedding Ring" description="Your wedding ring." type="equip-ring" weight="1"/>
 </items>