Merge branch 'develop'

Majiir · Oct 7, 2014 · 1688b8a · 1688b8a
2 parents 4b0a6ca + b9440cb
commit 1688b8a
Show file tree

Hide file tree

Showing 11 changed files with 395 additions and 1,205 deletions.
diff --git a/.gitignore b/.gitignore
@@ -107,6 +107,9 @@ _UpgradeReport_Files/
 Backup*/
 UpgradeLog*.XML
 
+# Windows
+Thumbs.db
+
 # Kethane Utilities Ignores
 /ModFolder/
 /KethaneRelease/

diff --git a/Plugin/Kethane/Kethane.csproj b/Plugin/Kethane/Kethane.csproj
@@ -35,6 +35,9 @@
     <Reference Include="Assembly-CSharp, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
     </Reference>
+    <Reference Include="Assembly-CSharp-firstpass, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
     <Reference Include="GeodesicGrid" />
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -48,6 +51,8 @@
     <Compile Include="Generators\CellularResourceGenerator.cs" />
     <Compile Include="PartModules\PartExtensions.cs" />
     <Compile Include="ResourceData.cs" />
+    <Compile Include="UserInterface\MainMenuOverlay.cs" />
+    <Compile Include="UserInterface\OverlayRenderer.cs" />
     <Compile Include="Utilities\CompatibilityChecker.cs" />
     <Compile Include="Utilities\InstallCleanup.cs" />
     <Compile Include="Generators\LegacyResourceGenerator.cs" />
@@ -79,8 +84,6 @@
     <Compile Include="SettingsManager.cs" />
     <Compile Include="UserInterface\TerrainData.cs" />
     <Compile Include="PartModules\TimedMovingAverage.cs" />
-    <Compile Include="UserInterface\WindowToggle.cs" />
-    <Compile Include="Toolbar\ToolbarWrapper.cs" />
     <Compile Include="Utilities\LicenseSentinel.cs" />
     <Compile Include="Utilities\TutorialInstaller.cs" />
   </ItemGroup>

diff --git a/Plugin/Kethane/Properties/AssemblyInfo.cs b/Plugin/Kethane/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyInformationalVersion("0.9")]
+[assembly: AssemblyInformationalVersion("0.9.1")]