From 3c315caa9860a934febb908c542f5bfb6bcc2a77 Mon Sep 17 00:00:00 2001
From: wowgetoffyourcellphone <wowgetoffyourcellphone@wildfiregames.com>
Date: Sun, 20 Feb 2022 02:45:28 +0000
Subject: [PATCH] Move Han helmet meshes to the proper subfolder.

This was SVN commit r26430.
---
 .../actors/props/units/helmets/han_advanced_melee_helmet.xml    | 2 +-
 .../data/mods/public/art/actors/props/units/helmets/han_cap.xml | 2 +-
 .../actors/props/units/helmets/han_cavalry_spearman_helmet.xml  | 2 +-
 .../actors/props/units/helmets/han_cavalry_swordsman_helmet.xml | 2 +-
 .../public/art/actors/props/units/helmets/han_cavhelm_b.xml     | 2 +-
 .../mods/public/art/actors/props/units/helmets/han_hairbun.xml  | 2 +-
 .../art/actors/props/units/helmets/han_heavy_cavalry_helmet.xml | 2 +-
 .../art/actors/props/units/helmets/han_heavy_helmet_b.xml       | 2 +-
 .../mods/public/art/actors/props/units/helmets/han_ricehat.xml  | 2 +-
 .../public/art/actors/props/units/helmets/headband_generic.xml  | 2 +-
 .../props/{helmets => helmet}/han_advanced_melee_helmet.dae     | 0
 .../public/art/meshes/props/{helmets => helmet}/han_bandana.dae | 0
 .../public/art/meshes/props/{helmets => helmet}/han_cap.dae     | 0
 .../art/meshes/props/{helmets => helmet}/han_cavalry_helmet.dae | 0
 .../props/{helmets => helmet}/han_cavalry_swordsman_helmet.dae  | 0
 .../art/meshes/props/{helmets => helmet}/han_cavhelm_01.dae     | 0
 .../public/art/meshes/props/{helmets => helmet}/han_hairbun.dae | 0
 .../props/{helmets => helmet}/han_heavy_cavalry_helmet.dae      | 0
 .../art/meshes/props/{helmets => helmet}/han_heavy_helmet_b.dae | 0
 .../public/art/meshes/props/{helmets => helmet}/han_ricehat.dae | 0
 20 files changed, 10 insertions(+), 10 deletions(-)
 rename binaries/data/mods/public/art/meshes/props/{helmets => helmet}/han_advanced_melee_helmet.dae (100%)
 rename binaries/data/mods/public/art/meshes/props/{helmets => helmet}/han_bandana.dae (100%)
 rename binaries/data/mods/public/art/meshes/props/{helmets => helmet}/han_cap.dae (100%)
 rename binaries/data/mods/public/art/meshes/props/{helmets => helmet}/han_cavalry_helmet.dae (100%)
 rename binaries/data/mods/public/art/meshes/props/{helmets => helmet}/han_cavalry_swordsman_helmet.dae (100%)
 rename binaries/data/mods/public/art/meshes/props/{helmets => helmet}/han_cavhelm_01.dae (100%)
 rename binaries/data/mods/public/art/meshes/props/{helmets => helmet}/han_hairbun.dae (100%)
 rename binaries/data/mods/public/art/meshes/props/{helmets => helmet}/han_heavy_cavalry_helmet.dae (100%)
 rename binaries/data/mods/public/art/meshes/props/{helmets => helmet}/han_heavy_helmet_b.dae (100%)
 rename binaries/data/mods/public/art/meshes/props/{helmets => helmet}/han_ricehat.dae (100%)

diff --git a/binaries/data/mods/public/art/actors/props/units/helmets/han_advanced_melee_helmet.xml b/binaries/data/mods/public/art/actors/props/units/helmets/han_advanced_melee_helmet.xml
index 41ad74000b..55276ee853 100644
--- a/binaries/data/mods/public/art/actors/props/units/helmets/han_advanced_melee_helmet.xml
+++ b/binaries/data/mods/public/art/actors/props/units/helmets/han_advanced_melee_helmet.xml
@@ -3,7 +3,7 @@
   <castshadow/>
   <group>
     <variant frequency="100" name="helmetA">
