Merge pull request #972 from PorktoberRevolution/master

Release

.github/workflows/deploy.yml

@@ -44,4 +44,6 @@ jobs:
     - name: Staging package
       run: python build-deploy/src/stage.py --f "Distribution/Restock/.mod_data.yml" # Run the staging script
     - name: Deploying Restock
+      run: python build-deploy/src/deploy.py --f "Distribution/Restock/.mod_data.yml" # Deploy package to spacedock, curse, github
+    - name: Deploying RestockPlus
       run: python build-deploy/src/deploy.py --f "Distribution/RestockPlus/.mod_data.yml" # Deploy package to spacedock, curse, github

.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,7 +13,7 @@ package:
     - RestockRigidLegs
 dependencies:  # Configure dependencies
   ModuleManager:
-    version: 4.1.4
+    version: 4.2.1
     location: s3
 deploy:
   SpaceDock:

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/Control/restock-rcs.cfg

@@ -185,7 +185,6 @@
 // RV-1X RCS Thruster Block
 @PART[RCSblock_01_small]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
-
   @author = Chris Adderley (Nertea)
   !mesh = DELETE
   !MODEL {}
@@ -558,6 +557,38 @@
       key = 0 1
     }
   }
+  !MODULE[ModulePartVariants] {}
+  MODULE
+  {
+    name = ModulePartVariants
+    baseVariant = Bare    
+    useMultipleDragCubes = true
+    VARIANT
+    {
+      name = Bare
+      displayName =  #autoLOC_8007115
+      primaryColor = #ffffff
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        MiniRCSBlock1 = true
+        MiniRCSBlock2 = false
+      }
+    }   
+    VARIANT
+    {
+      name = Shroud
+      displayName = #autoLOC_8007114
+      primaryColor = #999999
+      secondaryColor = #999999
+      GAMEOBJECTS
+      {
+        MiniRCSBlock1 = false
+        MiniRCSBlock2 = true
+
+      }
+    }
+  }
   @MODULE[ModuleRCSFX]
   {
     @thrusterTransformName = RCSthruster

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
+    name = ModulePartVariants
-    shaderProperty = _EmissiveColor
+    baseVariant = Gray with Stripes
-    animRate = 0.8
+    useMultipleDragCubes = false
-    animState = false
+    VARIANT
-    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
+      name = Gray with Stripes
-      key = 1 1 0 0
+      displayName = #autoLOC_8320084
+      themeName = Gray
+      primaryColor = #999999
+      themeName = Gray with Stripes
+      secondaryColor = #b08b39
+      GAMEOBJECTS
+      {
+        Docking25Base = true
+        Docking25Grey = false
+      }
     }
-    greenCurve
+    VARIANT
     {
-      key = 0 0 0 1
+      name = Gray
-      key = 1 1 1 0
+      displayName = #autoLOC_8007101
-    }
+      themeName = Gray
-    blueCurve
+      primaryColor = #999999
-    {
+      secondaryColor = #999999
-      key = 0 0 0 0
+      GAMEOBJECTS
-      key = 1 0.7 1.5 0
+      {
-    }
+        Docking25Base = false
-    alphaCurve
+        Docking25Grey = true
-    {
+      }
-      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

@@ -128,6 +128,128 @@
   } 
 }
 
