Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
@allista
allista committed Jul 5, 2020
2 parents de23887 + e1396ba commit 39c4358
Show file tree
Hide file tree
Showing 10 changed files with 42 additions and 39 deletions.
36 changes: 18 additions & 18 deletions AT_Utils.csproj
View file
Expand Up @@ -33,79 +33,79 @@
</PropertyGroup>
<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="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="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="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="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.AssetBundleModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>../KSP-test/KSP_test_1.9.1/KSP_Data/Managed/UnityEngine.AssetBundleModule.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine.AudioModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\KSP-test\KSP_test_1.9.1\KSP_Data\Managed\UnityEngine.AudioModule.dll</HintPath>
<HintPath>..\KSP-test\KSP_test_1.10.0\KSP_Data\Managed\UnityEngine.AudioModule.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.ImageConversionModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\KSP-test\KSP_test_1.9.1\KSP_Data\Managed\UnityEngine.ImageConversionModule.dll</HintPath>
<HintPath>..\KSP-test\KSP_test_1.10.0\KSP_Data\Managed\UnityEngine.ImageConversionModule.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.TextRenderingModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\KSP-test\KSP_test_1.9.1\KSP_Data\Managed\UnityEngine.TextRenderingModule.dll</HintPath>
<HintPath>..\KSP-test\KSP_test_1.10.0\KSP_Data\Managed\UnityEngine.TextRenderingModule.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="UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
<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="UnityEngine.UIModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\KSP-test\KSP_test_1.9.1\KSP_Data\Managed\UnityEngine.UIModule.dll</HintPath>
<HintPath>..\KSP-test\KSP_test_1.10.0\KSP_Data\Managed\UnityEngine.UIModule.dll</HintPath>
<Private>False</Private>
</Reference>
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion AnimatedConverters
Submodule AnimatedConverters updated 1 files
+9 −9 AnimatedConverters.csproj
2 changes: 1 addition & 1 deletion AnisotropicPartResizer
Submodule AnisotropicPartResizer updated 1 files
+9 −9 AnisotropicPartResizer.csproj
5 changes: 4 additions & 1 deletion ChangeLog.md
View file
@@ -1,6 +1,9 @@
#AT Utils ChangeLog

* **v1.9.4**
* **v1.9.4.1**
* Compiled against KSP-1.10

* v1.9.4
* CC Moved hangar resource tanks to FuelTank category
* OrbitalUtils: added ClearManeuverNodes method
* OrbitalUtils: added Node2OrbitalDeltaV method
Expand Down
2 changes: 1 addition & 1 deletion ConfigurableContainers
Submodule ConfigurableContainers updated 4 files
+3 −0 ChangeLog.md
+10 −10 ConfigurableContainers.csproj
+3 −3 GameData/ConfigurableContainers/ConfigurableContainers.version
+2 −2 Properties/AssemblyInfo.cs
6 changes: 3 additions & 3 deletions GameData/000_AT_Utils/000_AT_Utils.version
View file
Expand Up @@ -8,7 +8,7 @@
"MAJOR":1,
"MINOR":9,
"PATCH":4,
"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
}
}
2 changes: 1 addition & 1 deletion MultiAnimators
Submodule MultiAnimators updated 1 files
+12 −12 MultiAnimators.csproj
4 changes: 2 additions & 2 deletions Properties/AssemblyInfo.cs
View file
Expand Up @@ -27,7 +27,7 @@
#if NIGHTBUILD
[assembly: AssemblyVersion("1.9.*")]
#else
[assembly: AssemblyVersion("1.9.4")]
[assembly: AssemblyVersion("1.9.4.1")]
#endif
[assembly: KSPAssembly("AT_Utils", 1, 9)]

Expand All @@ -44,7 +44,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/AT_Utils/master/GameData/000_AT_Utils/000_AT_Utils.version";
UpgradeURL = "https://github.com/allista/AT_Utils/releases";
Expand Down
8 changes: 4 additions & 4 deletions SubmodelResizer/SubmodelResizer.csproj
View file
Expand Up @@ -38,19 +38,19 @@
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets"/>
<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="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">
<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>
</ItemGroup>
Expand Down
14 changes: 7 additions & 7 deletions Unity/AT_Utils.UI.csproj
View file
Expand Up @@ -39,35 +39,35 @@
</PropertyGroup>
<ItemGroup>
<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="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.AudioModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>../../KSP-test/KSP_test_1.8.1/KSP_Data/Managed/UnityEngine.AudioModule.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.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.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="UnityEngine.UIModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\..\KSP-test\KSP_test_1.9.1\KSP_Data\Managed\UnityEngine.UIModule.dll</HintPath>
<HintPath>..\..\KSP-test\KSP_test_1.10.0\KSP_Data\Managed\UnityEngine.UIModule.dll</HintPath>
<Private>False</Private>
</Reference>
</ItemGroup>
Expand Down

0 comments on commit 39c4358

Please sign in to comment.