Conflict resolution 1floyd_book

7 files changed, 0 insertions, 42 deletions

diff --git a/items/equip-ammo/_include.xml b/items/equip-ammo/_include.xml
index d5e7b54f..a442407c 100644
--- a/items/equip-ammo/_include.xml
+++ b/items/equip-ammo/_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-ammo/item529_IronArrow.xml"/>
   <include name="items/equip-ammo/item762_TerraniteArrow.xml"/>
   <include name="items/equip-ammo/item904_SlingBullet.xml"/>
diff --git a/items/equip-ammo/item1199_Arrow.xml b/items/equip-ammo/item1199_Arrow.xml
index 30c29704..09568b52 100644
--- a/items/equip-ammo/item1199_Arrow.xml
+++ b/items/equip-ammo/item1199_Arrow.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="1199" image="equipment/ammo/arrow.png" name="Arrow" description="A standard arrow." attack="20" type="equip-ammo" weight="1"/>
 </items>
diff --git a/items/equip-ammo/item1282_BoneArrows.xml b/items/equip-ammo/item1282_BoneArrows.xml
index 59d9b081..616a2228 100644
--- a/items/equip-ammo/item1282_BoneArrows.xml
+++ b/items/equip-ammo/item1282_BoneArrows.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="1282" image="equipment/ammo/bonedarts.png" name="Bone Arrows" description="Arrows made from bone. Not much different from the normal variety, but are much lighter." attack="55" type="equip-ammo" weight="1" sellProtected="true"/>
 </items>
diff --git a/items/equip-ammo/item5260_Snowball.xml b/items/equip-ammo/item5260_Snowball.xml
index d4fc5bbb..a6accc98 100644
--- a/items/equip-ammo/item5260_Snowball.xml
+++ b/items/equip-ammo/item5260_Snowball.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="5260" image="equipment/ammo/snowball.png" name="Snowball" description="It is Christmas time!" attack="20" type="equip-ammo" weight="1"/>
 </items>
diff --git a/items/equip-ammo/item529_IronArrow.xml b/items/equip-ammo/item529_IronArrow.xml
index 42d16da4..70eaf434 100644
--- a/items/equip-ammo/item529_IronArrow.xml
+++ b/items/equip-ammo/item529_IronArrow.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="529" image="equipment/ammo/ironarrow.png" name="Iron Arrow" description="A hard arrow made of iron." attack="40" type="equip-ammo" weight="1"/>
 </items>
diff --git a/items/equip-ammo/item762_TerraniteArrow.xml b/items/equip-ammo/item762_TerraniteArrow.xml
index d61e811e..bb87fa48 100644
--- a/items/equip-ammo/item762_TerraniteArrow.xml
+++ b/items/equip-ammo/item762_TerraniteArrow.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="762" image="equipment/ammo/arrow.png|W:#8B4513" name="Terranite Arrow" description="A terranite arrow." attack="50" criticalattack="20" type="equip-ammo" weight="1"/>
 </items>
diff --git a/items/equip-ammo/item904_SlingBullet.xml b/items/equip-ammo/item904_SlingBullet.xml
index 4219794c..74e3fabc 100644
--- a/items/equip-ammo/item904_SlingBullet.xml
+++ b/items/equip-ammo/item904_SlingBullet.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="904" image="equipment/ammo/stoneprojectile-icon.png" name="Sling Bullet" description="A smooth stone finished to fit neatly into a sling." attack="5" type="equip-ammo" weight="1"/>
 </items>