Merge branch '1-8-updates' into develop

# Conflicts:
#	Distribution/Restock/changelog.txt

Distribution/RestockPlus/GameData/ReStockPlus/Localization/en-us.cfg

@@ -32,14 +32,18 @@ Localization
     #LOC_RestockPlus_restock-engine-boar_tags = ascent main propuls lower sls dynetics f1b restock kr1 boar
 
     #LOC_RestockPlus_restock-engine-cherenkov_title = LV-N410 'Cherenkov' Atomic Rocker Motor
-    #LOC_RestockPlus_restock-engine-cherenkov_description = By popular demand, Rockomax has brought a powerful large nuclear engine to market. Like its smaller cousin the Nerv, it runs on only Liquid Fuel. As a result of a large development budget, gimballing mechanisms have been installed on the turbopump exhaust ducts, allowing limited vectored thrust abilities. 
-    #LOC_RestockPlus_restock-engine-cherenkov_tags = active atom efficient engine inter liquid (cherenkov nuclear nuke orbit propuls radio reactor vacuum restock 
+    #LOC_RestockPlus_restock-engine-cherenkov_description = By popular demand, Rockomax has brought a powerful large nuclear engine to market. Like its smaller cousin the Nerv, it runs on only Liquid Fuel. As a result of a large development budget, gimballing mechanisms have been installed on the turbopump exhaust ducts, allowing limited vectored thrust abilities.
+    #LOC_RestockPlus_restock-engine-cherenkov_tags = active atom efficient engine inter liquid (cherenkov nuclear nuke orbit propuls radio reactor vacuum restock
 
     // 1.875m
     #LOC_RestockPlus_restock-engine-srb-anvil_title = STS-1 'Anvil' Solid Rocket Booster
-    #LOC_RestockPlus_restock-engine-srb-anvil_description = This colossal solid rocket booster has more than enough power to be used to push lower thrust cores really high up or even be used as a core stage, if your engineers feel that the unstable explosive combustion's spine-tingling rumble could be harnessed as a back massage function for bored Kerbonauts.
+    #LOC_RestockPlus_restock-engine-srb-anvil_description = Discontinued due to component shortages. This colossal solid rocket booster has more than enough power to be used to push lower thrust cores really high up or even be used as a core stage, if your engineers feel that the unstable explosive combustion's spine-tingling rumble could be harnessed as a back massage function for bored Kerbonauts.
     #LOC_RestockPlus_restock-engine-srb-anvil_tags = a moar (more motor rocket shuttle ssrb srb restock anvil
 
+    #LOC_RestockPlus_restock-engine-srb-castor_title = TCK-2 'Castor' Solid Rocket Booster
+    #LOC_RestockPlus_restock-engine-srb-castor_description = This medium solid rocket booster has more than enough power to be used to push lower thrust cores really high up or even be used as a core stage, if your engineers feel that the unstable explosive combustion's spine-tingling rumble could be harnessed as a back massage function for bored Kerbonauts.
+    #LOC_RestockPlus_restock-engine-srb-castor_tags = a moar (more motor rocket shuttle ssrb srb restock anvil
+
     #LOC_RestockPlus_restock-engine-ursa_title = RK-107 'Ursa' Liquid Fuel Engine
     #LOC_RestockPlus_restock-engine-ursa_description = Though the Ursa is bearish on gimbal mechanisms, it is fairly powerful and does simple, effective duty as a booster engine.
     #LOC_RestockPlus_restock-engine-ursa_tags = fueltank ?lfo liquid oxidizer propellant rocket (ursa restock
@@ -67,11 +71,11 @@ Localization
     #LOC_RestockPlus_restock-engine-torch_tags = ascent main propuls lower titan restock mk1h torch
 
     #LOC_RestockPlus_restock-engine-srb-mallet_title = RT-1 'Mallet' Solid Rocket Booster
-    #LOC_RestockPlus_restock-engine-srb-mallet_description = The small Mallet answers the demand for miniature, compact SRBs suitable for additional booster assist or stack mounting for small launchers. The KSC's staff janitor, one O. Trag Kerman, has even proposed strapping dozens of them together to make super cheap vehicles!
+    #LOC_RestockPlus_restock-engine-srb-mallet_description = Discontinued due to component shortages. The small Mallet answers the demand for miniature, compact SRBs suitable for additional booster assist or stack mounting for small launchers. The KSC's staff janitor, one O. Trag Kerman, has even proposed strapping dozens of them together to make super cheap vehicles!
     #LOC_RestockPlus_restock-engine-srb-mallet_tags = moar (more motor rocket srb restock mallet
 
     #LOC_RestockPlus_restock-engine-srb-striker_title = RT-2 'Striker' Solid Rocket Booster
-    #LOC_RestockPlus_restock-engine-srb-striker_description = Extending the Mallet with additional segments can provide more boom than your integration team knows what to do with!
+    #LOC_RestockPlus_restock-engine-srb-striker_description = Discontinued due to component shortages. Extending the Mallet with additional segments can provide more boom than your integration team knows what to do with!
     #LOC_RestockPlus_restock-engine-srb-striker_tags = a moar (more motor rocket srb restock striker
 
     // Radial
@@ -233,7 +237,7 @@ Localization
 
     // 0.625m
     #LOC_RestockPlus_restock-claw-625-1_title = Advanced Grabbing Unit Junior
