Merge pull request #1496 from UmbraSpaceIndustries/DEVELOP

KSP 1.11 Updates

.gitignore

@@ -3,6 +3,9 @@ Models/Kerbitrail_Tube/Temp/UnityLockfile
 *.force
 *.db
 *.zip
+*.dll
+*.mdb
+*.pdb
 
 # Windows image file caches
 Thumbs.db

FOR_RELEASE/GameData/000_AT_Utils/000_AT_Utils.version

@@ -6,20 +6,20 @@
     "VERSION":
      {
          "MAJOR":1,
-         "MINOR":8,
-         "PATCH":0,
-         "BUILD":0
+         "MINOR":9,
+         "PATCH":4,
+         "BUILD":1
      },
     "KSP_VERSION_MIN":
      {
          "MAJOR":1,
-         "MINOR":7,
+         "MINOR":9,
          "PATCH":0
      },
     "KSP_VERSION_MAX":
      {
          "MAJOR":1,
-         "MINOR":7,
+         "MINOR":10,
          "PATCH":0
      }
 }

FOR_RELEASE/GameData/000_AT_Utils/Plugins/PluginData/000_AT_Utils/000_AT_Utils.glob

@@ -2,7 +2,7 @@ LineWidthMult = 0.4
 MinLineWidthMult = 0.01
 
 MeshesToSkip = flagtransform canopy
-BadParts = RadialDrill MKS.Drill.02 MKS.Drill.03 dmFlexoTube
+BadParts = RadialDrill MKS.Drill.02 MKS.Drill.03 dmFlexoTube UniversalDrill
 
 Colors
 {

FOR_RELEASE/GameData/000_USITools/AddConsumers.cfg

@@ -5,3 +5,11 @@
 		name = ModuleLogisticsConsumer
 	}
 }
+
+@PART[landingLeg*,miniLandingLeg]:HAS[!MODULE[USI_InertialDampener]]
+{
+	MODULE
+	{
+		name = USI_InertialDampener
+	}
+}

FOR_RELEASE/GameData/000_USITools/CHANGELOG.txt

@@ -1,3 +1,11 @@
+1.4.0 - 2020.12.20
+------------------
+KSP 1.11 Compatibility
+
+1.3.0 - 2019.10.28
+------------------
+KSP 1.8.x Compatibility
+
 1.2.0 - 2019.08.04
 ------------------
 KSP 1.7.x Compatibility

FOR_RELEASE/GameData/000_USITools/Converters.cfg

@@ -0,0 +1,8 @@
+// Prevent USI_Converter and USI_Harvester modules from automatically shutting down
+@PART[*]:HAS[@MODULE[USI_Converter]]
+{
+	@MODULE[USI_Converter]
+	{
+		%AutoShutdown = false
+	}
+}

FOR_RELEASE/GameData/000_USITools/Logistics.cfg

@@ -18,7 +18,31 @@ RESOURCE_DEFINITION  //Hidden resource used to manage mass
     volume = 1
 }
 
-@PART[*]:HAS[!MODULE[USI_ModuleFieldRepair],@RESOURCE[Machinery|EnrichedUranium|DepletedFuel|Recyclables]]:FOR[USITools]
+@PART[*]:HAS[!MODULE[USI_ModuleFieldRepair],@RESOURCE[Machinery]]:FOR[USITools]
+{
+    MODULE
+    {
+        name = USI_ModuleFieldRepair
+    }
+}
+
+@PART[*]:HAS[!MODULE[USI_ModuleFieldRepair],@RESOURCE[EnrichedUranium]]:FOR[USITools]
+{
+    MODULE
+    {
+        name = USI_ModuleFieldRepair
+    }
+}
+
+@PART[*]:HAS[!MODULE[USI_ModuleFieldRepair],@RESOURCE[DepletedFuel]]:FOR[USITools]
+{
+    MODULE
+    {
+        name = USI_ModuleFieldRepair
+    }
+}
+
+@PART[*]:HAS[!MODULE[USI_ModuleFieldRepair],@RESOURCE[Recyclables]]:FOR[USITools]
 {
     MODULE
     {

FOR_RELEASE/GameData/000_USITools/USITools.version

@@ -9,23 +9,23 @@
      },
      "VERSION":{
          "MAJOR":1,
-         "MINOR":2,
+         "MINOR":4,
          "PATCH":0,
          "BUILD":0
      },
      "KSP_VERSION":{
          "MAJOR":1,
-         "MINOR":7,
-         "PATCH":3
+         "MINOR":11,
+         "PATCH":0
      },
      "KSP_VERSION_MIN":{
          "MAJOR":1,
-         "MINOR":6,
+         "MINOR":8,
          "PATCH":0
      },
      "KSP_VERSION_MAX":{
          "MAJOR":1,
-         "MINOR":8,
-         "PATCH":9
+         "MINOR":11,
+         "PATCH":99
      }
  } 

