Merge pull request #137 from KSP-RO/Develop

updating for KSP 1.10.x
KSP-RO · Oct 17, 2020 · a7884eb · a7884eb
2 parents 9746e0d + 67256db
commit a7884eb
Show file tree

Hide file tree

Showing 10 changed files with 44 additions and 35 deletions.
diff --git a/GameData/CommunityCategoryKit/CCK.dll b/GameData/CommunityCategoryKit/CCK.dll
diff --git a/GameData/CommunityCategoryKit/CCK.version b/GameData/CommunityCategoryKit/CCK.version
@@ -5,27 +5,27 @@
         "REPOSITORY": "CommunityCategoryKit", 
         "USERNAME": "BobPalmer"
     }, 
-     "KSP_VERSION":{
-         "MAJOR":1,
-         "MINOR":8,
-         "PATCH":0
-     },
-     "KSP_VERSION_MIN":{
-         "MAJOR":1,
-         "MINOR":8,
-         "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": {
+        "BUILD": 0, 
         "MAJOR": 5, 
-        "MINOR": 0, 
-        "PATCH": 0,
-        "BUILD": 0     
-	}
+        "MINOR": 1, 
+        "PATCH": 0
+    }
 }
diff --git a/GameData/CommunityResourcePack/CHANGELOG.txt b/GameData/CommunityResourcePack/CHANGELOG.txt
@@ -1,3 +1,7 @@
+1.4.0 - 2020.09.26
+------------------
+KSP 1.10 Compatibility
+
 1.3.0 - 2019.10.28
 ------------------
 KSP 1.8.x Compatibility

diff --git a/GameData/CommunityResourcePack/CRP.version b/GameData/CommunityResourcePack/CRP.version
@@ -9,8 +9,8 @@
      },
      "VERSION":{
          "MAJOR":1,
-         "MINOR":3,
-         "PATCH":0,
+         "MINOR":4,
+         "PATCH":1,
          "BUILD":0
      },
      "KSP_VERSION":{
@@ -25,7 +25,7 @@
      },
      "KSP_VERSION_MAX":{
          "MAJOR":1,
-         "MINOR":8,
-         "PATCH":9
-     }
+         "MINOR":99,
+         "PATCH":99
+     }	 
  } 
diff --git a/GameData/REPOSoftTech/BackgroundResources/BackgroundResources.dll b/GameData/REPOSoftTech/BackgroundResources/BackgroundResources.dll
diff --git a/GameData/ThunderAerospace/ChangeLog.txt b/GameData/ThunderAerospace/ChangeLog.txt
@@ -1,3 +1,8 @@
+V0.16.0
+	Re-compile for KSP 1.10.x.
+	Background resources can now track any mod part that uses stock resource converters to generate EC. This can be turned on via the Difficulty Settings (off by default).
+	Fixed potential null reference errors on solar banels in background resources if the solar panel is missing transform definitions.
+	Removed "Vessel situation change" log spam.	
 V0.15.0
 	Fix potential NRE when applying game settings changes.
 	Remove Mini AVC plugin.

diff --git a/GameData/ThunderAerospace/TacLifeSupport/TacLifeSupport.version b/GameData/ThunderAerospace/TacLifeSupport/TacLifeSupport.version
@@ -3,20 +3,20 @@
   "URL": "http://ksp-avc.cybutek.net/version.php?id=9",
   "DOWNLOAD": "https://github.com/KSP-RO/TacLifeSupport/releases",
   "CHANGE_LOG_URL": "https://github.com/KSP-RO/TacLifeSupport/wiki/Changes",
-  "VERSION": "0.15.0.0",
+  "VERSION": "0.16.0.0",
   "KSP_VERSION": {
     "MAJOR": 1,
-    "MINOR": 9,
+    "MINOR": 10,
     "PATCH": 0
   },
   "KSP_VERSION_MIN": {
     "MAJOR": 1,
-    "MINOR": 9,
+    "MINOR": 10,
     "PATCH": 0
   },
   "KSP_VERSION_MAX": {
     "MAJOR": 1,
-    "MINOR": 9,
+    "MINOR": 10,
     "PATCH": 99
   }
 }
diff --git a/Source/LifeSupportController.cs b/Source/LifeSupportController.cs
@@ -2005,7 +2005,7 @@ private void onVesselWasModified(Vessel vessel)
 
         private void onVesselSituationChange(GameEvents.HostedFromToAction<Vessel, Vessel.Situations> evt)
         {
-            this.Log("Vessel situation change");
+            //this.Log("Vessel situation change");
         }
 
         #endregion

diff --git a/Source/Properties/AssemblyInfo.cs b/Source/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.15.0")]
-[assembly: AssemblyFileVersion("0.15.0")]
+[assembly: AssemblyVersion("0.16.0")]
+[assembly: AssemblyFileVersion("0.16.0")]
diff --git a/Source/TacLifeSupport.csproj b/Source/TacLifeSupport.csproj
@@ -134,7 +134,7 @@
   <Import Project="$(PROGRAMFILES)\MSBuild\ExtensionPack\4.0\MSBuild.ExtensionPack.tasks" Condition="Exists('$(PROGRAMFILES)\MSBuild\ExtensionPack\4.0\MSBuild.ExtensionPack.tasks')" />
   <PropertyGroup>
     <AssemblyMajorVersion>0</AssemblyMajorVersion>
-    <AssemblyMinorVersion>15</AssemblyMinorVersion>
+    <AssemblyMinorVersion>16</AssemblyMinorVersion>
     <AssemblyBuildNumber>0</AssemblyBuildNumber>
     <AssemblyFileMajorVersion>$(AssemblyMajorVersion)</AssemblyFileMajorVersion>
     <AssemblyFileMinorVersion>$(AssemblyMinorVersion)</AssemblyFileMinorVersion>
@@ -153,13 +153,13 @@
     <DownloadUrl>https://github.com/KSP-RO/TacLifeSupport/releases</DownloadUrl>
     <ChangelogUrl>https://github.com/KSP-RO/TacLifeSupport/wiki/Changes</ChangelogUrl>
     <KspVersionMajor>1</KspVersionMajor>
-    <KspVersionMinor>9</KspVersionMinor>
+    <KspVersionMinor>10</KspVersionMinor>
     <KspVersionPatch>0</KspVersionPatch>
     <KspMinVersionMajor>1</KspMinVersionMajor>
-    <KspMinVersionMinor>9</KspMinVersionMinor>
+    <KspMinVersionMinor>10</KspMinVersionMinor>
     <KspMinVersionPatch>0</KspMinVersionPatch>
     <KspMaxVersionMajor>1</KspMaxVersionMajor>
-    <KspMaxVersionMinor>9</KspMaxVersionMinor>
+    <KspMaxVersionMinor>10</KspMaxVersionMinor>
     <KspMaxVersionPatch>99</KspMaxVersionPatch>
   </PropertyGroup>
   <Target Name="GitInfo">