-    #LOC_RestockPlus_restock-claw-625-1_description = A smaller claw for grappling smaller things. Unfortunately, it does not pivot. 
+    #LOC_RestockPlus_restock-claw-625-1_description = A smaller claw for grappling smaller things. Unfortunately, it does not pivot.
     #LOC_RestockPlus_restock-claw-625-1_tags = restock a.r.m arm asteroid capture clam claw connect dock fasten grab join klaw nasa 625
 
     // 1.875m
@@ -259,9 +263,14 @@ Localization
 
     // 1.875m
     #LOC_RestockPlus_restock-nosecone-1875-1_title = Protective Rocket Nose Mk18
-    #LOC_RestockPlus_restock-nosecone-1875-1_description = For capping off those medium size boosters, you can't beat the Mark 18, unless you're the Mark 19.
+    #LOC_RestockPlus_restock-nosecone-1875-1_description = Discontinued due to component shortages. For capping off those medium size boosters, you can't beat the Mark 18, unless you're the Mark 19.
     #LOC_RestockPlus_restock-nosecone-1875-1_tags = restock aero aircraft booster )cap drag fligh plane rocket speed stab stream nose mk18
 
+    #LOC_RestockPlus_restock-nosecone-1875-2_title = Protective Rocket Nose Mk18
+    #LOC_RestockPlus_restock-nosecone-1875-2_description = For capping off those medium size boosters, you can't beat the Mark 18, unless you're the Mark 19.
+    #LOC_RestockPlus_restock-nosecone-1875-2_tags = restock aero aircraft booster )cap drag fligh plane rocket speed stab stream nose mk18
+
+
     // 3.75m
     #LOC_RestockPlus_restock-nosecone-375-1_title = Kerbodyne S3-3600 Nosecone
     #LOC_RestockPlus_restock-nosecone-375-1_description = A specialized and monstrous nosecone with revolutionary fuel-containing capabilities.

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Aero/1875/restock-nosecone-1875-1.cfg

@@ -1,5 +1,6 @@
-// ReStock+ 0.1.0
+// ReStock+ 0.2.0
 // 1.875m Nosecone
+// NOTE: Soft-deprecated as of KSP 1.8 update
 PART
 {
   name = restock-nosecone-1875-1
@@ -7,7 +8,7 @@ PART
   author = Chris Adderley (Nertea)
   MODEL
   {
-    model = ReStockPlus/Assets/Aero/restock-nosecone-1875-1
+    model = ReStock/Assets/Aero/restock-nosecone-1875-1
     scale = 1.0, 1.0, 1.0
   }
   scale = 1
@@ -20,7 +21,8 @@ PART
   entryCost = 4200
   // Info
   cost = 480
-  category = Aero
+  category = none
+  TechHidden = True
   subcategory = 0
   title = #LOC_RestockPlus_restock-nosecone-1875-1_title
   manufacturer = #autoLOC_501638

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Aero/1875/restock-nosecone-1875-2.cfg

@@ -0,0 +1,88 @@
+// ReStock+ 0.2.0
+// 1.875m Nosecone (as of KSP 1.8)
+PART
+{
+  name = restock-nosecone-1875-2
+  module = Part
+  author = Chris Adderley (Nertea)
+  MODEL
+  {
+    model = ReStock/Assets/Aero/restock-nosecone-1875-2
+    scale = 1.0, 1.0, 1.0
+  }
+  scale = 1
+  rescaleFactor = 1
+  // Attachment
+  attachRules = 1,1,1,1,0
+  node_stack_bottom = 0.0, -0.94, 0, 0.0, -1.0, 0.0, 1
+  // Tech
+  TechRequired = aerodynamicSystems
+  entryCost = 4200
+  // Info
+  cost = 480
+  category = Aero
+  subcategory = 0
+  title = #LOC_RestockPlus_restock-nosecone-1875-2_title
+  manufacturer = #autoLOC_501638
+  description = #LOC_RestockPlus_restock-nosecone-1875-2_description
+  tags = #LOC_RestockPlus_restock-nosecone-1875-2_tags
+  bulkheadProfiles = size1p5
+  // Parameters
+  mass = 0.12
+  dragModelType = default
+  maximum_drag = 0.2
+  minimum_drag = 0.3
+  angularDrag = 2
+  crashTolerance = 6
+  maxTemp = 2000
+  breakingForce = 350
+  breakingTorque = 350
+  MODULE
+  {
+    name = ModulePartVariants
+    baseVariant = White
+    useMultipleDragCubes = false
+    VARIANT
+    {
+      name = White
+      displayName = #autoLOC_8007119
+      themeName = White
+      primaryColor = #ffffff
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        1875mNoseconeBlackWhite = false
+        1875mNosecone = true
+        1875mNoseconeOrange = false
+      }
+    }
+    VARIANT
+    {
+      name = BlackAndWhite
+      displayName = #autoLOC_8007122
+      themeName = BlackAndWhite
+      primaryColor = #ffffff
+      secondaryColor = #000000
+      GAMEOBJECTS
+      {
+        1875mNoseconeBlackWhite = true
+        1875mNosecone = false
+        1875mNoseconeOrange = false
+      }
+    }
+    VARIANT
+    {
+      name = Orange
+      displayName = #autoLOC_8007123
+      themeName = Orange
+      primaryColor = #f49841
+      secondaryColor = #4c4f47
+      GAMEOBJECTS
+      {
+        1875mNoseconeBlackWhite = false
+        1875mNosecone = false
+        1875mNoseconeOrange = true
+      }
+    }
+  }
+}

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Coupling/1875/restock-decoupler-1875-1.cfg

