Move changelog entry to the correct version

- Add VABOrganizer support
- Fix spurious png file (#1017)

.gitignore

@@ -13,3 +13,4 @@ Distribution/Restock/GameData/ReStock/Spaces/**/*.png
 Distribution/Restock/GameData/ReStock/Props/**/*.png
 Distribution/RestockPlus/GameData/ReStockPlus/Props/**/*.png
 Distribution/RestockPlus/GameData/ReStockPlus/Spaces/**/*.png
+Distribution/Restock/GameData/ReStock/RestockPatchDisabler.cfg

Distribution/Restock/.mod_data.yml

@@ -13,8 +13,9 @@ package:
     - RestockRigidLegs
 dependencies:  # Configure dependencies
   ModuleManager:
-    version: 4.1.4
-    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

Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-aero-25.cfg

@@ -1,6 +1,7 @@
 // Patches applying art changes to 2.5m aerodynamic parts
 // Contents:
 // - Protective Rocket Nose Cone Mk7 (rocketNoseCone_v2)
+// - Protective Rocket Nose Cone Mk7 (rocketNoseCone_v3)
 
 // Protective Rocket Nose Cone Mk7
 @PART[rocketNoseCone_v2]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
@@ -62,3 +63,64 @@
     }
   }
 }
+
+// Protective Rocket Nose Cone Mk7 [1.12]
+@PART[rocketNoseCone_v3]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
+{
+  @author = Chris Adderley (Nertea)
+  !mesh = DELETE
+  !MODEL,* {}
+  MODEL
+  {
+    model = ReStock/Assets/Structural/restock-nosecone-25-2
+  }
+  !MODULE[ModulePartVariants] {}
+  MODULE
+  {
+    name = ModulePartVariants
+    useMultipleDragCubes = false
+    baseVariant = White
+    VARIANT
+    {
+      name = White
+      displayName = #autoLOC_8007119
+      themeName = White
+      primaryColor = #ffffff
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        25mNoseconeBlackWhite = false
+        25mNoseconeWhite = true
+        25mNoseconeOrange = false
+      }
+    }
+    VARIANT
+    {
+      name = BlackAndWhite
+      displayName = #autoLOC_8007122
+      themeName = BlackAndWhite
+      primaryColor = #ffffff
+      secondaryColor = #000000
+      GAMEOBJECTS
+      {
+        25mNoseconeBlackWhite = true
+        25mNoseconeWhite = false
+        25mNoseconeOrange = false
+      }
+    }
+    VARIANT
+    {
+      name = Orange
+      displayName = #autoLOC_8007121
+      themeName = Orange
+      primaryColor = #4c4f47
+      secondaryColor = #f49841
+      GAMEOBJECTS
+      {
+        25mNoseconeBlackWhite = false
+        25mNoseconeWhite = false
+        25mNoseconeOrange = true
+      }
+    }
+  }
+}

Distribution/Restock/GameData/ReStock/Patches/Command/restock-probes.cfg

@@ -1,14 +1,14 @@
 // Patches applying art changes to probe parts
 // Contents:
+// - Probodobodyne QBE (probeCoreCube)
+// - Probodobodyne Stayputnik (probeCoreSphere_v2)
 // - Probodobodyne HECS (probeCoreHex_v2)
 // - Probodobodyne OKTO (probeCoreOcto_v2)
 // - Probodobodyne OKTO2 (probeCoreOcto2_v2)
-// - Probodobodyne Stayputnik (probeCoreSphere_v2)
-// - Probodobodyne QBE (probeCoreCube)
 // - Probodobodyne HECS2 (HECS2_ProbeCore)
 // - Probodobodyne RoveMate (roverBody_v2)
-// - RC-L01 Remote Guidance Unit (probeStackLarge)
 // - RC-001S Remote Guidance Unit (probeStackSmall)
+// - RC-L01 Remote Guidance Unit (probeStackLarge)
 
 // QBE
 @PART[probeCoreCube]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
@@ -20,6 +20,11 @@
   {
     model = ReStock/Assets/Command/restock-probe-qube-1
   }
