Merge branch 'master' into merge-hiddenunits

Theseus-Aegis · Aug 10, 2023 · 65f4e26 · 65f4e26
2 parents 3e7ab56 + 38175af
commit 65f4e26
Show file tree

Hide file tree

Showing 90 changed files with 325 additions and 710 deletions.
diff --git a/addons/ammunition/cup/config.cpp b/addons/ammunition/cup/config.cpp
@@ -9,20 +9,13 @@ class CfgPatches {
         requiredAddons[] = {
             "tacgt_main",
             "tacgt_ammunition",
-            "CUP_Weapons_Ammunition",
-            "CUP_Weapons_AK12",
-            "CUP_Weapons_Bren2",
-            "CUP_Weapons_Famas",
-            "CUP_Weapons_M17",
-            "CUP_Weapons_Mk23",
-            "CUP_Weapons_SCAR",
-            "CUP_Weapons_X95",
+            "CUP_Weapons_LoadOrder"
         };
-        skipWhenMissingDependencies = 1;
         author = ECSTRING(main,Authors);
         authors[] = {"Mike"};
         url = ECSTRING(main,URL);
         VERSION_CONFIG;
+        skipWhenMissingDependencies = 1;
     };
 };
 

diff --git a/addons/ammunition/melb/config.cpp b/addons/ammunition/melb/config.cpp
@@ -11,11 +11,11 @@ class CfgPatches {
             "tacgt_ammunition",
             "MELB",
         };
-        skipWhenMissingDependencies = 1;
         author = ECSTRING(main,Authors);
         authors[] = {"Mike"};
         url = ECSTRING(main,URL);
         VERSION_CONFIG;
+        skipWhenMissingDependencies = 1;
     };
 };
 

diff --git a/addons/ammunition/niarms/config.cpp b/addons/ammunition/niarms/config.cpp
@@ -14,11 +14,11 @@ class CfgPatches {
             "hlcweapons_SG550",
             "niaweapons_226",
         };
-        skipWhenMissingDependencies = 1;
         author = ECSTRING(main,Authors);
         authors[] = {"Mike"};
         url = ECSTRING(main,URL);
         VERSION_CONFIG;
+        skipWhenMissingDependencies = 1;
     };
 };
 

diff --git a/addons/ammunition/pi/config.cpp b/addons/ammunition/pi/config.cpp
@@ -12,11 +12,11 @@ class CfgPatches {
             "bnae_r1",
             "bnae_RK95",
         };
-        skipWhenMissingDependencies = 1;
         author = ECSTRING(main,Authors);
         authors[] = {"Mike"};
         url = ECSTRING(main,URL);
         VERSION_CONFIG;
+        skipWhenMissingDependencies = 1;
     };
 };
 

diff --git a/addons/ammunition/ws/config.cpp b/addons/ammunition/ws/config.cpp
@@ -11,11 +11,11 @@ class CfgPatches {
             "tacgt_ammunition",
             "data_f_lxWS_Loadorder",
         };
-        skipWhenMissingDependencies = 1;
         author = ECSTRING(main,Authors);
         authors[] = {"Mike"};
         url = ECSTRING(main,URL);
         VERSION_CONFIG;
+        skipWhenMissingDependencies = 1;
     };
 };
 

diff --git a/addons/attachments/config.cpp b/addons/attachments/config.cpp
@@ -7,7 +7,11 @@ class CfgPatches {
         weapons[] = {};
         magazines[] = {};
         requiredVersion = REQUIRED_VERSION;
-        requiredAddons[] = {"tacgt_main", "tacgt_flashlight", "CUP_Weapons_West_Attachments"};
+        requiredAddons[] = {
+            "tacgt_main",
+            "tacgt_flashlight",
+            "CUP_Weapons_West_Attachments"
+        };
         author = ECSTRING(main,Authors);
         authors[] = {"Mike"};
         url = ECSTRING(main,URL);

diff --git a/addons/aug/$PBOPREFIX$ b/addons/aug/$PBOPREFIX$
diff --git a/addons/aug/CfgWeapons.hpp b/addons/aug/CfgWeapons.hpp
diff --git a/addons/aug/README.md b/addons/aug/README.md
diff --git a/addons/bnae/$PBOPREFIX$ b/addons/bnae/$PBOPREFIX$
diff --git a/addons/bnae/CfgWeapons.hpp b/addons/bnae/CfgWeapons.hpp
diff --git a/addons/bnae/README.md b/addons/bnae/README.md
diff --git a/addons/bnae/config.cpp b/addons/bnae/config.cpp
diff --git a/addons/chiappa/$PBOPREFIX$ b/addons/chiappa/$PBOPREFIX$
diff --git a/addons/chiappa/CfgMagazines.hpp b/addons/chiappa/CfgMagazines.hpp
diff --git a/addons/chiappa/CfgWeapons.hpp b/addons/chiappa/CfgWeapons.hpp
diff --git a/addons/chiappa/README.md b/addons/chiappa/README.md
diff --git a/addons/chiappa/config.cpp b/addons/chiappa/config.cpp
diff --git a/addons/chiappa/script_component.hpp b/addons/chiappa/script_component.hpp
diff --git a/addons/gimmick/$PBOPREFIX$ b/addons/gimmick/$PBOPREFIX$
diff --git a/addons/gimmick/CfgAmmo.hpp b/addons/gimmick/CfgAmmo.hpp
diff --git a/addons/gimmick/CfgMagazineWells.hpp b/addons/gimmick/CfgMagazineWells.hpp
diff --git a/addons/gimmick/CfgMagazines.hpp b/addons/gimmick/CfgMagazines.hpp
diff --git a/addons/gimmick/CfgSoundSets.hpp b/addons/gimmick/CfgSoundSets.hpp
diff --git a/addons/gimmick/CfgSoundShaders.hpp b/addons/gimmick/CfgSoundShaders.hpp
diff --git a/addons/gimmick/CfgWeapons.hpp b/addons/gimmick/CfgWeapons.hpp
diff --git a/addons/gimmick/README.md b/addons/gimmick/README.md