Merge pull request #998 from PorktoberRevolution/master

v1.4.4 Release PR
PorktoberRevolution · May 18, 2024 · 4ca4216 · 4ca4216
2 parents 4183f20 + 1877cec
commit 4ca4216
Show file tree

Hide file tree

Showing 31 changed files with 275 additions and 236 deletions.
diff --git a/Distribution/Restock/.mod_data.yml b/Distribution/Restock/.mod_data.yml
@@ -13,8 +13,9 @@ package:
     - RestockRigidLegs
 dependencies:  # Configure dependencies
   ModuleManager:
-    version: 4.2.1
-    location: s3
+    location: url
+    url: https://ksp.sarbian.com/jenkins/job/ModuleManager/163/artifact/ModuleManager.4.2.3.dll
+    zip: false
 deploy:
   SpaceDock:
     enabled: true  # activate/deactivate this deployment script

diff --git a/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-leg-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-leg-1.mu
diff --git a/Distribution/Restock/GameData/ReStock/Localization/ru.cfg b/Distribution/Restock/GameData/ReStock/Localization/ru.cfg
diff --git a/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-lights.cfg b/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-lights.cfg
@@ -42,7 +42,7 @@
     VARIANT
     {
       name = Dark
-      displayName #autoLOC_8007117
+      displayName = #autoLOC_8007117
       themeName = Dark
       primaryColor = #000000
       secondaryColor = #000000
@@ -90,7 +90,6 @@
     canPitch = true
     pitchAxisName = X
     pitchMin = 0
-    pitchMin = 0
     pitchMax = 180
   }
   MODULE
