Merge pull request #125 from KSP-RO/Develop

Develop
KSP-RO · Jun 29, 2019 · 7bbed9c · 7bbed9c
2 parents a87a3be + 9e7571c
commit 7bbed9c
Show file tree

Hide file tree

Showing 13 changed files with 48 additions and 30 deletions.
diff --git a/GameData/CommunityCategoryKit/CCK.version b/GameData/CommunityCategoryKit/CCK.version
@@ -7,24 +7,24 @@
     }, 
      "KSP_VERSION":{
          "MAJOR":1,
-         "MINOR":5,
+         "MINOR":6,
          "PATCH":0
      },
      "KSP_VERSION_MIN":{
          "MAJOR":1,
-         "MINOR":5,
+         "MINOR":6,
          "PATCH":0
      },
      "KSP_VERSION_MAX":{
          "MAJOR":1,
-         "MINOR":5,
+         "MINOR":6,
          "PATCH":9
      }, 
     "NAME": "Community Category Kit", 
     "URL": "https://raw.githubusercontent.com/BobPalmer/CommunityCategoryKit/master/FOR_RELEASE/GameData/CommunityCategoryKit/CCK.version", 
     "VERSION": {
         "MAJOR": 4, 
-        "MINOR": 0, 
+        "MINOR": 1, 
         "PATCH": 0,
         "BUILD": 0     
 	}

diff --git a/GameData/CommunityCategoryKit/CHANGELOG.txt b/GameData/CommunityCategoryKit/CHANGELOG.txt
@@ -1,4 +1,8 @@
-4.0.0 - 2018.10.20
+4.1.0 - 2019.02.05
+------------------
+KSP 1.6.x Compatibility
+
+4.0.0 - 2018.11.20
 ------------------
 KSP 1.5.0 Compatibility
 

diff --git a/GameData/CommunityResourcePack/CHANGELOG.txt b/GameData/CommunityResourcePack/CHANGELOG.txt
@@ -1,3 +1,11 @@
+1.1.0 - 2019.02.05
+------------------
+KSP 1.6.x Compatibility
+
+1.0.1 - 2018.11.20
+------------------
+Fixed antimatter config name
+
 1.0.0 - 2018.10.20
 ------------------
 KSP 1.5.0 Compatibility

diff --git a/GameData/CommunityResourcePack/CRP.version b/GameData/CommunityResourcePack/CRP.version
@@ -9,23 +9,23 @@
      },
      "VERSION":{
          "MAJOR":1,
-         "MINOR":0,
+         "MINOR":1,
          "PATCH":0,
          "BUILD":0
      },
      "KSP_VERSION":{
          "MAJOR":1,
-         "MINOR":5,
+         "MINOR":6,
          "PATCH":0
      },
      "KSP_VERSION_MIN":{
          "MAJOR":1,
-         "MINOR":5,
+         "MINOR":6,
          "PATCH":0
      },
      "KSP_VERSION_MAX":{
          "MAJOR":1,
-         "MINOR":5,
+         "MINOR":6,
          "PATCH":9
      }
  } 
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.13.13
+	Re-compile for KSP 1.7.x
+	Reduce Log Spam when scenes change (no longer logs all save data).
+	Support for Kromoneter and other mods that replace KSPUtil.dateTimeFormatter.
+	Add missing buildhead profile to 1.25m waste container.	
 V0.13.12
 	Re-compile for KSP 1.6.x
 	Added support for Near Future fission Generator in Unloaded Resource processing.

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.13.12.0",
+  "VERSION": "0.13.13.0",
   "KSP_VERSION": {
     "MAJOR": 1,
-    "MINOR": 6,
-    "PATCH": 1
+    "MINOR": 7,
+    "PATCH": 2
   },
   "KSP_VERSION_MIN": {
     "MAJOR": 1,
-    "MINOR": 6,
+    "MINOR": 7,
     "PATCH": 0
   },
   "KSP_VERSION_MAX": {
     "MAJOR": 1,
-    "MINOR": 6,
+    "MINOR": 7,
     "PATCH": 99
   }
 }
diff --git a/GameData/ThunderAerospace/TacLifeSupportContainers/Waste.cfg b/GameData/ThunderAerospace/TacLifeSupportContainers/Waste.cfg
@@ -31,6 +31,7 @@ PART
 	cost = 300
 	category = Utility
 	subcategory = 0
+	bulkheadProfiles = size1
 	title = #autoLOC_TACLS_00127 //Life Support Waste Container, 1.25m
 	manufacturer = #autoLOC_TACLS_00153 //Thunder Aerospace Corporation
 	description = #autoLOC_TACLS_00128 //A 1.25-meter container for holding Life Support waste products.

diff --git a/Source/AddLifeSupport.cs b/Source/AddLifeSupport.cs
@@ -95,7 +95,7 @@ private void EvaAddLifeSupport(AvailablePart part)
                 this.Log("Part " + part.name + " has no partPrefab");
                 return;
             }