-      <mesh>props/helmets/han_advanced_melee_helmet.dae</mesh>
+      <mesh>props/helmet/han_advanced_melee_helmet.dae</mesh>
       <textures>
         <texture file="props/helmets/han_advanced_melee_helmet.png" name="baseTex"/>
       </textures>
diff --git a/binaries/data/mods/public/art/actors/props/units/helmets/han_cap.xml b/binaries/data/mods/public/art/actors/props/units/helmets/han_cap.xml
index 080ba626be..c6d1015aab 100644
--- a/binaries/data/mods/public/art/actors/props/units/helmets/han_cap.xml
+++ b/binaries/data/mods/public/art/actors/props/units/helmets/han_cap.xml
@@ -2,7 +2,7 @@
 <actor version="1">
   <group>
     <variant name="Base">
-      <mesh>props/helmets/han_cap.dae</mesh>
+      <mesh>props/helmet/han_cap.dae</mesh>
     </variant>
   </group>
   <group>
diff --git a/binaries/data/mods/public/art/actors/props/units/helmets/han_cavalry_spearman_helmet.xml b/binaries/data/mods/public/art/actors/props/units/helmets/han_cavalry_spearman_helmet.xml
index 68412dfaca..3566be381b 100644
--- a/binaries/data/mods/public/art/actors/props/units/helmets/han_cavalry_spearman_helmet.xml
+++ b/binaries/data/mods/public/art/actors/props/units/helmets/han_cavalry_spearman_helmet.xml
@@ -3,7 +3,7 @@
   <castshadow/>
   <group>
     <variant frequency="100" name="helmet_A">
-      <mesh>props/helmets/han_cavalry_helmet.dae</mesh>
+      <mesh>props/helmet/han_cavalry_helmet.dae</mesh>
       <textures>
         <texture file="props/helmets/han_cavalry_helmet.png" name="baseTex"/>
       </textures>
diff --git a/binaries/data/mods/public/art/actors/props/units/helmets/han_cavalry_swordsman_helmet.xml b/binaries/data/mods/public/art/actors/props/units/helmets/han_cavalry_swordsman_helmet.xml
index e891d05463..8580881e4c 100644
--- a/binaries/data/mods/public/art/actors/props/units/helmets/han_cavalry_swordsman_helmet.xml
+++ b/binaries/data/mods/public/art/actors/props/units/helmets/han_cavalry_swordsman_helmet.xml
@@ -3,7 +3,7 @@
   <castshadow/>
   <group>
     <variant frequency="100" name="helmetA">
-      <mesh>props/helmets/han_cavalry_swordsman_helmet.dae</mesh>
+      <mesh>props/helmet/han_cavalry_swordsman_helmet.dae</mesh>
       <textures>
         <texture file="props/helmets/han_cavalry_swordsman_helmet_black.png" name="baseTex"/>
         <texture file="props/helmets/han_cavalry_swordsman_helmet_norm.png" name="normTex"/>
diff --git a/binaries/data/mods/public/art/actors/props/units/helmets/han_cavhelm_b.xml b/binaries/data/mods/public/art/actors/props/units/helmets/han_cavhelm_b.xml
index e7dfee9348..f4733048c5 100644
--- a/binaries/data/mods/public/art/actors/props/units/helmets/han_cavhelm_b.xml
+++ b/binaries/data/mods/public/art/actors/props/units/helmets/han_cavhelm_b.xml
@@ -3,7 +3,7 @@
   <castshadow/>
   <group>
     <variant frequency="1" name="helmet-01">
-      <mesh>props/helmets/han_cavhelm_01.dae</mesh>
+      <mesh>props/helmet/han_cavhelm_01.dae</mesh>
       <textures>
         <texture file="props/helmets/han_ricehat.png" name="baseTex"/>
       </textures>