@@ -52,6 +52,55 @@ PART
     crossfeedStatus = false
     toggleEditor = true
     toggleFlight = true
+  }
+   MODULE
+  {
+    name = ModulePartVariants
+    useMultipleDragCubes = false
+    baseVariant = BlackAndWhite
+    VARIANT
+    {
+      name = Metallic
+      displayName = #LOC_Restock_variant-surface_metal
+      themeName = Metal
+      primaryColor = #6f6e6d
+      secondaryColor = #6f6e6d
+      
+      GAMEOBJECTS
+      {
+        Decoupler1875White = false
+        Decoupler1875Metal = true
+        Decoupler1875Orange = false
+      }
+    }
+    VARIANT
+    {
+      name = BlackAndWhite
+      displayName = #autoLOC_8007122
+      themeName = BlackAndWhite
+      primaryColor = #ffffff
+      secondaryColor = #000000
+      GAMEOBJECTS
+      {
+        Decoupler1875White = true
+        Decoupler1875Metal = false
+        Decoupler1875Orange = false
+      }
+    }
+    VARIANT
+    {
+      name = GrayAndOrange
+      displayName = #autoLOC_8007121
+      themeName = GrayAndOrange
+      primaryColor = #4c4f47
+      secondaryColor = #f49841
+      GAMEOBJECTS
+      {
+        Decoupler1875White = false
+        Decoupler1875Metal = false
+        Decoupler1875Orange = true
+      }
+    }
   }
   MODULE
   {

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Coupling/1875/restock-separator-1875-1.cfg

@@ -53,6 +53,55 @@ PART
     toggleFlight = true
   }
   MODULE
+  {
+    name = ModulePartVariants
+    useMultipleDragCubes = false
+    baseVariant = BlackAndWhite
+    VARIANT
+    {
+      name = Metallic
+      displayName = #LOC_Restock_variant-surface_metal
+      themeName = Metal
+      primaryColor = #6f6e6d
+      secondaryColor = #6f6e6d
+      
+      GAMEOBJECTS
+      {
+        Separator1875White = false
+        Separator1875Metal = true
+        Separator1875Orange = false
+      }
+    }
+    VARIANT
+    {
+      name = BlackAndWhite
+      displayName = #autoLOC_8007122
+      themeName = BlackAndWhite
+      primaryColor = #ffffff
+      secondaryColor = #000000
+      GAMEOBJECTS
+      {
+        Separator1875White = true
+        Separator1875Metal = false
+        Separator1875Orange = false
+      }
+    }
+    VARIANT
+    {
+      name = GrayAndOrange
+      displayName = #autoLOC_8007121
+      themeName = GrayAndOrange
+      primaryColor = #4c4f47
+      secondaryColor = #f49841
+      GAMEOBJECTS
+      {
+        Separator1875White = false
+        Separator1875Metal = false
+        Separator1875Orange = true
+      }
+    }
+  }
+  MODULE
   {
     name = ModuleTestSubject
     useStaging = True

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Electrical/375/restock-battery-375-1.cfg

@@ -18,7 +18,7 @@ PART
   node_stack_top = 0.0, 0.203, 0.0, 0.0, 1.0, 0.0, 3
   node_stack_bottom = 0.0, -0.227, 0.0, 0.0, -1.0, 0.0, 3
   // --- editor parameters ---
-  TechRequired = largeElectrics
+  TechRequired = experimentalElectrics
   entryCost = 21500
   cost = 11250
   category = Electrical

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/0625/restock-engine-torch.cfg

@@ -174,7 +174,7 @@ PART
     VARIANT
     {
       name = Size0
-      displayName = #LOC_Restock_variant-engine_size0
+      displayName = #LOC_Restock_variant-engine_size0_grey-orange
       primaryColor = #999999
       secondaryColor = #f69449
       GAMEOBJECTS
@@ -192,12 +192,19 @@ PART
         CylLower004 = false
         ShroudTorchBasic = true
         ShroudTorchCompact = false
+
+        ShroudTorchCompactMetal = true
+        ShroudTorchCompactWhite = false
+        ShroudTorchBasicMetal = true
+        ShroudTorchBasicWhite = false
+        BoattailWhite = false
+        Boattail = true
       }
     }
     VARIANT
     {
       name = Boattail
-      displayName = #LOC_Restock_variant-engine_boattail
+      displayName = #LOC_Restock_variant-engine_boattail_grey-orange
       primaryColor = #ffffff
       secondaryColor = #f69449
       GAMEOBJECTS
@@ -215,12 +222,19 @@ PART
         CylLower004 = false
         ShroudTorchBasic = false
         ShroudTorchCompact = false
+
+        ShroudTorchCompactMetal = true
+        ShroudTorchCompactWhite = false
+        ShroudTorchBasicMetal = true
+        ShroudTorchBasicWhite = false
+        BoattailWhite = false
+        Boattail = true
       }
     }
     VARIANT
     {
       name = Compact
-      displayName = #LOC_Restock_variant-engine_compact
+      displayName = #LOC_Restock_variant-engine_compact_grey-orange
       primaryColor = #999999
       secondaryColor = #999999
       GAMEOBJECTS
@@ -238,6 +252,103 @@ PART
         CylLower004 = true
         ShroudTorchBasic = false
         ShroudTorchCompact = true
+
+        ShroudTorchCompactMetal = true
+        ShroudTorchCompactWhite = false
+        ShroudTorchBasicMetal = true
+        ShroudTorchBasicWhite = false
+        BoattailWhite = false
+        Boattail = true
+      }
+    }
+    VARIANT
+    {
+      name = Size0_Alternate
+      displayName = #LOC_Restock_variant-engine_size0_white
+      primaryColor = #999999
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        Torch_0625 = true
+        Torch_Boattail = false
+        Torch_Compact = false
+        CylUpper001 = true
+        CylUpper002 = true
+        CylUpper003 = false
+        CylUpper004 = false
+        CylLower001 = true
+        CylLower002 = true
+        CylLower003 = false
+        CylLower004 = false
+        ShroudTorchBasic = true
+        ShroudTorchCompact = false
+
+        ShroudTorchCompactMetal = false
+        ShroudTorchCompactWhite = true
+        ShroudTorchBasicMetal = false
+        ShroudTorchBasicWhite = true
+        BoattailWhite = true
+        Boattail = false
+      }
+    }
+    VARIANT
+    {
+      name = Boattail_Alternate
+      displayName = #LOC_Restock_variant-engine_boattail_white
+      primaryColor = #ffffff
+      secondaryColor = #f69449
+      GAMEOBJECTS
+      {
+        Torch_0625 = false
+        Torch_Boattail = true
+        Torch_Compact = false
+        CylUpper001 = true
+        CylUpper002 = true
+        CylUpper003 = false
+        CylUpper004 = false
+        CylLower001 = true
+        CylLower002 = true
+        CylLower003 = false
+        CylLower004 = false
+        ShroudTorchBasic = false
+        ShroudTorchCompact = false
+
+        ShroudTorchCompactMetal = false
+        ShroudTorchCompactWhite = true
+        ShroudTorchBasicMetal = false
+        ShroudTorchBasicWhite = true
+        BoattailWhite = true
+        Boattail = false
+      }
+    }
+    VARIANT
+    {
+      name = Compact_Alternate
+      displayName = #LOC_Restock_variant-engine_compact_white
+      primaryColor = #ffffff
+      secondaryColor = #999999
+      GAMEOBJECTS
+      {
+        Torch_0625 = false
+        Torch_Boattail = false
+        Torch_Compact = true
+        CylUpper001 = false
+        CylUpper002 = false
+        CylUpper003 = true
+        CylUpper004 = true
+        CylLower001 = false
+        CylLower002 = false
+        CylLower003 = true
+        CylLower004 = true
+        ShroudTorchBasic = false
+        ShroudTorchCompact = true
+
+        ShroudTorchCompactMetal = false
+        ShroudTorchCompactWhite = true
+        ShroudTorchBasicMetal = false
+        ShroudTorchBasicWhite = true
+        BoattailWhite = true
+        Boattail = false
       }
     }
   }

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/0625/restock-srb-mallet-1.cfg

