Merged development branch

allista · Apr 1, 2022 · 8227950 · 8227950
2 parents 137ee77 + 57f1fb5
commit 8227950
Show file tree

Hide file tree

Showing 10 changed files with 658 additions and 607 deletions.
diff --git a/AssemblyInfo.cs b/AssemblyInfo.cs
@@ -30,7 +30,7 @@
 #if NIGHTBUILD
 [assembly: AssemblyVersion("3.8.*")]
 #else
-[assembly: AssemblyVersion("3.8.0")]
+[assembly: AssemblyVersion("3.8.0.1")]
 #endif
 [assembly: KSPAssembly("ThrottleControlledAvionics", 3, 8)]
 
@@ -46,8 +46,8 @@ public class ModInfo : KSP_AVC_Info
     {
         public ModInfo()
         {
-            MinKSPVersion = new Version(1, 11, 1);
-            MaxKSPVersion = new Version(1, 11, 1);
+            MinKSPVersion = new Version(1, 12, 3);
+            MaxKSPVersion = new Version(1, 12, 3);
 
             VersionURL = "https://raw.githubusercontent.com/allista/ThrottleControlledAvionics/master/GameData/ThrottleControlledAvionics/ThrottleControlledAvionics.version";
             UpgradeURL = "http://spacedock.info/mod/198/Throttle%20Controlled%20Avionics";

diff --git a/ChangeLog.md b/ChangeLog.md
diff --git a/GameData/ThrottleControlledAvionics/ThrottleControlledAvionics.version b/GameData/ThrottleControlledAvionics/ThrottleControlledAvionics.version
@@ -8,18 +8,18 @@
          "MAJOR":3,
          "MINOR":8,
          "PATCH":0,
-         "BUILD":0
+         "BUILD":1
      },
     "KSP_VERSION_MIN":
      {
          "MAJOR":1,
-         "MINOR":11,
-         "PATCH":1
+         "MINOR":12,
+         "PATCH":3
      },
     "KSP_VERSION_MAX":
      {
          "MAJOR":1,
-         "MINOR":11,
-         "PATCH":1
+         "MINOR":12,
+         "PATCH":3
      }
 }
diff --git a/TCA.UI/TCA.UI.csproj b/TCA.UI/TCA.UI.csproj
@@ -7,9 +7,10 @@
         <OutputType>Library</OutputType>
         <RootNamespace>TCA.UI</RootNamespace>
         <AssemblyName>TCA.UI</AssemblyName>
-        <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+        <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
         <LangVersion>latest</LangVersion>
     </PropertyGroup>
+    <Import Project="$(MSBuildProjectDirectory)/../../CSharp.warnings.xml" />
     <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
         <DebugSymbols>true</DebugSymbols>
         <DebugType>full</DebugType>
@@ -49,19 +50,19 @@
     </ItemGroup>
     <ItemGroup>
         <Reference Include="System">
-            <HintPath>..\..\KSP-test\KSP_test_1.11.1\KSP_Data\Managed\System.dll</HintPath>
+            <HintPath>..\..\KSP-test\KSP_test_1.12.3\KSP_Data\Managed\System.dll</HintPath>
             <Private>False</Private>
         </Reference>
         <Reference Include="UnityEngine">
-            <HintPath>..\..\KSP-test\KSP_test_1.11.1\KSP_Data\Managed\UnityEngine.dll</HintPath>
+            <HintPath>..\..\KSP-test\KSP_test_1.12.3\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.11.1\KSP_Data\Managed\UnityEngine.CoreModule.dll</HintPath>
+            <HintPath>..\..\KSP-test\KSP_test_1.12.3\KSP_Data\Managed\UnityEngine.CoreModule.dll</HintPath>
             <Private>False</Private>
         </Reference>
         <Reference Include="UnityEngine.UI">
-            <HintPath>..\..\KSP-test\KSP_test_1.11.1\KSP_Data\Managed\UnityEngine.UI.dll</HintPath>
+            <HintPath>..\..\KSP-test\KSP_test_1.12.3\KSP_Data\Managed\UnityEngine.UI.dll</HintPath>
             <Private>False</Private>
         </Reference>
     </ItemGroup>

diff --git a/TechTree/ModuleNetworks.py b/TechTree/ModuleNetworks.py
@@ -32,7 +32,7 @@
 import networkx as nx
 from openpyxl import load_workbook
 
-from KSPUtils import ConfigNode
+from KSPUtils.config_node_utils import ConfigNode
 
 
 def all_successors(node: str, G: nx.DiGraph) -> Set[str]:

diff --git a/Tests/Engine.py b/Tests/Engine.py
@@ -1,5 +1,6 @@
 from common import lerp, dt, clamp01
-from KSPUtils import Part, SearchTerm
+from KSPUtils.config_node_utils import Part
+from KSPUtils.config_node_utils.search import SearchTerm
 
 class Engine(object):
     def __init__(self, maxThrust, acceleration=0, deceleration=0):

diff --git a/ThrottleControlledAvionics.csproj b/ThrottleControlledAvionics.csproj
@@ -7,8 +7,9 @@
         <OutputType>Library</OutputType>
         <RootNamespace>ThrottleControlledAvionics</RootNamespace>
         <AssemblyName>ThrottleControlledAvionics</AssemblyName>
-        <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+        <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     </PropertyGroup>
+    <Import Project="$(MSBuildProjectDirectory)/../CSharp.warnings.xml" />
     <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
         <DebugSymbols>True</DebugSymbols>
         <DebugType>full</DebugType>
@@ -38,63 +39,63 @@
     </PropertyGroup>
     <ItemGroup>
         <Reference Include="Assembly-CSharp">
