Conflict resolution 1floyd_book

9 files changed, 0 insertions, 54 deletions

diff --git a/items/racesprite/_include.xml b/items/racesprite/_include.xml
index 261f3ad0..20941000 100644
--- a/items/racesprite/_include.xml
+++ b/items/racesprite/_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/racesprite/item-100_Deprecated.xml"/>
   <include name="items/racesprite/item-101_Talpan.xml"/>
   <include name="items/racesprite/item-102_Tritan.xml"/>
diff --git a/items/racesprite/item-100_Deprecated.xml b/items/racesprite/item-100_Deprecated.xml
index 288e8105..93e29c89 100644
--- a/items/racesprite/item-100_Deprecated.xml
+++ b/items/racesprite/item-100_Deprecated.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="-100" type="racesprite" name="Placeholder">
     <sprite gender="female">model/female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite gender="male">model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
diff --git a/items/racesprite/item-101_Talpan.xml b/items/racesprite/item-101_Talpan.xml
index 94e476f8..b4da8442 100644
--- a/items/racesprite/item-101_Talpan.xml
+++ b/items/racesprite/item-101_Talpan.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="-101" type="racesprite" name="Talpan">
     <sprite gender="female">model/female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite gender="male">model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
diff --git a/items/racesprite/item-102_Tritan.xml b/items/racesprite/item-102_Tritan.xml
index ca87d302..04420f04 100644
--- a/items/racesprite/item-102_Tritan.xml
+++ b/items/racesprite/item-102_Tritan.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="-102" type="racesprite" name="Tritan">
     <sprite gender="female">model/female.xml|#166876,32992e,23a988,70cd87,a7f1b2;#0e0036,4c264b,a04f62,d2a391,e6d7b8;#3a3a3a,d5d5d5</sprite>
     <sprite gender="male">model/male.xml|#166876,32992e,23a988,70cd87,a7f1b2;#0e0036,4c264b,a04f62,d2a391,e6d7b8;#3a3a3a,d5d5d5</sprite>
diff --git a/items/racesprite/item-103_Ifriton.xml b/items/racesprite/item-103_Ifriton.xml
index ad844dc4..eb3021f0 100644
--- a/items/racesprite/item-103_Ifriton.xml
+++ b/items/racesprite/item-103_Ifriton.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="-103" type="racesprite" name="Ifriton">
     <sprite gender="female">model/female.xml|#5d3841,ba5f48,e48b6d,edb6a2;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite gender="male">model/male.xml|#5d3841,ba5f48,e48b6d,edb6a2;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
diff --git a/items/racesprite/item-104_Gispaan.xml b/items/racesprite/item-104_Gispaan.xml
index 85e8d7a5..dad348e9 100644
--- a/items/racesprite/item-104_Gispaan.xml
+++ b/items/racesprite/item-104_Gispaan.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="-104" type="racesprite" name="Gispaan">
     <sprite gender="female">model/female.xml|#413e22,6c5d31,baa06e,b2b05f;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite gender="male">model/male.xml|#413e22,6c5d31,baa06e,b2b05f;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
diff --git a/items/racesprite/item-105_Sparron.xml b/items/racesprite/item-105_Sparron.xml
index c91680ee..033dd99f 100644
--- a/items/racesprite/item-105_Sparron.xml
+++ b/items/racesprite/item-105_Sparron.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="-105" type="racesprite" name="Sparron">
     <sprite gender="female">model/female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite gender="male">model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
diff --git a/items/racesprite/item-106_Undead.xml b/items/racesprite/item-106_Undead.xml
index 4918a742..34dcf023 100644
--- a/items/racesprite/item-106_Undead.xml
+++ b/items/racesprite/item-106_Undead.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="-106" type="racesprite" name="Undead">
     <sprite>monsters/skeleton.xml|#ffe8bf</sprite>
     <replace sprite="hair">
diff --git a/items/racesprite/item-99054_Troll.xml b/items/racesprite/item-99054_Troll.xml
index 4ee60d50..767539d7 100644
--- a/items/racesprite/item-99054_Troll.xml
+++ b/items/racesprite/item-99054_Troll.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="-99054" type="racesprite" name="Troll">
     <sprite>monsters/troll-race.xml|#FFDEC2;#FF4D4D;#FF99FF;#FFC88A</sprite>
   </item>