Merge pull request #1150 from BobPalmer/DEVELOP

2017.02.05 Release

Author: BobPalmer

FOR_RELEASE/GameData/000_AT_Utils/000_AT_Utils.version

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

FOR_RELEASE/GameData/000_AT_Utils/Plugins/000_AT_Utils.dll

@@ -1,6 +1,10 @@
-0.8.12 - 2017.02.04
+0.8.13 - 2017.02.04
 ------------------
-Dependency Updates
+Fixed some nullref spam in Animations related to logistics
+
+0.8.13 - 2017.02.04
+------------------
+Fixed an issue with the new warehouse toggles
 
 0.8.11 - 2017.01.16
 -------------------

FOR_RELEASE/GameData/000_AT_Utils/Plugins/001_AnisotropicPartResizer.dll

@@ -10,7 +10,7 @@
      "VERSION":{
          "MAJOR":0,
          "MINOR":8,
-         "PATCH":12,
+         "PATCH":14,
          "BUILD":0
      },
      "KSP_VERSION":{

FOR_RELEASE/GameData/000_AT_Utils/Plugins/002_MultiAnimators.dll

@@ -8,7 +8,7 @@
          "MAJOR":2,
          "MINOR":4,
          "PATCH":0,
-         "BUILD":3
+         "BUILD":4
      },
     "KSP_VERSION_MIN":
      {

FOR_RELEASE/GameData/000_AT_Utils/Plugins/ConfigurableContainers.dll

@@ -0,0 +1,15 @@
+@PART[*]:NEEDS[GPOSpeedFuelPump]:HAS[@MODULE[ModuleTankManager],!MODULE[GPOSpeedPump]]:FINAL
+{
+        MODULE
+        {
+                name = GPOSpeedPump
+        }
+}
+
+@PART[*]:NEEDS[GPOSpeedFuelPump]:HAS[@MODULE[ModuleSwitchableTank],!MODULE[GPOSpeedPump]]:FINAL
+{
+        MODULE
+        {
+                name = GPOSpeedPump
+        }
+}

FOR_RELEASE/GameData/000_AT_Utils/Plugins/SubmodelResizer.dll

@@ -7,7 +7,7 @@
      {
          "MAJOR":1,
          "MINOR":1,
-         "PATCH":0,
+         "PATCH":1,
          "BUILD":0
      },
     "KSP_VERSION_MIN":

FOR_RELEASE/GameData/000_USITools/CHANGELOG.txt

@@ -1,4 +1,4 @@
-@PART[*]:HAS[#CrewCapacity[*],~CrewCapacity[0],!MODULE[GroundWorkshop]]:FINAL
+@PART[*]:HAS[#CrewCapacity[*],~CrewCapacity[0],!MODULE[NotGroundWorkshop],!MODULE[GroundWorkshop]]:FINAL
 {
 	MODULE
 	{
@@ -19,4 +19,4 @@
 	{
 		name = ConstructionSkill
 	}
-}
+}

FOR_RELEASE/GameData/000_USITools/USITools.dll

@@ -19,7 +19,7 @@ PART
 	subcategory = 0
 	title = Deployable Emergency Shelter
 	manufacturer = Umbra Space Industries
-	description = This emergency shelter can provide two Kerbals ample room for either a shorter-term mission, or emergency habitation on a long-term mission while they await rescue.  Suitable for twelve months of habitation at full occupancy.
+	description = This emergency shelter can provide two Kerbals ample room for either a shorter-term mission, or emergency habitation on a long-term mission while they await rescue. 
 	attachRules =1,0,0,1,0
 	mass = .24
 	dragModelType = default
@@ -42,14 +42,6 @@ PART
 		name = PodCockpit
 	}
 
-	MODULE
-	{
-		name = USIAnimation
-		animationName = Deploy
-		inflatable = true
-		CrewCapacity = 2
-	}
-
 	MODULE
 	{
 		name = ModuleLight
@@ -78,7 +70,7 @@ PART
 	MODULE
 	{
 		name = ModuleHabitation
-		KerbalMonths = 1.2
+		BaseKerbalMonths = 1.2
 		HabMultiplier = 0
 	}
 
@@ -107,4 +99,12 @@ PART
         carriable = true
         allowAttachOnStatic = false
 	}	
+	
+	MODULE
+	{
+		name = USIAnimation
+		animationName = Deploy
+		inflatable = true
+		CrewCapacity = 2
+	}	
 }

FOR_RELEASE/GameData/000_USITools/USITools.dll.mdb

@@ -1,3 +1,8 @@
+0.50.15 - 2017.02.05
+------------------
+Fixed issue with expanding modules
+Updated GC version and other dependencies
+
 0.50.15 - 2017.02.04
 ------------------
 Bundled the 'Ground Construction' mod as the standard off-world construction mod for USI.

FOR_RELEASE/GameData/000_USITools/USITools.pdb

@@ -10,7 +10,7 @@
      "VERSION":{
          "MAJOR":0,
          "MINOR":50,
-         "PATCH":15,
+         "PATCH":16,
          "BUILD":0
      },
      "KSP_VERSION":{

FOR_RELEASE/GameData/000_USITools/USITools.version

@@ -51,6 +51,7 @@
     </Reference>
     <Reference Include="USITools">
       <HintPath>..\..\..\..\..\KSP_DEV\GameData\000_USITools\USITools.dll</HintPath>
+      <Private>False</Private>
     </Reference>
   </ItemGroup>
   <ItemGroup>

FOR_RELEASE/GameData/ConfigurableContainers/ConfigurableContainers.version

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Runtime.InteropServices;
 using KolonyTools;
 using USITools;
 using USITools.Logistics;
@@ -41,18 +42,23 @@ public void FixedUpdate()
                 if(_warehouseList == null)
                     _warehouseList = vessel.FindPartModulesImplementing<USI_ModuleResourceWarehouse>();
 
-                foreach (var mod in _warehouseList)
+                if (_warehouseList != null)
                 {
-                    bool hasSkill = LogisticsTools.NearbyCrew(vessel, 500, "LogisticsSkill");
-
-                    if (!mod.soiTransferEnabled)
-                        continue;
-
-                    var rCount = mod.part.Resources.Count;
-                    for (int i = 0; i < rCount; ++i)
+                    foreach (var mod in _warehouseList)
                     {
-                        var res = mod.part.Resources[i];
-                        LevelResources(mod.part, res.resourceName,hasSkill);
+                        bool hasSkill = LogisticsTools.NearbyCrew(vessel, 500, "LogisticsSkill");
+
+                        if (!mod.soiTransferEnabled)
+                            continue;
+
+                        var rCount = mod.part.Resources.Count;
+                        for (int i = 0; i < rCount; ++i)
+                        {
+                            var res = mod.part.Resources[i];
+                            if (_blackList.Contains(res.resourceName))
+                                continue;
+                            LevelResources(mod.part, res.resourceName, hasSkill);
+                        }
                     }
                 }
             }
@@ -62,6 +68,8 @@ public void FixedUpdate()
             }
         }
 
+        private List<String> _blackList = new List<string> { "Machinery", "EnrichedUranium", "DepletedFuel", "Construction", "ReplacementParts", "ElectricCharge" };
+
 
         private void LevelResources(Part rPart, string resource, bool hasSkill)
         {