FOR_RELEASE/GameData/CommunityCategoryKit/CCK.version

@@ -5,27 +5,27 @@
         "REPOSITORY": "CommunityCategoryKit", 
         "USERNAME": "BobPalmer"
     }, 
-     "KSP_VERSION":{
-         "MAJOR":1,
-         "MINOR":7,
-         "PATCH":3
-     },
-     "KSP_VERSION_MIN":{
-         "MAJOR":1,
-         "MINOR":6,
-         "PATCH":0
-     },
-     "KSP_VERSION_MAX":{
-         "MAJOR":1,
-         "MINOR":8,
-         "PATCH":9
-     }, 
+    "KSP_VERSION": {
+        "MAJOR": 1, 
+        "MINOR": 9, 
+        "PATCH": 1
+    }, 
+    "KSP_VERSION_MAX": {
+        "MAJOR": 1, 
+        "MINOR": 99, 
+        "PATCH": 99
+    }, 
+    "KSP_VERSION_MIN": {
+        "MAJOR": 1, 
+        "MINOR": 8, 
+        "PATCH": 0
+    }, 
     "NAME": "Community Category Kit", 
     "URL": "https://raw.githubusercontent.com/BobPalmer/CommunityCategoryKit/master/FOR_RELEASE/GameData/CommunityCategoryKit/CCK.version", 
     "VERSION": {
-        "MAJOR": 4, 
-        "MINOR": 3, 
-        "PATCH": 0,
-        "BUILD": 0     
-	}
+        "BUILD": 0, 
+        "MAJOR": 5, 
+        "MINOR": 2, 
+        "PATCH": 0
+    }
 }

FOR_RELEASE/GameData/CommunityCategoryKit/CHANGELOG.txt

@@ -1,3 +1,11 @@
+5.2.0 - 2020.12.20
+------------------
+KSP 1.11 Compatibility
+
+4.3.0 - 2019.10.28
+------------------
+KSP 1.8.x Compatibility
+
 4.2.0 - 2019.08.04
 ------------------
 KSP 1.7.x Compatibility

FOR_RELEASE/GameData/CommunityCategoryKit/common-filters.cfg

@@ -8,7 +8,8 @@ CCKCommonFilterConfig
   {
     name = Containers
     tag = cck-containers
-    normalIcon = CommunityCategoryKit/icons/Containers
+    normalIcon = CommunityCategoryKit/icons/Containers_N
+    selectedIcon = CommunityCategoryKit/icons/Containers_S
     usedByMod = Kerbal Inventory System (KIS)
     usedByMod = Kerbal Attachment System (KAS)
   }

FOR_RELEASE/GameData/CommunityResourcePack/CHANGELOG.txt

@@ -1,3 +1,11 @@
+1.4.2 - 2020.12.20
+------------------
+KSP 1.11 Compatibility
+
+1.3.0 - 2019.10.28
+------------------
+KSP 1.8.x Compatibility
+
 1.2.0 - 2019.08.04
 ------------------
 KSP 1.7.x Compatibility

FOR_RELEASE/GameData/CommunityResourcePack/CRP.version

