Merged development branch

allista · Feb 18, 2022 · f92f1cd · f92f1cd
2 parents fb7e189 + c363fde
commit f92f1cd
Show file tree

Hide file tree

Showing 31 changed files with 982 additions and 208 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -7,9 +7,6 @@
 [submodule "ConfigurableContainers"]
 	path = ConfigurableContainers
 	url = git@github.com:allista/ConfigurableContainers.git
-[submodule "AnimatedConverters"]
-	path = AnimatedConverters
-	url = git@github.com:allista/AnimatedConverters.git
 [submodule "UI/HSV-Color-Picker-Unity"]
 	path = Unity/UI/HSV-Color-Picker-Unity
 	url = git@github.com:allista/HSV-Color-Picker-Unity.git
diff --git a/AT_Utils.csproj b/AT_Utils.csproj
@@ -14,7 +14,7 @@
         <DebugType>full</DebugType>
         <Optimize>false</Optimize>
         <OutputPath>GameData\000_AT_Utils\Plugins</OutputPath>
-        <DefineConstants>DEBUG;ENABLE_PROFILER;</DefineConstants>
+        <DefineConstants>DEBUG;ENABLE_PROFILER;NIGHTBUILD</DefineConstants>
         <WarningLevel>4</WarningLevel>
         <ConsolePause>false</ConsolePause>
     </PropertyGroup>
@@ -33,79 +33,79 @@
     </PropertyGroup>
     <ItemGroup>
         <Reference Include="System">
-            <HintPath>..\KSP-test\KSP_test_1.10.0\KSP_Data\Managed\System.dll</HintPath>
+            <HintPath>..\KSP-test\KSP_test_1.11.1\KSP_Data\Managed\System.dll</HintPath>
             <Private>False</Private>
         </Reference>
         <Reference Include="Assembly-CSharp">
-            <HintPath>..\KSP-test\KSP_test_1.10.0\KSP_Data\Managed\Assembly-CSharp.dll</HintPath>
+            <HintPath>..\KSP-test\KSP_test_1.11.1\KSP_Data\Managed\Assembly-CSharp.dll</HintPath>
             <Private>False</Private>
         </Reference>
         <Reference Include="UnityEngine">
-            <HintPath>..\KSP-test\KSP_test_1.10.0\KSP_Data\Managed\UnityEngine.dll</HintPath>
+            <HintPath>..\KSP-test\KSP_test_1.11.1\KSP_Data\Managed\UnityEngine.dll</HintPath>
             <Private>False</Private>
         </Reference>
         <Reference Include="System.Core">
-            <HintPath>..\KSP-test\KSP_test_1.10.0\KSP_Data\Managed\System.Core.dll</HintPath>
+            <HintPath>..\KSP-test\KSP_test_1.11.1\KSP_Data\Managed\System.Core.dll</HintPath>
             <Private>False</Private>
         </Reference>
         <Reference Include="Assembly-CSharp-firstpass">
-            <HintPath>..\KSP-test\KSP_test_1.10.0\KSP_Data\Managed\Assembly-CSharp-firstpass.dll</HintPath>
+            <HintPath>..\KSP-test\KSP_test_1.11.1\KSP_Data\Managed\Assembly-CSharp-firstpass.dll</HintPath>
             <Private>False</Private>
         </Reference>
         <Reference Include="Mono.Cecil">
-            <HintPath>..\KSP-test\KSP_test_1.10.0\KSP_Data\Managed\Mono.Cecil.dll</HintPath>
+            <HintPath>..\KSP-test\KSP_test_1.11.1\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.10.0\KSP_Data\Managed\UnityEngine.AnimationModule.dll</HintPath>
+            <HintPath>..\KSP-test\KSP_test_1.11.1\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>
+          <HintPath>..\KSP-test\KSP_test_1.11.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.10.0\KSP_Data\Managed\UnityEngine.AudioModule.dll</HintPath>
+            <HintPath>..\KSP-test\KSP_test_1.11.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.10.0\KSP_Data\Managed\UnityEngine.CoreModule.dll</HintPath>
+            <HintPath>..\KSP-test\KSP_test_1.11.1\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.10.0\KSP_Data\Managed\UnityEngine.ImageConversionModule.dll</HintPath>
+            <HintPath>..\KSP-test\KSP_test_1.11.1\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.10.0\KSP_Data\Managed\UnityEngine.IMGUIModule.dll</HintPath>
+            <HintPath>..\KSP-test\KSP_test_1.11.1\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.10.0\KSP_Data\Managed\UnityEngine.InputLegacyModule.dll</HintPath>
+            <HintPath>..\KSP-test\KSP_test_1.11.1\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.10.0\KSP_Data\Managed\UnityEngine.PhysicsModule.dll</HintPath>
+            <HintPath>..\KSP-test\KSP_test_1.11.1\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.10.0\KSP_Data\Managed\UnityEngine.TextRenderingModule.dll</HintPath>
+            <HintPath>..\KSP-test\KSP_test_1.11.1\KSP_Data\Managed\UnityEngine.TextRenderingModule.dll</HintPath>
             <Private>False</Private>
         </Reference>
         <Reference Include="UnityEngine.UI">
-            <HintPath>..\KSP-test\KSP_test_1.10.0\KSP_Data\Managed\UnityEngine.UI.dll</HintPath>
+            <HintPath>..\KSP-test\KSP_test_1.11.1\KSP_Data\Managed\UnityEngine.UI.dll</HintPath>
             <Private>False</Private>
         </Reference>
         <Reference Include="KSPAssets">
-            <HintPath>..\KSP-test\KSP_test_1.10.0\KSP_Data\Managed\KSPAssets.dll</HintPath>
+            <HintPath>..\KSP-test\KSP_test_1.11.1\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.10.0\KSP_Data\Managed\UnityEngine.UI.dll</HintPath>
+            <HintPath>..\KSP-test\KSP_test_1.11.1\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.10.0\KSP_Data\Managed\UnityEngine.UIModule.dll</HintPath>
+            <HintPath>..\KSP-test\KSP_test_1.11.1\KSP_Data\Managed\UnityEngine.UIModule.dll</HintPath>
             <Private>False</Private>
         </Reference>
     </ItemGroup>
@@ -256,4 +256,4 @@
       <Content Include="LICENSE" />
       <Content Include="make-release.sh" />
     </ItemGroup>
-</Project>
+</Project>