+  !DRAG_CUBE {}
+  DRAG_CUBE
+  {
+    cube = Default, 0.2859,0.9363,0.135, 0.2859,0.9365,0.135, 0.2378,0.936,0.1355, 0.2378,0.9361,0.1355, 0.2859,0.9415,0.135, 0.2859,0.9415,0.135, 0,-1.49E-08,1.776E-15, 0.4885,0.5855,0.4885
+  }
   MODULE
   {
     name = ModulePartVariants
@@ -89,6 +94,11 @@
   {
     model = ReStock/Assets/Command/restock-probe-sphere-1
   }
+  !DRAG_CUBE {}
+  DRAG_CUBE
+  {
+    cube = Default, 0.7138,0.7224,0.555, 0.7138,0.7223,0.555, 0.6414,0.4475,0.5448, 0.6414,0.5677,0.6443, 0.7138,0.7218,0.555, 0.7138,0.722,0.555, 0,0.1422,0, 0.9058,1.008,0.9058
+  }
   MODULE
   {
     name = ModulePartVariants
@@ -131,6 +141,11 @@
   {
     model = ReStock/Assets/Command/restock-probe-hecs-1
   }
+  !DRAG_CUBE {}
+  DRAG_CUBE
+  {
+    cube = Default, 0.2532,0.8507,0.3093, 0.2532,0.8504,0.3093, 0.4086,0.997,0.09923, 0.4086,0.997,0.09923, 0.2846,0.7473,0.4278, 0.2846,0.7489,0.4278, 0,0.0006218,0, 0.7738,0.3751,0.6869
+  }
   MODULE
   {
     name = ModulePartVariants
@@ -200,6 +215,11 @@
   {
     model = ReStock/Assets/Command/restock-probe-okto-1
   }
+  !DRAG_CUBE {}
+  DRAG_CUBE
+  {
+    cube = Default, 0.2648,0.7948,0.3164, 0.2648,0.7922,0.3164, 0.3945,0.9742,0.1582, 0.3945,0.9742,0.1582, 0.2648,0.7908,0.3164, 0.2648,0.7893,0.3164, 1.788E-07,0,4.172E-07, 0.6866,0.3848,0.6866
+  }
   MODULE
   {
     name = ModulePartVariants
@@ -269,6 +289,11 @@
   {
     model = ReStock/Assets/Command/restock-probe-okto2-1
   }
+  !DRAG_CUBE {}
+  DRAG_CUBE
+  {
+    cube = Default, 0.06879,0.7797,0.2855, 0.06879,0.7815,0.2855, 0.2805,0.9745,0.1119, 0.2805,0.9744,0.1119, 0.06879,0.7758,0.2855, 0.06879,0.7706,0.2855, 1.252E-06,-3.725E-09,-3.01E-06, 0.5828,0.1206,0.5828
+  }
   MODULE
   {
     name = ModulePartVariants
@@ -338,6 +363,11 @@
   {
     model = ReStock/Assets/Command/restock-probe-hecs2-1
   }
+  !DRAG_CUBE {}
+  DRAG_CUBE
+  {
+    cube = Default, 1.433,0.8207,0.8363, 1.433,0.8226,0.8363, 1.832,0.9705,0.221, 1.832,0.9705,0.221, 1.56,0.7408,0.7851, 1.56,0.7396,0.7851, -1.329E-05,0,2.283E-05, 1.638,0.9988,1.455
+  }
   !MODULE[ModulePartVariants] {}
   MODULE
   {
@@ -490,7 +520,7 @@
   !DRAG_CUBE {}
   DRAG_CUBE
   {
-    cube = Default, 0.3123,0.71,0.7274, 0.3123,0.7034,0.7331, 1.402,0.9681,0.1515, 1.402,0.9704,0.1515, 0.3077,0.701,0.7337, 0.3077,0.7054,0.7279, -0.005277,-9.855E-05,0.0009629, 1.261,0.2428,1.273
+    cube = Default, 0.2933,0.7015,0.758, 0.2933,0.7015,0.758, 1.398,0.9704,0.1499, 1.398,0.9739,0.1499, 0.2852,0.6621,0.7765, 0.2852,0.6625,0.7765, 0,0,0, 1.334,0.22,1.359
   }
 }
 
@@ -507,6 +537,6 @@
   !DRAG_CUBE {}
   DRAG_CUBE
   {
-    cube = Default, 1.028,0.7385,1.39, 1.028,0.7359,1.38, 5.274,0.9786,0.1842, 5.274,0.9776,0.1842, 1.072,0.7048,1.374, 1.072,0.7024,1.385, -0.0003395,0.0003387,-0.00157, 2.57,0.4079,2.58
+    cube = Default, 0.9721,0.7331,1.4, 0.9721,0.7336,1.4, 5.261,0.9806,0.1842, 5.261,0.9795,0.1842, 0.9997,0.7319,1.375, 0.9997,0.7309,1.42, -1.748E-09,2.384E-09,-0.02, 2.611,0.38,2.651
   }
 }

Distribution/Restock/GameData/ReStock/Patches/Communication/restock-antennas.cfg

@@ -112,4 +112,9 @@
     @animationName = Deploy
     @pivotName = Dish
   }
+  MODULE
+  {
+    name = ModuleRestockDepthMask
+    maskTransform = DepthMask
+  }
 }

Distribution/Restock/GameData/ReStock/Patches/Coupling/restock-docking.cfg

@@ -1,6 +1,7 @@
 // Patches applying art changes to crewed utility/science parts
 // Contents:
 // - Inline Clamp-O-Tron (dockingPortLateral)
+// - Mk2 Clamp-O-Tron (mk2DockingPort)
 // - Clamp-O-Tron Jr. Docking Port (dockingPort3)
 // - Clamp-O-Tron Docking Port (dockingPort2)
 // - Clamp-O-Tron Sr. Docking Port (dockingPortLarge)
@@ -9,15 +10,38 @@
 // Inline Clamp-O-Tron
 @PART[dockingPortLateral]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 { 
-  @author = Passinglurker
+  @author = Passinglurker and Chris Adderley (Nertea)
   !mesh = DELETE
   !MODEL {}
   MODEL
   {
-    model = ReStock/Assets/Coupling/125/Re_dockingPortInline/restock-inlinedockingport-mk1-1
+    model = ReStock/Assets/Coupling/restock-docking-inline-125-1
   }
   %rescaleFactor = 1
   %manufacturer = #autoLOC_501624
+
+  @MODULE[ModuleAnimateGeneric]
+  {
+    @animationName = DockingPortExtend
+  }
+}
+
+// Mk2 Clamp-O-Tron
+@PART[mk2DockingPort]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
+{
+  @author = Porkjet and Chris Adderley (Nertea)
+  !mesh = DELETE
+  !MODEL {}
+  MODEL
+  {
+    model = ReStock/Assets/Coupling/restock-docking-inline-mk2-1
+  }
+  %rescaleFactor = 1
+
+  @MODULE[ModuleAnimateGeneric]
+  {
+    @animationName = DockingPortExtend
+  }
 }
 
 // Clamp-O-Tron Jr. Docking Port
@@ -28,7 +52,7 @@
   !MODEL {}
   MODEL
   {
-    model = ReStock/Assets/Coupling/restock-docking-0625
+    model = ReStock/Assets/Coupling/restock-docking-0625-2
   }
   %rescaleFactor = 1
   MODULE
@@ -76,7 +100,7 @@
   !MODEL {}
   MODEL
   {
-    model = ReStock/Assets/Coupling/restock-docking-125-1
+    model = ReStock/Assets/Coupling/restock-docking-125-2
   }
   MODEL
   {
@@ -86,41 +110,7 @@
     rotation = 180, 0, 0
   }
   %rescaleFactor = 1
-  MODULE
-  {
-    name = ModuleColorChanger
-    shaderProperty = _EmissiveColor
-    animRate = 0.8
-    animState = false
-    useRate = true
-    toggleInEditor = true
-    toggleInFlight = true
-    unfocusedRange = 5
-    toggleName = #autoLOC_502011 //#autoLOC_502011 = Toggle Lights
-    eventOnName = #autoLOC_502012 //#autoLOC_502012 = Lights On
-    eventOffName = #autoLOC_502013 //#autoLOC_502013 = Lights Off
-    toggleAction = True
-    defaultActionGroup = Light
-    redCurve
-    {
-      key = 0 0 0 3
-      key = 1 1 0 0
-    }
-    greenCurve
-    {
-      key = 0 0 0 1
-      key = 1 1 1 0
-    }
-    blueCurve
-    {
-      key = 0 0 0 0
-      key = 1 0.7 1.5 0
-    }
-    alphaCurve
-    {
-      key = 0 1
-    }
-  }
+ 
 }
 
 // Clamp-O-Tron Sr. Docking Port
@@ -131,7 +121,7 @@
   !MODEL {}
   MODEL
   {
-    model = ReStock/Assets/Coupling/restock-docking-25-1
+    model = ReStock/Assets/Coupling/restock-docking-25-3
   }
   MODEL
   {
@@ -141,39 +131,38 @@
     rotation = 180, 0, 0
   }
   %rescaleFactor = 1
+  !MODULE[ModulePartVariants] {}
   MODULE
   {
-    name = ModuleColorChanger
-    shaderProperty = _EmissiveColor
-    animRate = 0.8
-    animState = false
-    useRate = true
-    toggleInEditor = true
-    toggleInFlight = true
-    unfocusedRange = 5
-    toggleName = #autoLOC_502011 //#autoLOC_502011 = Toggle Lights
-    eventOnName = #autoLOC_502012 //#autoLOC_502012 = Lights On
-    eventOffName = #autoLOC_502013 //#autoLOC_502013 = Lights Off
-    toggleAction = True
-    defaultActionGroup = Light
-    redCurve
+    name = ModulePartVariants
+    baseVariant = Gray with Stripes
+    useMultipleDragCubes = false
+    VARIANT
     {
-      key = 0 0 0 3
-      key = 1 1 0 0
+      name = Gray with Stripes
+      displayName = #autoLOC_8320084
+      themeName = Gray
+      primaryColor = #999999
+      themeName = Gray with Stripes
+      secondaryColor = #b08b39
+      GAMEOBJECTS
+      {
+        Docking25Base = true
+        Docking25Grey = false
       }
-    greenCurve
-    {
-      key = 0 0 0 1
-      key = 1 1 1 0
     }
-    blueCurve
+    VARIANT
     {
-      key = 0 0 0 0
-      key = 1 0.7 1.5 0
+      name = Gray
+      displayName = #autoLOC_8007101
+      themeName = Gray
+      primaryColor = #999999
+      secondaryColor = #999999
+      GAMEOBJECTS
+      {
+        Docking25Base = false
+        Docking25Grey = true
       }
-    alphaCurve
-    {
-      key = 0 1
     }   
   }
 }
@@ -186,7 +175,7 @@
   !MODEL {}
   MODEL
   {
-    model = ReStock/Assets/Coupling/restock-docking-shielded-125-1
+    model = ReStock/Assets/Coupling/restock-docking-shielded-125-2
   }
   MODEL
   {
@@ -200,41 +189,7 @@
   {
     @animationName = PortExtend
   }
-  MODULE
-  {
-    name = ModuleColorChanger
-    shaderProperty = _EmissiveColor
-    animRate = 0.8
-    animState = false
-    useRate = true
-    toggleInEditor = true
-    toggleInFlight = true
-    unfocusedRange = 5
-    toggleName = #autoLOC_502011 //#autoLOC_502011 = Toggle Lights
-    eventOnName = #autoLOC_502012 //#autoLOC_502012 = Lights On
-    eventOffName = #autoLOC_502013 //#autoLOC_502013 = Lights Off
-    toggleAction = True
-    defaultActionGroup = Light
-    redCurve
-    {
-      key = 0 0 0 3
-      key = 1 1 0 0
-    }
-    greenCurve
-    {
-      key = 0 0 0 1
-      key = 1 1 1 0
-    }
-    blueCurve
-    {
-      key = 0 0 0 0
-      key = 1 0.7 1.5 0
-    }
-    alphaCurve
-    {
-      key = 0 1
-    }
-  }
+  
   MODULE
   {
     name = FXModuleLookAtConstraint

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

Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-solarpanels.cfg

@@ -7,6 +7,11 @@
 // - Gigantor XL Solar Array (largeSolarPanel)
 // - OX-STAT Photovoltaic Panels (solarPanels5)
 // - OX-STAT-XL Photovoltaic Panels (LgRadialSolarPanel)
+// - OX-10C Photovoltaic Panels (solarPanelOX10C)
+// - SP-10C Photovoltaic Panels (solarPanelSP10C)
+// - OX-10L Photovoltaic Panels (solarPanelOX10L)
+// - SP-10L Photovoltaic Panels (solarPanelSP10C)
+
 
 // OX-4L 1x6 Photovoltaic Panels
 @PART[solarPanels4]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
@@ -111,7 +116,7 @@
   !MODEL,* {}
   MODEL
   {
-    model = ReStock/Assets/Electrical/restock-solarpanel-gigantor
+    model = ReStock/Assets/Electrical/restock-solarpanel-gigantor-2
     position = 0.0, 0.0, 0.0
     scale = 1,1,1
     rotation = 0, 0, 0
@@ -141,6 +146,11 @@
     scale = 1,1,1
     rotation = 0, 0, 0
   }
+  !DRAG_CUBE {}
+  DRAG_CUBE
+  {
+    cube = Default, 0.01025,0.7987,0.2722, 0.01025,0.7975,0.2722, 0.00603,0.774,0.3413, 0.00603,0.7971,0.3281, 0.1637,1,0.09954, 0.1637,0.9751,0.1524, 7.587E-09,0,0.03411, 0.3466,0.4747,0.06439
+  }
 }
 
 // OX-STAT-XL Photovoltaic Panels
@@ -156,4 +166,103 @@
     scale = 1,1,1
     rotation = 0, 0, 0
   }
+  !DRAG_CUBE {}
+  DRAG_CUBE
+  {
+    cube = Default, 0.04594,0.04438,0.3137, 0.04594,0.1383,0.3137, 0.02723,0.7552,0.8965, 0.02723,0.7537,0.8965, 1.28,1,0.09967, 1.28,0.01395,0.252, -2.98E-08,0,0.08014, 0.8,1.6,0.1631
+  }
+}
+
+// OX-10C Photovoltaic Panels
+@PART[solarPanelOX10C]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
+{
+  @author = Chris Adderley (Nertea)
+  !mesh = DELETE
+  !MODEL,* {}
+  MODEL
+  {
+    model = ReStock/Assets/Electrical/restock-solarpanel-round-1
+    position = 0.0, 0.0, 0.0
+    scale = 1,1,1
+    rotation = 0, 0, 0
+  }
+  @MODULE[ModuleDeployableSolarPanel]
+    { 
+    @animationName = PanelsExtend
+    @secondaryTransformName = sunCatcher
+    %pivotName = B_PanelSunPivot
+    @breakName = B_PanelPitch
+  }
+  MODULE
+  {
+    name =  ModuleRestockDeployableMeshHider
+    transformName = Panels
+  }
+}
+
+// SP-10C Photovoltaic Panels
+@PART[solarPanelSP10C]
+{
+  @author = Chris Adderley (Nertea)
+  !mesh = DELETE
+  !MODEL,* {}
+  MODEL
+  {
+    model = ReStock/Assets/Electrical/restock-solarpanel-round-shrouded-1
+    position = 0.0, 0.0, 0.0
+    scale = 1,1,1
+    rotation = 0, 0, 0
+  }
+  @MODULE[ModuleDeployableSolarPanel]
+  {
+    @animationName = PanelsExtend
+    @secondaryTransformName = sunCatcher
+    %pivotName = B_PanelSunPivot
+    @breakName = B_PanelPitch
+  }
+  MODULE
+  {
+    name =  ModuleRestockDeployableMeshHider
+    transformName = Panels
+  }
+  MODULE
+  {
+    name = ModuleRestockDepthMask
+    maskTransform = DepthMask
+  }
+}
+
+// OX-10L Photovoltaic Panels
+@PART[solarPanelOX10L]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
+{
+  @author = Beale
+  !mesh = DELETE
+  !MODEL,* {}
+  MODEL
+  {
+    model = ReStock/Assets/Electrical/restock-ox-10l
+    position = 0.0, 0.0, 0.0
+    scale = 1,1,1
+    rotation = 0, 0, 0
+  }
+}
+
+// SP-10L Photovoltaic Panels
+@PART[solarPanelSP10L]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
+{
+  @author = Beale
+  !mesh = DELETE
+  !MODEL,* {}
+  MODEL
+  {
+    model = ReStock/Assets/Electrical/restock-sp-10l
+    position = 0.0, 0.0, 0.0
+    scale = 1,1,1
+    rotation = 0, 0, 0
+  }
+  MODULE
+  {
+    name = ModuleRestockDepthMask
+    maskTransform = mask
+  }
 }

Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-125.cfg

@@ -3,10 +3,10 @@
 // - LV-N "Nerv" Atomic Rocket Motor (nuclearEngine)
 // - S3 KS-25 "Vector" Liquid Fuel Engine (SSME)
 // - LV-909 "Terrier" Liquid Fuel Engine (liquidEngine3_v2)
-// - LV-T30 "Reliant" Liquid Fuel Engine (liquidEngine)
-// - LV-T45 "Swivel" Liquid Fuel Engine (liquidEngine2)
+// - LV-T30 "Reliant" Liquid Fuel Engine (liquidEngine_v2)
+// - LV-T45 "Swivel" Liquid Fuel Engine (liquidEngine2_v2)
 // - Mk-55 "Thud" Liquid Fuel Engine (radialLiquidEngine1-2) - FX only
-// - T-1 Toroidal "Aerospike" Liquid Fuel Engine (toroidalAerospike) - FX only
+// - T-1 Toroidal "Aerospike" Liquid Fuel Engine (toroidalAerospike)
 
 // LV-N "Nerv" Atomic Rocket Motor
 @PART[nuclearEngine]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
@@ -904,14 +904,14 @@
 }
 
 // LV-T30 "Reliant" Liquid Fuel Engine
-@PART[liquidEngine]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
+@PART[liquidEngine_v2]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
   @author = Porkjet and Chris Adderley (Nertea)
   !mesh = DELETE
   !MODEL {}
   MODEL
   {
-    model = ReStock/Assets/Engine/restock-engine-reliant-1
+    model = ReStock/Assets/Engine/restock-engine-reliant-2
   }
   %rescaleFactor = 1
   @scale = 1
@@ -1021,16 +1021,17 @@
     }
   }
   @bulkheadProfiles = srf, size1
-  %node_attach = 0.0, 0.90182625, 0.0, 0.0, 1.0, 0.0, 1
-  @node_stack_top = 0.0, 0.90182625, 0.0, 0.0, 1.0, 0.0
-  @node_stack_bottom = 0.0, -0.90925375, 0.0, 0.0, -1.0, 0.0
+
+  %node_attach = 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 1
+ 
+  !MODULE[ModulePartVariants] {}
   MODULE
   {
     name = ModulePartVariants
-    baseVariant = Size1
+    baseVariant = TrussMount
     VARIANT
     {
-      name = Size1
+      name = TrussMount
       displayName = #LOC_Restock_variant-engine_size1_white
       primaryColor = #999999
       secondaryColor = #ffffff
@@ -1051,7 +1052,7 @@
     }
     VARIANT
     {
-      name = Boattail
+      name = Shroud
       displayName = #LOC_Restock_variant-engine_boattail_white
       primaryColor = #ffffff
       secondaryColor = #ffffff
@@ -1072,7 +1073,7 @@
     }
     VARIANT
     {
-      name = Compact
+      name = Bare
       displayName = #LOC_Restock_variant-engine_compact_white
       primaryColor = #666666
       secondaryColor = #ffffff
@@ -1155,6 +1156,10 @@
       }
     }
   }
