Merge pull request #299 from UmbraSpaceIndustries/DEVELOP

KSP 1.11 Updates
UmbraSpaceIndustries · Dec 21, 2020 · c91bbfa · c91bbfa
2 parents a0b24ec + b436622
commit c91bbfa
Show file tree

Hide file tree

Showing 25 changed files with 117 additions and 43 deletions.
diff --git a/FOR_RELEASE/GameData/000_USITools/AddConsumers.cfg b/FOR_RELEASE/GameData/000_USITools/AddConsumers.cfg
@@ -5,3 +5,11 @@
 		name = ModuleLogisticsConsumer
 	}
 }
+
+@PART[landingLeg*,miniLandingLeg]:HAS[!MODULE[USI_InertialDampener]]
+{
+	MODULE
+	{
+		name = USI_InertialDampener
+	}
+}
diff --git a/FOR_RELEASE/GameData/000_USITools/CHANGELOG.txt b/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

diff --git a/FOR_RELEASE/GameData/000_USITools/Converters.cfg b/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
+	}
+}
diff --git a/FOR_RELEASE/GameData/000_USITools/Logistics.cfg b/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
     {

diff --git a/FOR_RELEASE/GameData/000_USITools/MiniAVC.dll b/FOR_RELEASE/GameData/000_USITools/MiniAVC.dll
diff --git a/FOR_RELEASE/GameData/000_USITools/USITools.dll b/FOR_RELEASE/GameData/000_USITools/USITools.dll
diff --git a/FOR_RELEASE/GameData/000_USITools/USITools.pdb b/FOR_RELEASE/GameData/000_USITools/USITools.pdb
diff --git a/FOR_RELEASE/GameData/000_USITools/USITools.version b/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
      }
  } 
diff --git a/FOR_RELEASE/GameData/CommunityCategoryKit/CCK.dll b/FOR_RELEASE/GameData/CommunityCategoryKit/CCK.dll
diff --git a/FOR_RELEASE/GameData/CommunityCategoryKit/CCK.version b/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
+    }
 }
diff --git a/FOR_RELEASE/GameData/CommunityCategoryKit/CHANGELOG.txt b/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

diff --git a/FOR_RELEASE/GameData/CommunityCategoryKit/common-filters.cfg b/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)
   }

diff --git a/FOR_RELEASE/GameData/CommunityCategoryKit/icons/Containers_N.png b/FOR_RELEASE/GameData/CommunityCategoryKit/icons/Containers_N.png
diff --git a/...CommunityCategoryKit/icons/Containers.png → ...mmunityCategoryKit/icons/Containers_S.png b/...CommunityCategoryKit/icons/Containers.png → ...mmunityCategoryKit/icons/Containers_S.png
diff --git a/FOR_RELEASE/GameData/CommunityResourcePack/CHANGELOG.txt b/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

diff --git a/FOR_RELEASE/GameData/CommunityResourcePack/CRP.version b/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
+     }	 
  } 
diff --git a/FOR_RELEASE/GameData/ModuleManager.4.0.2.dll b/FOR_RELEASE/GameData/ModuleManager.4.0.2.dll
diff --git a/FOR_RELEASE/GameData/ModuleManager.4.1.4.dll b/FOR_RELEASE/GameData/ModuleManager.4.1.4.dll
diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/ChangeLog.txt b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/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

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/Recycler.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/Recycler.cfg
@@ -12,7 +12,7 @@ PART
 	subcategory = 0
 	title = RT-500 Recycling Module
 	manufacturer = USI - Life Support Division
-	description = A surface-mounted recycler just enough to reduce life support load for one Kerbal.
+	description = TBD
 	attachRules = 0,1,0,0,0
 	mass = 0.1
 	dragModelType = default

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/USI-LS.version b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/USI-LS.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
      }
  } 
diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/USILifeSupport.dll b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/USILifeSupport.dll
diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/USILifeSupport.dll.mdb b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/USILifeSupport.dll.mdb
diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/USILifeSupport.pdb b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/USILifeSupport.pdb
diff --git a/Source/USILifeSupport/USILifeSupport.csproj b/Source/USILifeSupport/USILifeSupport.csproj
@@ -99,7 +99,8 @@
 </PostBuildEvent>
   </PropertyGroup>
   <PropertyGroup>
-    <PostBuildEvent>D:\Games\pdb2mdb\pdb2mdb.exe $(TargetFileName)</PostBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.