@@ -1,5 +1,6 @@
-// ReStock+ 0.1.0
+// ReStock+ 0.2.0
 // Small 0625m SRB
+// NOTE: Soft-deprecated as of KSP 1.8 update
 PART
 {
   name = restock-srb-mallet-1
@@ -9,7 +10,7 @@ PART
   scale = 1
   MODEL
   {
-    model = ReStockPlus/Assets/Engine/restock-engine-mallet-1
+    model = ReStock/Assets/Engine/restock-engine-mallet-1
   }
   node_stack_bottom = 0.0, -1.4, 0.0, 0.0, -1.0, 0.0, 0
   node_stack_top = 0.0, 1.71, 0.0, 0.0, 1.0, 0.0, 0
@@ -87,7 +88,8 @@ PART
   TechRequired = start
   entryCost = 0
   cost = 125
-  category = Engine
+  category = none
+  TechHidden = True
   subcategory = 0
   title = #LOC_RestockPlus_restock-engine-srb-mallet_title
   description = #LOC_RestockPlus_restock-engine-srb-mallet_description

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/0625/restock-srb-striker-1.cfg

@@ -1,5 +1,7 @@
-// ReStock+ 0.1.0
+// ReStock+ 0.2.0
 // Small 0625m SRB
+// NOTE: Soft-deprecated as of KSP 1.8 update
+
 PART
 {
   name = restock-srb-striker-1
@@ -9,7 +11,7 @@ PART
   scale = 1
   MODEL
   {
-    model = ReStockPlus/Assets/Engine/restock-engine-striker-1
+    model = ReStock/Assets/Engine/restock-engine-striker-1
   }
   EFFECTS
   {
@@ -87,7 +89,9 @@ PART
   TechRequired = start
   entryCost = 0
   cost = 200
-  category = Engine
+  category = none
+  TechHidden = True
+  subcategory = 0
   subcategory = 0
   title = #LOC_RestockPlus_restock-engine-srb-striker_title
   description = #LOC_RestockPlus_restock-engine-srb-striker_description

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/125/restock-engine-pug.cfg

@@ -142,7 +142,7 @@ PART
     VARIANT
     {
       name = Size1
-      displayName = #LOC_Restock_variant-engine_size1
+      displayName = #LOC_Restock_variant-engine_size1_white
       primaryColor = #999999
       secondaryColor = #ffb80c
       GAMEOBJECTS
@@ -152,12 +152,19 @@ PART
         LV_303_Compact = false
         Shroud = true
         Shroud_Compact = false
+
+        ShroudWhite = true
+        ShroudOrange = false
+        Shroud_CompactWhite = true
+        Shroud_CompactOrange = false
+        Frame_Boat = true
+        Frame_BoatOrange = false
       }
     }
     VARIANT
     {
       name = Boattail
-      displayName = #LOC_Restock_variant-engine_boattail
+      displayName = #LOC_Restock_variant-engine_boattail_white
       primaryColor = #ffffff
       secondaryColor = #ffb80c
       GAMEOBJECTS
@@ -167,12 +174,19 @@ PART
         LV_303_Compact = false
         Shroud = false
         Shroud_Compact = false
+
+        ShroudWhite = true
+        ShroudOrange = false
+        Shroud_CompactWhite = true
+        Shroud_CompactOrange = false
+        Frame_Boat = true
+        Frame_BoatOrange = false
       }
     }
     VARIANT
     {
       name = Compact
-      displayName = #LOC_Restock_variant-engine_compact
+      displayName = #LOC_Restock_variant-engine_compact_white
       primaryColor = #999999
       secondaryColor = #999999
       GAMEOBJECTS
@@ -182,9 +196,83 @@ PART
         LV_303_Compact = true
         Shroud = false
         Shroud_Compact = true
+
+        ShroudWhite = true
+        ShroudOrange = false
+        Shroud_CompactWhite = true
+        Shroud_CompactOrange = false
+        Frame_Boat = true
+        Frame_BoatOrange = false
+      }
+    }
+    VARIANT
+    {
+      name = Size1Alternate
+      displayName = #LOC_Restock_variant-engine_size1_grey-orange
+      primaryColor = #6f6e6d
+      secondaryColor = #ffb80c
+      GAMEOBJECTS
+      {
+        LV_303 = true
+        LV_303_Boattail = false
+        LV_303_Compact = false
+        Shroud = true
+        Shroud_Compact = false
+
+        ShroudWhite = false
+        ShroudOrange = true
+        Shroud_CompactWhite = false
+        Shroud_CompactOrange = true
+        Frame_Boat = false
+        Frame_BoatOrange = true
+      }
+    }
+    VARIANT
+    {
+      name = Boattail_Alternate
+      displayName = #LOC_Restock_variant-engine_boattail_grey-orange
+      primaryColor = #666666
+      secondaryColor = #ffb80c
+      GAMEOBJECTS
+      {
+        LV_303 = false
+        LV_303_Boattail = true
+        LV_303_Compact = false
+        Shroud = false
+        Shroud_Compact = false
+
+        ShroudWhite = false
+        ShroudOrange = true
+        Shroud_CompactWhite = false
+        Shroud_CompactOrange = true
+        Frame_Boat = false
+        Frame_BoatOrange = true
+      }
+    }
+    VARIANT
+    {
+      name = Compact_Alternate
+      displayName = #LOC_Restock_variant-engine_compact_grey-orange
+      primaryColor = #6f6e6d
+      secondaryColor = #999999
+      GAMEOBJECTS
+      {
+        LV_303 = false
+        LV_303_Boattail = false
+        LV_303_Compact = true
+        Shroud = false
+        Shroud_Compact = true
+
+        ShroudWhite = false
+        ShroudOrange = true
+        Shroud_CompactWhite = false
+        Shroud_CompactOrange = true
+        Frame_Boat = false
+        Frame_BoatOrange = true
       }
     }
   }