-            <HintPath>..\KSP-test\KSP_test_1.11.1\KSP_Data\Managed\Assembly-CSharp.dll</HintPath>
+            <HintPath>..\KSP-test\KSP_test_1.12.3\KSP_Data\Managed\Assembly-CSharp.dll</HintPath>
             <Private>False</Private>
         </Reference>
         <Reference Include="UnityEngine">
-            <HintPath>..\KSP-test\KSP_test_1.11.1\KSP_Data\Managed\UnityEngine.dll</HintPath>
+            <HintPath>..\KSP-test\KSP_test_1.12.3\KSP_Data\Managed\UnityEngine.dll</HintPath>
             <Private>False</Private>
         </Reference>
         <Reference Include="System.Core">
-            <HintPath>..\KSP-test\KSP_test_1.11.1\KSP_Data\Managed\System.Core.dll</HintPath>
+            <HintPath>..\KSP-test\KSP_test_1.12.3\KSP_Data\Managed\System.Core.dll</HintPath>
             <Private>False</Private>
         </Reference>
         <Reference Include="Mono.Cecil">
-            <HintPath>..\KSP-test\KSP_test_1.11.1\KSP_Data\Managed\Mono.Cecil.dll</HintPath>
+            <HintPath>..\KSP-test\KSP_test_1.12.3\KSP_Data\Managed\Mono.Cecil.dll</HintPath>
             <Private>False</Private>
         </Reference>
         <Reference Include="Mono.Security">
-            <HintPath>..\KSP-test\KSP_test_1.11.1\KSP_Data\Managed\Mono.Security.dll</HintPath>
+            <HintPath>..\KSP-test\KSP_test_1.12.3\KSP_Data\Managed\Mono.Security.dll</HintPath>
             <Private>False</Private>
         </Reference>
         <Reference Include="System.Xml">
-            <HintPath>..\KSP-test\KSP_test_1.11.1\KSP_Data\Managed\System.Xml.dll</HintPath>
+            <HintPath>..\KSP-test\KSP_test_1.12.3\KSP_Data\Managed\System.Xml.dll</HintPath>
             <Private>False</Private>
         </Reference>
         <Reference Include="Assembly-CSharp-firstpass">
-            <HintPath>..\KSP-test\KSP_test_1.11.1\KSP_Data\Managed\Assembly-CSharp-firstpass.dll</HintPath>
+            <HintPath>..\KSP-test\KSP_test_1.12.3\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.11.1\KSP_Data\Managed\UnityEngine.AnimationModule.dll</HintPath>
+            <HintPath>..\KSP-test\KSP_test_1.12.3\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.11.1\KSP_Data\Managed\UnityEngine.CoreModule.dll</HintPath>
+            <HintPath>..\KSP-test\KSP_test_1.12.3\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.11.1\KSP_Data\Managed\UnityEngine.IMGUIModule.dll</HintPath>
+            <HintPath>..\KSP-test\KSP_test_1.12.3\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.11.1\KSP_Data\Managed\UnityEngine.InputLegacyModule.dll</HintPath>
+            <HintPath>..\KSP-test\KSP_test_1.12.3\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.11.1\KSP_Data\Managed\UnityEngine.PhysicsModule.dll</HintPath>
+            <HintPath>..\KSP-test\KSP_test_1.12.3\KSP_Data\Managed\UnityEngine.PhysicsModule.dll</HintPath>
             <Private>False</Private>
         </Reference>
         <Reference Include="UnityEngine.UI">
-            <HintPath>..\KSP-test\KSP_test_1.11.1\KSP_Data\Managed\UnityEngine.UI.dll</HintPath>
+            <HintPath>..\KSP-test\KSP_test_1.12.3\KSP_Data\Managed\UnityEngine.UI.dll</HintPath>
             <Private>False</Private>
         </Reference>
         <Reference Include="KSPAssets">
-            <HintPath>..\KSP-test\KSP_test_1.11.1\KSP_Data\Managed\KSPAssets.dll</HintPath>
+            <HintPath>..\KSP-test\KSP_test_1.12.3\KSP_Data\Managed\KSPAssets.dll</HintPath>
             <Private>False</Private>
         </Reference>
         <Reference Include="System">
-            <HintPath>..\KSP-test\KSP_test_1.11.1\KSP_Data\Managed\System.dll</HintPath>
+            <HintPath>..\KSP-test\KSP_test_1.12.3\KSP_Data\Managed\System.dll</HintPath>
             <Private>False</Private>
         </Reference>
     </ItemGroup>

diff --git a/make-nightbuild.sh b/make-nightbuild.sh
diff --git a/make-release.sh b/make-release.sh
diff --git a/modconfig.yaml b/modconfig.yaml
@@ -0,0 +1,25 @@
+dll_path: GameData/ThrottleControlledAvionics/Plugins/ThrottleControlledAvionics.dll
+archive_path: Releases
+github_url: allista/ThrottleControlledAvionics
+spacedock_mod_id: 198
+game_data_path: GameData
+additional_data_paths:
+    - '../AT_Utils/GameData'
+exclude_patterns:
+    - '*/TCA.conf'
+    - '*/TCA.macro'
+    - '*/@thumbs/*'
+    - '*/config.xml'
+    - '*.user'
+    - '*.orig'
+    - '*.mdb'
+    - '*.pdb'
+    - '*/System.*.dll'
+    - '*/Mono.*.dll'
+    - '*/Unity*.dll'
+    - '*/001_AnisotropicPartResizer*'
+    - '*/002_MultiAnimators.dll'
+    - '*/AnimatedConverters.dll'
+    - '*/ConfigurableContainers.dll'
+    - '*/SubmodelResizer.dll'
+    - 'GameData/000_AT_Utils/ResourceHack.cfg'