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

Distribution/Restock/GameData/ReStock/Localization/fr-fr.cfg

@@ -1,30 +1,100 @@
+// Proposed format:
+//   #LOC_Restock_partconfigname_fieldname
+// eg.
+//   #LOC_Restock_restock-engine-375-3_title = ...
+//   #LOC_Restock_restock-engine-375-3_description = ...
 // Courtesy of Challyss of the KSP forums
-
+// additionnal translation by vinix38
 Localization
 {
   fr-fr
   {
+    // Actions and buttons
+    #LOC_Restock_scanner_screen_on = Ecran ON
+    #LOC_Restock_scanner_screen_off = Ecran OFF
+    #LOC_Restock_scanner_screen_toggle = Activer écran
+
     #LOC_Restock_variant-engine_size0 = 0.625m
+    #LOC_Restock_variant-engine_size0_white = 0.625m (Enveloppe blanche)
+    #LOC_Restock_variant-engine_size0_grey-orange = 0.625m (Enveloppe Orange/Grise)
     #LOC_Restock_variant-engine_size1 = 1.25m
+    #LOC_Restock_variant-engine_size1_white = 1.25m (Enveloppe blanche)
+    #LOC_Restock_variant-engine_size1_grey-orange = 1.25m (Enveloppe Orange/Grise)
+    #LOC_Restock_variant-engine_size1p5 = 1.875m
+    #LOC_Restock_variant-engine_size1p5_white = 1.875m (Enveloppe blanche)
+    #LOC_Restock_variant-engine_size1p5_grey-orange = 1.875m (Enveloppe Orange/Grise)
     #LOC_Restock_variant-engine_size2 = 2.5m
+    #LOC_Restock_variant-engine_size2_white = 2.5m (Enveloppe blanche)
+    #LOC_Restock_variant-engine_size2_grey-orange = 2.5m (Enveloppe Orange/Grise)
     #LOC_Restock_variant-engine_size3 = 3.75m
     #LOC_Restock_variant-engine_compact = Compact
+    #LOC_Restock_variant-engine_compact_white = Compact (Enveloppe blanche)
+    #LOC_Restock_variant-engine_compact_grey-orange = Compact (Enveloppe Orange/Grise)
     #LOC_Restock_variant-engine_radial = Radial
     #LOC_Restock_variant-engine_boattail = Caréné
+    #LOC_Restock_variant-engine_boattail_white = Caréné (Blanc)
+    #LOC_Restock_variant-engine_boattail_grey-orange = Caréné (Orange/Gris)
+    #LOC_Restock_variant-engine_boattail_orange = Caréné (Orange)
+    #LOC_Restock_variant-engine_boattail_metal = Caréné (Métal)
+    #LOC_Restock_variant-engine_boattail_dark = Caréné (Sombre)
+    #LOC_Restock_variant-engine_boattail_size1 = Caréné (1.25m)
+    #LOC_Restock_variant-engine_boattail_size1p5 = Caréné (1.875m)
+    #LOC_Restock_variant-engine_boattail_size1_white = Caréné (1.25m, Blanc)
+    #LOC_Restock_variant-engine_boattail_size1p5_white = Caréné (1.875m, Blanc)
+    #LOC_Restock_variant-engine_boattail_size1_grey-orange = Caréné (1.25m, Orange/Gris)
+    #LOC_Restock_variant-engine_boattail_size1p5_grey-orange = Caréné (1.875m, Orange/Gris)
+    #LOC_Restock_variant-engine_tankbutt_size2_white = Fond de réservoir (2.5m, Blanc)
+    #LOC_Restock_variant-engine_tankbutt_size2_grey-orange = Fond de réservoir (2.5m, Orange/Gris)
+
+    #LOC_Restock_variant-engine_boattail_size2_white = Caréné (2.5m, Blanc)
+    #LOC_Restock_variant-engine_boattail_size2_grey-orange = Caréné (2.5m, Orange/Gris)
+    #LOC_Restock_variant-engine_boattail_size3_white = Caréné (3.75m, Blanc)
+    #LOC_Restock_variant-engine_boattail_size3_grey-orange = Caréné (3.75m, Orange/Gris)
+
+    #LOC_Restock_variant-engine_shroud_white = Enveloppe blanche
+    #LOC_Restock_variant-engine_shroud_grey-orange = Enveloppe métallique
 
+    #LOC_Restock_variant-engine_shroud = Enveloppé
+    #LOC_Restock_variant-engine_shroud_wide = Grande Enveloppe
+    #LOC_Restock_variant-engine_docking = Port d'amarrage
+
+    #LOC_Restock_variant-mounting_classic = Classique
+    #LOC_Restock_variant-mounting_classic_white = Classique (Enveloppe blanche)
+    #LOC_Restock_variant-mounting_classic_grey-orange = Classique (Enveloppe Orange/Grise)
     #LOC_Restock_variant-mounting_truss = Treillis
     #LOC_Restock_variant-mounting_compact = Compact
 
+    #LOC_Restock_variant-gold-truss = Doré (Support)
+    #LOC_Restock_variant-silver-truss = Argenté (Support)
+
+    #LOC_Restock_variant-engine_pod-orange = Support (Orange)
+    #LOC_Restock_variant-engine_pod-grey = Support (Gris)
+
     #LOC_Restock_variant-antenna_size0 = 0.625m
     #LOC_Restock_variant-antenna_size1 = 1.25m
     #LOC_Restock_variant-antenna_truss = Treillis
-    #LOC_Restock_variant-antenna_compact = Compact
-    #LOC_Restock_variant-antenna_radial = Radial
-    #LOC_Restock_variant-antenna_radial_reverse = Radial (Inversé)
-    #LOC_Restock_variant-antenna_axial = Axial
-    #LOC_Restock_variant-antenna_axial_reverse = Axial (Inversé)
+    #LOC_Restock_variant-antenna_compact = Compacte
+    #LOC_Restock_variant-antenna_radial = Radiale
+    #LOC_Restock_variant-antenna_radial_reverse = Radiale (Inversée)
+    #LOC_Restock_variant-antenna_axial = Axiale
+    #LOC_Restock_variant-antenna_axial_reverse = Axiale (Inversée)
+
+    #LOC_Restock_variant-telescope_shielded = Protégé
+    #LOC_Restock_variant-telescope_bare = Nu
+
+    #LOC_Restock_variant-wheel_broken = Cassée
+    #LOC_Restock_variant-wheel_bare = Nue
 
     #LOC_Restock_variant-surface_metal = Métal
+    #LOC_Restock_variant-surface_basic = Basique
+    #LOC_Restock_variant-surface_truss = Treillis
+    #LOC_Restock_variant-surface_thermalblankets = Isolé
+
+    #LOC_Restock_variant-decoupler_metal = Métal
+    #LOC_Restock_variant-decoupler_grey-orange = Orange/Gris
+
+    #LOC_Restock_variant-surface_yellow = Jaune
+    #LOC_Restock_variant-surface_black = Noir
 
     #LOC_Restock_variant-service-bay-opaque = Bases pleines
     #LOC_Restock_variant-service-bay-transparent = Bases treillis
@@ -42,5 +112,23 @@ Localization
     #LOC_Restock_variant-probe-gold = Doré
     #LOC_Restock_variant-probe-silver = Argenté
     #LOC_Restock_variant-probe-bare = Basique
+
+    #LOC_Restock_variant-radiator_basic = Basique
+    #LOC_Restock_variant-radiator_flat = Plat
+    #LOC_Restock_variant-radiator_compact = Compact
+
+    #LOC_Restock_variant-tube-length-short = Court
+    #LOC_Restock_variant-tube-length-med-short = Moyen-Court
+    #LOC_Restock_variant-tube-length-med = Moyen
+    #LOC_Restock_variant-tube-length-med-long = Moyen-Long
+    #LOC_Restock_variant-tube-length-long = Long
+
+    #LOC_Restock_variant-tube-length-short-alt = Court (Alternatif)
+    #LOC_Restock_variant-tube-length-med-short-alt = Moyen-Court (Alternatif)
+    #LOC_Restock_variant-tube-length-med-alt = Moyen (Alternatif)
+    #LOC_Restock_variant-tube-length-med-long-alt = Moyen-Long (Alternatif)
+    #LOC_Restock_variant-tube-length-long-alt = Long (Alternatif)
+
+    #LOC_Restock_description-FuelCellArray = Pourquoi se contenter d'une seule pile à combustible quand on peut en avoir trois ? Cette série de piles est idéale lorsque vous avez besoin d'une source d'énergie fiable et de grande capacité. Tout comme les piles plus petites, cette série fonctionne par conversion de l'ergol et de l'oxydant en énergie.
   }
 }

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

