Conflict resolution 1floyd_book

21 files changed, 0 insertions, 126 deletions

diff --git a/items/hairsprite/_include.xml b/items/hairsprite/_include.xml
index f3caaeb4..0fae080e 100644
--- a/items/hairsprite/_include.xml
+++ b/items/hairsprite/_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/hairsprite/item-1_Bald.xml"/>
   <include name="items/hairsprite/item-2_Flatponytail.xml"/>
   <include name="items/hairsprite/item-3_Bowlcut.xml"/>
diff --git a/items/hairsprite/item-10_Shortandcurly.xml b/items/hairsprite/item-10_Shortandcurly.xml
index 0437b0f4..de490e20 100644
--- a/items/hairsprite/item-10_Shortandcurly.xml
+++ b/items/hairsprite/item-10_Shortandcurly.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="-10" type="hairsprite" name="Short and curly">
     <sprite race="0" gender="male">hairstyles/hairstyle09-male.xml</sprite>
     <sprite race="1" gender="male">hairstyles/hairstyle09-male.xml</sprite>
diff --git a/items/hairsprite/item-11_Pigtails.xml b/items/hairsprite/item-11_Pigtails.xml
index e157839e..1531aef5 100644
--- a/items/hairsprite/item-11_Pigtails.xml
+++ b/items/hairsprite/item-11_Pigtails.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="-11" type="hairsprite" name="Pigtails">
     <sprite race="0" gender="male">hairstyles/hairstyle10-male.xml</sprite>
     <sprite race="1" gender="male">hairstyles/hairstyle10-male.xml</sprite>
diff --git a/items/hairsprite/item-12_Longandcurly.xml b/items/hairsprite/item-12_Longandcurly.xml
index 8017cb86..4757ae72 100644
--- a/items/hairsprite/item-12_Longandcurly.xml
+++ b/items/hairsprite/item-12_Longandcurly.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="-12" type="hairsprite" name="Long and curly">
     <sprite race="0" gender="male">hairstyles/hairstyle11-male.xml</sprite>
     <sprite race="1" gender="male">hairstyles/hairstyle11-male.xml</sprite>
diff --git a/items/hairsprite/item-13_Parted.xml b/items/hairsprite/item-13_Parted.xml
index b5f90e67..67d0e80b 100644
--- a/items/hairsprite/item-13_Parted.xml
+++ b/items/hairsprite/item-13_Parted.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="-13" type="hairsprite" name="Parted">
     <sprite race="0" gender="male">hairstyles/hairstyle12-male.xml</sprite>
     <sprite race="1" gender="male">hairstyles/hairstyle12-male.xml</sprite>
diff --git a/items/hairsprite/item-14_Perkyponytail.xml b/items/hairsprite/item-14_Perkyponytail.xml
index f864bc03..206d5c2e 100644
--- a/items/hairsprite/item-14_Perkyponytail.xml
+++ b/items/hairsprite/item-14_Perkyponytail.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="-14" type="hairsprite" name="Perky ponytail">
     <sprite race="0" gender="male">hairstyles/hairstyle13-male.xml</sprite>
     <sprite race="1" gender="male">hairstyles/hairstyle13-male.xml</sprite>
diff --git a/items/hairsprite/item-15_Wave.xml b/items/hairsprite/item-15_Wave.xml
index 6d797411..eda358ef 100644
--- a/items/hairsprite/item-15_Wave.xml
+++ b/items/hairsprite/item-15_Wave.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="-15" type="hairsprite" name="Wave">
     <sprite race="0" gender="male">hairstyles/hairstyle14-male.xml</sprite>
     <sprite race="1" gender="male">hairstyles/hairstyle14-male.xml</sprite>
diff --git a/items/hairsprite/item-16_Mane.xml b/items/hairsprite/item-16_Mane.xml
index a39cf6ae..4f4372f8 100644
--- a/items/hairsprite/item-16_Mane.xml
+++ b/items/hairsprite/item-16_Mane.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="-16" type="hairsprite" name="Mane">
     <sprite race="0" gender="male">hairstyles/hairstyle15-male.xml</sprite>
     <sprite race="1" gender="male">hairstyles/hairstyle15-male.xml</sprite>
diff --git a/items/hairsprite/item-17_Bun.xml b/items/hairsprite/item-17_Bun.xml
index eb04a08b..8338c08b 100644
--- a/items/hairsprite/item-17_Bun.xml
+++ b/items/hairsprite/item-17_Bun.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="-17" type="hairsprite" name="Bun">
     <sprite race="0" gender="male">hairstyles/hairstyle16-male.xml</sprite>
     <sprite race="1" gender="male">hairstyles/hairstyle16-male.xml</sprite>
diff --git a/items/hairsprite/item-18_Shoulderlengthflick.xml b/items/hairsprite/item-18_Shoulderlengthflick.xml
index ef98d79c..6f6b49f4 100644
--- a/items/hairsprite/item-18_Shoulderlengthflick.xml
+++ b/items/hairsprite/item-18_Shoulderlengthflick.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="-18" type="hairsprite" name="Shoulder length flick">
     <sprite race="0" gender="male">hairstyles/hairstyle17-male.xml</sprite>
     <sprite race="1" gender="male">hairstyles/hairstyle17-male.xml</sprite>
