Merge pull request #355 from ihsoft/next

Release v1.24
ihsoft · Dec 7, 2019 · 642c3f4 · 642c3f4
2 parents 4c236d9 + baff86b
commit 642c3f4
Show file tree

Hide file tree

Showing 10 changed files with 43 additions and 33 deletions.
diff --git a/Binaries/KSPDev_Utils.2.0.dll → Binaries/KSPDev_Utils.2.1.dll b/Binaries/KSPDev_Utils.2.0.dll → Binaries/KSPDev_Utils.2.1.dll
diff --git a/Binaries/KSPDev_Utils.2.0.xml → Binaries/KSPDev_Utils.2.1.xml b/Binaries/KSPDev_Utils.2.0.xml → Binaries/KSPDev_Utils.2.1.xml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 1.24 (pre-release):
+* [Change] Add a workaround for #354 to not get GUI freezed.
+* [Fix #352] Incorrect calculation of resources on the equipped items.
+
 # 1.23 (October 23rd, 2019):
 * [Change] `KSP 1.8` compatibility. __WARNING__: the mod won't work with version lower than `KSP 1.8`!
 * [Change] Replace `Editor/partGrabModifiers` setting with `Editor/editorPartGrabAction`.

diff --git a/KIS.version b/KIS.version
@@ -19,9 +19,9 @@
     "NAME": "Kerbal Inventory System", 
     "URL": "https://raw.githubusercontent.com/ihsoft/KIS/master/KIS.version", 
     "VERSION": {
-        "BUILD": 41726, 
+        "BUILD": 41031, 
         "MAJOR": 1, 
-        "MINOR": 23, 
-        "PATCH": 7234
+        "MINOR": 24, 
+        "PATCH": 7279
     }
 }
diff --git a/Source/KIS.csproj b/Source/KIS.csproj
@@ -52,8 +52,8 @@
     <Reference Include="Assembly-CSharp-firstpass">
       <HintPath>Q:\KSP_x64_Data\Managed\Assembly-CSharp-firstpass.dll</HintPath>
     </Reference>
-    <Reference Include="KSPDev_Utils.2.0">
-      <HintPath>..\Binaries\KSPDev_Utils.2.0.dll</HintPath>
+    <Reference Include="KSPDev_Utils.2.1, Version=2.1.7279.39857, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\Binaries\KSPDev_Utils.2.1.dll</HintPath>
     </Reference>
     <Reference Include="System">
       <HintPath>Q:\KSP_x64_Data\Managed\System.dll</HintPath>

diff --git a/Source/KIS_Item.cs b/Source/KIS_Item.cs
@@ -735,6 +735,8 @@ void CaptureItemStateFromPart(Part copyFrom) {
         + copyFrom.GetModuleMass(copyFrom.partInfo.partPrefab.mass);
     _itemDryCost = copyFrom.partInfo.cost
         + copyFrom.GetModuleCosts(copyFrom.partInfo.cost);
+    _resourceMass = 0;
+    _resourceCost = 0;
     foreach (var resource in copyFrom.Resources) {
       _resourceMass += (float)resource.amount * resource.info.density;
       _resourceCost += (float)resource.amount * resource.info.unitCost;

diff --git a/Source/Properties/AssemblyInfo.cs b/Source/Properties/AssemblyInfo.cs
@@ -29,6 +29,6 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion ("1.23.*")]
-[assembly: AssemblyInformationalVersion ("1.23 for KSP 1.8+")]
-[assembly: KSPAssembly ("KIS", 1, 23)]
+[assembly: AssemblyVersion ("1.24.*")]
+[assembly: AssemblyInformationalVersion ("1.24 for KSP 1.8+")]
+[assembly: KSPAssembly ("KIS", 1, 24)]
diff --git a/Tools/publish_curseforge_args.txt b/Tools/publish_curseforge_args.txt
@@ -4,4 +4,4 @@
 --github=ihsoft/KIS
 --versions=latest_all_builds
 --title=KIS {tag}
---archive=../KIS_v1.23.zip
+--archive=../KIS_v1.24.zip
diff --git a/Tools/publish_github_args.txt b/Tools/publish_github_args.txt
@@ -4,4 +4,4 @@
 --changelog=../CHANGELOG.md
 --as_draft
 --title=KIS v{tag}
---archive=../KIS_v1.23.zip
+--archive=../KIS_v1.24.zip
diff --git a/Tools/publish_spacedock_args.txt b/Tools/publish_spacedock_args.txt
@@ -3,4 +3,4 @@
 --changelog=../CHANGELOG.md
 --github=ihsoft/KIS
 --ksp_version=latest
---archive=../KIS_v1.23.zip
+--archive=../KIS_v1.24.zip