diff --git a/binaries/data/mods/public/art/actors/props/units/helmets/han_hairbun.xml b/binaries/data/mods/public/art/actors/props/units/helmets/han_hairbun.xml
index a48077600c..0cd5f4842f 100644
--- a/binaries/data/mods/public/art/actors/props/units/helmets/han_hairbun.xml
+++ b/binaries/data/mods/public/art/actors/props/units/helmets/han_hairbun.xml
@@ -3,7 +3,7 @@
   <group>
     <variant frequency="1" name="Base">
       <color>61 61 61</color>
-      <mesh>props/helmets/han_hairbun.dae</mesh>
+      <mesh>props/helmet/han_hairbun.dae</mesh>
       <textures>
         <texture file="props/heads/han_b.png" name="baseTex"/>
       </textures>
diff --git a/binaries/data/mods/public/art/actors/props/units/helmets/han_heavy_cavalry_helmet.xml b/binaries/data/mods/public/art/actors/props/units/helmets/han_heavy_cavalry_helmet.xml
index 56ab47b1a4..a6f1707884 100644
--- a/binaries/data/mods/public/art/actors/props/units/helmets/han_heavy_cavalry_helmet.xml
+++ b/binaries/data/mods/public/art/actors/props/units/helmets/han_heavy_cavalry_helmet.xml
@@ -3,7 +3,7 @@
   <castshadow/>
   <group>
     <variant frequency="100" name="helmetA">
-      <mesh>props/helmets/han_heavy_cavalry_helmet.dae</mesh>
+      <mesh>props/helmet/han_heavy_cavalry_helmet.dae</mesh>
       <textures>
         <texture file="props/helmets/han_heavy_cavalry_helmet.png" name="baseTex"/>
         <texture file="props/helmets/han_heavy_cavalry_helmet_norm.png" name="normTex"/>
diff --git a/binaries/data/mods/public/art/actors/props/units/helmets/han_heavy_helmet_b.xml b/binaries/data/mods/public/art/actors/props/units/helmets/han_heavy_helmet_b.xml
index 491a0f604a..201d2f0db0 100644
--- a/binaries/data/mods/public/art/actors/props/units/helmets/han_heavy_helmet_b.xml
+++ b/binaries/data/mods/public/art/actors/props/units/helmets/han_heavy_helmet_b.xml
@@ -3,7 +3,7 @@
   <castshadow/>
   <group>
     <variant frequency="100" name="helmetA">
-      <mesh>props/helmets/han_heavy_helmet_b.dae</mesh>
+      <mesh>props/helmet/han_heavy_helmet_b.dae</mesh>
       <textures>
         <texture file="props/helmets/han_heavy_helmet_b.png" name="baseTex"/>
         <texture file="props/helmets/han_heavy_helmet_b_norm.png" name="normTex"/>
diff --git a/binaries/data/mods/public/art/actors/props/units/helmets/han_ricehat.xml b/binaries/data/mods/public/art/actors/props/units/helmets/han_ricehat.xml
index 4316420d8f..882a146c5b 100644
--- a/binaries/data/mods/public/art/actors/props/units/helmets/han_ricehat.xml
+++ b/binaries/data/mods/public/art/actors/props/units/helmets/han_ricehat.xml
@@ -3,7 +3,7 @@
   <castshadow/>
   <group>
     <variant frequency="1" name="helmet-01">
-      <mesh>props/helmets/han_ricehat.dae</mesh>
+      <mesh>props/helmet/han_ricehat.dae</mesh>
       <textures>
         <texture file="props/helmets/han_ricehat.png" name="baseTex"/>
       </textures>
diff --git a/binaries/data/mods/public/art/actors/props/units/helmets/headband_generic.xml b/binaries/data/mods/public/art/actors/props/units/helmets/headband_generic.xml
index 3ca1cf6b66..e02db610f8 100644
--- a/binaries/data/mods/public/art/actors/props/units/helmets/headband_generic.xml
+++ b/binaries/data/mods/public/art/actors/props/units/helmets/headband_generic.xml
@@ -3,7 +3,7 @@
   <castshadow/>
   <group>
     <variant frequency="1" name="headband">