+  @MODULE[ModuleSurfaceFX]
+  {
+    @thrustProviderModuleIndex= 0
+  }
   @MODULE[ModuleEngines]
   {
     @name = ModuleEnginesFX
@@ -1245,20 +1250,18 @@
 }
 
 // LV-T45 "Swivel" Liquid Fuel Engine
-@PART[liquidEngine2]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
+@PART[liquidEngine2_v2]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
   @author = Porkjet and Chris Adderley (Nertea)
   !mesh = DELETE
   !MODEL {}
   MODEL
   {
-    model = ReStock/Assets/Engine/restock-engine-swivel-1
+    model = ReStock/Assets/Engine/restock-engine-swivel-2
   }
   @bulkheadProfiles = srf, size1
-  rescaleFactor = 1.0
-  @node_stack_top = 0.0, 9.0182625, 0.0, 0.0, 1.0, 0.0
-  @node_stack_bottom = 0.0, -7.179225, 0.0, 0.0, -1.0, 0.0
-  %node_attach = 0.0, 9.0182625, 0.0, 0.0, 1.0, 0.0, 1
+  %rescaleFactor = 1.0
+  %node_attach = 0.0, 0, 0.0, 0.0, 1.0, 0.0, 1
   @attachRules = 1,1,1,0,0
   !DRAG_CUBE {}
   DRAG_CUBE
@@ -1275,6 +1278,8 @@
   !sound_rocket_hard = DELETE
   !sound_vent_soft = DELETE
   !sound_explosion_low = DELETE
+
+  !MODULE[ModulePartVariants] {}
   EFFECTS
   {
     engage
@@ -1351,18 +1356,23 @@
       }
     }
   }
+  @MODULE[ModuleSurfaceFX]
+  {
+    @thrustProviderModuleIndex= 0
+  }
   @MODULE[ModuleEngines]
   {
     @name = ModuleEnginesFX
     %runningEffectName = fx-swivel-running
   }
+
   MODULE
   {
     name = ModulePartVariants
-    baseVariant = Size1
+    baseVariant = TrussMount
     VARIANT
     {
-      name = Size1
+      name = TrussMount
       displayName = #LOC_Restock_variant-engine_size1_white
       primaryColor = #999999
       secondaryColor = #ffffff
@@ -1389,7 +1399,7 @@
     }
     VARIANT
     {
-      name = Boattail
+      name = Shroud
       displayName = #LOC_Restock_variant-engine_boattail_white
       primaryColor = #ffffff
       secondaryColor = #ffffff
@@ -1416,7 +1426,7 @@
     }
     VARIANT
     {
-      name = Compact
+      name = Bare
       displayName = #LOC_Restock_variant-engine_compact_white
       primaryColor = #666666
       secondaryColor = #ffffff
@@ -1534,6 +1544,7 @@
     gimbalResponseSpeed = 8
     useGimbalResponseSpeed = true
   }
+  !MODULE[FXModuleLookAtConstraint] {}
   MODULE
   {
     name = FXModuleLookAtConstraint
@@ -1738,9 +1749,23 @@
   }
 }
 
-// T-1 Toroidal "Aerospike" Liquid Fuel Engine (FX only)
+// T-1 Toroidal "Aerospike" Liquid Fuel Engine
 @PART[toroidalAerospike]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
+  @author = Kavaeric
+  !mesh = DELETE
+  !MODEL {}
+  MODEL
+  {
+    model = ReStock/Assets/Engine/restock-engine-dart-1
+  }
+  %node_attach = 0.0, 0, 0.0, 0.0, 1.0, 0.0, 1
+  !DRAG_CUBE {}
+  DRAG_CUBE
+  {
+    cube = Fairing, 1.355,0.7569,0.7222, 1.355,0.7569,0.7222, 1.213,0.9305,0.254, 1.213,0.7276,0.9296, 1.355,0.7569,0.7222, 1.355,0.7568,0.7222, 0,-0.394,0, 1.25,1.095,1.25
+    cube = Clean, 0.6549,0.6778,0.691, 0.6549,0.6778,0.691, 1.095,0.9444,0.2547, 1.095,0.7086,0.8151, 0.6549,0.6767,0.691, 0.6549,0.6789,0.691, 0,-0.3368,0, 1.188,0.9809,1.188
+  }
   !fx_exhaustFlame_blue  = DELETE
   !fx_exhaustLight_blue = DELETE
   !fx_smokeTrail_light = DELETE
@@ -1782,7 +1807,7 @@
         volume = 0.0 0.0
         volume = 1.0 1.0
         pitch = 0.0 0.2
-        pitch = 1.0 1.0
+        pitch = 2.0 2.0
         loop = true
       }
       MODEL_MULTI_PARTICLE
@@ -1818,4 +1843,80 @@
     @name = ModuleEnginesFX
     %runningEffectName = fx-dart-running
   }
+  MODULE
+  {
+    name = ModulePartVariants
+    baseVariant = TrussMount
+    VARIANT
+    {
+	  name = TrussMount
+	  displayName = #LOC_Restock_variant-engine_size1
+	  primaryColor = #999999
+	  secondaryColor = #ffffff
+	  GAMEOBJECTS
+	  {
+	    Aerospike_Common = true
+        Aerospike_12_Mount = true
+        Aerospike_12_Boattail = false
+		Aerospike_Shroud_Empty = true
+	  }
+	}
+	VARIANT
+    {
+	  name = Shroud
+	  displayName = #LOC_Restock_variant-engine_boattail
+	  primaryColor = #ffffff
+	  secondaryColor = #ffffff
+	  GAMEOBJECTS
+	  {
+	    Aerospike_Common = true
+        Aerospike_12_Mount = false
+        Aerospike_12_Boattail = true
+		Aerospike_Shroud_Empty = false
+	  }
+	}
+  }
+  @MODULE[ModuleJettison]
+  {
+    @jettisonName = Aerospike_Shroud
+    %useMultipleDragCubes = true
+  }
+  !MODULE[FXModuleAnimateThrottle] {}
+  MODULE
+  {
+    name = FXModuleThrottleEffects
+    fxModuleNames = heatColor
+    responseSpeed = 1.0
+    dependOnEngineState = True
+    dependOnThrottle = True
+  }
+  MODULE
+  {
+    name = ModuleColorChanger
+    moduleID = heatColor
+    animRate = 0.05
+    shaderProperty = _EmissiveColor
+    toggleInEditor = false
+    toggleInFlight = false
+    redCurve
+    {
+      key = 0 0 1 1
+      key = 1 1 1 1
+    }
+    greenCurve
+    {
+      key = 0 0 1 1
+      key = 1 1 1 1
+    }
+    blueCurve
+    {
+      key = 0 0 1 1
+      key = 1 1 1 1
+    }
+    alphaCurve
+    {
+      key = 0 0 1 1
+      key = 1 1 1 1
+    }
+  }
 }

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
   {

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

Distribution/Restock/GameData/ReStock/Patches/FuelTank/restock-fueltanks-radial.cfg

@@ -14,6 +14,11 @@
   {
     model = ReStock/Assets/FuelTank/restock-fueltank-foil-sphere-1
   }
+  !DRAG_CUBE {}
+  DRAG_CUBE
+  {
+    cube = Default, 0.3158,0.6901,0.4184, 0.3158,0.6901,0.4184, 0.3018,0.6431,0.4109, 0.3018,0.6432,0.4109, 0.3158,0.6882,0.4184, 0.3158,0.6892,0.4184, -1.49E-08,0,0, 0.6402,0.625,0.6402
+  }
   !MODULE[ModulePartVariants] {}
   MODULE
   {
@@ -97,6 +102,11 @@
   {
     model = ReStock/Assets/FuelTank/restock-fueltank-foil-capsule-1
   }
+  !DRAG_CUBE {}
+  DRAG_CUBE
+  {
+    cube = Default, 0.7116,0.7432,0.4178, 0.7116,0.7432,0.4178, 0.3194,0.6708,0.4037, 0.3194,0.671,0.4037, 0.7116,0.742,0.4178, 0.7116,0.742,0.4178, 0,0,0, 0.6388,1.25,0.6388
+  }
   !MODULE[ModulePartVariants] {}
   MODULE
   {
@@ -183,7 +193,7 @@
   !DRAG_CUBE {}
   DRAG_CUBE
   {
-    cube = Default, 0.3608,0.6239,0.7064, 0.3608,0.6124,0.7064, 1.21,0.96,0.2872447, 1.21,0.96,0.245615, 0.3608,0.616,0.7064, 0.3608,0.6181,0.7064, 0,0,0, 1.218,0.3161,1.218
+    cube = Default, 0.381,0.6261,0.7165, 0.381,0.6255,0.7165, 0.9252,0.7779,0.2652, 0.9252,0.7776,0.2652, 0.3681,0.6327,0.7308, 0.3681,0.6346,0.7308, 3.553E-17,-2.861E-08,-7.105E-17, 1.25,0.3325,1.267
   }
   !MODULE[ModulePartVariants] {}
   MODULE

Distribution/Restock/GameData/ReStock/Patches/Ground/restock-legs.cfg

@@ -141,21 +141,23 @@
   }
   @MODULE[ModuleWheelBase]
   {
-    @clipObject = leg3_piston_CAPSULECOLLIDER
+    @wheelColliderTransformName = wheelCollider
+    @clipObject = piston_collider
   }
   @MODULE[ModuleWheelSuspension]
   {
-    @suspensionTransformName = leg3_piston
-    @suspensionColliderName = leg3_piston_CAPSULECOLLIDER
+    @suspensionTransformName = piston
+    @suspensionColliderName = piston_collider
   }
   @MODULE[ModuleWheelDeployment]
   {
-    @animationTrfName = leg3
+    @deployTargetTransformName = deployTgt
+    @animationTrfName = leg
     @animationStateName = restock-leg-3-deploy
-    @retractTransformName = leg3_piston
+    @retractTransformName = piston
   }
   @MODULE[ModuleWheelBogey]
   {
-    @bogeyTransformName = leg3_foot
+    @bogeyTransformName = foot
   }
 }

Distribution/Restock/GameData/ReStock/Patches/Ground/restock-wheels.cfg

@@ -115,7 +115,7 @@
     @damagedTransformName = WheelBusted
     @undamagedTransformName = Wheel
   }
-  !MODULE[FXModuleLookAtConstraint]
+  !MODULE[FXModuleLookAtConstraint]{}
   MODULE
   {
     name = ModuleRestockConstraints

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

Distribution/Restock/GameData/ReStock/Patches/Thermal/restock-heat-shields.cfg

@@ -22,7 +22,7 @@
   DRAG_CUBE
   {
     cube = Fairing, 0.05634,0.7512,0.6665, 0.05634,0.7603,0.5694, 0.3044,0.9566,0.1698, 0.3044,0.932,0.1674, 0.05487,0.7518,0.4044, 0.05488,0.7514,0.4076, 0.001332,0.001115,-0.002111, 0.625,0.1071,0.625
-    cube = Clean, 0.06044,0.4659,0.4447, 0.06044,0.4659,0.4447, 0.3843,0.9488,0.1482, 0.3843,0.9396,0.1682, 0.06044,0.4645,0.4447, 0.06044,0.4673,0.4447, 0,0.003277,-3.906E-10, 0.7,0.1,0.7
+    cube = Clean, 0.05805,0.485,0.4482, 0.05805,0.485,0.4482, 0.3831,0.9519,0.1482, 0.3831,0.9428,0.1694, 0.05805,0.4835,0.4482, 0.05805,0.4866,0.4482, 0,0.003277,-3.906E-10, 0.7,0.1,0.7
   }
   MODULE
   {
@@ -149,8 +149,8 @@
   !DRAG_CUBE {}
   DRAG_CUBE
   {
-    cube = Fairing, 0.3875,0.7436,0.7686, 0.3875,0.7436,0.7686, 1.44,0.9625,0.1822, 1.44,0.964,0.3017, 0.3875,0.7436,0.7686, 0.3875,0.7436,0.7686, 0,-0.05126,0, 1.355,0.2838,1.355
-    cube = Clean, 0.1825,0.4643,0.7229, 0.1825,0.4643,0.7229, 1.274,0.9542,0.1829, 1.274,0.9475,0.2177, 0.1825,0.4628,0.7229, 0.1825,0.4658,0.7229, 0,0.005576,-1.994E-09, 1.275,0.1702,1.275
+    cube = Fairing, 0.3875,0.7461,0.7686, 0.3875,0.7461,0.7686, 1.435,0.9658,0.1822, 1.435,0.9675,0.3017, 0.3875,0.7461,0.7686, 0.3875,0.7461,0.7686, 0,-0.05126,0, 1.355,0.2838,1.355
+    cube = Clean, 0.181,0.468,0.7344, 0.181,0.468,0.7344, 1.27,0.9574,0.1829, 1.27,0.9507,0.2177, 0.181,0.4664,0.7344, 0.181,0.4695,0.7344, 0,0.005576,-1.994E-09, 1.275,0.1702,1.275
   }
 }
 
@@ -216,10 +216,11 @@
     excludedRenderer = HeatShield25Fairing
     excludedRenderer = HeatShieldInternals
   }
