Merge branch 'testsession1' into 'master'

Testsession1

See merge request themanaworld/evolved/clientdata!16

1 files changed, 22 insertions, 22 deletions

diff --git a/items/hairsprite.xml b/items/hairsprite.xml
index 61a7e217..e9fd5889 100644
--- a/items/hairsprite.xml
+++ b/items/hairsprite.xml
@@ -12,7 +12,7 @@
   </item>
   <item id="-2"
         type="hairsprite"
-        name="Bowl Cut">
+        name="Flat Ponytail">
     <sprite race="0">hairstyles/hairstyle01.xml</sprite>
     <sprite race="1">hairstyles/hairstyle01.xml</sprite>
     <sprite race="2">hairstyles/hairstyle01b.xml</sprite>
@@ -21,7 +21,7 @@
   </item>
   <item id="-3"
         type="hairsprite"
-        name="Combed Back">
+        name="Bowl Cut">
     <sprite race="0">hairstyles/hairstyle02.xml</sprite>
     <sprite race="1">hairstyles/hairstyle02.xml</sprite>
     <sprite race="2">hairstyles/hairstyle02b.xml</sprite>
@@ -30,7 +30,7 @@
   </item>
   <item id="-4"
         type="hairsprite"
-        name="Emo">
+        name="Combed back">
     <sprite race="0">hairstyles/hairstyle03.xml</sprite>
     <sprite race="1">hairstyles/hairstyle03.xml</sprite>
     <sprite race="2">hairstyles/hairstyle03b.xml</sprite>
@@ -39,7 +39,7 @@
   </item>
   <item id="-5"
         type="hairsprite"
-        name="Mohawk">
+        name="Emo">
     <sprite race="0">hairstyles/hairstyle04.xml</sprite>
     <sprite race="1">hairstyles/hairstyle04.xml</sprite>
     <sprite race="2">hairstyles/hairstyle04b.xml</sprite>
@@ -48,7 +48,7 @@
   </item>
   <item id="-6"
         type="hairsprite"
-        name="Pompadour">
+        name="Mohawk">
     <sprite race="0">hairstyles/hairstyle05.xml</sprite>
     <sprite race="1">hairstyles/hairstyle05.xml</sprite>
     <sprite race="2">hairstyles/hairstyle05b.xml</sprite>
@@ -57,7 +57,7 @@
   </item>
   <item id="-7"
         type="hairsprite"
-        name="Center Parting">
+        name="Pompadour">
     <sprite race="0">hairstyles/hairstyle06.xml</sprite>
     <sprite race="1">hairstyles/hairstyle06.xml</sprite>
     <sprite race="2">hairstyles/hairstyle06b.xml</sprite>
@@ -66,7 +66,7 @@
   </item>
   <item id="-8"
         type="hairsprite"
-        name="Long and slick">
+        name="Center parting">
     <sprite race="0">hairstyles/hairstyle07.xml</sprite>
     <sprite race="1">hairstyles/hairstyle07.xml</sprite>
     <sprite race="2">hairstyles/hairstyle07b.xml</sprite>
@@ -75,7 +75,7 @@
   </item>
   <item id="-9"
         type="hairsprite"
-        name="Short and Curly">
+        name="Long and Slick">
     <sprite race="0">hairstyles/hairstyle08.xml</sprite>
     <sprite race="1">hairstyles/hairstyle08.xml</sprite>
     <sprite race="2">hairstyles/hairstyle08.xml</sprite>
@@ -84,7 +84,7 @@
   </item>
   <item id="-10"
         type="hairsprite"
-        name="Pigtails">
+        name="Short and Curly">
     <sprite race="0">hairstyles/hairstyle09.xml</sprite>
     <sprite race="1">hairstyles/hairstyle09.xml</sprite>
     <sprite race="2">hairstyles/hairstyle09.xml</sprite>
@@ -93,7 +93,7 @@
   </item>
   <item id="-11"
         type="hairsprite"
-        name="Long and Curly">
+        name="Pigtails">
     <sprite race="0">hairstyles/hairstyle10.xml</sprite>
     <sprite race="1">hairstyles/hairstyle10.xml</sprite>
     <sprite race="2">hairstyles/hairstyle10.xml</sprite>
@@ -102,7 +102,7 @@
   </item>
   <item id="-12"
         type="hairsprite"
