Merge remote-tracking branch 'refs/remotes/origin/master'

- Add VABOrganizer support
- Fix spurious png file (#1017)

Distribution/Restock/GameData/ReStock/Patches/Ground/restock-legs.cfg

@@ -141,21 +141,23 @@
   }
   @MODULE[ModuleWheelBase]
   {
-    @clipObject = leg3_piston_CAPSULECOLLIDER
+    @wheelColliderTransformName = wheelCollider
+    @clipObject = piston_collider
   }
   @MODULE[ModuleWheelSuspension]
   {
-    @suspensionTransformName = leg3_piston
+    @suspensionTransformName = piston
-    @suspensionColliderName = leg3_piston_CAPSULECOLLIDER
+    @suspensionColliderName = piston_collider
   }
   @MODULE[ModuleWheelDeployment]
   {
-    @animationTrfName = leg3
+    @deployTargetTransformName = deployTgt
+    @animationTrfName = leg
     @animationStateName = restock-leg-3-deploy
-    @retractTransformName = leg3_piston
+    @retractTransformName = piston
   }
   @MODULE[ModuleWheelBogey]
   {
-    @bogeyTransformName = leg3_foot
+    @bogeyTransformName = foot
   }
 }

Distribution/Restock/GameData/ReStock/Versioning/ReStock.version

@@ -6,7 +6,7 @@
     {
         "MAJOR":1,
         "MINOR":4,
-        "PATCH":5,
+        "PATCH":6,
         "BUILD":0
     },
     "KSP_VERSION":

Distribution/Restock/changelog.txt