@@ -102,7 +101,7 @@
     VARIANT
     {
       name = Dark
-      displayName #autoLOC_8007117
+      displayName = #autoLOC_8007117
       themeName = Dark
       primaryColor = #000000
       secondaryColor = #000000
@@ -162,7 +161,7 @@
     VARIANT
     {
       name = Dark
-      displayName #autoLOC_8007117
+      displayName = #autoLOC_8007117
       themeName = Dark
       primaryColor = #000000
       secondaryColor = #000000
@@ -210,7 +209,6 @@
     canPitch = true
     pitchAxisName = X
     pitchMin = 0
-    pitchMin = 0
     pitchMax = 180
   }
   !MODULE[ModulePartVariants] {}
@@ -223,7 +221,7 @@
     VARIANT
     {
       name = Dark
-      displayName #autoLOC_8007117
+      displayName = #autoLOC_8007117
       themeName = Dark
       primaryColor = #000000
       secondaryColor = #000000
@@ -278,7 +276,7 @@
     VARIANT
     {
       name = Dark
-      displayName #autoLOC_8007117
+      displayName = #autoLOC_8007117
       themeName = Dark
       primaryColor = #000000
       secondaryColor = #000000
@@ -348,7 +346,7 @@
     VARIANT
     {
       name = Dark
-      displayName #autoLOC_8007117
+      displayName = #autoLOC_8007117
       themeName = Dark
       primaryColor = #000000
       secondaryColor = #000000
@@ -417,7 +415,7 @@
     VARIANT
     {
       name = Dark
-      displayName #autoLOC_8007117
+      displayName = #autoLOC_8007117
       themeName = Dark
       primaryColor = #000000
       secondaryColor = #000000
@@ -486,7 +484,7 @@
     VARIANT
     {
       name = Dark
-      displayName #autoLOC_8007117
+      displayName = #autoLOC_8007117
       themeName = Dark
       primaryColor = #000000
       secondaryColor = #000000

diff --git a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-25.cfg b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-25.cfg
@@ -121,7 +121,7 @@
   {
     @name = ModuleEnginesFX
     %runningEffectName = fx-poodle-running
-  }s
+  }
   !MODULE[FXModuleLookAtConstraint] {}
   MODULE
   {

diff --git a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-375.cfg b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-375.cfg
@@ -8,7 +8,7 @@
 {
   @author = Chris Adderley (Nertea)
   !mesh = DELETE
-  !MODEL = {}
+  !MODEL {}
   MODEL
   {
     model = ReStock/Assets/Engine/restock-engine-rhino-1
@@ -20,7 +20,6 @@
     cube = 0, 15.48,0.7679,2.678, 15.48,0.7679,2.743, 11.07,0.9882,0.3025, 11.06,0.7086,4, 15.48,0.7679,2.678, 15.48,0.7679,2.743, 0.002109,-0.5297,-0.002108, 5.308,4.086,5.308
     cube = 1, 11.59,0.7684,2.41, 11.59,0.7684,2.426, 11,0.5,3.35, 11,0.5,2.257, 11.59,0.7685,2.41, 11.59,0.7681,2.41, 0,-0.8842,0, 3.765,3.374,3.765
   }
-  #node_stack_bottom02 = 0.0, -2.536873, 0.0, 0.0, -1.0, 0.0, 3
   %node_attach = 0.0, 1.487975, 0.0, 0.0, 1.0, 0.0, 3
   @attachRules = 1,1,1,0,0
   !EFFECTS {}
@@ -272,7 +271,7 @@
 {
   @author = Chris Adderley (Nertea)
   !mesh = DELETE
-  !MODEL = {}
+  !MODEL {}
   MODEL
   {
     model = ReStock/Assets/Engine/restock-engine-mammoth-1

diff --git a/Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-truss.cfg b/Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-truss.cfg
@@ -387,7 +387,6 @@
       displayName = #LOC_Restock_variant-surface_thermalblankets
       primaryColor = #ffffff
       GAMEOBJECTS
-      GAMEOBJECTS
       {
         PanelBasic =  false
         PanelHollow = false
@@ -503,7 +502,6 @@
       displayName = #LOC_Restock_variant-surface_thermalblankets
       primaryColor = #ffffff
       GAMEOBJECTS
-      GAMEOBJECTS
       {
         PanelXLBasic =  false
         PanelXLHollow = false

diff --git a/Distribution/Restock/GameData/ReStock/PatchesMH/Coupling/restock-mh-engineplates.cfg b/Distribution/Restock/GameData/ReStock/PatchesMH/Coupling/restock-mh-engineplates.cfg
@@ -35,7 +35,7 @@
     VARIANT
     {
       name = Short
-      mass = -0.02
+      mass = -0.01
       cost = 0
       displayName =  #LOC_Restock_variant-tube-length-short // Short
       primaryColor = #3a562a
@@ -70,7 +70,7 @@
     VARIANT
     {
       name = Medium-Short
-      mass = -0.015
+      mass = -0.0075
       cost = 0
       displayName =  #LOC_Restock_variant-tube-length-med-short // Medium-Short
       primaryColor = #3a562a
@@ -105,7 +105,7 @@
     VARIANT
     {
       name = Medium
-      mass = -0.01
+      mass = -0.005
       cost = 0
       displayName =  #LOC_Restock_variant-tube-length-med // Medium
       primaryColor = #3a562a
@@ -140,7 +140,7 @@
     VARIANT
     {
       name = Medium-Long
-      mass = -0.005
+      mass = -0.0025
       cost = 0
       displayName =  #LOC_Restock_variant-tube-length-med-long // Medium-Long
       primaryColor = #3a562a
@@ -210,7 +210,7 @@
     VARIANT
     {
       name = Short-Orange
-      mass = -0.02
+      mass = -0.01
       cost = 0
       displayName = #LOC_Restock_variant-tube-length-short-alt // Short (Alternate)
       primaryColor = #f49841
@@ -245,7 +245,7 @@
     VARIANT
     {
       name = Medium-Short-Orange
-      mass = -0.015
+      mass = -0.0075
       cost = 0
       displayName =  #LOC_Restock_variant-tube-length-med-short-alt // Medium-Short (Alternate)
       primaryColor = #f49841
@@ -280,7 +280,7 @@
     VARIANT
     {
       name = Medium-Orange
-      mass = -0.01
+      mass = -0.005
       cost = 0
       displayName = #LOC_Restock_variant-tube-length-med-alt // Medium (Alternate)
       primaryColor = #f49841
@@ -315,7 +315,7 @@
     VARIANT
     {
       name = Medium-Long-Orange
-      mass = -0.005
+      mass = -0.0025
       cost = 0
       displayName = #LOC_Restock_variant-tube-length-med-long-alt // Medium-Long (Alternate)
       primaryColor = #f49841
@@ -385,7 +385,7 @@
     VARIANT
     {
       name = Boattail-Dark
-      mass = -0.015
+      mass = -0.0075
       cost = 50
       displayName = #LOC_Restock_variant-engine_boattail_dark // Boattail (Dark)
       primaryColor = #4c4f47
@@ -420,7 +420,7 @@
     VARIANT
     {
       name = Boattail-White
-      mass = -0.015
+      mass = -0.0075
       cost = 50
       displayName = #LOC_Restock_variant-engine_boattail_white // Boattail (White)
       primaryColor = #ffffff
@@ -455,7 +455,7 @@
     VARIANT
     {
       name = Boattail-Orange
-      mass = -0.015
+      mass = -0.0075
       cost = 50
       displayName = #LOC_Restock_variant-engine_boattail_grey-orange // Boattail (Orange/Grey)
       primaryColor = #f49841

diff --git a/Distribution/Restock/GameData/ReStock/PatchesMH/Engine/restock-mh-engines-25.cfg b/Distribution/Restock/GameData/ReStock/PatchesMH/Engine/restock-mh-engines-25.cfg
@@ -714,7 +714,7 @@
       }
       NODES
       {
-        node_stack_top = 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 2
+        node_stack_top = 0.0, 0.177279, 0.0, 0.0, 1.0, 0.0, 2
         node_stack_bottom = 0.0, -2.54, 0.0, 0.0, -1.0, 0.0, 2
       }
     }
@@ -914,7 +914,7 @@
       }
       NODES
       {
-        node_stack_top = 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 2
+        node_stack_top = 0.0, 0.177279, 0.0, 0.0, 1.0, 0.0, 2
         node_stack_bottom = 0.0, -2.54, 0.0, 0.0, -1.0, 0.0, 2
       }
     }

diff --git a/Distribution/Restock/GameData/ReStock/Props/Hatches/RS_HTCH_625.cfg b/Distribution/Restock/GameData/ReStock/Props/Hatches/RS_HTCH_625.cfg
@@ -7,6 +7,6 @@ PROP
   {
     model = ReStock/Props/Hatches/RS_HTCH_625
   }
+  proxy = 0, 0, 0,    0.6, 0.1, 0.6,   1, 0, 0
 }
 
-proxy = 0, 0, 0,    0.6, 0.1, 0.6,   1, 0, 0
diff --git a/Distribution/Restock/GameData/ReStock/Props/Lights/RS_LGHT_Airlock_Green.cfg b/Distribution/Restock/GameData/ReStock/Props/Lights/RS_LGHT_Airlock_Green.cfg
@@ -7,6 +7,6 @@ PROP
   {
     model = ReStock/Props/Lights/RS_LGHT_Airlock_Green
   }
+  proxy = 0, 0, 0,    0.10, 0.15, 0.07,   1, 0, 0
 }
 
-proxy = 0, 0, 0,    0.10, 0.15, 0.07,   1, 0, 0
diff --git a/Distribution/Restock/GameData/ReStock/Props/Lights/RS_LGHT_Airlock_Red.cfg b/Distribution/Restock/GameData/ReStock/Props/Lights/RS_LGHT_Airlock_Red.cfg
@@ -7,6 +7,6 @@ PROP
   {
     model = ReStock/Props/Lights/RS_LGHT_Airlock_Red
   }
+  proxy = 0, 0, 0,    0.10, 0.15, 0.07,   1, 0, 0
 }
 
-proxy = 0, 0, 0,    0.10, 0.15, 0.07,   1, 0, 0
diff --git a/Distribution/Restock/GameData/ReStock/Props/Lights/RS_LGHT_Box_1.cfg b/Distribution/Restock/GameData/ReStock/Props/Lights/RS_LGHT_Box_1.cfg
@@ -9,21 +9,21 @@ PROP
   }
 
   //MODULE
-  {
-    name = InternalButtonLight
-
-    buttonName = enable_BOXCOLLIDER
-    defaultValue = true
-
-    lightName = SpotLight
-    lightColor = 1,1,1
-    lightIntensityOn = 0.75
-    lightIntensityOff = 0
-
-    useButtonColor = true
-    buttonColorOn = 1,1,1
-    buttonColorOff = 0,0,0
-  }
+  //{
+  //  name = InternalButtonLight
+  //
+  //  buttonName = enable_BOXCOLLIDER
+  //  defaultValue = true
+  //
+  //  lightName = SpotLight
+  //  lightColor = 1,1,1
+  //  lightIntensityOn = 0.75
+  //  lightIntensityOff = 0
+  //
+  //  useButtonColor = true
+  //  buttonColorOn = 1,1,1
+  //  buttonColorOff = 0,0,0
+  //}
+  proxy = 0, 0, 0,    0.06, 0.15, 0.07,   1, 0, 0
 }
 
-proxy = 0, 0, 0,    0.06, 0.15, 0.07,   1, 0, 0
diff --git a/Distribution/Restock/GameData/ReStock/Versioning/ReStock.version b/Distribution/Restock/GameData/ReStock/Versioning/ReStock.version
@@ -6,14 +6,14 @@
     {
         "MAJOR":1,
         "MINOR":4,
-        "PATCH":3,
+        "PATCH":4,
         "BUILD":0
     },
     "KSP_VERSION":
     {
         "MAJOR":1,
         "MINOR":12,
-        "PATCH":2
+        "PATCH":4
     },
     "KSP_VERSION_MIN":{
         "MAJOR":1,

diff --git a/Distribution/Restock/changelog.txt b/Distribution/Restock/changelog.txt
@@ -1,3 +1,12 @@
+v1.4.4
+------
+- Fixed wheelCollider on the LT-05 Micro Landing Strut
+- Fixed 1.25m, 2.5m, 3.75m and 5m Engine Plate mass values
+- Fixed top node for Mastodon 3.75m Boattail variant
+- Fixed Russian localization syntax
+- Fixed variant display names for lights
+- Tidied up various config syntax errors, thank you HebaruSan!
+
 v1.4.3
 ------
 - KSP 1.12.3

diff --git a/Distribution/Restock/readme.txt b/Distribution/Restock/readme.txt
@@ -1,5 +1,5 @@
 =============
-RESTOCK 1.4.3
+RESTOCK 1.4.4
 =============
 
 Restock is a project to improve the art of the Kerbal Space Program part set. Some of the revisions are based on the canceled Part Overhaul project by Porkjet.
@@ -13,7 +13,7 @@ DEPENDENCIES
 ============
 
 Required:
-- ModuleManager (4.2.1)
+- ModuleManager (4.2.3)
 
 =======
 CREDITS
@@ -50,7 +50,7 @@ To install, drag the ReStock folder and ModuleManager DLL from the GameData fold
             - Assets
             - Patches
             - etc.
-        - ModuleManager.4.2.1.dll
+        - ModuleManager.4.2.3.dll
 
 ===============
 ASSET BLACKLIST
@@ -80,7 +80,7 @@ This mod primarily uses vanilla-provided localization, but for additional string
 - German (woeller)
 - French (Challyss and vinix38)
 - Brazilian Portuguese (AluisioASG)
-- Spanish (Niako)
+- Spanish (Niako and Fitiales)
 - Simplified Chinese (Duck1998)
 - Russian (Fedor-St)
 - Japanese (Chemical-Factory)
-Original file line number
+Diff line change
@@ Expand Up / @@ -121,7 +121,7 @@ @@
       {
         @name = ModuleEnginesFX
         %runningEffectName = fx-poodle-running
-      }s
+      }
       !MODULE[FXModuleLookAtConstraint] {}
       MODULE
       {
@@ Expand Down @@