+
   MODULE
   {
     name = ModuleJettison

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/125/restock-engine-valiant.cfg

@@ -168,7 +168,7 @@ PART
     VARIANT
     {
       name = Size1
-      displayName = #LOC_Restock_variant-engine_size1
+      displayName = #LOC_Restock_variant-engine_size1_white
       primaryColor = #999999
       secondaryColor = #ffb80c
       GAMEOBJECTS
@@ -190,12 +190,19 @@ PART
         Piston002Upper = true
         Piston003Upper = false
         Piston004Upper = false
+
+        ShroudWhite = true
+        ShroudOrange = false
+        Shroud_CompactWhite = true
+        Shroud_CompactOrange = false
+        Frame_Boat = true
+        Frame_Boat_Orange = false
       }
     }
     VARIANT
     {
       name = Boattail
-      displayName = #LOC_Restock_variant-engine_boattail
+      displayName = #LOC_Restock_variant-engine_boattail_white
       primaryColor = #ffffff
       secondaryColor = #ffb80c
       GAMEOBJECTS
@@ -217,12 +224,19 @@ PART
         Piston002Upper = false
         Piston003Upper = false
         Piston004Upper = false
+
+        ShroudWhite = true
+        ShroudOrange = false
+        Shroud_CompactWhite = true
+        Shroud_CompactOrange = false
+        Frame_Boat = true
+        Frame_Boat_Orange = false
       }
     }
     VARIANT
     {
       name = Compact
-      displayName = #LOC_Restock_variant-engine_compact
+      displayName = #LOC_Restock_variant-engine_compact_white
       primaryColor = #999999
       secondaryColor = #999999
       GAMEOBJECTS
@@ -244,9 +258,119 @@ PART
         Piston002Upper = false
         Piston003Upper = true
         Piston004Upper = true
+
+        ShroudWhite = true
+        ShroudOrange = false
+        Shroud_CompactWhite = true
+        Shroud_CompactOrange = false
+        Frame_Boat = true
+        Frame_Boat_Orange = false
+      }
+    }
+    VARIANT
+    {
+      name = Size1_Alternate
+      displayName = #LOC_Restock_variant-engine_size1_grey-orange
+      primaryColor = #6f6e6d
+      secondaryColor = #ffb80c
+      GAMEOBJECTS
+      {
+        LV_T15 = true
+        LV_T15_Boattail = false
+        LV_T15_Compact = false
+        Shroud = true
+        Shroud_Compact = false
+        EngineCompact = false
+        Engine = true
+        MovingPartsCompactT15 = false
+        MovingParts = true
+        Piston001Lower = true
+        Piston002Lower = true
+        Piston003Lower = false
+        Piston004Lower = false
+        Piston001Upper = true
+        Piston002Upper = true
+        Piston003Upper = false
+        Piston004Upper = false
+
+        ShroudWhite = false
+        ShroudOrange = true
+        Shroud_CompactWhite = false
+        Shroud_CompactOrange = true
+        Frame_Boat = false
+        Frame_Boat_Orange = true
+      }
+    }
+    VARIANT
+    {
+      name = Boattail_Alternate
+      displayName = #LOC_Restock_variant-engine_boattail_grey-orange
+      primaryColor = #666666
+      secondaryColor = #ffb80c
+      GAMEOBJECTS
+      {
+        LV_T15 = false
+        LV_T15_Boattail = true
+        LV_T15_Compact = false
+        Shroud = false
+        Shroud_Compact = false
+        EngineCompact = false
+        Engine = true
+        MovingPartsCompactT15 = false
+        MovingParts = false
+        Piston001Lower = false
+        Piston002Lower = false
+        Piston003Lower = false
+        Piston004Lower = false
+        Piston001Upper = false
+        Piston002Upper = false
+        Piston003Upper = false
+        Piston004Upper = false
+
+        ShroudWhite = false
+        ShroudOrange = true
+        Shroud_CompactWhite = false
+        Shroud_CompactOrange = true
+        Frame_Boat = false
+        Frame_Boat_Orange = true
+      }
+    }
+    VARIANT
+    {
+      name = Compact_Alternate
+      displayName = #LOC_Restock_variant-engine_compact_grey-orange
+      primaryColor = #6f6e6d
+      secondaryColor = #999999
+      GAMEOBJECTS
+      {
+        LV_T15 = false
+        LV_T15_Boattail = false
+        LV_T15_Compact = true
+        Shroud = false
+        Shroud_Compact = true
+        EngineCompact = true
+        Engine = false
+        MovingPartsCompactT15 = true
+        MovingParts = false
+        Piston001Lower = false
+        Piston002Lower = false
+        Piston003Lower = true
+        Piston004Lower = true
+        Piston001Upper = false
+        Piston002Upper = false
+        Piston003Upper = true
+        Piston004Upper = true
+
+        ShroudWhite = false
+        ShroudOrange = true
+        Shroud_CompactWhite = false
+        Shroud_CompactOrange = true
+        Frame_Boat = false
+        Frame_Boat_Orange = true
       }
     }
   }