+  !DRAG_CUBE {}
   DRAG_CUBE
   {
-    cube = Fairing, 1.436,0.7472,1.355, 1.436,0.7472,1.355, 5.341,0.9614,0.259, 5.341,0.9714,0.4709, 1.436,0.7472,1.355, 1.436,0.7471,1.355, 0,-0.1004,0, 2.609,0.5505,2.609
-    cube = Clean, 0.7091,0.4621,1.346, 0.7091,0.4621,1.346, 4.998,0.9524,0.2587, 4.998,0.9466,0.3249, 0.7091,0.4605,1.346, 0.7091,0.4638,1.346, 0,0.01104,0, 2.525,0.3277,2.525
+    cube = Fairing, 1.436,0.7497,1.366, 1.436,0.7497,1.366, 5.323,0.9648,0.259, 5.323,0.9747,0.4709, 1.436,0.7497,1.366, 1.436,0.7497,1.366, 0,-0.1004,0, 2.609,0.5505,2.609
+    cube = Clean, 0.7025,0.4649,1.357, 0.7025,0.4649,1.357, 4.982,0.9555,0.2587, 4.982,0.9499,0.327, 0.7025,0.4634,1.357, 0.7025,0.4665,1.357, 0,0.01104,-3.947E-09, 2.525,0.3277,2.525
   }
 }
 
@@ -233,11 +234,6 @@
   {
     model = ReStock/Assets/Aero/restock-heatshield-375-1
   }
-  DRAG_CUBE
-  {
-    cube = Fairing, 3.357,0.7502,2.005, 3.357,0.7502,2.005, 12.48,0.9608,0.3456, 12.48,0.9621,0.6953, 3.357,0.7502,2.005, 3.357,0.7502,2.005, 0,-0.1559,0, 3.99,0.8369,3.99
-    cube = Clean, 1.563,0.4576,1.952, 1.563,0.4576,1.952, 11.03,0.9547,0.3365, 11.03,0.9465,0.4361, 1.563,0.456,1.952, 1.563,0.459,1.952, 0,0.01101,0, 3.75,0.4864,3.75
-  }
   @MODULE[ModuleJettison]
   {
     @jettisonName = HeatShield375Fairing
@@ -289,6 +285,12 @@
     excludedRenderer = HeatShield375Fairing
     excludedRenderer = HeatShield375Internal
   }
+  !DRAG_CUBE {}
+  DRAG_CUBE
+  {
+    cube = Fairing, 3.357,0.7502,2.005, 3.357,0.7502,2.005, 12.44,0.9645,0.3456, 12.44,0.9656,0.6994, 3.357,0.7502,2.005, 3.357,0.7502,2.005, 0,-0.1559,0, 3.99,0.8369,3.99
+    cube = Clean, 1.549,0.4589,1.967, 1.549,0.4589,1.967, 10.99,0.9578,0.3365, 10.99,0.9498,0.4388, 1.549,0.4573,1.967, 1.549,0.4603,1.967, 0,0.01101,-3.936E-09, 3.75,0.4864,3.75
+  }
 }
 
 // Heat Shield (10m)
@@ -305,4 +307,10 @@
   {
     @animationName = Inflate
   }
+  !DRAG_CUBE {}
+  DRAG_CUBE
+  {
+    cube = A, 19.07,0.4872,8.728, 19.07,0.4871,8.728, 72.75,0.8279,2.352, 71.74,0.8437,2.415, 18.75,0.4822,9.129, 18.75,0.5195,9.129, -4.768E-07,0.9913,4.768E-07, 8.528,3.025,9.074
+    cube = B, 5.042,0.7795,4.677, 5.042,0.7795,4.677, 4.271,0.8684,4.235, 3.585,0.6972,0.9259, 5.008,0.7754,4.212, 5.008,0.7758,4.212, -4.768E-07,2.057,0, 6.815,4.172,5.902
+  }
 }

Distribution/Restock/GameData/ReStock/PatchesLegacy/Engines/restock-engines-liquid-125.cfg