-        name="Parted">
+        name="Long and Curly">
     <sprite race="0">hairstyles/hairstyle11.xml</sprite>
     <sprite race="1">hairstyles/hairstyle11.xml</sprite>
     <sprite race="2">hairstyles/hairstyle11.xml</sprite>
@@ -111,7 +111,7 @@
   </item>
   <item id="-13"
         type="hairsprite"
-        name="Perky Ponytail">
+        name="Parted">
     <sprite race="0">hairstyles/hairstyle12.xml</sprite>
     <sprite race="1">hairstyles/hairstyle12.xml</sprite>
     <sprite race="2">hairstyles/hairstyle12.xml</sprite>
@@ -120,7 +120,7 @@
   </item>
   <item id="-14"
         type="hairsprite"
-        name="Wave">
+        name="Perky Ponytail">
     <sprite race="0">hairstyles/hairstyle13.xml</sprite>
     <sprite race="1">hairstyles/hairstyle13.xml</sprite>
     <sprite race="2">hairstyles/hairstyle13.xml</sprite>
@@ -129,7 +129,7 @@
   </item>
   <item id="-15"
         type="hairsprite"
-        name="Mane">
+        name="Wave">
     <sprite race="0">hairstyles/hairstyle14.xml</sprite>
     <sprite race="1">hairstyles/hairstyle14.xml</sprite>
     <sprite race="2">hairstyles/hairstyle14.xml</sprite>
@@ -138,7 +138,7 @@
   </item>
   <item id="-16"
         type="hairsprite"
-        name="Bun">
+        name="Mane">
     <sprite race="0">hairstyles/hairstyle15.xml</sprite>
     <sprite race="1">hairstyles/hairstyle15.xml</sprite>
     <sprite race="2">hairstyles/hairstyle15.xml</sprite>
@@ -147,7 +147,7 @@
   </item>
   <item id="-17"
         type="hairsprite"
-        name="Shoulder length flick">
+        name="Bun">
     <sprite race="0">hairstyles/hairstyle16.xml</sprite>
     <sprite race="1">hairstyles/hairstyle16.xml</sprite>
     <sprite race="2">hairstyles/hairstyle16.xml</sprite>
@@ -156,7 +156,7 @@
   </item>
   <item id="-18"
         type="hairsprite"
-        name="Fizzy">
+        name="Shoulder length and Flick">
     <sprite race="0">hairstyles/hairstyle17.xml</sprite>
     <sprite race="1">hairstyles/hairstyle17.xml</sprite>
     <sprite race="2">hairstyles/hairstyle17.xml</sprite>
@@ -165,7 +165,7 @@
   </item>
   <item id="-19"
         type="hairsprite"
-        name="Long and Clipped">
+        name="Fizzy">
     <sprite race="0">hairstyles/hairstyle18.xml</sprite>
     <sprite race="1">hairstyles/hairstyle18.xml</sprite>
     <sprite race="2">hairstyles/hairstyle18.xml</sprite>
@@ -174,7 +174,7 @@
   </item>
   <item id="-20"
         type="hairsprite"
-        name="Bunches">
+        name="Long and Clipped">
     <sprite race="0">hairstyles/hairstyle19.xml</sprite>
     <sprite race="1">hairstyles/hairstyle19.xml</sprite>
     <sprite race="2">hairstyles/hairstyle19.xml</sprite>
@@ -183,7 +183,7 @@
   </item>
   <item id="-21"
         type="hairsprite"
-        name="Long Ponytail">
+        name="Bunches">
     <sprite race="0">hairstyles/hairstyle20.xml</sprite>
     <sprite race="1">hairstyles/hairstyle20.xml</sprite>
     <sprite race="2">hairstyles/hairstyle20.xml</sprite>
@@ -192,7 +192,7 @@
   </item>
   <item id="-22"
         type="hairsprite"
-        name="Infinitely Long">
+        name="Long Ponytail">
     <sprite race="0">hairstyles/hairstyle21.xml</sprite>
     <sprite race="1">hairstyles/hairstyle21.xml</sprite>
     <sprite race="2">hairstyles/hairstyle21.xml</sprite>
@@ -201,7 +201,7 @@
   </item>
   <item id="-23"
         type="hairsprite"
-        name="Flat Ponytail">
+        name="Indefinitely long">
     <sprite race="0">hairstyles/hairstyle22.xml</sprite>
     <sprite race="1">hairstyles/hairstyle22.xml</sprite>
     <sprite race="2">hairstyles/hairstyle22.xml</sprite>