+
   MODULE
   {
     name = ModuleGimbal

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/1875/restock-srb-anvil.cfg

@@ -1,5 +1,6 @@
-// ReStock+ 0.1.0
+// ReStock+ 0.2.0
 // 1.875m SRB
+// NOTE: Soft-deprecated as of KSP 1.8 update
 PART
 {
   name = restock-srb-anvil-1
@@ -9,7 +10,7 @@ PART
   scale = 1
   MODEL
   {
-    model = ReStockPlus/Assets/Engine/restock-srb-anvil-1
+    model = ReStock/Assets/Engine/restock-srb-anvil-1
   }
   EFFECTS
   {
@@ -87,7 +88,8 @@ PART
   TechRequired = heavierRocketry
   entryCost = 0
   cost = 10500
-  category = Engine
+  category = none
+  TechHidden = True
   subcategory = 0
   title = #LOC_RestockPlus_restock-engine-srb-anvil_title
   description = #LOC_RestockPlus_restock-engine-srb-anvil_description

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/1875/restock-srb-castor.cfg

@@ -0,0 +1,459 @@
+// ReStock+ 0.2.0
+// 1.875m SRB for post-1.8 (mirrors Pollux)
+PART
+{
+  name = restock-srb-anvil-1
+  module = Part
+  author = Chris Adderley (Nertea)
+  rescaleFactor = 1
+  scale = 1
+  MODEL
+  {
+    model = ReStock/Assets/Engine/restock-engine-srb-pollux-1
+  }
+  EFFECTS
+  {
+    engage
+    {
+      AUDIO
+      {
+        channel = Ship
+        clip = sound_vent_medium
+        volume = 1.0
+        pitch = 2.0
+        loop = false
+      }
+    }
+    flameout
+    {
+      PREFAB_PARTICLE
+      {
+        prefabName = fx_exhaustSparks_flameout_2
+        transformName = thrustTransform
+        oneShot = true
+      }
+      AUDIO
+      {
+        channel = Ship
+        clip = sound_explosion_low
+        volume = 1.0
+        pitch = 2.0
+        loop = false
+      }
+    }
+    fx-anvil-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 = ReStockPlus/FX/restock-fx-srb-anvil
+        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
+      }
+      PREFAB_PARTICLE
+      {
+        prefabName = fx_smokeTrail_veryLarge
+        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, 1
+      }
+    }
+  }
+  node_stack_bottom = 0.0, -10.699, 0.0, 0.0, -1.0, 0.0, 1
+  node_stack_top = 0.0, 7.574, 0.0, 0.0, 1.0, 0.0, 1
+  node_attach = 0.0, 0.0, -0.9375, 0.0, 0.0, 1.0, 1
+  TechRequired = heavierRocketry
+  entryCost = 0
+  cost = 10500
+  category = Engine
+  subcategory = 0
+  title = #LOC_RestockPlus_restock-engine-srb-castor_title
+  description = #LOC_RestockPlus_restock-engine-srb-castor_description
+  attachRules = 1,1,1,1,0
+  mass = 10
+  heatConductivity = 0.06 // 1/2 default
+  skinInternalConductionMult = 4.0
+  emissiveConstant = 0.5 // yes, it's white. But let's claim it's an emissive white...
+  dragModelType = default
+  maximum_drag = 0.3
+  minimum_drag = 0.2
+  angularDrag = 2
+  crashTolerance = 7
+  maxTemp = 2000 // = 3600
+  stagingIcon = SOLID_BOOSTER
+  bulkheadProfiles = size1p5, srf
+  tags = #LOC_RestockPlus_restock-engine-srb-anvil_tags
+  MODULE
+  {
+    name = ModuleEnginesFX
+    thrustVectorTransformName = thrustTransform
+    throttleLocked = True
+    exhaustDamage = True
+    ignitionThreshold = 0.1
+    minThrust = 0
+    maxThrust = 2250
+    heatProduction = 545
+    useEngineResponseTime = True
+    engineAccelerationSpeed = 10.0
+    allowShutdown = False
+    fxOffset = 0, 0, 0.0
+    runningEffectName = fx-anvil-running
+    // Possible EngineType values:
+    // Generic, SolidBooster, LiquidFuel, Piston, Turbine, ScramJet, Electric, Nuclear, MonoProp
+    EngineType = SolidBooster
+    exhaustDamageDistanceOffset = 0.6
+    PROPELLANT
+    {
+      name = SolidFuel
+      ratio = 1.0
+      DrawGauge = True
+    }
+    atmosphereCurve
+    {
+      key = 0 238
+      key = 1 212
+      key = 4 100
+    }
+  }
+  RESOURCE
+  {
+    name = SolidFuel
+    amount = 7200
+    maxAmount = 7200
+  }
+  MODULE
+  {
+    name = ModuleGimbal
+    gimbalTransformName = Gimbal
+    gimbalRange = 3
+    gimbalResponseSpeed = 5
+    useGimbalResponseSpeed = true
+  }
+  MODULE
+  {
+    name = ModuleTestSubject
+    useStaging = True
+    useEvent = True
+    situationMask = 60
+    CONSTRAINT
+    {
+      // disable all but home
+      type = SITUATION
+      value = 0
+      body = _NotHome
+      prestige = Trivial
+    }
+    CONSTRAINT
+    {
+      // disable all but home
+      type = SITUATION
+      value = 0
+      body = _NotHome
+      prestige = Significant
+    }
+    CONSTRAINT
+    {
+      type = REPEATABILITY
+      value = ALWAYS
+      prestige = Trivial
+    }
+    CONSTRAINT
+    {
+      type = REPEATABILITY
+      value = BODYANDSITUATION
+      prestige = Significant
+    }
+    CONSTRAINT
+    {
+      type = REPEATABILITY
+      value = ONCEPERPART
+      prestige = Exceptional
+    }
+    CONSTRAINT
+    {
+      type = ALTITUDEENV
+      test = GT
+      value = 4000
+      prestige = Trivial
+    }
+    CONSTRAINT
+    {
+      type = ALTITUDEENV
+      test = LT
+      value = 8000
+      prestige = Trivial
+    }
+    CONSTRAINT
+    {
+      type = ALTITUDEENV
+      test = GT
+      value = 2000
+      prestige = Significant
+    }
+    CONSTRAINT
+    {
+      type = ALTITUDEENV
+      test = LT
+      value = 4000
+      prestige = Significant
+    }
+    CONSTRAINT
+    {
+      type = ALTITUDEENV
+      test = GT
+      value = 1000
+      prestige = Exceptional
+    }
+    CONSTRAINT
+    {
+      type = ALTITUDEENV
+      test = LT
+      value = 2000
+      prestige = Exceptional
+    }
+    CONSTRAINT
+    {
+      type = ALTITUDE
+      test = GT
+      value = 0 // this just registers altitude as something to care about
+      situationMask = 8
+    }
+    CONSTRAINT
+    {
+      type = ALTITUDE
+      test = LT
+      value = 300000
+      situationMask = 16
+      body = _NotSun
+    }
+    CONSTRAINT
+    {
+      type = ALTITUDE
+      test = LT
+      value = 600000
+      situationMask = 32
+      body = _NotSun
+    }
+    CONSTRAINT
+    {
+      type = SPEED
+      test = GT
+      value = 0
+      situationMask = 8
+      prestige = Trivial
+    }
+    CONSTRAINT
+    {
+      type = SPEED
+      test = LT
+      value = 600
+      situationMask = 8
+      prestige = Trivial
+    }
+    CONSTRAINT
+    {
+      type = SPEED
+      test = GT
+      value = 0
+      situationMask = 8
+      prestige = Significant
+    }
+    CONSTRAINT
+    {
+      type = SPEED
+      test = LT
+      value = 900
+      situationMask = 8
+      prestige = Significant
+    }
+    CONSTRAINT
+    {
+      type = SPEED
+      test = GT
+      value = 300
+      situationMask = 8
+      prestige = Exceptional
+    }
+    CONSTRAINT
+    {
+      type = SPEED
+      test = LT
+      value = 1200
+      situationMask = 8
+      prestige = Exceptional
+    }
+    CONSTRAINT
+    {
+      type = SPEEDENV
+      test = LT
+      value = 200
+      prestige = Trivial
+    }
+    CONSTRAINT
+    {
+      type = SPEEDENV
+      test = GT
+      value = 100
+      prestige = Trivial
+    }
+    CONSTRAINT
+    {
+      type = SPEEDENV
+      test = LT
+      value = 100
+      prestige = Significant
+    }
+    CONSTRAINT
+    {
+      type = SPEEDENV
+      test = GT
+      value = 50
+      prestige = Significant
+    }
+    CONSTRAINT
+    {
+      type = SPEEDENV
+      test = LT
+      value = 50
+      prestige = Exceptional
+    }
+    CONSTRAINT
+    {
+      type = SPEEDENV
+      test = GT
+      value = 20
+      prestige = Exceptional
+    }
+  }
+  MODULE
+  {
+    name = ModuleSurfaceFX
+    thrustProviderModuleIndex = 0
+    fxMax = 0.7
+    maxDistance = 50
+    falloff = 2
+    thrustTransformName = thrustTransform
+  }
+  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.1
+    shaderProperty = _EmisiveColor
+    excludedRenderers = EngineCore
+    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
+    includedRenderers = EngineCore
+    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
+    }
+  }
+  MODULE
+  {
+    name = FXModuleLookAtConstraint
+    CONSTRAINLOOKFX
+    {
+      targetName = UpperCyl001
+      rotatorsName = LowerCyl001
+    }
+    CONSTRAINLOOKFX
+    {
+      targetName = UpperCyl002
+      rotatorsName = LowerCyl002
+    }
+    CONSTRAINLOOKFX
+    {
+      targetName = LowerCyl001
+      rotatorsName = UpperCyl001
+    }
+    CONSTRAINLOOKFX
+    {
+      targetName = LowerCyl002
+      rotatorsName = UpperCyl002
+    }
+  }
+}

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/25/restock-engine-cherenkov.cfg

