Merge branch 'CombatExtended-Continued:Development' into Development

CombatExtended-Continued · Nov 2, 2023 · 6430b81 · 6430b81
2 parents 70394cb + b7a6941
commit 6430b81
Show file tree

Hide file tree

Showing 134 changed files with 7,593 additions and 2,959 deletions.
diff --git a/About/About.xml b/About/About.xml
@@ -8,7 +8,7 @@
 		<li>1.4</li>
 	</supportedVersions>
 	<packageId>CETeam.CombatExtended</packageId>
-	<description>Version: 1.4.5.4\n\nExtends combat mechanics to make them deeper and more tactical.</description>
+	<description>Version: 1.4.5.5\n\nExtends combat mechanics to make them deeper and more tactical.</description>
 	<modDependencies>
 		<li>
 			<packageId>brrainz.harmony</packageId>
@@ -82,6 +82,7 @@
 		<li>Slashandz.MiniMiner</li>
 		<li>Killathon.MechHumanlikes.MechanicalBiomimetics</li>
 		<li>botchjob.divineorder</li>
+		<li>OskarPotocki.VFE.Deserters</li>
 	</loadAfter>
 
-</ModMetaData>
+</ModMetaData>
diff --git a/About/Manifest.xml b/About/Manifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <Manifest>
 	<identifier>CombatExtended</identifier>
-	<version>1.4.5.4</version><!-- Don't add extra digits to this, or it breaks Fluffy's versioning.  -->
+	<version>1.4.5.5</version><!-- Don't add extra digits to this, or it breaks Fluffy's versioning.  -->
 	<dependencies>
 		<li>2009463077</li><!-- Harmony -->
 	</dependencies>
@@ -11,4 +11,4 @@
 	<showCrossPromotions>true</showCrossPromotions>
 	<manifestUri>https://raw.githubusercontent.com/CombatExtended-Continued/CombatExtended/master/About/Manifest.xml</manifestUri>
 	<downloadUri>https://github.com/CombatExtended-Continued/CombatExtended/releases/latest</downloadUri>
-</Manifest>
+</Manifest>
diff --git a/Assemblies/0CombatExtendedLoader.dll b/Assemblies/0CombatExtendedLoader.dll
diff --git a/Defs/Ammo/GENERIC/AntiMateriel.xml → Defs/Ammo/Generic/AntiMateriel.xml b/Defs/Ammo/GENERIC/AntiMateriel.xml → Defs/Ammo/Generic/AntiMateriel.xml
diff --git a/Defs/Ammo/GENERIC/Autocannon.xml → Defs/Ammo/Generic/Autocannon.xml b/Defs/Ammo/GENERIC/Autocannon.xml → Defs/Ammo/Generic/Autocannon.xml
diff --git a/Defs/Ammo/GENERIC/Charged.xml → Defs/Ammo/Generic/Charged.xml b/Defs/Ammo/GENERIC/Charged.xml → Defs/Ammo/Generic/Charged.xml
diff --git a/Defs/Ammo/GENERIC/Generics_Misc.xml → Defs/Ammo/Generic/Generics_Misc.xml b/Defs/Ammo/GENERIC/Generics_Misc.xml → Defs/Ammo/Generic/Generics_Misc.xml
diff --git a/Defs/Ammo/GENERIC/LauncherGrenade.xml → Defs/Ammo/Generic/LauncherGrenade.xml b/Defs/Ammo/GENERIC/LauncherGrenade.xml → Defs/Ammo/Generic/LauncherGrenade.xml
diff --git a/Defs/Ammo/GENERIC/Mech.xml → Defs/Ammo/Generic/Mech.xml b/Defs/Ammo/GENERIC/Mech.xml → Defs/Ammo/Generic/Mech.xml
diff --git a/Defs/Ammo/GENERIC/Pistol.xml → Defs/Ammo/Generic/Pistol.xml b/Defs/Ammo/GENERIC/Pistol.xml → Defs/Ammo/Generic/Pistol.xml
diff --git a/Defs/Ammo/GENERIC/PistolMagnum.xml → Defs/Ammo/Generic/PistolMagnum.xml b/Defs/Ammo/GENERIC/PistolMagnum.xml → Defs/Ammo/Generic/PistolMagnum.xml
diff --git a/Defs/Ammo/GENERIC/Rifle.xml → Defs/Ammo/Generic/Rifle.xml b/Defs/Ammo/GENERIC/Rifle.xml → Defs/Ammo/Generic/Rifle.xml
diff --git a/Defs/Ammo/GENERIC/RifleIntermediate.xml → Defs/Ammo/Generic/RifleIntermediate.xml b/Defs/Ammo/GENERIC/RifleIntermediate.xml → Defs/Ammo/Generic/RifleIntermediate.xml
diff --git a/Defs/Ammo/GENERIC/RifleMagnum.xml → Defs/Ammo/Generic/RifleMagnum.xml b/Defs/Ammo/GENERIC/RifleMagnum.xml → Defs/Ammo/Generic/RifleMagnum.xml