@@ -0,0 +1,759 @@
+// Patches applying art changes to old versions of 1.25m engines
+// Contents:
+// - LV-T30 "Reliant" Liquid Fuel Engine (liquidEngine)
+// - LV-T45 "Swivel" Liquid Fuel Engine (liquidEngine2)
+
+// LV-T30 "Reliant" Liquid Fuel Engine
+@PART[liquidEngine]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
+{
+  @author = Porkjet and Chris Adderley (Nertea)
+  !mesh = DELETE
+  !MODEL {}
+  MODEL
+  {
+    model = ReStock/Assets/Engine/restock-engine-reliant-1
+  }
+  %rescaleFactor = 1
+  @scale = 1
+  @attachRules = 1,1,1,0,0
+  !DRAG_CUBE {}
+  DRAG_CUBE
+  {
+    cube = 0, 1.323,0.7658,0.6937, 1.323,0.7658,0.6937, 1.2,0.71,1.99, 1.2,0.60,1.863, 1.342,0.7654,0.7222, 1.342,0.7655,0.7222, -4.768E-07,0.04716,-1.442E-05, 1.25,1.959,1.25
+    cube = 1, 1.626,0.7348,0.9771, 1.626,0.7485,0.7117, 1.199,0.9966,0.321, 1.199,0.4031,1.449, 1.682,0.7548,0.7173, 1.682,0.7527,0.7117, 0.0001327,0.07738,-1.454E-05, 1.24,1.899,1.24
+    cube = 2, 1.344,0.7648,0.6937, 1.344,0.7649,0.7165, 1.2,0.41,1.999, 1.2,0.40,1.914, 1.342,0.7641,0.7222, 1.342,0.7642,0.7222, -0.0001337,0.04716,-0.001876, 1.25,1.959,1.25
+  }
+  !fx_exhaustFlame_blue = DELETE
+  !fx_exhaustLight_blue = DELETE
+  !fx_smokeTrail_light = DELETE
+  !fx_exhaustSparks_flameout = DELETE
+  !sound_vent_medium = DELETE
+  !sound_rocket_hard = DELETE
+  !sound_vent_soft = DELETE
+  !sound_explosion_low = DELETE
+  !EFFECTS {}
+  EFFECTS
+  {
+    engage
+    {
+      AUDIO
+      {
+        channel = Ship
+        clip = sound_vent_medium
+        volume = 1.0
+        pitch = 2.0
+        loop = false
+      }
+    }
+    flameout
+    {
+      AUDIO
+      {
+        channel = Ship
+        clip = sound_explosion_low
+        volume = 1.0
+        pitch = 2.0
+        loop = false
+      }
+    }
+    fx-reliant-running
+    {
+      AUDIO
+      {
+        channel = Ship
+        clip = sound_rocket_hard
+        volume = 0.0 0.0
+        volume = 0.01 0.4
+        volume = 1.0 1.0
+        pitch = 0.0 0.2
+        pitch = 0.01 0.6
+        pitch = 1.0 1.8
+        loop = true
+      }
+      MODEL_MULTI_PARTICLE
+      {
+        name = turbo
+        modelName = ReStock/FX/restock-fx-reliant-turbo-1
+        transformName = fxTransformTurbo
+        emission = 0.0 0.0
+        emission = 0.01 0.1
+        emission = 0.075 0.25
+        emission = 1.0 1.0
+        speed = 0.0 0.35
+        speed = 1.0 1.0
+      }
+      MODEL_MULTI_PARTICLE
+      {
+        name = core
+        modelName = ReStock/FX/restock-fx-reliant-core-1
+        transformName = fxTransformCore
+        emission = 0.0 0.0
+        emission = 0.01 0.1
+        emission = 0.075 0.25
+        emission = 1.0 1.0
+        speed = 0.0 0.35
+        speed = 1.0 1.0
+      }
+      MODEL_MULTI_PARTICLE
+      {
+        name = plume
+        modelName = ReStock/FX/restock-fx-reliant-plume-1
+        transformName = fxTransformPlume
+        emission = 0.0 0.0
+        emission = 0.01 0.1
+        emission = 0.075 0.25
+        emission = 1.0 1.0
+        speed = 0.0 0.35
+        speed = 1.0 1.0
+      }
+      PREFAB_PARTICLE
+      {
+        prefabName = fx_smokeTrail_light
+        transformName = smokePoint
+        emission = 0.0 0.0
+        emission = 0.05 0.0
+        emission = 0.075 0.25
+        emission = 1.0 1.25
+        speed = 0.0 0.25
+        speed = 1.0 1.0
+        localOffset = 0, 0, 0
+      }
+    }
+  }
+  @bulkheadProfiles = srf, size1
+  %node_attach = 0.0, 0.90182625, 0.0, 0.0, 1.0, 0.0, 1
+  @node_stack_top = 0.0, 0.90182625, 0.0, 0.0, 1.0, 0.0
+  @node_stack_bottom = 0.0, -0.90925375, 0.0, 0.0, -1.0, 0.0
+  MODULE
+  {
+    name = ModulePartVariants
+    baseVariant = Size1
+    VARIANT
+    {
+      name = Size1
+      displayName = #LOC_Restock_variant-engine_size1_white
+      primaryColor = #999999
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        LV_T30_Basic = true
+        LV_T30_Compact = false
+        LV_T30_Boattail = false
+        fairing = true
+        ShroudT30_Compact = false
+        fairingWhite = true
+        ShroudT30_CompactWhite = true
+        LV_T30_Boat = true
+        fairingOrange = false
+        ShroudT30_CompactOrange = false
+        LV_T30_BoatOrange = false
+      }
+    }
+    VARIANT
+    {
+      name = Boattail
+      displayName = #LOC_Restock_variant-engine_boattail_white
+      primaryColor = #ffffff
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        LV_T30_Basic = false
+        LV_T30_Compact = false
+        LV_T30_Boattail = true
+        fairing = false
+        ShroudT30_Compact = false
+        fairingWhite = true
+        ShroudT30_CompactWhite = true
+        LV_T30_Boat = true
+        fairingOrange = false
+        ShroudT30_CompactOrange = false
+        LV_T30_BoatOrange = false
+      }
+    }
+    VARIANT
+    {
+      name = Compact
+      displayName = #LOC_Restock_variant-engine_compact_white
+      primaryColor = #666666
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        LV_T30_Basic = false
+        LV_T30_Compact = true
+        LV_T30_Boattail = false
+        fairing = false
+        ShroudT30_Compact = true
+        fairingWhite = true
+        ShroudT30_CompactWhite = true
+        LV_T30_Boat = true
+        fairingOrange = false
+        ShroudT30_CompactOrange = false
+        LV_T30_BoatOrange = false
+      }
+    }
+    VARIANT
+    {
+      name = Size1_Alternate
+      displayName = #LOC_Restock_variant-engine_size1_grey-orange
+      primaryColor = #999999
+      secondaryColor = #f69449
+      GAMEOBJECTS
+      {
+        LV_T30_Basic = true
+        LV_T30_Compact = false
+        LV_T30_Boattail = false
+        fairing = true
+        ShroudT30_Compact = false
+        fairingWhite = false
+        ShroudT30_CompactWhite = false
+        LV_T30_Boat = false
+        fairingOrange = true
+        ShroudT30_CompactOrange = true
+        LV_T30_BoatOrange = true
+      }
+    }
+    VARIANT
+    {
+      name = Boattail_Alternate
+      displayName = #LOC_Restock_variant-engine_boattail_grey-orange
+      primaryColor = #666666
+      secondaryColor = #666666
+      GAMEOBJECTS
+      {
+        LV_T30_Basic = false
+        LV_T30_Compact = false
+        LV_T30_Boattail = true
+        fairing = false
+        ShroudT30_Compact = false
+        fairingWhite = false
+        ShroudT30_CompactWhite = false
+        LV_T30_Boat = false
+        fairingOrange = true
+        ShroudT30_CompactOrange = true
+        LV_T30_BoatOrange = true
+      }
+    }
+    VARIANT
+    {
+      name = Compact_Alternate
+      displayName = #LOC_Restock_variant-engine_compact_grey-orange
+      primaryColor = #666666
+      secondaryColor = #f69449
+      GAMEOBJECTS
+      {
+        LV_T30_Basic = false
+        LV_T30_Compact = true
+        LV_T30_Boattail = false
+        fairing = false
+        ShroudT30_Compact = true
+        fairingWhite = false
+        ShroudT30_CompactWhite = false
+        LV_T30_Boat = false
+        fairingOrange = true
+        ShroudT30_CompactOrange = true
+        LV_T30_BoatOrange = true
+      }
+    }
+  }
+  @MODULE[ModuleEngines]
+  {
+    @name = ModuleEnginesFX
+    %runningEffectName = fx-reliant-running
+  }
+  @MODULE[ModuleJettison]
+  {
+    @jettisonName = fairing,ShroudT30_Compact
+    useMultipleDragCubes = false
+  }
+  !MODULE[FXModuleAnimateThrottle] {}
+  MODULE
+  {
+    name = FXModuleThrottleEffects
+    fxModuleNames = heatColor
+    responseSpeed = 1.0
+    dependOnEngineState = True
+    dependOnThrottle = True
+  }
+  MODULE
+  {
+    name = FXModuleThrottleEffects
+    fxModuleNames = throttleColor
+    responseSpeed = 1.0
+    dependOnEngineState = True
+    dependOnThrottle = True
+  }
+  MODULE
+  {
+    name = ModuleColorChanger
+    moduleID = heatColor
+    animRate = 0.025
+    shaderProperty = _EmissiveColor
+    excludedRenderer = EngineCoreT30Glow
+    toggleInEditor = false
+    toggleInFlight = false
+    redCurve
+    {
+      key = 0 0 1 1
+      key = 1 1 1 1
+    }
+    greenCurve
+    {
+      key = 0 0 1 1
+      key = 1 1 1 1
+    }
+    blueCurve
+    {
+      key = 0 0 1 1
+      key = 1 1 1 1
+    }
+    alphaCurve
+    {
+      key = 0 0 1 1
+      key = 1 1 1 1
+    }
+  }
+  MODULE
+  {
+    name = ModuleColorChanger
+    moduleID = throttleColor
+    animRate = 1
+    shaderProperty = _TintColor
+    includedRenderer = EngineCoreT30Glow
+    toggleInEditor = false
+    toggleInFlight = false
+    redCurve
+    {
+      key = 0 0
+      key = 1 1
+    }
+    greenCurve
+    {
+      key = 0 0
+      key = 1 1
+    }
+    blueCurve
+    {
+      key = 0 0
+      key = 1 1
+    }
+    alphaCurve
+    {
+      key = 0 0
+      key = 1 1
+    }
+  }
+}
+
+// LV-T45 "Swivel" Liquid Fuel Engine
+@PART[liquidEngine2]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
+{
+  @author = Porkjet and Chris Adderley (Nertea)
+  !mesh = DELETE
+  !MODEL {}
+  MODEL
+  {
+    model = ReStock/Assets/Engine/restock-engine-swivel-1
+  }
+  @bulkheadProfiles = srf, size1
+  rescaleFactor = 1.0
+  @node_stack_top = 0.0, 9.0182625, 0.0, 0.0, 1.0, 0.0
+  @node_stack_bottom = 0.0, -7.179225, 0.0, 0.0, -1.0, 0.0
+  %node_attach = 0.0, 9.0182625, 0.0, 0.0, 1.0, 0.0, 1
+  @attachRules = 1,1,1,0,0
+  !DRAG_CUBE {}
+  DRAG_CUBE
+  {
+    cube = 0, 1.068,0.7677,0.8473, 1.068,0.7677,0.6994, 1.2,0.71,1.582, 1.2,0.63,1.716, 1.061,0.7673,0.6994, 1.061,0.7674,0.6994, 0,0.1126,0, 1.25,1.703,1.25
+    cube = 1, 1.498,0.7444,0.8578, 1.498,0.721,0.9836, 1.234,0.9966,0.2519, 1.234,0.4147,1.423, 1.535,0.7475,0.7262, 1.535,0.7471,0.7205, 0,0.1194,1.788E-07, 1.258,1.689,1.258
+    cube = 2, 1.075,0.768,0.7165, 1.075,0.7679,0.6994, 1.2,0.42,1.582, 1.2,0.40,1.657, 1.069,0.7671,0.6994, 1.069,0.7672,0.6994, 0,0.1126,0, 1.25,1.703,1.25
+  }
+  !fx_exhaustFlame_blue = DELETE
+  !fx_exhaustLight_blue = DELETE
+  !fx_smokeTrail_light = DELETE
+  !fx_exhaustSparks_flameout = DELETE
+  !sound_vent_medium = DELETE
+  !sound_rocket_hard = DELETE
+  !sound_vent_soft = DELETE
+  !sound_explosion_low = DELETE
+  EFFECTS
+  {
+    engage
+    {
+      AUDIO
+      {
+        channel = Ship
+        clip = sound_vent_medium
+        volume = 1.0
+        pitch = 2.0
+        loop = false
+      }
+    }
+    flameout
+    {
+      AUDIO
+      {
+        channel = Ship
+        clip = sound_explosion_low
+        volume = 1.0
+        pitch = 2.0
+        loop = false
+      }
+    }
+    fx-swivel-running
+    {
+      AUDIO
+      {
+        channel = Ship
+        clip = sound_rocket_hard
+        volume = 0.0 0.0
+        volume = 0.01 0.4
+        volume = 1.0 1.0
+        pitch = 0.0 0.2
+        pitch = 0.01 0.6
+        pitch = 1.0 1.8
+        loop = true
+      }
+      MODEL_MULTI_PARTICLE
+      {
+        name = core
+        modelName = ReStock/FX/restock-fx-swivel-core-1
+        transformName = fxTransformCore
+        emission = 0.0 0.0
+        emission = 0.01 0.1
+        emission = 0.075 0.25
+        emission = 1.0 1.0
+        speed = 0.0 0.35
+        speed = 1.0 1.0
+      }
+      MODEL_MULTI_PARTICLE
+      {
+        name = plume
+        modelName = ReStock/FX/restock-fx-swivel-plume-1
+        transformName = fxTransformPlume
+        emission = 0.0 0.0
+        emission = 0.01 0.1
+        emission = 0.075 0.25
+        emission = 1.0 1.0
+        speed = 0.0 0.35
+        speed = 1.0 1.0
+      }
+      PREFAB_PARTICLE
+      {
+        prefabName = fx_smokeTrail_light
+        transformName = smokePoint
+        emission = 0.0 0.0
+        emission = 0.05 0.0
+        emission = 0.075 0.25
+        emission = 1.0 1.25
+        speed = 0.0 0.25
+        speed = 1.0 1.0
+        localOffset = 0, 0, 0
+      }
+    }
+  }
+  @MODULE[ModuleEngines]
+  {
+    @name = ModuleEnginesFX
+    %runningEffectName = fx-swivel-running
+  }
+  MODULE
+  {
+    name = ModulePartVariants
+    baseVariant = Size1
+    VARIANT
+    {
+      name = Size1
+      displayName = #LOC_Restock_variant-engine_size1_white
+      primaryColor = #999999
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        LV_T45_Boattail = false
+        LV_T45_Basic = true
+        LV_T45_Compact = false
+        T45_Piston001 = true
+        T45_Piston002 = true
+        T45_Piston003 = false
+        T45_Piston004 = false
+        Engine = true
+        EngineBoattail = false
+        fairing = true
+        ShroudT45_Compact = false
+        fairingWhite = true
+        ShroudT45_CompactWhite = true
+        Frame_Boat = true
+        fairingOrange = false
+        ShroudT45_CompactOrange = false
+        Frame_BoatOrange = false
+      }
+    }
+    VARIANT
+    {
+      name = Boattail
+      displayName = #LOC_Restock_variant-engine_boattail_white
+      primaryColor = #ffffff
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        LV_T45_Boattail = true
+        LV_T45_Basic = false
+        LV_T45_Compact = false
+        T45_Piston001 = false
+        T45_Piston002 = false
+        T45_Piston003 = false
+        T45_Piston004 = false
+        Engine = false
+        EngineBoattail = true
+        fairing = false
+        ShroudT45_Compact = false
+        fairingWhite = true
+        ShroudT45_CompactWhite = true
+        Frame_Boat = true
+        fairingOrange = false
+        ShroudT45_CompactOrange = false
+        Frame_BoatOrange = false
+      }
+    }
+    VARIANT
+    {
+      name = Compact
+      displayName = #LOC_Restock_variant-engine_compact_white
+      primaryColor = #666666
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        LV_T45_Boattail = false
+        LV_T45_Basic = false
+        LV_T45_Compact = true
+        T45_Piston001 = false
+        T45_Piston002 = false
+        T45_Piston003 = true
+        T45_Piston004 = true
+        Engine = true
+        EngineBoattail = false
+        fairing = false
+        ShroudT45_Compact = true
+        fairingWhite = true
+        ShroudT45_CompactWhite = true
+        Frame_Boat = true
+        fairingOrange = false
+        ShroudT45_CompactOrange = false
+        Frame_BoatOrange = false
+      }
+    }
+    VARIANT
+    {
+      name = Size1_Alternate
+      displayName = #LOC_Restock_variant-engine_size1_grey-orange
+      primaryColor = #999999
+      secondaryColor = #f69449
+      GAMEOBJECTS
+      {
+        LV_T45_Boattail = false
+        LV_T45_Basic = true
+        LV_T45_Compact = false
+        T45_Piston001 = true
+        T45_Piston002 = true
+        T45_Piston003 = false
+        T45_Piston004 = false
+        Engine = true
+        EngineBoattail = false
+        fairing = true
+        ShroudT45_Compact = false
+        fairingWhite = false
+        ShroudT45_CompactWhite = false
+        Frame_Boat = false
+        fairingOrange = true
+        ShroudT45_CompactOrange = true
+        Frame_BoatOrange = true
+      }
+    }
+    VARIANT
+    {
+      name = Boattail_Alternate
+      displayName = #LOC_Restock_variant-engine_boattail_grey-orange
+      primaryColor = #666666
+      secondaryColor = #666666
+      GAMEOBJECTS
+      {
+        LV_T45_Boattail = true
+        LV_T45_Basic = false
+        LV_T45_Compact = false
+        T45_Piston001 = false
+        T45_Piston002 = false
+        T45_Piston003 = false
+        T45_Piston004 = false
+        Engine = false
+        EngineBoattail = true
+        fairing = false
+        ShroudT45_Compact = false
+        fairingWhite = false
+        ShroudT45_CompactWhite = false
+        Frame_Boat = false
+        fairingOrange = true
+        ShroudT45_CompactOrange = true
+        Frame_BoatOrange = true
+      }
+    }
+    VARIANT
+    {
+      name = Compact_Alternate
+      displayName = #LOC_Restock_variant-engine_compact_grey-orange
+      primaryColor = #666666
+      secondaryColor = #f69449
+      GAMEOBJECTS
+      {
+        LV_T45_Boattail = false
+        LV_T45_Basic = false
+        LV_T45_Compact = true
+        T45_Piston001 = false
+        T45_Piston002 = false
+        T45_Piston003 = true
+        T45_Piston004 = true
+        Engine = true
+        EngineBoattail = false
+        fairing = false
+        ShroudT45_Compact = true
+        fairingWhite = false
+        ShroudT45_CompactWhite = false
+        Frame_Boat = false
+        fairingOrange = true
+        ShroudT45_CompactOrange = true
+        Frame_BoatOrange = true
+      }
+    }
+  }
+  @MODULE[ModuleJettison]
+  {
+    @jettisonName = fairing,ShroudT45_Compact
+    useMultipleDragCubes = false
+  }
+  @MODULE[ModuleGimbal]
+  {
+    @gimbalTransformName = Gimbal
+    gimbalResponseSpeed = 8
+    useGimbalResponseSpeed = true
+  }
+  MODULE
+  {
+    name = FXModuleLookAtConstraint
+    // Basic
+    CONSTRAINLOOKFX
+    {
+      targetName = T45_PistonTop001
+      rotatorsName = T45_Piston001
+    }
+    CONSTRAINLOOKFX
+    {
+      targetName = T45_PistonTop002
+      rotatorsName = T45_Piston002
+    }
+    CONSTRAINLOOKFX
+    {
+      targetName = T45_Piston001
+      rotatorsName = T45_PistonTop001
+    }
+    CONSTRAINLOOKFX
+    {
+      targetName = T45_Piston002
+      rotatorsName = T45_PistonTop002
+    }
+    CONSTRAINLOOKFX
+    {
+      targetName = T45_PistonTop004
+      rotatorsName = T45_Piston003
+    }
+    CONSTRAINLOOKFX
+    {
+      targetName = T45_PistonTop003
+      rotatorsName = T45_Piston004
+    }
+    CONSTRAINLOOKFX
+    {
+      targetName = T45_Piston001
+      rotatorsName = T45_PistonTop004
+    }
+    CONSTRAINLOOKFX
+    {
+      targetName = T45_Piston002
+      rotatorsName = T45_PistonTop003
+    }
+  }
+  !MODULE[FXModuleAnimateThrottle] {}
+  MODULE
+  {
+    name = FXModuleThrottleEffects
+    fxModuleNames = heatColor
+    responseSpeed = 1.0
+    dependOnEngineState = True
+    dependOnThrottle = True
+  }
+  MODULE
+  {
+    name = FXModuleThrottleEffects
+    fxModuleNames = throttleColor
+    responseSpeed = 1.0
+    dependOnEngineState = True
+    dependOnThrottle = True
+  }
+  MODULE
+  {
+    name = ModuleColorChanger
+    moduleID = heatColor
+    animRate = 0.025
+    shaderProperty = _EmissiveColor
+    excludedRenderer = EngineCoreT45Glow
+    toggleInEditor = false
+    toggleInFlight = false
+    redCurve
+    {
+      key = 0 0 1 1
+      key = 1 1 1 1
+    }
+    greenCurve
+    {
+      key = 0 0 1 1
+      key = 1 1 1 1
+    }
+    blueCurve
+    {
+      key = 0 0 1 1
+      key = 1 1 1 1
+    }
+    alphaCurve
+    {
+      key = 0 0 1 1
+      key = 1 1 1 1
+    }
+  }
+  MODULE
+  {
+    name = ModuleColorChanger
+    moduleID = throttleColor
+    animRate = 1
+    shaderProperty = _TintColor
+    includedRenderer = EngineCoreT45Glow
+    toggleInEditor = false
+    toggleInFlight = false
+    redCurve
+    {
+      key = 0 1
+      key = 1 1
+    }
+    greenCurve
+    {
+      key = 0 1
+      key = 1 1
+    }
+    blueCurve
+    {
+      key = 0 1
+      key = 1 1
+    }
+    alphaCurve
+    {
+      key = 0 0
+      key = 1 1
+    }
+  }
+}

