Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
allista committed Jul 5, 2020
2 parents fef5ca1 + 64c1b1a commit 57122f8
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 24 deletions.
4 changes: 2 additions & 2 deletions AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#if NIGHTBUILD
[assembly: AssemblyVersion("3.7.*")]
#else
[assembly: AssemblyVersion("3.7.0")]
[assembly: AssemblyVersion("3.7.0.1")]
#endif
[assembly: KSPAssembly("ThrottleControlledAvionics", 3, 7)]

Expand All @@ -47,7 +47,7 @@ public class ModInfo : KSP_AVC_Info
public ModInfo()
{
MinKSPVersion = new Version(1, 9, 0);
MaxKSPVersion = new Version(1, 9, 1);
MaxKSPVersion = new Version(1, 10, 0);

VersionURL = "https://raw.githubusercontent.com/allista/ThrottleControlledAvionics/master/GameData/ThrottleControlledAvionics/ThrottleControlledAvionics.version";
UpgradeURL = "http://spacedock.info/mod/198/Throttle%20Controlled%20Avionics";
Expand Down
5 changes: 4 additions & 1 deletion ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@

_**BUT** do not delete the ThrottleControlledAvionics.user and config.xml files to preserve your settings_

* **v3.7.0 - Maneuver Engines Reloaded**
* **v3.7.0.1**
* Compiled against KSP-1.10

* v3.7.0 - **Maneuver Engines Reloaded**
* **Manual engines are no longer used for horizontal thrust**,
instead _the maneuver engines are used_.
* Added *Mode* of operation *of maneuver engines*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"MAJOR":3,
"MINOR":7,
"PATCH":0,
"BUILD":0
"BUILD":1
},
"KSP_VERSION_MIN":
{
Expand All @@ -19,7 +19,7 @@
"KSP_VERSION_MAX":
{
"MAJOR":1,
"MINOR":9,
"PATCH":1
"MINOR":10,
"PATCH":0
}
}
6 changes: 3 additions & 3 deletions TCA.UI/TCA.UI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,15 @@
</ItemGroup>
<ItemGroup>
<Reference Include="System">
<HintPath>..\..\KSP-test\KSP_test_1.9.1\KSP_Data\Managed\System.dll</HintPath>
<HintPath>..\..\KSP-test\KSP_test_1.10.0\KSP_Data\Managed\System.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine">
<HintPath>..\..\KSP-test\KSP_test_1.9.1\KSP_Data\Managed\UnityEngine.dll</HintPath>
<HintPath>..\..\KSP-test\KSP_test_1.10.0\KSP_Data\Managed\UnityEngine.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\..\KSP-test\KSP_test_1.9.1\KSP_Data\Managed\UnityEngine.CoreModule.dll</HintPath>
<HintPath>..\..\KSP-test\KSP_test_1.10.0\KSP_Data\Managed\UnityEngine.CoreModule.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine.UI">
Expand Down
30 changes: 15 additions & 15 deletions ThrottleControlledAvionics.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -38,63 +38,63 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Assembly-CSharp">
<HintPath>..\KSP-test\KSP_test_1.9.1\KSP_Data\Managed\Assembly-CSharp.dll</HintPath>
<HintPath>..\KSP-test\KSP_test_1.10.0\KSP_Data\Managed\Assembly-CSharp.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine">
<HintPath>..\KSP-test\KSP_test_1.9.1\KSP_Data\Managed\UnityEngine.dll</HintPath>
<HintPath>..\KSP-test\KSP_test_1.10.0\KSP_Data\Managed\UnityEngine.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System.Core">
<HintPath>..\KSP-test\KSP_test_1.9.1\KSP_Data\Managed\System.Core.dll</HintPath>
<HintPath>..\KSP-test\KSP_test_1.10.0\KSP_Data\Managed\System.Core.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Mono.Cecil">
<HintPath>..\KSP-test\KSP_test_1.9.1\KSP_Data\Managed\Mono.Cecil.dll</HintPath>
<HintPath>..\KSP-test\KSP_test_1.10.0\KSP_Data\Managed\Mono.Cecil.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Mono.Security">
<HintPath>..\KSP-test\KSP_test_1.9.1\KSP_Data\Managed\Mono.Security.dll</HintPath>
<HintPath>..\KSP-test\KSP_test_1.10.0\KSP_Data\Managed\Mono.Security.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System.Xml">
<HintPath>..\KSP-test\KSP_test_1.9.1\KSP_Data\Managed\System.Xml.dll</HintPath>
<HintPath>..\KSP-test\KSP_test_1.10.0\KSP_Data\Managed\System.Xml.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Assembly-CSharp-firstpass">
<HintPath>..\KSP-test\KSP_test_1.9.1\KSP_Data\Managed\Assembly-CSharp-firstpass.dll</HintPath>
<HintPath>..\KSP-test\KSP_test_1.10.0\KSP_Data\Managed\Assembly-CSharp-firstpass.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine.AnimationModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\KSP-test\KSP_test_1.9.1\KSP_Data\Managed\UnityEngine.AnimationModule.dll</HintPath>
<HintPath>..\KSP-test\KSP_test_1.10.0\KSP_Data\Managed\UnityEngine.AnimationModule.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\KSP-test\KSP_test_1.9.1\KSP_Data\Managed\UnityEngine.CoreModule.dll</HintPath>
<HintPath>..\KSP-test\KSP_test_1.10.0\KSP_Data\Managed\UnityEngine.CoreModule.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine.IMGUIModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\KSP-test\KSP_test_1.9.1\KSP_Data\Managed\UnityEngine.IMGUIModule.dll</HintPath>
<HintPath>..\KSP-test\KSP_test_1.10.0\KSP_Data\Managed\UnityEngine.IMGUIModule.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine.InputLegacyModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\KSP-test\KSP_test_1.9.1\KSP_Data\Managed\UnityEngine.InputLegacyModule.dll</HintPath>
<HintPath>..\KSP-test\KSP_test_1.10.0\KSP_Data\Managed\UnityEngine.InputLegacyModule.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine.PhysicsModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\KSP-test\KSP_test_1.9.1\KSP_Data\Managed\UnityEngine.PhysicsModule.dll</HintPath>
<HintPath>..\KSP-test\KSP_test_1.10.0\KSP_Data\Managed\UnityEngine.PhysicsModule.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine.UI">
<HintPath>..\KSP-test\KSP_test_1.9.1\KSP_Data\Managed\UnityEngine.UI.dll</HintPath>
<HintPath>..\KSP-test\KSP_test_1.10.0\KSP_Data\Managed\UnityEngine.UI.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="KSPAssets">
<HintPath>..\KSP-test\KSP_test_1.9.1\KSP_Data\Managed\KSPAssets.dll</HintPath>
<HintPath>..\KSP-test\KSP_test_1.10.0\KSP_Data\Managed\KSPAssets.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System">
<HintPath>..\KSP-test\KSP_test_1.9.1\KSP_Data\Managed\System.dll</HintPath>
<HintPath>..\KSP-test\KSP_test_1.10.0\KSP_Data\Managed\System.dll</HintPath>
<Private>False</Private>
</Reference>
</ItemGroup>
Expand Down

0 comments on commit 57122f8

Please sign in to comment.