Merge branch 'master' of https://github.com/PorktoberRevolution/ReSto…

…cked
PorktoberRevolution · Feb 25, 2022 · 9f980d4 · 9f980d4
2 parents 72996db + b0450f0
commit 9f980d4
Show file tree

Hide file tree

Showing 8 changed files with 1,965 additions and 7 deletions.
diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-engineplate-125-2.mu b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-engineplate-125-2.mu
diff --git a/Distribution/Restock/GameData/ReStock/PatchesMH/Coupling/restock-mh-engineplates.cfg b/Distribution/Restock/GameData/ReStock/PatchesMH/Coupling/restock-mh-engineplates.cfg
diff --git a/Distribution/Restock/changelog.txt b/Distribution/Restock/changelog.txt
@@ -1,8 +1,10 @@
 v1.4.3
 ------
+- KSP 1.12.3
+- Incorporated 1.25m Engine Plate into ReStock base to account for Making History 1.25m Engine Plate addition
 - Fix Communotron 88-88 starting extended in the VAB (#965)
 - Added a depth mask to the Communotron 88-88
-- Fixed Reliant boattail grey option being the old pre-1.12 one.
+- Fixed Reliant boattail grey option being the old pre-1.12 one
 - Removed extra rescaleFactor from Swivel
 
 v1.4.2

diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Localization/en-us.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Localization/en-us.cfg
@@ -341,7 +341,8 @@ Localization
     #LOC_RestockPlus_restock-airlock-inflatable-625-1_tags = restock berth capture connect couple dock fasten join moor shield socket inflate airlock Leonov Voskhod
 
     // 1.25m
-    #LOC_RestockPlus_restock-engineplate-125-1_title = EP-12 Engine Plate
+    #LOC_RestockPlus_restock-engineplate-125-1_title = EP-12 Engine Plate *DEPRECATED DO NOT USE*
+	#LOC_RestockPlus_restock-engineplate-125-2_title = EP-12 Engine Plate
     #LOC_RestockPlus_restock-engineplate-125-1_description = A small plate for holding one or more engines. Includes optional boattail to protect first stage engines, or several lengths of shroud. Includes a decoupler for use with upper stages.
     #LOC_RestockPlus_restock-engineplate-125-1_tags = restock engine plate shroud boattail explo break decouple seperat split pancake 125 1.25 Electron
 

diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Localization/ja.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Localization/ja.cfg
diff --git a/...ibution/RestockPlus/GameData/ReStockPlus/Parts/Coupling/125/restock-engineplate-125-1.cfg b/...ibution/RestockPlus/GameData/ReStockPlus/Parts/Coupling/125/restock-engineplate-125-1.cfg
@@ -14,11 +14,14 @@ PART
   rescaleFactor = 1.0
   node_stack_top = 0.0, 0.1, 0.0, 0.0, 1.0, 0.0, 1
   node_stack_bottom = 0.0, 0, 0.0, 0.0, -1.0, 0.0, 1, 0, 0, 1, 0
+  /// Flag to disable this part if MH is installed
+  MHReplacement = True
   TechRequired = advConstruction
   entryCost = 2200
+  TechHidden = True
   cost = 200
-  category = Coupling
-  title = #LOC_RestockPlus_restock-engineplate-125-1_title // EP-12 Engine Plate
+  category = none
+  title = #LOC_RestockPlus_restock-engineplate-125-1_title // EP-12 Engine Plate *DEPRECATED DO NOT USE*
   manufacturer = #autoLOC_501682 // Rokea Inc
   description = #LOC_RestockPlus_restock-engineplate-125-1_description 
   // A small plate for holding one or more engines. Includes optional boattail to protect first stage engines, or several lengths of shroud. Includes a decoupler for use with upper stages.