Distribution/Restock/GameData/ReStock/PatchesMH/Aero/restock-mh-heat-shields.cfg

@@ -63,4 +63,10 @@
     excludedRenderer = HeatShield1875Fairing
     excludedRenderer = HeatShieldInternals
   }
+  !DRAG_CUBE {}
+  DRAG_CUBE
+  {
+    cube = Fairing, 0.8075,0.7497,1.049, 0.8075,0.7497,1.049, 2.992,0.9648,0.2187, 2.992,0.9747,0.3773, 0.8075,0.7497,1.049, 0.8075,0.7497,1.049, 0,-0.07528,0, 1.957,0.4129,1.957
+    cube = Clean, 0.3952,0.4649,1.043, 0.3952,0.4649,1.043, 2.804,0.9555,0.2203, 2.804,0.9499,0.271, 0.3952,0.4634,1.043, 0.3952,0.4665,1.043, 0,0.008278,-2.96E-09, 1.894,0.2458,1.894
+  }
 }

Distribution/Restock/GameData/ReStock/PatchesMH/Coupling/restock-mh-engineplates.cfg

@@ -1,10 +1,509 @@
 // Patches applying art changes to Making History engine plates
 // Contents:
+// - EP-12 Engine Plate (EnginePlate5)
 // - EP-18 Engine Plate (EnginePlate1p5)
 // - EP-25 Engine Plate (EnginePlate2)
 // - EP-37 Engine Plate (EnginePlate3)
 // - EP-50 Engine Plate (EnginePlate4)
 