-      <mesh>props/helmets/han_bandana.dae</mesh>
+      <mesh>props/helmet/han_bandana.dae</mesh>
       <textures>
         <texture file="props/helmets/han_bandana.png" name="baseTex"/>
         <texture file="props/helmets/han_bandana_norm.png" name="normTex"/>
diff --git a/binaries/data/mods/public/art/meshes/props/helmets/han_advanced_melee_helmet.dae b/binaries/data/mods/public/art/meshes/props/helmet/han_advanced_melee_helmet.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/helmets/han_advanced_melee_helmet.dae
rename to binaries/data/mods/public/art/meshes/props/helmet/han_advanced_melee_helmet.dae
diff --git a/binaries/data/mods/public/art/meshes/props/helmets/han_bandana.dae b/binaries/data/mods/public/art/meshes/props/helmet/han_bandana.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/helmets/han_bandana.dae
rename to binaries/data/mods/public/art/meshes/props/helmet/han_bandana.dae
diff --git a/binaries/data/mods/public/art/meshes/props/helmets/han_cap.dae b/binaries/data/mods/public/art/meshes/props/helmet/han_cap.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/helmets/han_cap.dae
rename to binaries/data/mods/public/art/meshes/props/helmet/han_cap.dae
diff --git a/binaries/data/mods/public/art/meshes/props/helmets/han_cavalry_helmet.dae b/binaries/data/mods/public/art/meshes/props/helmet/han_cavalry_helmet.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/helmets/han_cavalry_helmet.dae
rename to binaries/data/mods/public/art/meshes/props/helmet/han_cavalry_helmet.dae
diff --git a/binaries/data/mods/public/art/meshes/props/helmets/han_cavalry_swordsman_helmet.dae b/binaries/data/mods/public/art/meshes/props/helmet/han_cavalry_swordsman_helmet.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/helmets/han_cavalry_swordsman_helmet.dae
rename to binaries/data/mods/public/art/meshes/props/helmet/han_cavalry_swordsman_helmet.dae
diff --git a/binaries/data/mods/public/art/meshes/props/helmets/han_cavhelm_01.dae b/binaries/data/mods/public/art/meshes/props/helmet/han_cavhelm_01.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/helmets/han_cavhelm_01.dae
rename to binaries/data/mods/public/art/meshes/props/helmet/han_cavhelm_01.dae
diff --git a/binaries/data/mods/public/art/meshes/props/helmets/han_hairbun.dae b/binaries/data/mods/public/art/meshes/props/helmet/han_hairbun.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/helmets/han_hairbun.dae
rename to binaries/data/mods/public/art/meshes/props/helmet/han_hairbun.dae
diff --git a/binaries/data/mods/public/art/meshes/props/helmets/han_heavy_cavalry_helmet.dae b/binaries/data/mods/public/art/meshes/props/helmet/han_heavy_cavalry_helmet.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/helmets/han_heavy_cavalry_helmet.dae
rename to binaries/data/mods/public/art/meshes/props/helmet/han_heavy_cavalry_helmet.dae
diff --git a/binaries/data/mods/public/art/meshes/props/helmets/han_heavy_helmet_b.dae b/binaries/data/mods/public/art/meshes/props/helmet/han_heavy_helmet_b.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/helmets/han_heavy_helmet_b.dae
rename to binaries/data/mods/public/art/meshes/props/helmet/han_heavy_helmet_b.dae
diff --git a/binaries/data/mods/public/art/meshes/props/helmets/han_ricehat.dae b/binaries/data/mods/public/art/meshes/props/helmet/han_ricehat.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/helmets/han_ricehat.dae
rename to binaries/data/mods/public/art/meshes/props/helmet/han_ricehat.dae