From 9a31df1547fa6f50a66114f640460ff8fc789cd5 Mon Sep 17 00:00:00 2001
From: ChrisAdderley <cadderley@gmail.com>
Date: Sat, 28 Dec 2019 12:20:19 -0800
Subject: [PATCH] Some fixes

- Including #765, #766
---
 .../Aero/restock-heatshield-inflatable-1.mu   | Bin 1240448 -> 1240448 bytes
 .../GameData/ReStock/Localization/en-us.cfg   |   4 ++--
 Distribution/Restock/changelog.txt            |   5 +++++
 Distribution/RestockPlus/changelog.txt        |   4 ++++
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-heatshield-inflatable-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-heatshield-inflatable-1.mu
index 49cb8a5a508ebe707ee6f1c8c8c4c7ed43034bf1..b84f697bf14728003c4a3197075c36a093a4fb2c 100644
GIT binary patch
delta 98
zcmZp;?cD%GTNu-1d6vy~*_|)cY&C19<i7SISw<jc0%B$$W&vVWAZ7z%b|B^eVoo6D
c0%C3;<^f_}Am#&NejpYAV!`c2vO;_p0IwP!-T(jq

delta 98
zcmZp;?cD%GTNu-1c`{5AcZ+Wiv|6mZ)3&`xmJx`VfS4JGS%8=oh}nRc9f&!Am=lP(
cfS4PId4QM~i1~n+ABY8jSa5rhtPtM?0CMpkBLDyZ

diff --git a/Distribution/Restock/GameData/ReStock/Localization/en-us.cfg b/Distribution/Restock/GameData/ReStock/Localization/en-us.cfg
index 533c9c24..dabb07b7 100644
--- a/Distribution/Restock/GameData/ReStock/Localization/en-us.cfg
+++ b/Distribution/Restock/GameData/ReStock/Localization/en-us.cfg
@@ -40,8 +40,8 @@ Localization
     #LOC_Restock_variant-engine_boattail_size1p5_white = Boattail (1.875m, White)
     #LOC_Restock_variant-engine_boattail_size1_grey-orange = Boattail (1.25m, Orange/Grey)
     #LOC_Restock_variant-engine_boattail_size1p5_grey-orange = Boattail (1.875m, Orange/Grey)
-	#LOC_Restock_variant-engine_tankbutt_size1p5_white = Tankbutt (1.875m, White)
-    #LOC_Restock_variant-engine_tankbutt_size1p5_grey-orange = Tankbutt (1.875m, Orange/Grey)
+	#LOC_Restock_variant-engine_tankbutt_size1p5_white = Tankbutt (2.5m, White)
+    #LOC_Restock_variant-engine_tankbutt_size1p5_grey-orange = Tankbutt (2.5m, Orange/Grey)
 
     #LOC_Restock_variant-engine_shroud_white = White Shroud
     #LOC_Restock_variant-engine_shroud_grey-orange = Metallic Shroud
diff --git a/Distribution/Restock/changelog.txt b/Distribution/Restock/changelog.txt
index e6b72ba7..d88b8234 100644
--- a/Distribution/Restock/changelog.txt
+++ b/Distribution/Restock/changelog.txt
@@ -1,3 +1,8 @@
+v1.0.2
+-----
+- Fixed 'tankbutt' localizations for Skiff showing 1.875m when they should be 2.5m (#766)
+- Fixed inflatable heatshield fairing (#765)
+
 v1.0.1
 -----
 - Fixed lack of bundled ModuleManager
diff --git a/Distribution/RestockPlus/changelog.txt b/Distribution/RestockPlus/changelog.txt
index f58ba192..2e112f8e 100644
--- a/Distribution/RestockPlus/changelog.txt
+++ b/Distribution/RestockPlus/changelog.txt
@@ -1,3 +1,7 @@
+v1.0.2
+-----
+- Fixed tech tree locations for 1.875m decoupler and separator
+
 v1.0.1
 ------
 - Fixed lack of bundled ModuleManager