+// EP-12 Engine Plate
+@PART[EnginePlate5]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
+{
+  @author = Andrew Cassidy (Cinebox) and Chris Adderley (Nertea)
+  !MODEL,* {}
+  MODEL 
+  {
+    model = ReStock/Assets/Coupling/restock-engineplate-125-2
+    texture = blank, ReStock/Assets/Structural/restock-structural-tubes-1
+    texture = blank-n, ReStock/Assets/Structural/restock-structural-tubes-1-n
+  }
+
+  // this is the same as the stock value in KSP 1.9.x, but since KSP 1.8.x 
+  // has different mass values, the variant masses below result in negative mass.
+  // This prevents that from happening, at the expense of slightly affecting part balance
+  // when ReStock is used with 1.8.x
+  @mass = 0.062
+
+  !MODULE[ModulePartVariants] {}
+  MODULE
+  {
+    name = ModulePartVariants
+    baseVariant = Long
+    baseMass = 0
+    baseCost = 0
+    useProceduralDragCubes = true
+    VARIANT
+    {
+      name = Short
+      mass = -0.01
+      cost = 0
+      displayName =  #LOC_Restock_variant-tube-length-short // Short
+      primaryColor = #3a562a
+      secondaryColor = #999999
+      themeName = White
+      sizeGroup = GroupB
+      GAMEOBJECTS
+      {
+        Engineplate-125-White = true
+        Engineplate-125-Orange = false
+        Boattail-125-Colliders = false
+        Boattail-125-Dark = false
+        Boattail-125-White = false
+        Boattail-125-Orange = false
+        Shroud1xDummy = false
+        Shroud1x0 = true
+        Shroud1x1 = false
+        Shroud1x2 = false
+        Shroud1x3 = false
+        Shroud1x4 = false
+        Shroud1x0-Orange = false
+        Shroud1x1-Orange = false
+        Shroud1x2-Orange = false
+        Shroud1x3-Orange = false
+        Shroud1x4-Orange = false
+      }
+      NODES
+      {
+        node_stack_bottom = 0.0, -0.625, 0.0, 0.0, -1.0, 0.0, 1
+      }
+    }
+    VARIANT
+    {
+      name = Medium-Short
+      mass = -0.0075
+      cost = 0
+      displayName =  #LOC_Restock_variant-tube-length-med-short // Medium-Short
+      primaryColor = #3a562a
+      secondaryColor = #999999
+      themeName = White
+      sizeGroup = GroupB
+      GAMEOBJECTS
+      {
+        Engineplate-125-White = true
+        Engineplate-125-Orange = false
+        Boattail-125-Colliders = false
+        Boattail-125-Dark = false
+        Boattail-125-White = false
+        Boattail-125-Orange = false
+        Shroud1xDummy = false
+        Shroud1x0 = false
+        Shroud1x1 = true
+        Shroud1x2 = false
+        Shroud1x3 = false
+        Shroud1x4 = false
+        Shroud1x0-Orange = false
+        Shroud1x1-Orange = false
+        Shroud1x2-Orange = false
+        Shroud1x3-Orange = false
+        Shroud1x4-Orange = false
+      }
+      NODES
+      {
+        node_stack_bottom = 0.0, -1.25, 0.0, 0.0, -1.0, 0.0, 1
+      }
+    }
+    VARIANT
+    {
+      name = Medium
+      mass = -0.005
+      cost = 0
+      displayName =  #LOC_Restock_variant-tube-length-med // Medium
+      primaryColor = #3a562a
+      secondaryColor = #999999
+      themeName = White
+      sizeGroup = GroupB
+      GAMEOBJECTS
+      {
+        Engineplate-125-White = true
+        Engineplate-125-Orange = false
+        Boattail-125-Colliders = false
+        Boattail-125-Dark = false
+        Boattail-125-White = false
+        Boattail-125-Orange = false
+        Shroud1xDummy = false
+        Shroud1x0 = false
+        Shroud1x1 = false
+        Shroud1x2 = true
+        Shroud1x3 = false
+        Shroud1x4 = false
+        Shroud1x0-Orange = false
+        Shroud1x1-Orange = false
+        Shroud1x2-Orange = false
+        Shroud1x3-Orange = false
+        Shroud1x4-Orange = false
+      }
+      NODES
+      {
+        node_stack_bottom = 0.0, -1.875, 0.0, 0.0, -1.0, 0.0, 1
+      }
+    }
+    VARIANT
+    {
+      name = Medium-Long
+      mass = -0.0025
+      cost = 0
+      displayName =  #LOC_Restock_variant-tube-length-med-long // Medium-Long
+      primaryColor = #3a562a
+      secondaryColor = #999999
+      themeName = White
+      sizeGroup = GroupB
+      GAMEOBJECTS
+      {
+        Engineplate-125-White = true
+        Engineplate-125-Orange = false
+        Boattail-125-Colliders = false
+        Boattail-125-Dark = false
+        Boattail-125-White = false
+        Boattail-125-Orange = false
+        Shroud1xDummy = false
+        Shroud1x0 = false
+        Shroud1x1 = false
+        Shroud1x2 = false
+        Shroud1x3 = true
+        Shroud1x4 = false
+        Shroud1x0-Orange = false
+        Shroud1x1-Orange = false
+        Shroud1x2-Orange = false
+        Shroud1x3-Orange = false
+        Shroud1x4-Orange = false
+      }
+      NODES
+      {
+        node_stack_bottom = 0.0, -2.5, 0.0, 0.0, -1.0, 0.0, 1
+      }
+    }
+    VARIANT
+    {
+      name = Long
+      mass = 0
+      cost = 0
+      displayName =  #LOC_Restock_variant-tube-length-long // Long
+      primaryColor = #3a562a
+      secondaryColor = #999999
+      themeName = White
+      sizeGroup = GroupB
+      GAMEOBJECTS
+      {
+        Engineplate-125-White = true
+        Engineplate-125-Orange = false
+        Boattail-125-Colliders = false
+        Boattail-125-Dark = false
+        Boattail-125-White = false
+        Boattail-125-Orange = false
+        Shroud1xDummy = false
+        Shroud1x0 = false
+        Shroud1x1 = false
+        Shroud1x2 = false
+        Shroud1x3 = false
+        Shroud1x4 = true
+        Shroud1x0-Orange = false
+        Shroud1x1-Orange = false
+        Shroud1x2-Orange = false
+        Shroud1x3-Orange = false
+        Shroud1x4-Orange = false
+      }
+      NODES
+      {
+        node_stack_bottom = 0.0, -3.75, 0.0, 0.0, -1.0, 0.0, 1
+      }
+    }   
+    VARIANT
+    {
+      name = Short-Orange
+      mass = -0.01
+      cost = 0
+      displayName = #LOC_Restock_variant-tube-length-short-alt // Short (Alternate)
+      primaryColor = #f49841
+      secondaryColor = #4c4f47
+      themeName = Orange
+      sizeGroup = GroupB
+      GAMEOBJECTS
+      {
+        Engineplate-125-White = false
+        Engineplate-125-Orange = true
+        Boattail-125-Colliders = false
+        Boattail-125-Dark = false
+        Boattail-125-White = false
+        Boattail-125-Orange = false
+        Shroud1xDummy = false
+        Shroud1x0 = false
+        Shroud1x1 = false
+        Shroud1x2 = false
+        Shroud1x3 = false
+        Shroud1x4 = false
+        Shroud1x0-Orange = true
+        Shroud1x1-Orange = false
+        Shroud1x2-Orange = false
+        Shroud1x3-Orange = false
+        Shroud1x4-Orange = false
+      }
+      NODES
+      {
+        node_stack_bottom = 0.0, -0.625, 0.0, 0.0, -1.0, 0.0, 1
+      }
+    }
+    VARIANT
+    {
+      name = Medium-Short-Orange
+      mass = -0.0075
+      cost = 0
+      displayName =  #LOC_Restock_variant-tube-length-med-short-alt // Medium-Short (Alternate)
+      primaryColor = #f49841
+      secondaryColor = #4c4f47
+      themeName = Orange
+      sizeGroup = GroupB
+      GAMEOBJECTS
+      {
+        Engineplate-125-White = false
+        Engineplate-125-Orange = true
+        Boattail-125-Colliders = false
+        Boattail-125-Dark = false
+        Boattail-125-White = false
+        Boattail-125-Orange = false
+        Shroud1xDummy = false
+        Shroud1x0 = false
+        Shroud1x1 = false
+        Shroud1x2 = false
+        Shroud1x3 = false
+        Shroud1x4 = false
+        Shroud1x0-Orange = false
+        Shroud1x1-Orange = true
+        Shroud1x2-Orange = false
+        Shroud1x3-Orange = false
+        Shroud1x4-Orange = false
+      }
+      NODES
+      {
+        node_stack_bottom = 0.0, -1.25, 0.0, 0.0, -1.0, 0.0, 1
+      }
+    }
+    VARIANT
+    {
+      name = Medium-Orange
+      mass = -0.005
+      cost = 0
+      displayName = #LOC_Restock_variant-tube-length-med-alt // Medium (Alternate)
+      primaryColor = #f49841
+      secondaryColor = #4c4f47
+      themeName = Orange
+      sizeGroup = GroupB
+      GAMEOBJECTS
+      {
+        Engineplate-125-White = false
+        Engineplate-125-Orange = true
+        Boattail-125-Colliders = false
+        Boattail-125-Dark = false
+        Boattail-125-White = false
+        Boattail-125-Orange = false
+        Shroud1xDummy = false
+        Shroud1x0 = false
+        Shroud1x1 = false
+        Shroud1x2 = false
+        Shroud1x3 = false
+        Shroud1x4 = false
+        Shroud1x0-Orange = false
+        Shroud1x1-Orange = false
+        Shroud1x2-Orange = true
+        Shroud1x3-Orange = false
+        Shroud1x4-Orange = false
+      }
+      NODES
+      {
+        node_stack_bottom = 0.0, -1.875, 0.0, 0.0, -1.0, 0.0, 1
+      }
+    }
+    VARIANT
+    {
+      name = Medium-Long-Orange
+      mass = -0.0025
+      cost = 0
+      displayName = #LOC_Restock_variant-tube-length-med-long-alt // Medium-Long (Alternate)
+      primaryColor = #f49841
+      secondaryColor = #4c4f47
+      themeName = Orange
+      sizeGroup = GroupB
+      GAMEOBJECTS
+      {
+        Engineplate-125-White = false
+        Engineplate-125-Orange = true
+        Boattail-125-Colliders = false
+        Boattail-125-Dark = false
+        Boattail-125-White = false
+        Boattail-125-Orange = false
+        Shroud1xDummy = false
+        Shroud1x0 = false
+        Shroud1x1 = false
+        Shroud1x2 = false
+        Shroud1x3 = false
+        Shroud1x4 = false
+        Shroud1x0-Orange = false
+        Shroud1x1-Orange = false
+        Shroud1x2-Orange = false
+        Shroud1x3-Orange = true
+        Shroud1x4-Orange = false
+      }
+      NODES
+      {
+        node_stack_bottom = 0.0, -2.5, 0.0, 0.0, -1.0, 0.0, 1
+      }
+    }
+    VARIANT
+    {
+      name = Long-Orange
+      mass = 0
+      cost = 0
+      displayName =  #LOC_Restock_variant-tube-length-long-alt // Long (Alternate)
+      primaryColor = #f49841
+      secondaryColor = #4c4f47
+      themeName = Orange
+      sizeGroup = GroupB
+      GAMEOBJECTS
+      {
+        Engineplate-125-White = false
+        Engineplate-125-Orange = true
+        Boattail-125-Colliders = false
+        Boattail-125-Dark = false
+        Boattail-125-White = false
+        Boattail-125-Orange = false
+        Shroud1xDummy = false
+        Shroud1x0 = false
+        Shroud1x1 = false
+        Shroud1x2 = false
+        Shroud1x3 = false
+        Shroud1x4 = false
+        Shroud1x0-Orange = false
+        Shroud1x1-Orange = false
+        Shroud1x2-Orange = false
+        Shroud1x3-Orange = false
+        Shroud1x4-Orange = true
+      }
+      NODES
+      {
+        node_stack_bottom = 0.0, -3.75, 0.0, 0.0, -1.0, 0.0, 1
+      }
+    }
+    VARIANT
+    {
+      name = Boattail-Dark
+      mass = -0.0075
+      cost = 50
+      displayName = #LOC_Restock_variant-engine_boattail_dark // Boattail (Dark)
+      primaryColor = #4c4f47
+      secondaryColor = #4c4f47
+      themeName = Dark
+      sizeGroup = GroupB
+      GAMEOBJECTS
+      {
+        Engineplate-125-White = false
+        Engineplate-125-Orange = false
+        Boattail-125-Colliders = true
+        Boattail-125-Dark = true
+        Boattail-125-White = false
+        Boattail-125-Orange = false
+        Shroud1xDummy = true
+        Shroud1x0 = false
+        Shroud1x1 = false
+        Shroud1x2 = false
+        Shroud1x3 = false
+        Shroud1x4 = false
+        Shroud1x0-Orange = false
+        Shroud1x1-Orange = false
+        Shroud1x2-Orange = false
+        Shroud1x3-Orange = false
+        Shroud1x4-Orange = false
+      }
+      NODES
+      {
+        node_stack_bottom = 0.0, -1.25, 0.0, 0.0, -1.0, 0.0, 1
+      }
+    }
+    VARIANT
+    {
+      name = Boattail-White
+      mass = -0.0075
+      cost = 50
+      displayName = #LOC_Restock_variant-engine_boattail_white // Boattail (White)
+      primaryColor = #ffffff
+      secondaryColor = #ffffff
+      themeName = White
+      sizeGroup = GroupB
+      GAMEOBJECTS
+      {
+        Engineplate-125-White = false
+        Engineplate-125-Orange = false
+        Boattail-125-Colliders = true
+        Boattail-125-Dark = false
+        Boattail-125-White = true
+        Boattail-125-Orange = false
+        Shroud1xDummy = true
+        Shroud1x0 = false
+        Shroud1x1 = false
+        Shroud1x2 = false
+        Shroud1x3 = false
+        Shroud1x4 = false
+        Shroud1x0-Orange = false
+        Shroud1x1-Orange = false
+        Shroud1x2-Orange = false
+        Shroud1x3-Orange = false
+        Shroud1x4-Orange = false
+      }
+      NODES
+      {
+        node_stack_bottom = 0.0, -1.25, 0.0, 0.0, -1.0, 0.0, 1
+      }
+    }
+    VARIANT
+    {
+      name = Boattail-Orange
+      mass = -0.0075
+      cost = 50
+      displayName = #LOC_Restock_variant-engine_boattail_grey-orange // Boattail (Orange/Grey)
+      primaryColor = #f49841
+      secondaryColor = #4c4f47
+      themeName = GrayAndOrange
+      sizeGroup = GroupB
+      GAMEOBJECTS
+      {
+        Engineplate-125-White = false
+        Engineplate-125-Orange = false
+        Boattail-125-Colliders = true
+        Boattail-125-Dark = false
+        Boattail-125-White = false
+        Boattail-125-Orange = true
+        Shroud1xDummy = true
+        Shroud1x0 = false
+        Shroud1x1 = false
+        Shroud1x2 = false
+        Shroud1x3 = false
+        Shroud1x4 = false
+        Shroud1x0-Orange = false
+        Shroud1x1-Orange = false
+        Shroud1x2-Orange = false
+        Shroud1x3-Orange = false
+        Shroud1x4-Orange = false
+      }
+      NODES
+      {
+        node_stack_bottom = 0.0, -1.25, 0.0, 0.0, -1.0, 0.0, 1
+      }
+    }
+  }
+
+  !MODULE[ModuleJettison] {}
+  MODULE
+  {
+    name = ModuleJettison
+    jettisonName =  Shroud1x0,Shroud1x1,Shroud1x2,Shroud1x3,Shroud1x4,Shroud1x0-Orange,Shroud1x1-Orange,Shroud1x2-Orange,Shroud1x3-Orange,Shroud1x4-Orange,Shroud1xDummy
+    bottomNodeName = bottom
+    isFairing = True
+    jettisonedObjectMass = 0.1
+    jettisonForce = 5
+    jettisonDirection = 0 0 1
+    stagingEnabled = false
+    useMultipleDragCubes = false
+  } 
+}
+
 // EP-18 Engine Plate
 @PART[EnginePlate1p5]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
@@ -447,7 +946,8 @@
 }
 
 // EP-25 Engine Plate