@@ -1,3 +1,9 @@
+v1.4.6
+------
+- Fixed extra random png texture in the distribution (#1017)
+- Fixed rotation of Mk2 Lander can airlock (#1008)
+- Fixed LT-2 landing leg being weaker than stock (#858)
+
 v1.4.5
 ------
 - Add drag cubes from KSP 1.12.5 Vanilla to the following parts (this should help a lot with re-entry with craft designed in Vanilla):

Distribution/Restock/readme.txt

@@ -1,5 +1,5 @@
 =============
-RESTOCK 1.4.5
+RESTOCK 1.4.6
 =============
 
 Restock is a project to improve the art of the Kerbal Space Program part set. Some of the revisions are based on the canceled Part Overhaul project by Porkjet.
@@ -27,6 +27,8 @@ Art
 - Passinglurker
 - Porkjet
 - riocrokite
+- Kavaeric
+- Well
 
 Drag cube wizardry
 - DMagic

Distribution/RestockPlus/GameData/ReStockPlus/Patches/VABOrganizerRestockPlus.cfg

@@ -0,0 +1,269 @@
+// Config for RS+
+
+/// Aerodynamic
+/// -----------
+@PART[restock-nosecone-5-1,restock-nosecone-0625-1,restock-nosecone-1875-1,restock-nosecone-1875-2]:FOR[ReStockPlus]:NEEDS[VABOrganizer]
+{
+  %VABORGANIZER
+  {
+    %organizerSubcategory = noses
+  }
+}
+
+/// Cargo
+/// -------------
+/// Command
+/// -------------
+@PART[restock-pod-sphere-1,restock-pod-sphere-2,restock-pod-sphere-3,restock-mk2-pod]:FOR[ReStockPlus]:NEEDS[VABOrganizer]
+{
+  %VABORGANIZER
+  {
+    %organizerSubcategory = pods
+  }
+}
+@PART[restock-drone-core-375-1,restock-drone-core-1875-1,restock-drone-core-0625-1]:FOR[ReStockPlus]:NEEDS[VABOrganizer]
+{
+  %VABORGANIZER
+  {
+    %organizerSubcategory = probes
+  }
+}
+/// Communication
+/// -------------
+@PART[restock-antenna-stack-2,restock-antenna-stack-3]:FOR[ReStockPlus]:NEEDS[VABOrganizer]
+{
+  %VABORGANIZER
+  {
+    %organizerSubcategory = direct
+  }
+}
+@PART[restock-relay-radial-2_v2,restock-relay-radial-2]:FOR[ReStockPlus]:NEEDS[VABOrganizer]
+{
+  %VABORGANIZER
+  {
+    %organizerSubcategory = relay
+  }
+}
+/// Control
+/// -------------
+@PART[restock-reactionwheel-1875-1,restock-reactionwheel-radial-1]:FOR[ReStockPlus]:NEEDS[VABOrganizer]
+{
+  %VABORGANIZER
+  {
+    %organizerSubcategory = reactionWheels
+  }
+}
+@PART[restock-rcs-block-dual-1,restock-rcs-block-dual-mini-1,restock-rcs-block-multi-2,restock-rcs-block-multi-mini-2,restock-rcs-block-quad-angled-1,restock-rcs-block-quad-angled-mini-1,restock-rcs-block-quad-mini-1,restock-rcs-block-quint-1,restock-rcs-block-quint-mini-1,restock-rcs-block-triple-angled-1,restock-rcs-block-triple-angled-mini-1,restock-rcs-single-mini-1]:FOR[ReStockPlus]:NEEDS[VABOrganizer]
+{
+  %VABORGANIZER
+  {
+    %organizerSubcategory = rcs
+  }
+}
+/// Coupling
+/// -------------
+@PART[restock-decoupler-5-1,restock-decoupler-1875-1,restock-decoupler-1875-truss-1,restock-decoupler-radial-tiny-1]:FOR[ReStockPlus]:NEEDS[VABOrganizer]
+{
+  %VABORGANIZER
+  {
+    %organizerSubcategory = decouplers
+  }
+}
+@PART[restock-separator-5-1,restock-separator-1875-1]:FOR[ReStockPlus]:NEEDS[VABOrganizer]
+{
+  %VABORGANIZER
+  {
+    %organizerSubcategory = separators
+  }
+}
+@PART[restock-docking-375-1]:FOR[ReStockPlus]:NEEDS[VABOrganizer]
+{
+  %VABORGANIZER
+  {
+    %organizerSubcategory = dockingPorts
+  }
+}
+@PART[restock-claw-625-1]:FOR[VABOrganizer]
+{
+  %VABORGANIZER
+  {
+    %organizerSubcategory = grapples
+  }
+}
+/// Electrical
+/// -------------
+@PART[restock-battery-1875-1,restock-battery-375-1]:FOR[ReStockPlus]:NEEDS[VABOrganizer]
+{
+  %VABORGANIZER
+  {
+    %organizerSubcategory = batteries
+  }
+}
+@PART[restock-apu-radial-1]:FOR[ReStockPlus]:NEEDS[VABOrganizer]
+{
+  %VABORGANIZER
+  {
+    %organizerSubcategory = fuelCells
+  }
+}
+/// Fuel
+/// -------------
+@PART[restock-fueltank*|restock-fueltank-adapter*|restock-fueltank-saturn-engine-1|restock-nosecone-375-1|restock-fuel-tank-probe*|restock-fuel-tank-0625*|restock-fuel-tank-375-4]:FOR[ReStockPlus]:NEEDS[VABOrganizer]
+{
+  %VABORGANIZER
+  {
+    %organizerSubcategory = lfo
+  }
+}
+@PART[restock-fuel-tank-rcs*]:FOR[ReStockPlus]:NEEDS[VABOrganizer]
+{
+  %VABORGANIZER
+  {
+    %organizerSubcategory = monoprop
+  }
+}
+@PART[restock-oretank*]:FOR[ReStockPlus]:NEEDS[VABOrganizer]
+{
+  %VABORGANIZER
+  {
+    %organizerSubcategory = resources
+  }
+}
+/// Engines
+/// -------------
+@PART[restock-engine-boar,restock-engine-125-pug,restock-engine-125-valiant,restock-engine-375-corgi,restock-engine-torch,restock-engine-caravel-1,restock-engine-galleon-1,restock-engine-schnauzer-1,restock-engine-ursa-1,restock-engine-panda-1]:FOR[ReStockPlus]:NEEDS[VABOrganizer]
+{
+  %VABORGANIZER
+  {
+    %organizerSubcategory = lfoEngines
+  }
+}
+@PART[restock-engine-cherenkov]:FOR[ReStockPlus]:NEEDS[VABOrganizer]
+{
+  %VABORGANIZER
+  {
+    %organizerSubcategory = nuclearEngines
+  }
+}
+@PART[restock-srb-mallet-1,restock-srb-striker-1,restock-srb-anvil-1,restock-srb-castor-1]:FOR[ReStockPlus]:NEEDS[VABOrganizer]
+{
+  %VABORGANIZER
+  {
+    %organizerSubcategory = solidEngines
+  }
+}
+/// Ground
+/// -------------
+@PART[restock-wheel-1-T|restock-wheel-4]:FOR[ReStockPlus]:NEEDS[VABOrganizer]
+{
+  %VABORGANIZER
+  {
+    %organizerSubcategory = wheels
+  }
+}
+/// Payload
+/// -------------
+
+@PART[restock-fairing-base*]:FOR[ReStockPlus]:NEEDS[VABOrganizer]
+{
+  %VABORGANIZER
+  {
+    %organizerSubcategory = fairings
+  }
+}
+
+@PART[restock-service-module*|restock-service-bay-1875-1]:FOR[ReStockPlus]:NEEDS[VABOrganizer]
+{
+  %VABORGANIZER
+  {
+    %organizerSubcategory = serviceBays
+  }
+}
+/// Robotics
+/// -------------
+
+/// Science
+/// -------------
+@PART[restock-goocanister-625-1,restock-materialbay-radial-1]:FOR[ReStockPlus]:NEEDS[VABOrganizer]
+{
+  %VABORGANIZER
+  {
+    %organizerSubcategory = science
+  }
+}
+@PART[restock-sciencebox-stack-1]:FOR[ReStockPlus]:NEEDS[VABOrganizer]
+{
+  %VABORGANIZER
+  {
+    %organizerSubcategory = scienceStorage
+  }
+}
+/// Structural
+/// -------------
+@PART[restock-engineplate-125-1,restock-engineplate-125-2,restock-engineplate-1875-1,restock-engineplate-25-1,restock-engineplate-375-1,restock-engineplate-5-1]:FOR[ReStockPlus]:NEEDS[VABOrganizer]
+{
+  %VABORGANIZER
+  {
+    %organizerSubcategory = engineMount
+  }
+}
+@PART[restock-structural-tube*]:FOR[ReStockPlus]:NEEDS[VABOrganizer]
+{
+  %VABORGANIZER
+  {
+    %organizerSubcategory = tubes
+  }
+}
+@PART[restock-adapter*]:FOR[ReStockPlus]:NEEDS[VABOrganizer]
+{
+  %VABORGANIZER
+  {
+    %organizerSubcategory = adapters
+  }
+}
+@PART[restock-truss-3]:FOR[ReStockPlus]:NEEDS[VABOrganizer]
+{
+  %VABORGANIZER
+  {
+    %organizerSubcategory = trusses
+  }
+}
+@PART[restock-truss-adapter-0625-1]:FOR[ReStockPlus]:NEEDS[VABOrganizer]
+{
+  %VABORGANIZER
+  {
+    %organizerSubcategory = trussAdapters
+  }
+}
+@PART[restock-truss-hub-1]:FOR[ReStockPlus]:NEEDS[VABOrganizer]
+{
+  %VABORGANIZER
+  {
+    %organizerSubcategory = trussHubs
+  }
+}
+@PART[restock-node-*]:FOR[VABOrganizer]
+{
+  %VABORGANIZER
+  {
+    %organizerSubcategory = radialAdapters
+  }
+}
+/// Thermal
+/// -------------
+@PART[restock-heatshield-1875-1]:FOR[ReStockPlus]:NEEDS[VABOrganizer]
+{
+  %VABORGANIZER
+  {
+    %organizerSubcategory = heatShields
+  }
+}
+/// Utility
+/// -------------
+@PART[restock-ladder-static*]:FOR[ReStockPlus]:NEEDS[VABOrganizer]
+{
+  %VABORGANIZER
+  {
+    %organizerSubcategory = heatShields
+  }
+}

Distribution/RestockPlus/GameData/ReStockPlus/Versioning/ReStockPlus.version

@@ -6,7 +6,7 @@
     {
         "MAJOR":1,
         "MINOR":4,
-        "PATCH":5,
+        "PATCH":6,
         "BUILD":0
     },
     "KSP_VERSION":

Distribution/RestockPlus/changelog.txt

@@ -1,3 +1,7 @@
+v1.4.6
+------
+- Added VABOrganizer support
+
 v1.4.5
 ------
 - Add part volumes for all parts under 2700L to allow for use with the stock inventory system (by mostly using KSP Part Volume mod to generate volumes).

Distribution/RestockPlus/readme.txt

@@ -1,5 +1,5 @@
 ==============
-RESTOCK+ 1.4.5
+RESTOCK+ 1.4.6
 ==============
 
 Restock+ is a complement to Restock which adds useful parts that we feel are missing from the base game. Functionally, these parts additions allow better flexibility in craft construction and not add new gameplay systems or form factors. Some examples might include:
@@ -23,7 +23,7 @@ DEPENDENCIES
 ============
 
 Required:
-- Restock (1.4.4)
+- Restock (1.4.6)
 - ModuleManager (4.2.3)
 
 =============
@@ -34,6 +34,7 @@ Art
 - Chris Adderley (Nertea)
 - Andrew Cassidy (Cineboxandrew)
 - Porkjet
+- Kavaeric
 
 Drag cube wizardry
 - DMagic

README.md

@@ -28,6 +28,7 @@ If you are interested in contributing artistically to the revamp, please contact
 - Porkjet
 - riocrokite
 - Kavaeric
+- Well
 
 #### Drag cube wizardry
 - DMagic