From 3337c5a74996e374225c341f7af944f7c6646ddb Mon Sep 17 00:00:00 2001
From: AirwavesMan <AirwavesMan@users.noreply.github.com>
Date: Tue, 23 Mar 2021 15:39:50 +0100
Subject: [PATCH 1/2] Remove new parachute due to model issues

Unfortunately we have to remove the new parachute model. The model does not behave corretly when the player lands.
---
 CHANGE LOG 1.0.7.txt                              | 1 -
 SQF/dayz_code/Configs/CfgVehicles/CfgVehicles.hpp | 3 ---
 SQF/dayz_code/Configs/CfgVehicles/Parachute.hpp   | 4 ----
 3 files changed, 8 deletions(-)
 delete mode 100644 SQF/dayz_code/Configs/CfgVehicles/Parachute.hpp

diff --git a/CHANGE LOG 1.0.7.txt b/CHANGE LOG 1.0.7.txt
index bad0381d5..5bc359969 100644
--- a/CHANGE LOG 1.0.7.txt	
+++ b/CHANGE LOG 1.0.7.txt	
@@ -153,7 +153,6 @@
 [UPDATED] The Journal main page was reworked and has some more information about the server settings now. (ef05eb4e) @AirwavesMan
 [UPDATED] Harvesting wood will yield at least 16 or more wood. This was added in order to decrease network traffic. (8dc6ef8d) @AirwavesMan
 [UPDATED] Increased cargo count of Refuel Trucks. (4667f20b) @AirwavesMan
-[UPDATED] The parachute has a new model. (cc4ee5b2) @AirwavesMan, @Helion4
 [UPDATED] Cinder buildings and metal floors have a new texture. @Helion4
 [UPDATED] Highly increased infection chance if the player eats uncooked meat or fish. (29b6a26) @AirwavesMan
 [UPDATED] Crafting wooden buildings now requires a handsaw and a hammer. (247f5dc6) @AirwavesMan
diff --git a/SQF/dayz_code/Configs/CfgVehicles/CfgVehicles.hpp b/SQF/dayz_code/Configs/CfgVehicles/CfgVehicles.hpp
index 7609b527c..57ce03a87 100644
--- a/SQF/dayz_code/Configs/CfgVehicles/CfgVehicles.hpp
+++ b/SQF/dayz_code/Configs/CfgVehicles/CfgVehicles.hpp
@@ -708,9 +708,6 @@ class CfgVehicles
 	#include "Boat\JetSkiYanahui.hpp"
 	#include "Boat\Seafox.hpp"
 	#include "Boat\Submarine.hpp"
-	
-	//Epoch Parachute
-	#include "Parachute.hpp"
 
 	//Includes all Building Stuff
 	//Houses
diff --git a/SQF/dayz_code/Configs/CfgVehicles/Parachute.hpp b/SQF/dayz_code/Configs/CfgVehicles/Parachute.hpp
deleted file mode 100644
index 30d0d2afa..000000000
--- a/SQF/dayz_code/Configs/CfgVehicles/Parachute.hpp
+++ /dev/null
@@ -1,4 +0,0 @@
-class ParachuteBase;
-class ParachuteWest: ParachuteBase {
-	model = "\z\addons\dayz_epoch_v\vehicles\chute\PARA.p3d";
-};
\ No newline at end of file

From 0cb84e8cb9fdcc4403ebbc16dabd2f9b0fe57a48 Mon Sep 17 00:00:00 2001
From: AirwavesMan <AirwavesMan@users.noreply.github.com>
Date: Wed, 24 Mar 2021 13:50:27 +0100
Subject: [PATCH 2/2] Fix wrong gunrack 2 string

---
 SQF/dayz_code/stringtable.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml
index 1a1ac640d..8937ff013 100644
--- a/SQF/dayz_code/stringtable.xml
+++ b/SQF/dayz_code/stringtable.xml
@@ -27935,7 +27935,7 @@
 			<German>Ein Waffenregal für 20 Waffen.</German>
 			<Russian>Полка, на которую можно повесить до 20 единиц оружия.</Russian>
 		</Key>
-		<Key ID="STR_EPOCH_GUNRACKKIT_DESC2">
+		<Key ID="STR_EPOCH_GUNRACKKIT2_DESC">
 			<English>A Gun Rack for 40 weapons.</English>
 			<German>Ein Waffenregal für 40 Waffen.</German>
 			<Russian>Полка, на которую можно повесить до 40 единиц оружия.</Russian>