diff --git a/items/hairsprite/item-19_Fizzy.xml b/items/hairsprite/item-19_Fizzy.xml
index 7a7f1413..028c69d2 100644
--- a/items/hairsprite/item-19_Fizzy.xml
+++ b/items/hairsprite/item-19_Fizzy.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="-19" type="hairsprite" name="Fizzy">
     <sprite race="0" gender="male">hairstyles/hairstyle18-male.xml</sprite>
     <sprite race="1" gender="male">hairstyles/hairstyle18-male.xml</sprite>
diff --git a/items/hairsprite/item-1_Bald.xml b/items/hairsprite/item-1_Bald.xml
index 8bc31142..c6627525 100644
--- a/items/hairsprite/item-1_Bald.xml
+++ b/items/hairsprite/item-1_Bald.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="-1" type="hairsprite" name="No style">
     <sprite race="2">hairstyles/hairstyle28.xml</sprite>
     <sprite race="3">hairstyles/hairstyle29.xml</sprite>
diff --git a/items/hairsprite/item-20_LongandClipped.xml b/items/hairsprite/item-20_LongandClipped.xml
index be9c49b6..52336b91 100644
--- a/items/hairsprite/item-20_LongandClipped.xml
+++ b/items/hairsprite/item-20_LongandClipped.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="-20" type="hairsprite" name="Long and Clipped">
     <sprite race="0" gender="male">hairstyles/hairstyle19-male.xml</sprite>
     <sprite race="1" gender="male">hairstyles/hairstyle19-male.xml</sprite>
diff --git a/items/hairsprite/item-2_Flatponytail.xml b/items/hairsprite/item-2_Flatponytail.xml
index 548d3d5e..c45f8444 100644
--- a/items/hairsprite/item-2_Flatponytail.xml
+++ b/items/hairsprite/item-2_Flatponytail.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="-2" type="hairsprite" name="Flat ponytail">
     <sprite race="2">hairstyles/hairstyle25.xml</sprite>
     <sprite race="3">hairstyles/hairstyle20.xml</sprite>
diff --git a/items/hairsprite/item-3_Bowlcut.xml b/items/hairsprite/item-3_Bowlcut.xml
index 4c992836..f1d76d8c 100644
--- a/items/hairsprite/item-3_Bowlcut.xml
+++ b/items/hairsprite/item-3_Bowlcut.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="-3" type="hairsprite" name="Bowl cut">
     <sprite race="2">hairstyles/hairstyle26.xml</sprite>
     <sprite race="3">hairstyles/hairstyle21.xml</sprite>
diff --git a/items/hairsprite/item-4_Combedback.xml b/items/hairsprite/item-4_Combedback.xml
index f4c38469..000b632a 100644
--- a/items/hairsprite/item-4_Combedback.xml
+++ b/items/hairsprite/item-4_Combedback.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="-4" type="hairsprite" name="Combed back">
     <sprite race="2">hairstyles/hairstyle27.xml</sprite>
     <sprite race="3">hairstyles/hairstyle22.xml</sprite>
diff --git a/items/hairsprite/item-5_Emo.xml b/items/hairsprite/item-5_Emo.xml
index d72c747c..14363483 100644
--- a/items/hairsprite/item-5_Emo.xml
+++ b/items/hairsprite/item-5_Emo.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="-5" type="hairsprite" name="Emo">
     <sprite race="2">hairstyles/hairstyle30.xml</sprite>
     <sprite race="3">hairstyles/hairstyle23.xml</sprite>
diff --git a/items/hairsprite/item-6_Mohawk.xml b/items/hairsprite/item-6_Mohawk.xml
index 03de757a..115e741d 100644
--- a/items/hairsprite/item-6_Mohawk.xml
+++ b/items/hairsprite/item-6_Mohawk.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="-6" type="hairsprite" name="Mohawk">
     <sprite race="2">hairstyles/hairstyle31.xml</sprite>
     <sprite race="3">hairstyles/hairstyle24.xml</sprite>
diff --git a/items/hairsprite/item-7_Pompadour.xml b/items/hairsprite/item-7_Pompadour.xml
index 79e755c9..42084577 100644
--- a/items/hairsprite/item-7_Pompadour.xml
+++ b/items/hairsprite/item-7_Pompadour.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="-7" type="hairsprite" name="Pompadour">
     <sprite race="2">hairstyles/hairstyle32.xml</sprite>
     <sprite race="0" gender="male">hairstyles/hairstyle06-male.xml</sprite>
diff --git a/items/hairsprite/item-8_CenterpartingShortandslick.xml b/items/hairsprite/item-8_CenterpartingShortandslick.xml
index 36cec6ad..aff7d57d 100644
--- a/items/hairsprite/item-8_CenterpartingShortandslick.xml
+++ b/items/hairsprite/item-8_CenterpartingShortandslick.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="-8" type="hairsprite" name="Center parting/Short and slick">
     <sprite race="2">hairstyles/hairstyle33.xml</sprite>
     <sprite race="0" gender="male">hairstyles/hairstyle07-male.xml</sprite>
diff --git a/items/hairsprite/item-9_Longandslick.xml b/items/hairsprite/item-9_Longandslick.xml
index 4d2ab808..105f0085 100644
--- a/items/hairsprite/item-9_Longandslick.xml
+++ b/items/hairsprite/item-9_Longandslick.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="-9" type="hairsprite" name="Long and slick">
     <sprite race="0" gender="male">hairstyles/hairstyle08-male.xml</sprite>
     <sprite race="1" gender="male">hairstyles/hairstyle08-male.xml</sprite>