Merge branch 'master' into solar-tests

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

@@ -0,0 +1,17 @@
+// Patches applying art changes to Making History decouplers
+// Contents:
+- TD-18 Decoupler (Decoupler_1p5)
+
+
+// TD-18 Decoupler
+@PART[Decoupler_1p5] {
+	@author = Chris Adderley (Nertea)
+
+	!mesh = DELETE
+	!MODEL {}
+	MODEL {
+		model = ReStock/Assets/Coupling/restock-decoupler-1875-1
+	}
+
+	%rescaleFactor = 1
+}

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

@@ -0,0 +1,16 @@
+// Patches applying art changes to Making History separators
+// Contents:
+- TS-18 Separator (Separator_1p5)
+
+// TS-18 Separator
+@PART[Separator_1p5] {
+	@author = Chris Adderley (Nertea)
+
+	!mesh = DELETE
+	!MODEL {}
+	MODEL {
+		model = ReStock/Assets/Coupling/restock-separator-1875-1
+	}
+
+	%rescaleFactor = 1
+}

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

@@ -0,0 +1,14 @@
+// Patches applying art changes to Making History RCS tanks
+// Contents:
+// -  (MonoPropMini)
+
+//  Spherical Radial Tiny Tank
+@PART[MonoPropMini]
+{
+  @author = Chris Adderley (Nertea)
+  !mesh = DELETE
+  !MODEL {}
+  MODEL {
+    model = ReStock/Assets/FuelTank/restock-fuel-tank-rcs-radial-tiny-1
+  }
+}

Distribution/Restock/GameData/ReStock/PatchesMH/Payload/restock-mh-fairing-bases.cfg

@@ -0,0 +1,118 @@
+// Patches applying art changes to Making History fairings
+// Contents:
+- AE-FF1.5 Airstream Protective Shell (1.875m) (fairingSize1p5)
+
+@PART[fairingSize1p5]
+{
+  @author = Chris Adderley (Nertea)
+
+  !mesh = DELETE
+  !MODEL {}
+  MODEL {
+    model = ReStock/Assets/Payload/restock-fairing-base-1875-1
+  }
+  MODEL
+	{
+		model = Squad/Parts/Aero/fairings/AutoTruss
+		scale = 1.5,1.5,1.5
+		position = 0.0,0.22,0.0
+	}
+
+  @MODULE[ModuleProceduralFairing]
+  {
+    @pivot = 0,0.151, 0
+    @TextureURL = ReStock/Assets/Payload/restock-fairing-25-1
+    @CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1
+    @TextureNormalURL = ReStock/Assets/Payload/restock-fairing-25-1-n
+  }
+
+  @MODULE[ModulePartVariants]
+  {
+    @VARIANT[White]
+    {
+      !TEXTURE {}
+      !EXTRA_INFO {}
+      TEXTURE
+      {
+        materialName=FairingIconShell
+        mainTextureURL =  ReStock/Assets/Payload/restock-fairing-125-1
+      }
+      EXTRA_INFO
+      {
+        FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-125-1
+        FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-125-1-n
+        CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1
+      }
+      GAMEOBJECTS
+      {
+        FairingBase1875White = true
+        FairingBase1875Orange = false
+        FairingBase1875BlackWhite = false
+      }
+    }
+    @VARIANT[Grey]
+    {
+      !TEXTURE {}
+      !EXTRA_INFO {}
+      TEXTURE
+      {
+        materialName=FairingIconShell
+        mainTextureURL =  ReStock/Assets/Payload/restock-fairing-125-1
+      }
+      EXTRA_INFO
+      {
+        FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-125-1
+        FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-125-1-n
+        CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1
+      }
+      GAMEOBJECTS
+      {
+        FairingBase1875White = false
+        FairingBase1875Orange = false
+        FairingBase1875BlackWhite = true
+      }
+    }
+    @VARIANT[Dark?Grey]
+    {
+      !TEXTURE {}
+      !EXTRA_INFO {}
+      TEXTURE
+      {
+        materialName=FairingIconShell
+        mainTextureURL =  ReStock/Assets/Payload/restock-fairing-125-1-orange
+      }
+      EXTRA_INFO
+      {
+        FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-125-1-orange
+        FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-125-1-n
+        CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1-orange
+      }
+			GAMEOBJECTS
+      {
+        FairingBase1875White = false
+        FairingBase1875Orange = true
+        FairingBase1875BlackWhite = false
+      }
+    }
+  }
+  MODULE
+  {
+    name = ModuleRestockModifyFairingMaterials
+    COLOR_PROPERTY
+    {
+      name = _Color
+      color = 1.0, 1.0, 1.0, 1.0
+    }
+    COLOR_PROPERTY
+    {
+      name = _SpecColor
+      color = 0.753, 0.753, 0.753, 1.0
+    }
+
+    FLOAT_PROPERTY
+    {
+      name = _Shininess
+      value = 0.3
+    }
+  }
+}