@@ -3,7 +3,7 @@
 // - Small Nose Cone (standardNoseCone)
 
 // Small Nose Cone
-@PART[standardNoseCone]:HAS[~RestockIgnore[*]]:FOR[ReStock]
+@PART[standardNoseCone]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
   @author = Chris Adderley (Nertea)
   !mesh = DELETE

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

@@ -5,7 +5,7 @@
 // - Advanced Nose Cone - Type B (pointyNoseConeB)
 
 // Aerodynamic Nose Cone
-@PART[noseCone]:HAS[~RestockIgnore[*]]:FOR[ReStock]
+@PART[noseCone]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
   @author = Chris Adderley (Nertea)
   !mesh = DELETE
@@ -84,7 +84,7 @@
 }
 
 // Advanced Nose Cone - Type A
-@PART[pointyNoseConeA]:HAS[~RestockIgnore[*]]:FOR[ReStock]
+@PART[pointyNoseConeA]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
   @author = Chris Adderley (Nertea)
   !mesh = DELETE
@@ -164,7 +164,7 @@
 }
 
 // Advanced Nose Cone - Type B
-@PART[pointyNoseConeB]:HAS[~RestockIgnore[*]]:FOR[ReStock]
+@PART[pointyNoseConeB]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
   @author = Chris Adderley (Nertea)
   !mesh = DELETE

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

@@ -3,7 +3,7 @@
 // - Protective Rocket Nose Cone Mk7 (rocketNoseCone_v2)
 
 // Protective Rocket Nose Cone Mk7
-@PART[rocketNoseCone_v2]:HAS[~RestockIgnore[*]]:FOR[ReStock]
+@PART[rocketNoseCone_v2]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
   @author = Chris Adderley (Nertea)
   !mesh = DELETE

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

@@ -3,7 +3,7 @@
 // - Protective Rocket Nose Cone Mk12A (rocketNoseConeSize3)
 
 // Protective Rocket Nose Cone Mk12A
-@PART[rocketNoseConeSize3]:HAS[~RestockIgnore[*]]:FOR[ReStock]
+@PART[rocketNoseConeSize3]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
   @author = Chris Adderley (Nertea)
   !mesh = DELETE