Skip to content

Commit 5e2f255

Browse files
committed
Merge branch 'master' of https://github.com/zer0Kerbal/ODFCr
2 parents d5ff06e + 1b14e63 commit 5e2f255

File tree

2 files changed

+26
-9
lines changed

2 files changed

+26
-9
lines changed

Source/ODFC.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using System;
1+
using System;
22
using System.Collections.Generic;
33
using UnityEngine;
44
using KSP.Localization;
@@ -442,6 +442,8 @@ internal void updatePAWLabel() // private
442442
if (HighLogic.LoadedSceneIsEditor) PAWStatus = begStr + colorStr + "Fuel Cell: " + fuel_consumption + " - " + maxECs_status + " EC/s:" + endStr;
443443
}
444444

445+
/// <summary>Updates the PAW with scaleFactor and advises KSP that the ship has changed</summary>
446+
445447
/// <summary>
446448
/// <para>
447449
/// Called when [rescale].
@@ -497,7 +499,7 @@ internal void OnRescale(TweakScale.ScalingFactor.FactorSet scaleFactor)
497499
}
498500

499501
#endregion Public Functions
500-
#region on events
502+
#region on events
501503
/// <summary>Called when part is added to the craft.</summary>
502504
public override void OnAwake()
503505
{
@@ -640,7 +642,6 @@ public override void OnUpdate()
640642
}
641643
base.OnUpdate();
642644
}
643-
644645
#endregion on Events
645646
#region GetInfo
646647

Source/OnDemandFuelCells.csproj

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,27 @@
4040
<Reference Include="System.Data.DataSetExtensions" />
4141
<Reference Include="System.Data" />
4242
<Reference Include="System.Xml" />
43-
<Reference Include="$(DevDir)\KSP_x64_Data\Managed\Assembly-CSharp.dll" />
44-
<Reference Include="$(DevDir)\KSP_x64_Data\Managed\UnityEngine*.dll" />
45-
<Reference Include="$(DevDir)\KSP_x64_Data\Managed\Assembly-CSharp-firstpass.dll" />
46-
<Reference Include="$(DevDir)\KSP_x64_Data\Managed\UnityEngine.UI*.dll" />
43+
<Reference Include="$(DevDir)\KSP_x64_Data\Managed\Assembly-CSharp*.dll">
44+
<Private>False</Private>
45+
</Reference>
46+
<Reference Include="$(DevDir)\KSP_x64_Data\Managed\UnityEngine*.dll">
47+
<Private>False</Private>
48+
</Reference>
49+
<Reference Include="\$(DevDir)\GameData\Scale_Redist.dll" >
50+
<Private>False</Private>
51+
</Reference>
52+
<Reference Include="$(DevDir)\KSP_x64_Data\Managed\Assembly-CSharp.dll" >
53+
<Private>False</Private>
54+
</Reference>
55+
<Reference Include="$(DevDir)\KSP_x64_Data\Managed\UnityEngine*.dll" >
56+
<Private>False</Private>
57+
</Reference>
58+
<Reference Include="$(DevDir)\KSP_x64_Data\Managed\Assembly-CSharp-firstpass.dll" >
59+
<Private>False</Private>
60+
</Reference>
61+
<Reference Include="$(DevDir)\KSP_x64_Data\Managed\UnityEngine.UI*.dll" >
62+
<Private>False</Private>
63+
</Reference>
4764
</ItemGroup>
4865
<ItemGroup>
4966
<Compile Include="AssemblyVersion.cs">
@@ -68,8 +85,7 @@
6885
</ItemGroup>
6986
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
7087
<PropertyGroup>
71-
<PostBuildEvent>start /D $(ProjectDir)..\ /WAIT deploy.bat $(TargetDir) $(TargetFileName)
72-
if $(ConfigurationName) == Release start /D $(ProjectDir)..\ /WAIT buildRelease.bat $(TargetDir) $(TargetFileName)</PostBuildEvent>
88+
<PostBuildEvent></PostBuildEvent>
7389
</PropertyGroup>
7490
<PropertyGroup>
7591
<PreBuildEvent>set textTemplatingPath="$(DevEnvDir)texttransform.exe"

0 commit comments

Comments
 (0)