@@ -137,14 +137,9 @@ PART
     PROPELLANT
     {
       name = LiquidFuel
-      ratio = 0.9
+      ratio = 1.0
       DrawGauge = True
     }
-    PROPELLANT
-    {
-      name = Oxidizer
-      ratio = 1.1
-    }
     atmosphereCurve
     {
       key = 0 820
@@ -180,7 +175,7 @@ PART
     VARIANT
     {
       name = Size2
-      displayName = #LOC_Restock_variant-engine_size2
+      displayName = #LOC_Restock_variant-engine_size2_white
       primaryColor = #999999
       secondaryColor = #f69449
       GAMEOBJECTS
@@ -189,6 +184,10 @@ PART
         LargeNuke25Ring = true
         Cherenkov_ShroudLong = true
         Cherenkov_ShroudShort = false
+        Cherenkov_ShroudLongWhite = true
+        Cherenkov_ShroudShortWhite = false
+        Cherenkov_ShroudLongOrange = false
+        Cherenkov_ShroudShortOrange = false
       }
       NODES
       {
@@ -198,7 +197,7 @@ PART
     VARIANT
     {
       name = Compact
-      displayName = #LOC_Restock_variant-engine_compact
+      displayName = #LOC_Restock_variant-engine_compact_white
       primaryColor = #ffffff
       secondaryColor = #f69449
       GAMEOBJECTS
@@ -207,6 +206,55 @@ PART
         LargeNuke25Ring = false
         Cherenkov_ShroudLong = false
         Cherenkov_ShroudShort = true
+        Cherenkov_ShroudLongWhite = false
+        Cherenkov_ShroudShortWhite = true
+        Cherenkov_ShroudLongOrange = false
+        Cherenkov_ShroudShortOrange = false
+      }
+      NODES
+      {
+        node_stack_top = 0.0, 1.982, 0.0, 0.0, 1.0, 0.0, 2
+      }
+
+    }
+      VARIANT
+    {
+      name = Size2_Alternate
+      displayName = #LOC_Restock_variant-engine_size2_grey-orange
+      primaryColor = #666666
+      secondaryColor = #f69449
+      GAMEOBJECTS
+      {
+        LargeNukeCompact = false
+        LargeNuke25Ring = true
+        Cherenkov_ShroudLong = true
+        Cherenkov_ShroudShort = false
+        Cherenkov_ShroudLongWhite = false
+        Cherenkov_ShroudShortWhite = false
+        Cherenkov_ShroudLongOrange = true
+        Cherenkov_ShroudShortOrange = false
+      }
+      NODES
+      {
+        node_stack_top = 0.0, 2.4118, 0.0, 0.0, 1.0, 0.0, 2
+      }
+    }
+    VARIANT
+    {
+      name = Compact_Alternate
+      displayName = #LOC_Restock_variant-engine_compact_grey-orange
+      primaryColor = #666666
+      secondaryColor = #6f6e6d
+      GAMEOBJECTS
+      {
+        LargeNukeCompact = true
+        LargeNuke25Ring = false
+        Cherenkov_ShroudLong = false
+        Cherenkov_ShroudShort = true
+        Cherenkov_ShroudLongWhite = false
+        Cherenkov_ShroudShortWhite = false
+        Cherenkov_ShroudLongOrange = false
+        Cherenkov_ShroudShortOrange = true
       }
       NODES
       {