@@ -9,14 +9,14 @@
      },
      "VERSION":{
          "MAJOR":1,
-         "MINOR":2,
-         "PATCH":0,
+         "MINOR":4,
+         "PATCH":2,
          "BUILD":0
      },
      "KSP_VERSION":{
          "MAJOR":1,
-         "MINOR":7,
-         "PATCH":3
+         "MINOR":8,
+         "PATCH":0
      },
      "KSP_VERSION_MIN":{
          "MAJOR":1,
@@ -25,7 +25,7 @@
      },
      "KSP_VERSION_MAX":{
          "MAJOR":1,
-         "MINOR":8,
-         "PATCH":9
-     }
+         "MINOR":99,
+         "PATCH":99
+     }	 
  } 

FOR_RELEASE/GameData/Firespitter/CHANGELOG.txt

@@ -0,0 +1,5 @@
+0.7.17 - 2020.12.20
+------------------
+KSP 1.11 Compatibility
+Converted Biplane cockpit into a crewed command seat
+Moved legacy biplane parts to the legacy parts folder - nab these if you need them.

FOR_RELEASE/GameData/Firespitter/Firespitter.version

@@ -3,22 +3,22 @@
   "URL": "https://raw.githubusercontent.com/snjo/Firespitter/master/For%20release/Firespitter/Firespitter.version",
   "VERSION": {
     "MAJOR": 7,
-    "MINOR": 13,
+    "MINOR": 17,
     "PATCH": 0
   },
      "KSP_VERSION":{
          "MAJOR":1,
-         "MINOR":7,
-         "PATCH":3
+         "MINOR":11,
+         "PATCH":0
      },
      "KSP_VERSION_MIN":{
          "MAJOR":1,
-         "MINOR":6,
+         "MINOR":8,
          "PATCH":0
      },
      "KSP_VERSION_MAX":{
          "MAJOR":1,
-         "MINOR":8,
-         "PATCH":9
+         "MINOR":11,
+         "PATCH":99
      }
 }

FOR_RELEASE/GameData/GroundConstruction/Engineer.cfg

@@ -1,7 +1,7 @@
-@EXPERIENCE_TRAIT[Engineer]
+@EXPERIENCE_TRAIT[Engineer]:HAS[!EFFECT[ConstructionSkill]]
 {
     EFFECT
     {
         name = ConstructionSkill
     }
-}
+}

FOR_RELEASE/GameData/GroundConstruction/GroundConstruction.version

@@ -6,20 +6,20 @@
     "VERSION":
      {
          "MAJOR":2,
-         "MINOR":4,
-         "PATCH":0,
-         "BUILD":0
+         "MINOR":6,
+         "PATCH":3,
+         "BUILD":1
      },
     "KSP_VERSION_MIN":
      {
          "MAJOR":1,
-         "MINOR":7,
+         "MINOR":9,
          "PATCH":0
      },
     "KSP_VERSION_MAX":
      {
          "MAJOR":1,
-         "MINOR":7,
+         "MINOR":10,
          "PATCH":0
      }
 }

FOR_RELEASE/GameData/GroundConstruction/IgnoreModules.cfg

@@ -21,4 +21,6 @@ GC_IGNORE_MODULES
     ignore = ModuleKISItem
     ignore = TCAEngineInfo
     ignore = ResourceHack
+    ignore = ModuleConstructionKit
+    ignore = DockedKitContainer
 }

FOR_RELEASE/GameData/GroundConstruction/KitResources.cfg

@@ -1,13 +1,23 @@
-GC_KIT_RESOURCES
+GC_KEEP_RESOURCES
 {
-    keep = Ablator
-    keep = SolidFuel
-    keep = EnrichedUranium
-    keep = Plutonium-238
-    keep = Uraninite
-    keep = UraniumNitride
-    keep = UF4
-    keep = ThF4
-    keep = Actinides
-    keep = Machinery
+    resource = Ablator
+    resource = SolidFuel
+    resource = EnrichedUranium
+    resource = Plutonium-238
+    resource = Uraninite
+    resource = UraniumNitride
+    resource = UF4
+    resource = ThF4
+    resource = Actinides
+    resource = Machinery
+}
+
+GC_ASSEMBLE_RESOURCES
+{
+    resource = Machinery
+}
+
+GC_CONSTRUCT_RESOURCES
+{
+    resource = Ablator
 }