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

Reviewed-on: #56
Update script_version.hpp
2024-06-23 23:35:59 -05:00 · 2024-06-23 23:33:23 -05:00 · 2024-06-23 23:33:07 -05:00 · 2024-06-23 23:32:24 -05:00 · 2024-06-20 23:51:06 -05:00
3 changed files with 8 additions and 3 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,12 @@ 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
@@ -12,7 +18,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - 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
--- a/defines/DisallowedEquipment.hpp
+++ b/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
 		};
 	};

--- a/framework/script_version.hpp
+++ b/framework/script_version.hpp
@@ -1,4 +1,4 @@
 #define MAJOR 4
 #define MINOR 2
-#define PATCHLVL 0
+#define PATCHLVL 1
 #define BUILD 0
Author	SHA1	Message	Date
hizumi	c94f660682	Merge pull request '4.2.1 release' (#56 ) from develop into main All checks were successful Generate testing snapshot / Create testing release (push) Successful in 41s Details Reviewed-on: #56	2024-06-23 23:35:59 -05:00
hizumi	7e93ebfbfd	Update script_version.hpp All checks were successful Generate testing snapshot / Create testing release (push) Successful in 41s Details prep 4.2.1 release	2024-06-23 23:33:23 -05:00
hizumi	e0c8f3c952	Update CHANGELOG.md version 4.2.0 release notes	2024-06-23 23:33:07 -05:00
hizumi	d200f83375	Update DisallowedEquipment.hpp	2024-06-23 23:32:24 -05:00
hizumi	51c5da44ce	Merge pull request '4.2.0 release' (#55 ) from develop into main All checks were successful Generate testing snapshot / Create testing release (push) Successful in 36s Details Reviewed-on: #55	2024-06-20 23:51:06 -05:00