Merge pull request #134 from post-kerbin-mining-corporation/dev

Prepare 1.2.2
post-kerbin-mining-corporation · Mar 18, 2021 · 41e9901 · 41e9901
2 parents d0a20f2 + ab4eb40
commit 41e9901
Show file tree

Hide file tree

Showing 15 changed files with 264 additions and 548 deletions.
diff --git a/.gitignore b/.gitignore
@@ -344,3 +344,4 @@ tmp/
 deploy/
 build_scripts/version.txt
 build_scripts/changelog.md
+GameData/NearFutureElectrical/Parts/@thumbs
diff --git a/.mod_data.yml b/.mod_data.yml
@@ -17,7 +17,7 @@ dependencies:  # Configure dependencies
     version: 1.4.2
     location: s3
   DynamicBatteryStorage:
-    tag: 2.2.1
+    tag: 2.2.2
     location: github
     repository: post-kerbin-mining-corporation/DynamicBatteryStorage
 deploy:

diff --git a/GameData/NearFutureElectrical/Patches/NFElectricalUSIReactors.cfg b/GameData/NearFutureElectrical/Patches/NFElectricalUSIReactors.cfg
@@ -7,7 +7,7 @@
 	@category = Electrical
 	@mass = 0.103
 
-	!MODULE[USI_Converter]{}
+	!MODULE[ModuleResourceConverter]{}
 	!MODULE[ModuleOverheatDisplay]{}
 	!MODULE[USI_ModuleFieldRepair]{}
 
@@ -122,7 +122,7 @@
 	@mass = 0.285
 
 	!MODULE[ModuleOverheatDisplay]{}
-	!MODULE[USI_Converter]{}
+	!MODULE[ModuleResourceConverter]{}
 	!MODULE[USI_ModuleFieldRepair]{}
 
 	MODULE
@@ -235,7 +235,7 @@
 	@mass = 0.565
 
 	!MODULE[ModuleOverheatDisplay]{}
-	!MODULE[USI_Converter]{}
+	!MODULE[ModuleResourceConverter]{}
 	!MODULE[USI_ModuleFieldRepair]{}
 
 	MODULE
@@ -348,7 +348,7 @@
 	@mass = 2.745
 
 	!MODULE[ModuleOverheatDisplay]{}
-	!MODULE[USI_Converter]{}
+	!MODULE[ModuleResourceConverter]{}
 	!MODULE[USI_ModuleFieldRepair]{}
 
 	MODULE
@@ -460,7 +460,7 @@
 	@mass = 10.869
 
 	!MODULE[ModuleOverheatDisplay]{}
-	!MODULE[USI_Converter]{}
+	!MODULE[ModuleResourceConverter]{}
 	!MODULE[USI_ModuleFieldRepair]{}
 
 	MODULE
@@ -573,7 +573,7 @@
 	@category = Electrical
 	@mass = 9.524
 
-	!MODULE[USI_Converter]{}
+	!MODULE[ModuleResourceConverter]{}
 	!MODULE[ModuleOverheatDisplay]{}
 	!MODULE[USI_ModuleFieldRepair]{}
 
@@ -699,7 +699,7 @@
 	@mass = 18.667
 	@description = Weighing in at over thirty tons when fully fueled, this massive nuclear reactor provides ample power for Starlifter-class freighters.
 
-	!MODULE[USI_Converter]{}
+	!MODULE[ModuleResourceConverter]{}
 	!MODULE[ModuleOverheatDisplay]{}
 	!MODULE[USI_ModuleFieldRepair]{}
 
@@ -824,7 +824,7 @@
 	@entryCost = 484338
 
 	!MODULE[ModuleOverheatDisplay]{}
-	!MODULE[USI_Converter]{}
+	!MODULE[ModuleResourceConverter]{}
 	!MODULE[USI_ModuleFieldRepair]{}
 
 	MODULE
@@ -929,7 +929,7 @@
 	@entryCost = 758050
 
 	!MODULE[ModuleOverheatDisplay]{}
-	!MODULE[USI_Converter]{}
+	!MODULE[ModuleResourceConverter]{}
 	!MODULE[USI_ModuleFieldRepair]{}
 
 	MODULE

