Merge branch 'main' into Added-Bravo-Warhorse-insignia

7Cav · Jul 17, 2024 · fe84212 · fe84212
2 parents deea3b0 + 19416e4
commit fe84212
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/addons/textures/CfgEditorSubcategories.hpp b/addons/textures/CfgEditorSubcategories.hpp
@@ -1,20 +1,20 @@
 class CfgEditorSubcategories {
     class Cav_EdSubcat_Callsigns_Black {
-        displayname = CSTRING(Cat_Callsigns_Black); 
+        displayname = CSTRING(Cav_EdSubcat_Callsigns_Black); 
     };
     class Cav_EdSubcat_Callsigns_White {
-        displayname = CSTRING(Cat_Callsigns_White); 
+        displayname = CSTRING(Cav_EdSubcat_Callsigns_White); 
     };
     class Cav_EdSubcat_Terrain_Black {
-        displayname = CSTRING(Cat_Terrain_Black); 
+        displayname = CSTRING(Cav_EdSubcat_Terrain_Black); 
     };
     class Cav_EdSubcat_Terrain_White {
-        displayname = CSTRING(Cat_Terrain_White); 
+        displayname = CSTRING(Cav_EdSubcat_Terrain_White); 
     };
     class Cav_EdSubcat_Arlington {
-        displayname = CSTRING(Cat_Arlington); 
+        displayname = CSTRING(Cav_EdSubcat_Arlington); 
     };
     class Cav_EdSubcat_Vehicle_Labels {
-        displayname = CSTRING(Cat_Vehicle_Labels); 
+        displayname = CSTRING(Cav_EdSubcat_Vehicle_Labels); 
     };
 };
diff --git a/addons/textures/data/arlington/Arlington_Macgehee_ca.paa b/addons/textures/data/arlington/Arlington_Macgehee_ca.paa
diff --git a/addons/textures/data/arlington/Arlington_Mcgehee_ca.paa b/addons/textures/data/arlington/Arlington_Mcgehee_ca.paa
diff --git a/addons/textures/data/arlington/CfgVehicles.inc.hpp b/addons/textures/data/arlington/CfgVehicles.inc.hpp
@@ -6,7 +6,7 @@ class var1: UserTexture1m_F { \
     displayName = CSTRING(var1); \
     author = ECSTRING(main,modteam); \
     editorPreview = QPATHTOF(data\arlington\var2); \
-    \
+    editorSubcategory = "Cav_EdSubcat_Arlington"; \
     hiddenSelectionsTextures[] = { \
         QPATHTOF(data\arlington\var2) \
     };\

diff --git a/addons/textures/stringtable.xml b/addons/textures/stringtable.xml
@@ -1,21 +1,21 @@
 <Project name="Cav">
     <Package name="Textures">
-        <Key ID="STR_Cav_Textures_Cat_Callsigns_Black">
+        <Key ID="STR_Cav_Textures_Cav_EdSubcat_Callsigns_Black">
             <English>7th Cavalry Callsigns Black</English>
         </Key>
-        <Key ID="STR_Cav_Textures_Cat_Callsigns_White">
+        <Key ID="STR_Cav_Textures_Cav_EdSubcat_Callsigns_White">
             <English>7th Cavalry Callsigns White</English>
         </Key>
-        <Key ID="STR_Cav_Textures_Cat_Terrain_Black">
+        <Key ID="STR_Cav_Textures_Cav_EdSubcat_Terrain_Black">
             <English>7th Cavalry Terrain Black</English>
         </Key>
-        <Key ID="STR_Cav_Textures_Cat_Terrain_White">
+        <Key ID="STR_Cav_Textures_Cav_EdSubcat_Terrain_White">
             <English>7th Cavalry Terrain White</English>
         </Key>
-        <Key ID="STR_Cav_Textures_Cat_Arlington">
+        <Key ID="STR_Cav_Textures_Cav_EdSubcat_Arlington">
             <English>7th Cavalry Arlington</English>
         </Key>
-        <Key ID="STR_Cav_Textures_Cat_Vehicle_Labels">
+        <Key ID="STR_Cav_Textures_Cav_EdSubcat_Vehicle_Labels">
             <English>7th Cavalry Vehicle Labels</English>
         </Key>