Merge pull request '4.2.1 release' (#56) from develop into main

Reviewed-on: #56

CHANGELOG.md

@@ -4,6 +4,34 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project badly attempts [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [4.2.1] - 2024-06-23
+
+### Changed
+
+- Allowed Equipment Definition typo
+
+## [4.2.0] - 2024-06-20
+
+### Added
+
+- Custom remainsCollector script to replace and supplement the built in arma remainsCollector function
+- New Resupply Boxes
+- Ability to spawn spare tires and tracks at the arsenal and via Zeus module
+
+### Changed
+
+- Split vehicle flags into colors and shapes for additional options
+- Battalion Callsigns
+- Allowed Equipment Definitions
+- Resupply Box Contents
+- Fixed incorrect ace carry variable setting
+
+### Removed
+
+- SMA mod references
+- Extraneous server performance calculation broadcast to all clients
+- Ability for pilots to check re-insertion queue
+
 ## [4.1.2] - 2024-04-25
 
 ### Changed

defines/DisallowedEquipment.hpp

@@ -141,7 +141,7 @@ class DisallowedEquipment {
 			"Tier1_ATACR18_Geissele_Docter_Black", //Nightforce Series Optic
 			"Tier1_ATACR18_Geissele_Docter_Desert_Vanilla", //Nightforce Series Optic
 			"Tier1_ATACR18_Geissele_Docter_Desert", //Nightforce Series Optic
-			"sps_black_hornet_01_F" // Black Hornet Drone Mod
+			"sps_black_hornet_01_Static_F" // Black Hornet Drone Mod
 		};
 	};
 

defines/SupplyCrates.hpp

@@ -210,4 +210,28 @@ class SupplyCrates {
 		};
 		items[] = {};
 	};
+
+	class ResupplyTire {
+		boxClass = "ACE_Wheel";
+		displayName = "Vehicle Tire";
+		tooltip = "A single tire for replacement";
+		icon = "A3\ui_f\data\igui\cfg\simpletasks\types\repair_ca.paa";
+		
+		backpacks[] = {};
+		weapons[] = {};
+		magazines[] = {};
+		items[] = {};
+	};
+
+	class ResupplyTrack {
+		boxClass = "ACE_Track";
+		displayName = "Vehicle Track";
+		tooltip = "A single track for replacement";
+		icon = "z\ace\addons\repair\ui\patch_ca.paa";
+		
+		backpacks[] = {};
+		weapons[] = {};
+		magazines[] = {};
+		items[] = {};
+	};
 };

framework/script_version.hpp

@@ -1,4 +1,4 @@
 #define MAJOR 4
-#define MINOR 1
-#define PATCHLVL 2
+#define MINOR 2
+#define PATCHLVL 1
 #define BUILD 0