diff --git a/GameData/NearFutureElectrical/Plugins/NearFutureElectrical.dll b/GameData/NearFutureElectrical/Plugins/NearFutureElectrical.dll
diff --git a/GameData/NearFutureElectrical/Versioning/NearFutureElectrical.version b/GameData/NearFutureElectrical/Versioning/NearFutureElectrical.version
@@ -6,14 +6,14 @@
     {
         "MAJOR":1,
         "MINOR":2,
-        "PATCH":1,
+        "PATCH":2,
         "BUILD":0
     },
     "KSP_VERSION":
     {
         "MAJOR":1,
         "MINOR":11,
-        "PATCH":0
+        "PATCH":2
     },
     "KSP_VERSION_MIN":{
         "MAJOR":1,

diff --git a/README.md b/README.md
@@ -24,8 +24,8 @@ Ever wanted some futuristic energy generation that wasn't too... futuristic? I h
 These components are required for the mod to function and are bundled as part of any download:
 * [ModuleManager (4.1.4)](https://github.com/sarbian/ModuleManager)
 * [B9PartSwitch (2.17.0)](https://github.com/blowfishpro/B9PartSwitch)
-* [Community Resource Pack (1.3.0)](https://github.com/BobPalmer/CommunityResourcePack)
-* [DynamicBatteryStorage (2.1.7)](https://github.com/ChrisAdderley/DynamicBatteryStorage)
+* [Community Resource Pack (1.4.2)](https://github.com/BobPalmer/CommunityResourcePack)
+* [DynamicBatteryStorage (2.2.2)](https://github.com/ChrisAdderley/DynamicBatteryStorage)
 
 ## Installation
 

diff --git a/Source/NearFutureElectrical/NearFutureElectrical.cs b/Source/NearFutureElectrical/NearFutureElectrical.cs
diff --git a/Source/NearFutureElectrical/NearFutureElectrical.csproj b/Source/NearFutureElectrical/NearFutureElectrical.csproj
@@ -37,7 +37,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Assembly-CSharp">
-      <HintPath>..\..\..\..\..\..\..\Games\Steam\steamapps\common\Kerbal Space Program\KSP_x64_Data\Managed\Assembly-CSharp.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Kerbal Space Program\KSP_x64_Data\Managed\Assembly-CSharp.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -48,29 +48,38 @@
     <Reference Include="Assembly-CSharp">
       <HintPath>..\..\..\..\Users\cadderley\Library\Application Support\Steam\steamapps\common\Kerbal Space Program\Managed\Assembly-CSharp.dll</HintPath>
     </Reference>
+    <Reference Include="UnityEngine">
+      <HintPath>..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Kerbal Space Program\KSP_x64_Data\Managed\UnityEngine.dll</HintPath>
+    </Reference>
     <Reference Include="UnityEngine.AnimationModule">
-      <HintPath>..\..\..\..\..\..\..\Games\Steam\steamapps\common\Kerbal Space Program\KSP_x64_Data\Managed\UnityEngine.AnimationModule.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Kerbal Space Program\KSP_x64_Data\Managed\UnityEngine.AnimationModule.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine.CoreModule">
-      <HintPath>..\..\..\..\..\..\..\Games\Steam\steamapps\common\Kerbal Space Program\KSP_x64_Data\Managed\UnityEngine.CoreModule.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Kerbal Space Program\KSP_x64_Data\Managed\UnityEngine.CoreModule.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine.IMGUIModule">
-      <HintPath>..\..\..\..\..\..\..\Games\Steam\steamapps\common\Kerbal Space Program\KSP_x64_Data\Managed\UnityEngine.IMGUIModule.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Kerbal Space Program\KSP_x64_Data\Managed\UnityEngine.IMGUIModule.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine.InputLegacyModule">
-      <HintPath>..\..\..\..\..\..\..\Games\Steam\steamapps\common\Kerbal Space Program\KSP_x64_Data\Managed\UnityEngine.InputLegacyModule.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Kerbal Space Program\KSP_x64_Data\Managed\UnityEngine.InputLegacyModule.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine.InputModule">
-      <HintPath>..\..\..\..\..\..\..\Games\Steam\steamapps\common\Kerbal Space Program\KSP_x64_Data\Managed\UnityEngine.InputModule.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Kerbal Space Program\KSP_x64_Data\Managed\UnityEngine.InputModule.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine.PhysicsModule">
-      <HintPath>..\..\..\..\..\..\..\Games\Steam\steamapps\common\Kerbal Space Program\KSP_x64_Data\Managed\UnityEngine.PhysicsModule.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Kerbal Space Program\KSP_x64_Data\Managed\UnityEngine.PhysicsModule.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine.TextRenderingModule">
-      <HintPath>..\..\..\..\..\..\..\Games\Steam\steamapps\common\Kerbal Space Program\KSP_x64_Data\Managed\UnityEngine.TextRenderingModule.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Kerbal Space Program\KSP_x64_Data\Managed\UnityEngine.TextRenderingModule.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine.UI">
-      <HintPath>..\..\..\..\..\..\..\Games\Steam\steamapps\common\Kerbal Space Program\KSP_x64_Data\Managed\UnityEngine.UI.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Kerbal Space Program\KSP_x64_Data\Managed\UnityEngine.UI.dll</HintPath>
+    </Reference>
+    <Reference Include="UnityEngine.UIElementsModule">
+      <HintPath>..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Kerbal Space Program\KSP_x64_Data\Managed\UnityEngine.UIElementsModule.dll</HintPath>
+    </Reference>
+    <Reference Include="UnityEngine.UIModule">
+      <HintPath>..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Kerbal Space Program\KSP_x64_Data\Managed\UnityEngine.UIModule.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -86,15 +95,11 @@
     <Compile Include="FissionEngine.cs" />
     <Compile Include="FissionGenerator.cs" />
     <Compile Include="FissionReactor.cs" />
-    <Compile Include="NearFutureElectrical.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="RadioactiveStorageContainer.cs" />
     <Compile Include="RadioisotopeGenerator.cs" />
     <Compile Include="UI\ReactorUI.cs" />
     <Compile Include="UI\ReactorUIEntry.cs" />
-    <Compile Include="Resources.cs" />
-    <Compile Include="RPMFissionReactorButtons.cs" />
-    <Compile Include="RPMFissionReactorVariables.cs" />
     <Compile Include="UI\UIResources.cs" />
     <Compile Include="Utils.cs" />
   </ItemGroup>

diff --git a/Source/NearFutureElectrical/RPMFissionReactorButtons.cs b/Source/NearFutureElectrical/RPMFissionReactorButtons.cs