Merge pull request #36 from ntwest/dev

Merge dev branch into master

Author: ntwest

GameData/GameData.projitems

@@ -18,11 +18,8 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="$(MSBuildThisFileDirectory)README.md" />
-    <None Include="$(MSBuildThisFileDirectory)TimeControl\MiniAVC.dll" />
+    <None Include="$(MSBuildThisFileDirectory)TimeControl\PluginData\GlobalSettings.cfg" />
     <None Include="$(MSBuildThisFileDirectory)TimeControl\README.md" />
     <None Include="$(MSBuildThisFileDirectory)TimeControl\TimeControl.version" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="$(MSBuildThisFileDirectory)TimeControl\PluginData\TimeControl\" />
-  </ItemGroup>
 </Project>

GameData/TimeControl/MiniAVC.dll

@@ -0,0 +1 @@
+

GameData/TimeControl/PluginData/GlobalSettings.cfg

@@ -5,23 +5,23 @@
   "CHANGE_LOG_URL": "https://github.com/ntwest/TimeControl/blob/master/CHANGELOG.md",
   "VERSION": {
     "MAJOR": 2,
-    "MINOR": 8,
-    "PATCH": 3,
+    "MINOR": 9,
+    "PATCH": 0,
     "BUILD": 0
   },
   "KSP_VERSION": {
     "MAJOR": 1,
-    "MINOR": 3,
+    "MINOR": 4,
     "PATCH": 1
   },
   "KSP_VERSION_MIN": {
     "MAJOR": 1,
-    "MINOR": 3,
+    "MINOR": 4,
     "PATCH": 1
   },
   "KSP_VERSION_MAX": {
     "MAJOR": 1,
-    "MINOR": 3,
+    "MINOR": 4,
     "PATCH": 1
   }
 }

GameData/TimeControl/TimeControl.dll

@@ -6,4 +6,4 @@
 
  using System.Reflection;
 
- [assembly: AssemblyVersion("2.8.3.0")]
+ [assembly: AssemblyVersion("2.9.0.0")]

GameData/TimeControl/TimeControl.version

@@ -102,20 +102,17 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="Assembly-CSharp, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\_Dependencies\KSPAssemblies_1.3.1\Assembly-CSharp.dll</HintPath>
+    <Reference Include="Assembly-CSharp">
+      <HintPath>..\..\_Dependencies\KSPAssemblies_1.4.1\Assembly-CSharp.dll</HintPath>
     </Reference>
     <Reference Include="System">
       <HintPath>R:\KSP_1.2.2_dev\KSP_x64_Data\Managed\System.dll</HintPath>
     </Reference>
-    <Reference Include="UnityEngine, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\_Dependencies\KSPAssemblies_1.3.1\UnityEngine.dll</HintPath>
+    <Reference Include="UnityEngine">
+      <HintPath>..\..\_Dependencies\KSPAssemblies_1.4.1\UnityEngine.dll</HintPath>
     </Reference>
-    <Reference Include="UnityEngine.UI, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\_Dependencies\KSPAssemblies_1.3.1\UnityEngine.UI.dll</HintPath>
+    <Reference Include="UnityEngine.UI">
+      <HintPath>..\..\_Dependencies\KSPAssemblies_1.4.1\UnityEngine.UI.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -145,14 +142,22 @@
     </T4ParameterValues>
   </ItemGroup>
   <PropertyGroup>
-    <PostBuildEvent>SET KSPTest=D:\KSP\KSP_win64-1.3.1-TEST
+    <PostBuildEvent>SET KSPTest=D:\KSP\KSP_win64-1.4.1-TEST
+SET KSPMHTest=D:\KSP\KSP_win64-1.4.1-MH-TEST
+
 SET GameDataTarget=%25KSPTest%25\GameData\TimeControl
 IF EXIST %25GameDataTarget%25 (
    RMDIR /S /Q "%25GameDataTarget%25"
 )
 
+SET GameDataMHTarget=%25KSPMHTest%25\GameData\TimeControl
+IF EXIST %25GameDataMHTarget%25 (
+   RMDIR /S /Q "%25GameDataMHTarget%25"
+)
+
 copy  "$(TargetPath)" "$(SolutionDir)\GameData\TimeControl"
 robocopy /E $(SolutionDir)\GameData\TimeControl "%25GameDataTarget%25"
+robocopy /E $(SolutionDir)\GameData\TimeControl "%25GameDataMHTarget%25"
 
 exit 0</PostBuildEvent>
   </PropertyGroup>