Merge branch 'master' into develop

Distribution/Restock/GameData/ReStock/Compatibility/FAR.cfg

@@ -65,3 +65,61 @@
 
   !DRAG_CUBE {}
 }
+
+@PART[restock-fueltank-sphere-0625-1]:NEEDS[FerramAerospaceResearch]:AFTER[ReStockPlus]
+{
+  @MODULE[GeometryPartModule]
+  {
+	%ignoreIfNoRenderer = true
+  }
+}
+
+@PART[restock-fueltank-sphere-125-1]:NEEDS[FerramAerospaceResearch]:AFTER[ReStockPlus]
+{
+  @MODULE[GeometryPartModule]
+  {
+	%ignoreIfNoRenderer = true
+  }
+}
+
+@PART[restock-fueltank-sphere-1875-1]:NEEDS[FerramAerospaceResearch]:AFTER[ReStockPlus]
+{
+  @MODULE[GeometryPartModule]
+  {
+	%ignoreIfNoRenderer = true
+  }
+}
+
+@PART[restock-fueltank-sphere-25-1]:NEEDS[FerramAerospaceResearch]:AFTER[ReStockPlus]
+{
+  @MODULE[GeometryPartModule]
+  {
+	%ignoreIfNoRenderer = true
+  }
+}
+
+@PART[restock-fueltank-sphere-375-1]:NEEDS[FerramAerospaceResearch]:AFTER[ReStockPlus]
+{
+  @MODULE[GeometryPartModule]
+  {
+	%ignoreIfNoRenderer = true
+  }
+}
+
+@PART[restock-fueltank-sphere-375-1]:NEEDS[FerramAerospaceResearch]:AFTER[ReStockPlus]
+{
+  @MODULE[GeometryPartModule]
+  {
+	%ignoreIfNoRenderer = true
+  }
+}
+
+@PART[restock-relay-radial-2]:NEEDS[FerramAerospaceResearch]:AFTER[ReStockPlus]
+{
+  @MODULE[GeometryPartModule]
+  {
+	%forceUseMeshes = true
+	%ignoreIfNoRenderer = true
+	%rebuildOnAnimation = true
+  }
+}

Distribution/Restock/GameData/ReStock/Compatibility/KerbalFoundries.cfg

@@ -0,0 +1,121 @@
+// KerbalFoundries has an optional patch for the stock wheels, this fixes it to work with Restock models
+
+//LT-05 -- 'micro'
+@PART[miniLandingLeg]:AFTER[KerbalFoundries-Patches]
+{
+
+    @MODULE[KSPWheelSuspension]
+    {
+        @suspensionName = leg1_piston
+    }
+    @MODULE[KSPWheelDeployment]
+    {
+        @animationName = restock-leg-1-deploy
+    }
+}
+
+//LT-01 -- 'medium'
+@PART[landingLeg1]:AFTER[KerbalFoundries-Patches]
+{
+    @MODULE[KSPWheelSuspension]
+    {
+        @suspensionName = Piston
+    }
+    @MODULE[KSPWheelSuspsension]
+    {
+        @animationName = Deploy
+    }
+    @MODULE[KSPWheelBogey]
+    {
+        @bogeyName = foot
+        @bogeyRotAxis = 1, 0, 0
+        @rotationOffset = 180
+        @restingRotation = 90
+    }
+}
+
+//LT-02 -- 'large'
+@PART[landingLeg1-2]:AFTER[KerbalFoundries-Patches]
+{
+    @MODULE[KSPWheelSuspension]
+    {
+        @suspensionName = leg3_piston
+    }
+    @MODULE[KSPWheelDeployment]
+    {
+        animationName = restock-leg-3-deploy
+    }
+    @MODULE[KSPWheelBogey]
+    {
+        @bogeyName = leg3_foot
+        @bogeyRotAxis = 1, 0, 0
+        @rotationOffset = 0
+        @restingRotation = 0
+    }
+}
+
+//roverWheelS2 - the probe wheels
+@PART[roverWheel2]:AFTER[KerbalFoundries-Patches]
+{
+    @MODULE[KSPWheelRotation]
+    {
+        @wheelMeshName = WheelPivot
+    }
+    @MODULE[KSPWheelSuspension]
+    {
+        @suspensionName = SuspensionPivot
+    }
+    @MODULE[KSPWheelSteering]
+    {
+        @steeringName = SteeringPivot
+    }
+    @MODULE[KSPWheelDamage]
+    {
+        @wheelName = Wheel
+        @bustedWheelName = WheelBusted
+    }
+}
+
+//roverWheelM1 - the doughnut
+@PART[roverWheel1]:AFTER[KerbalFoundries-Patches]
+{
+    @MODULE[KSPWheelRotation]
+    {
+        @wheelMeshName = WheelPivot
+    }
+    @MODULE[KSPWheelSuspension]
+    {
+        @suspensionName = SuspensionPivot
+    }
+    @MODULE[KSPWheelSteering]
+    {
+        @steeringName = SteeringPivot
+    }
+    @MODULE[KSPWheelDamage]
+    {
+        @wheelName = Wheel
+        @bustedWheelName = WheelBusted
+    }
+}
+
+//roverWheelTR-2L - truck wheels
+@PART[wheelMed]:AFTER[KerbalFoundries-Patches]
+{
+    @MODULE[KSPWheelRotation]
+    {
+        @wheelMeshName = WheelPivot
+    }
+    @MODULE[KSPWheelSuspension]
+    {
+        @suspensionName = SuspensionPivot
+    }
+    @MODULE[KSPWheelSteering]
+    {
+        @steeringName = SteeringPivot
+    }
+    @MODULE[KSPWheelDamage]
+    {
+        @wheelName = Wheel
+        @bustedWheelName = WheelBusted
+    }
+}