Merge branch 'master' into patch-2

Author: linuxgurugamer

ChangeLog.txt

@@ -191,3 +191,7 @@ Changelog
 		Repaired appearance in Science category
 	Thanks to github user !7ranceaddic7 for this
 		Wiki Docs Initial Commit
+
+3.2.6.1
+	Added AssemblyFileVersion
+	Updated version file for 1.12

FilterExtension.version

@@ -10,11 +10,16 @@
     "MAJOR": 3,
     "MINOR": 2,
     "PATCH": 6,
-    "BUILD": 0
+    "BUILD": 1
+  },
+  "KSP_VERSION": {
+    "MAJOR": 1,
+    "MINOR": 12,
+    "PATCH": 2
   },
   "KSP_VERSION_MIN": {
     "MAJOR": 1,
-    "MINOR": 8,
+    "MINOR": 12,
     "PATCH": 0
   }
 }

FilterExtension/AssemblyVersion.cs

@@ -10,4 +10,5 @@
 
  using System.Reflection;
 
- [assembly: AssemblyVersion("3.2.4.0")]
+ [assembly: AssemblyVersion("3.2.6.0")]
+ [assembly: AssemblyFileVersion("3.2.6.0")]

FilterExtension/AssemblyVersion.tt

@@ -97,4 +97,5 @@
 
  using System.Reflection;
 
- [assembly: AssemblyVersion("<#= major #>.<#= minor #>.<#= patch #>.<#= build #>")]
+ [assembly: AssemblyVersion("<#= major #>.<#= minor #>.<#= patch #>.<#= build #>")]
+ [assembly: AssemblyFileVersion("<#= major #>.<#= minor #>.<#= patch #>.<#= build #>")]

FilterExtension/FilterExtensions.csproj

@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>FilterExtensions</RootNamespace>
     <AssemblyName>FilterExtensions</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -88,20 +88,32 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>
-start /D D:\Users\jbb\github\FilterExtension /WAIT deploy.bat  $(TargetDir) $(TargetFileName)
+    <PostBuildEvent>set KSPDIR=$(KSPDIR)
 
-if $(ConfigurationName) == Release (
+IF "%25KSPDIR%25"=="" (
 
-	start /D D:\Users\jbb\github\FilterExtension /WAIT buildRelease.bat $(TargetDir) $(TargetFileName)
+	ECHO Configuration error - KSPDIR not specified in project.
+
+	ECHO Either set KSPDIR environment variable or edit BetterLoadSaveGame.Common.props
+
+	PAUSE
+
+	GOTO DONE
+
+)
+
+start /D $(SolutionDir) /WAIT deploy.bat  $(TargetDir) $(TargetFileName) $(TargetName)
+
+if $(ConfigurationName) == Release (	
+
+	start /D $(SolutionDir) /WAIT buildRelease.bat $(TargetDir) $(TargetFileName) $(TargetName)
 
 )
 </PostBuildEvent>
   </PropertyGroup>
   <PropertyGroup>
-    <PreBuildEvent>set textTemplatingPath="%25ProgramFiles(x86)%25\Microsoft Visual Studio\2017\Community\Common7\IDE\texttransform.exe"
-
-%25textTemplatingPath%25 "$(ProjectDir)AssemblyVersion.tt</PreBuildEvent>
+    <PreBuildEvent>"$(DevEnvDir)\texttransform.exe" "$(ProjectDir)AssemblyVersion.tt"
+</PreBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

FilterExtension/Properties/AssemblyInfo.cs

@@ -33,4 +33,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 //[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+//[assembly: AssemblyFileVersion("1.0.0.0")]

GameData/000_FilterExtensions/Icons/Autoloaded_Icons_Mods/CRE.dds

@@ -19,9 +19,12 @@ CATEGORY
 		list = 9,LFO Size 4 [5 m]
 		list = 10,LFO Size 5+ [7.5 m+]
 		list = 11,Radial Tank
-		list = 12,Liquid Fuel Tank
-		list = 13,Oxidizer Tank
-		list = 14,Monopropellant Tank
+		list:NEEDS[!REFUSE] = 12,Liquid Fuel Tank
+		list:NEEDS[!REFUSE] = 13,Oxidizer Tank
+		list:NEEDS[!REFUSE] = 14,Monopropellant Tank
+		list:NEEDS[REFUSE] = 12,Kerosene Tank
+		list:NEEDS[REFUSE] = 13,Liquid Oxygen Tank
+		list:NEEDS[REFUSE] = 14,HTP Tank
 		list = 15,Xenon Gas Tank
 	}
 }

GameData/000_FilterExtensions/Icons/Autoloaded_Icons_Mods/CRE_selected.dds

@@ -9,7 +9,8 @@ CATEGORY
 	{
 		list = 0, Solar Panels
 		list = 1, Generators
-		list = 2, Power Storage
-		list = 3, Lights
+		list = 2, Radioisotope Generators
+		list = 3, Power Storage
+		list = 4, Lights
 	}
 }