-@PART[EnginePlate2]:HAS[~RestockIgnore[*]]:FOR[000_ReStock] {
+@PART[EnginePlate2]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
+{
   @author = Andrew Cassidy (Cinebox) and Chris Adderley (Nertea)
   !MODEL,* {}
   MODEL 
@@ -983,7 +1483,8 @@
 }
 
 // EP-37 Engine Plate
-@PART[EnginePlate3]:HAS[~RestockIgnore[*]]:FOR[000_ReStock] {
+@PART[EnginePlate3]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
+{
   @author = Andrew Cassidy (Cinebox) and Chris Adderley (Nertea)
   !MODEL,* {}
   MODEL 
@@ -1423,7 +1924,8 @@
 }
 
 // EP-50 Engine Plate
-@PART[EnginePlate4]:HAS[~RestockIgnore[*]]:FOR[000_ReStock] {
+@PART[EnginePlate4]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
+{
   @author = Andrew Cassidy (Cinebox) and Chris Adderley (Nertea)
   !MODEL,* {}
   MODEL 

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
       }
     }

Distribution/Restock/GameData/ReStock/PatchesMH/Engine/restock-mh-engines-srb-1875.cfg

@@ -89,6 +89,7 @@
     @name = ModuleEnginesFX
     %runningEffectName = fx-pollux-running
   }
+  
   MODULE
   {
     name = FXModuleThrottleEffects

Distribution/Restock/GameData/ReStock/PatchesMH/FuelTank/restock-mh-fueltanks-5.cfg

@@ -313,6 +313,10 @@
     model = ReStock/Assets/FuelTank/restock-fueltank-saturn-engine-1
   }
     MODEL
+  {
+    model = ReStock/Assets/FuelTank/restock-fueltank-saturn-engine-2
+  }
+  MODEL
   {
     model = ReStock/Assets/FuelTank/restock-endcap-5-2
     position = 0.0, 1.25, 0.0
@@ -326,16 +330,16 @@
   // 2 cones
   NODE
   {
-    name = N2_1
-    transform = N2_1
+    name = FixedN2_1
+    transform = FixedN2_1
     size=1
     method=FIXED_JOINT
     rigid = true
   }
   NODE
   {
-    name = N2_2
-    transform = N2_2
+    name = FixedN2_2
+    transform = FixedN2_2
     size=1
     method=FIXED_JOINT
     rigid = true
@@ -343,24 +347,24 @@
   // 3 cones
   NODE
   {
-    name = N3_1
-    transform = N3_1
+    name = FixedN3_1
+    transform = FixedN3_1
     size=1
     method=FIXED_JOINT
     rigid = true
   }
   NODE
   {
-    name = N3_2
-    transform = N3_2
+    name = FixedN3_2
+    transform = FixedN3_2
     size=1
     method=FIXED_JOINT
     rigid = true
   }
   NODE
   {
-    name = N3_3
-    transform = N3_3
+    name = FixedN3_3
+    transform = FixedN3_3
     size=1
     method=FIXED_JOINT
     rigid = true
@@ -368,32 +372,32 @@
   // 4 cones
   NODE
   {
-    name = N4_1
-    transform = N4_1
+    name = FixedN4_1
+    transform = FixedN4_1
     size=1
     method=FIXED_JOINT
     rigid = true
   }
   NODE
   {
-    name = N4_2
-    transform = N4_2
+    name = FixedN4_2
+    transform = FixedN4_2
     size=1
     method=FIXED_JOINT
     rigid = true
   }
   NODE
   {
-    name = N4_3
-    transform = N4_3
+    name = FixedN4_3
+    transform = FixedN4_3
     size=1
     method=FIXED_JOINT
     rigid = true
   }
   NODE
   {
-    name = N4_4
-    transform = N4_4
+    name = FixedN4_4
+    transform = FixedN4_4
     size=1
     method=FIXED_JOINT
     rigid = true
@@ -401,48 +405,48 @@
   // 6 cones
   NODE
   {
-    name = N6_1
-    transform = N6_1
+    name = FixedN6_1
+    transform = FixedN6_1
     size=1
     method=FIXED_JOINT
     rigid = true
   }
   NODE
   {
-    name = N6_2
-    transform = N6_2
+    name = FixedN6_2
+    transform = FixedN6_2
     size=1
     method=FIXED_JOINT
     rigid = true
   }
   NODE
   {
-    name = N6_3
-    transform = N6_3
+    name = FixedN6_3
+    transform = FixedN6_3
     size=1
     method=FIXED_JOINT
     rigid = true
   }
   NODE
   {
-    name = N6_4
-    transform = N6_4
+    name = FixedN6_4
+    transform = FixedN6_4
     size=1
     method=FIXED_JOINT
     rigid = true
   }
   NODE
   {
-    name = N6_5
-    transform = N6_5
+    name = FixedN6_5
+    transform = FixedN6_5
     size=1
     method=FIXED_JOINT
     rigid = true
   }
   NODE
   {
-    name = N6_6
-    transform = N6_6
+    name = FixedN6_6
+    transform = FixedN6_6
     size=1
     method=FIXED_JOINT
     rigid = true
@@ -456,7 +460,7 @@
     {
       DisplayText = Four
       MeshTransform = 5mMountSaturnX5
-      NodePrefix = N4_
+      NodePrefix = FixedN4_
       SetCount = 4
       Symmetry = 3
     }   
@@ -464,7 +468,7 @@
     {
       DisplayText = Three
       MeshTransform = 5mMountSaturnX4
-      NodePrefix = N3_
+      NodePrefix = FixedN3_
       SetCount = 3
       Symmetry = 2
     }
@@ -472,7 +476,7 @@
     {
       DisplayText = Two
       MeshTransform = 5mMountSaturnX3
-      NodePrefix = N2_
+      NodePrefix = FixedN2_
       SetCount = 2
       Symmetry = 1
     }
@@ -480,7 +484,7 @@
     {
       DisplayText = Six
       MeshTransform = 5mMountSaturnX7
-      NodePrefix = N6_
+      NodePrefix = FixedN6_
       SetCount = 6
       Symmetry = 5
     }

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

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

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

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
+}
+

Distribution/Restock/GameData/ReStock/Restock.restockblacklist

@@ -2,6 +2,7 @@ Squad/Parts/Aero/aerodynamicNoseCone/
 Squad/Parts/Aero/basicFin/
 Squad/Parts/Aero/cones/Assets/ConeA.mu
 Squad/Parts/Aero/cones/Assets/ConeB.mu
+Squad/Parts/Aero/cones/Assets/rocketNoseCone_v3
 Squad/Parts/Aero/cones/Assets/ConesDiffuse*.dds
 Squad/Parts/Aero/cones/Assets/ConesHeat*.dds
 Squad/Parts/Aero/cones/Assets/TinyCone.mu
@@ -29,6 +30,8 @@ Squad/Parts/Command/probeStackLarge/
 Squad/Parts/Command/probeStackSmall/
 Squad/Parts/Command/probeStackSphere_v2/
 Squad/Parts/CompoundParts/
+Squad/Parts/Electrical/10CSolarPanels/
+Squad/Parts/Electrical/10LSolarPanels/
 Squad/Parts/Electrical/1x6ShroudSolarPanels/
 Squad/Parts/Electrical/1x6SolarPanels/
 Squad/Parts/Electrical/3x2ShroudSolarPanels/
@@ -52,6 +55,8 @@ Squad/Parts/Engine/liquidEngineLV-909_v2/
 Squad/Parts/Engine/liquidEngineLV-N/
 Squad/Parts/Engine/liquidEngineLV-T30/
 Squad/Parts/Engine/liquidEngineLV-T45/
+Squad/Parts/Engine/liquidEngineLV-T30_v2/
+Squad/Parts/Engine/liquidEngineLV-T45_v2/
 Squad/Parts/Engine/liquidEngineMainsail_v2/
 Squad/Parts/Engine/liquidEnginePoodle_v2/
 Squad/Parts/Engine/liquidEngineSkipper_v2/
@@ -144,6 +149,7 @@ Squad/Parts/Utility/launchClamp1/
 Squad/Parts/Utility/launchEscapeSystem/
 Squad/Parts/Utility/Lights/
 Squad/Parts/Utility/linearVernorRCS/
+Squad/Parts/Utility/mk2DockingPort/
 Squad/Parts/Utility/parachuteMk1/
 Squad/Parts/Utility/parachuteMk12-R/
 Squad/Parts/Utility/parachuteMk16-XL/

Distribution/Restock/GameData/ReStock/RestockPatchDisabler.cfg

@@ -1,10 +0,0 @@
-// Disables Restock patches for stock parts.
-// IMPORTANT NOTE: YOU WILL ALSO NEED TO WHITELIST THE PARTS' ART ASSETS
-
-// To use, uncomment the following @PART entry, and change yourPartName to the part that you want Restock to leave alone :(.
-// Make a copy with an appropriate value for yourPartName
-
-// @PART[yourPartName]:BEFORE[000_ReStock]
-//{
-//  RestockIgnore = True
-//}

Distribution/Restock/GameData/ReStock/Versioning/ReStock.version

@@ -5,24 +5,24 @@
     "VERSION":
     {
         "MAJOR":1,
-        "MINOR":3,
-        "PATCH":1,
+        "MINOR":4,
+        "PATCH":6,
         "BUILD":0
     },
     "KSP_VERSION":
     {
         "MAJOR":1,
-        "MINOR":11,
-        "PATCH":1
+        "MINOR":12,
+        "PATCH":5
     },
     "KSP_VERSION_MIN":{
         "MAJOR":1,
-        "MINOR":11,
-        "PATCH":1
+        "MINOR":12,
+        "PATCH":2
     },
     "KSP_VERSION_MAX":{
         "MAJOR":1,
-        "MINOR":11,
+        "MINOR":12,
         "PATCH":99
     }
 }

Distribution/Restock/changelog.txt

@@ -1,3 +1,87 @@
+v1.4.6
+------
+- Fixed extra random png texture in the distribution (#1017)
+- Fixed rotation of Mk2 Lander can airlock (#1008)
+- Fixed LT-2 landing leg being weaker than stock (#858)
+
+v1.4.5
+------
+- Add drag cubes from KSP 1.12.5 Vanilla to the following parts (this should help a lot with re-entry with craft designed in Vanilla):
+  - Probodobodyne QBE
+  - Probodobodyne Stayputnik
+  - Probodobodyne HECS
+  - Probodobodyne OKTO
+  - Probodobodyne OKTO2
+  - Probodobodyne HECS2
+  - RC-L01 Remote Guidance Unit
+  - RC-001S Remote Guidance Unit
+  - R-4 'Dumpling' External Tank
+  - R-11 'Baguette' External Tank
+  - R-12 'Doughnut' External Tank
+  - Heat Shield (0.625m)
+  - OX-STAT Photovoltaic Panels
+  - OX-STAT-XL Photovoltaic Panels
+- Fix engine attachment nodes on the Making History Kerbodyne Engine Cluster Adapter Tank.
+- New stock part replacement:
+  - T-1 Toroidal Aerospike "Dart" Liquid Fuel Engine.
+
+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
+- 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
+- Removed extra rescaleFactor from Swivel
+
+v1.4.2
+------
+- KSP 1.12.2
+- Updated ModuleManager to 4.2.1
+- Fixed Gigantor panel extension
+- Adjusted and applied Restock Swivel and Reliant models to fit new Squad revamps (adjusted dimensions, colliders)
+- Fixed Mk2 docking port not docking
+- Added new Senior docking port grey variant 
+
+v1.4.1
+------
+- Numerous fixes to circular solar panel model (shrouded and not)
+- Fixed Clamp-O-Tron Sr. docking port shader being emissive when it wasn't supposed to be
+- Moved alignment arrows closer to the surface on Mk1 Inline Docking port
+- Fixed new solar panel assets not being blacklisted appropriately
+
+v1.4.0
+------
+- KSP 1.12
+- Added new part replacements
+ - Electrical
+  - OX-10C Photovoltaic Panels (Nertea)
+  - SP-10C Photovoltaic Panels (Nertea)
+  - OX-10L Photovoltaic Panels (Beale)
+  - SP-10L Photovoltaic Panels (Beale)
+- Adapted docking port models for new 1.12 rotational functionality
+- Adapted new stock collider for 2.5m nosecone replacement
+- Texture updates for Gigantor
+
+v1.3.3
+------
+- Fix Poodle shroud shaders
+
+v1.3.2
+------
+- Fixed collider location inconsistency with stock for 1.25m heatshield (#914)
+- Fixed drag cubes (and occlusion) for 1.875m heatshield (#923)
+- Added new FX transform nodes for Poodle
+
 v1.3.1
 ------
 - Fixed small linear RCS collider

Distribution/Restock/readme.txt

@@ -1,5 +1,5 @@
 =============
-RESTOCK 1.3.1
+RESTOCK 1.4.6
 =============
 
 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.1.4)
+- ModuleManager (4.2.3)
 
 =======
 CREDITS
@@ -27,6 +27,8 @@ Art
 - Passinglurker
 - Porkjet
 - riocrokite
+- Kavaeric
+- Well
 
 Drag cube wizardry
 - DMagic
@@ -50,7 +52,7 @@ To install, drag the ReStock folder and ModuleManager DLL from the GameData fold
             - Assets
             - Patches
             - etc.
-        - ModuleManager.4.1.4.dll
+        - ModuleManager.4.2.3.dll
 
 ===============
 ASSET BLACKLIST
@@ -80,7 +82,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)

Distribution/RestockPlus/.mod_data.yml

@@ -10,8 +10,9 @@ package:
     - license.txt
 dependencies:  # Configure dependencies
   ModuleManager:
-    version: 4.1.4
-    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