+// Illuminator Mk1 V2
+@PART[spotLight1_v2]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
+{
+  @author = Chris Adderley (Nertea)
+  !mesh = DELETE
+  !MODEL,* {}
+  MODEL
+  {
+    model = ReStock/Assets/Electrical/restock-light-spot-2
+    position = 0.0, 0.0, 0.0
+    scale = 1,1,1
+    rotation = 0, 0, 0
+  }
+  @MODULE[ModuleLight]
+  {
+    @lightMeshRendererName = SpotLightLens
+    @lightName = Spot
+    movementTransformName = SpotLightBase
+    canRotate = false
+    canPitch = true
+    pitchAxisName = X
+    pitchMin = 0
+    pitchMax = 180
+  }
+  !MODULE[ModulePartVariants] {}
+  MODULE
+  {
+    name = ModulePartVariants
+    useMultipleDragCubes = false
+    baseVariant = Dark
+
+    VARIANT
+    {
+      name = Dark
+      displayName #autoLOC_8007117
+      themeName = Dark
+      primaryColor = #000000
+      secondaryColor = #000000
+      TEXTURE
+      {
+        materialName = restock-lights-1
+        mainTextureURL = ReStock/Assets/Electrical/restock-lights-1
+      }
+    } 
+    VARIANT
+    {
+      name = White
+      displayName = #autoLOC_8007119
+      themeName = White
+      primaryColor = #ffffff
+      secondaryColor = #ffffff
+      TEXTURE
+      {
+        materialName = restock-lights-1
+        mainTextureURL = ReStock/Assets/Electrical/restock-lights-1-alt
+      }
+    }   
+  } 
+}
+
+// Illuminator Mk2 V2
+@PART[spotLight2_v2]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
+{
+  @author = Chris Adderley (Nertea)
+  !mesh = DELETE
+  !MODEL,* {}
+  MODEL
+  {
+    model = ReStock/Assets/Electrical/restock-light-flood-2
+    position = 0.0, 0.0, 0.0
+    scale = 1,1,1
+    rotation = 0, 0, 0
+  }
+  @MODULE[ModuleLight]
+  {
+    @lightMeshRendererName = FloodLightLens
+    @lightName = Spot
+    movementTransformName = FloodR
+    canRotate = false
+    canPitch = true
+    pitchAxisName = X
+    pitchMin = 0
+    pitchMin = 0
+    pitchMax = 180
+  }
+  !MODULE[ModulePartVariants] {}
+  MODULE
+  {
+    name = ModulePartVariants
+    useMultipleDragCubes = false
+    baseVariant = Dark
+
+    VARIANT
+    {
+      name = Dark
+      displayName #autoLOC_8007117
+      themeName = Dark
+      primaryColor = #000000
+      secondaryColor = #000000
+      TEXTURE
+      {
+        materialName = restock-lights-1
+        mainTextureURL = ReStock/Assets/Electrical/restock-lights-1
+      }
+    } 
+    VARIANT
+    {
+      name = White
+      displayName = #autoLOC_8007119
+      themeName = White
+      primaryColor = #ffffff
+      secondaryColor = #ffffff
+      TEXTURE
+      {
+        materialName = restock-lights-1
+        mainTextureURL = ReStock/Assets/Electrical/restock-lights-1-alt
+      }
+    }   
+  } 
+}
+
+
 // [1.11] Dome Light
 @PART[domeLight1]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {

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,11 +116,21 @@
   !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
   }
+  MODULE
+  {
+    name =  ModuleRestockDeployableMeshHider
+    transformName = Panels
+    transformName = PanelTruss
+  }
+  @MODULE[ModuleDeployableSolarPanel]
+  {
+    @breakName = pivotBase
+  }
 }
 
 // OX-STAT Photovoltaic Panels
@@ -147,3 +162,97 @@
     rotation = 0, 0, 0
   }
 }
+
+// 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,8 +3,8 @@
 // - 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-T30 "Reliant" Liquid Fuel Engine (liquidEngine_v2)
-// - LV-T45 "Swivel" Liquid Fuel Engine (liquidEngine2)
+// - 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
 
@@ -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_attach = 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 1
-  @node_stack_bottom = 0.0, -0.90925375, 0.0, 0.0, -1.0, 0.0
+ 
+  !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_attach = 0.0, 0, 0.0, 0.0, 1.0, 0.0, 1
-  @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
@@ -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

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/Thermal/restock-heat-shields.cfg

@@ -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 = 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.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 = 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 = 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.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 = 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/Engine/restock-mh-engines-srb-1875.cfg

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

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/
@@ -160,6 +166,8 @@ Squad/Parts/Utility/ServiceBay_v2/
 Squad/Parts/Utility/smallClaw/
 Squad/Parts/Utility/spotLightMk1/
 Squad/Parts/Utility/spotLightMk2/
+Squad/Parts/Utility/spotLightMk1_v2/
+Squad/Parts/Utility/spotLightMk2_v2/
 Squad/Parts/Utility/stackCouplers/
 Squad/Parts/Wheel/roverWheelM1/
 Squad/Parts/Wheel/roverWheelS2/

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,
+        "MINOR":4,
-        "PATCH":0,
+        "PATCH":2,
         "BUILD":0
     },
     "KSP_VERSION":
     {
         "MAJOR":1,
-        "MINOR":11,
+        "MINOR":12,
-        "PATCH":0
+        "PATCH":2
     },
     "KSP_VERSION_MIN":{
         "MAJOR":1,
-        "MINOR":10,
+        "MINOR":12,
-        "PATCH":1
+        "PATCH":2
     },
     "KSP_VERSION_MAX":{
         "MAJOR":1,
-        "MINOR":11,
+        "MINOR":12,
         "PATCH":99
     }
 }

Distribution/Restock/changelog.txt

@@ -1,3 +1,52 @@
+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
+- Fixed Gigantor not being repairable
+- Fixed compatability marked for 1.10.1, it isn't, really
+- Change DXT5 textures to DXT1 where an alpha channel was unnecessary
+- Applied Restock models to new Squad revamped Mk1, Mk2 Illuminators
+- Added obese variant to small linear RCS to align with Squad's vision for the part
+- Gigantor now breaks more correctly but still badly
+
 v1.3.0
 ------
 - 1.11.0