-            this.Log("Adding resources to " + part.name + "/" + prefabPart.partInfo.title);
+            //this.Log("Adding resources to " + part.name + "/" + prefabPart.partInfo.title);
 
             EvaAddPartModule(prefabPart);
             if (HighLogic.CurrentGame == null) return;
@@ -110,10 +110,10 @@ private void EvaAddLifeSupport(AvailablePart part)
             EvaAddResource(prefabPart, HighLogic.CurrentGame.Parameters.CustomParams<TAC_SettingsParms_Sec2>().CO2ProductionRate, globalSettings.CO2, false);
             EvaAddResource(prefabPart, HighLogic.CurrentGame.Parameters.CustomParams<TAC_SettingsParms_Sec2>().WasteProductionRate, globalSettings.Waste, false);
             EvaAddResource(prefabPart, HighLogic.CurrentGame.Parameters.CustomParams<TAC_SettingsParms_Sec2>().WasteWaterProductionRate, globalSettings.WasteWater, false);
-            for (int i = 0; i < prefabPart.Resources.Count; i++)
-            {
-                this.Log("Resource " + prefabPart.Resources[i].resourceName);
-            }
+            //for (int i = 0; i < prefabPart.Resources.Count; i++)
+            //{
+            //    this.Log("Resource " + prefabPart.Resources[i].resourceName);
+            //}
 
         }
 

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.13.12")]
-[assembly: AssemblyFileVersion("0.13.12")]
+[assembly: AssemblyVersion("0.13.13")]
+[assembly: AssemblyFileVersion("0.13.13")]
diff --git a/Source/TacLifeSupport.cs b/Source/TacLifeSupport.cs
@@ -210,7 +210,7 @@ public override void OnLoad(ConfigNode gameNode)
                         child.Load(gameNode);
                     }
                 }
-                this.Log("OnLoad: " + gameNode);
+                //this.Log("OnLoad: " + gameNode);
             }
         }
 
@@ -228,7 +228,7 @@ public override void OnSave(ConfigNode gameNode)
                         child.Save(gameNode);
                     }
                 }
-                this.Log("OnSave: " + gameNode);
+                //this.Log("OnSave: " + gameNode);
             }
         }
 

diff --git a/Source/TacLifeSupport.csproj b/Source/TacLifeSupport.csproj
@@ -112,7 +112,7 @@
   <PropertyGroup>
     <AssemblyMajorVersion>0</AssemblyMajorVersion>
     <AssemblyMinorVersion>13</AssemblyMinorVersion>
-    <AssemblyBuildNumber>12</AssemblyBuildNumber>
+    <AssemblyBuildNumber>13</AssemblyBuildNumber>
     <AssemblyFileMajorVersion>$(AssemblyMajorVersion)</AssemblyFileMajorVersion>
     <AssemblyFileMinorVersion>$(AssemblyMinorVersion)</AssemblyFileMinorVersion>
     <AssemblyFileBuildNumber>$(AssemblyBuildNumber)</AssemblyFileBuildNumber>
@@ -130,13 +130,13 @@
     <DownloadUrl>https://github.com/KSP-RO/TacLifeSupport/releases</DownloadUrl>
     <ChangelogUrl>https://github.com/KSP-RO/TacLifeSupport/wiki/Changes</ChangelogUrl>
     <KspVersionMajor>1</KspVersionMajor>
-    <KspVersionMinor>6</KspVersionMinor>
-    <KspVersionPatch>1</KspVersionPatch>
+    <KspVersionMinor>7</KspVersionMinor>
+    <KspVersionPatch>2</KspVersionPatch>
     <KspMinVersionMajor>1</KspMinVersionMajor>
-    <KspMinVersionMinor>6</KspMinVersionMinor>
+    <KspMinVersionMinor>7</KspMinVersionMinor>
     <KspMinVersionPatch>0</KspMinVersionPatch>
     <KspMaxVersionMajor>1</KspMaxVersionMajor>
-    <KspMaxVersionMinor>6</KspMaxVersionMinor>
+    <KspMaxVersionMinor>7</KspMaxVersionMinor>
     <KspMaxVersionPatch>99</KspMaxVersionPatch>
   </PropertyGroup>
   <Target Name="GitInfo">

diff --git a/TacLib/Source/Utilities.cs b/TacLib/Source/Utilities.cs
@@ -163,8 +163,8 @@ public static string FormatTime(double value, int numDecimals = 0)
         {
             const double SECONDS_PER_MINUTE = 60.0;
             const double MINUTES_PER_HOUR = 60.0;
-            double HOURS_PER_DAY = (GameSettings.KERBIN_TIME) ? 6.0 : 24.0;
-            double DAYS_PER_YEAR = (GameSettings.KERBIN_TIME) ? 426.0 : 365.0;
+            double HOURS_PER_DAY = KSPUtil.dateTimeFormatter.Day / 3600;
+            double DAYS_PER_YEAR = KSPUtil.dateTimeFormatter.Year / KSPUtil.dateTimeFormatter.Day;
 
             if (!stringsCached)
             {