From e4a6ee03d8cab824b54a17aa3dc5143cfee31081 Mon Sep 17 00:00:00 2001
From: Idhrendur <idhrendur@hotmail.com>
Date: Sun, 24 Apr 2016 10:00:41 -0700
Subject: [PATCH 1/4] Update version number

---
 EU4toV2/Source/EU4toV2Converter.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/EU4toV2/Source/EU4toV2Converter.cpp b/EU4toV2/Source/EU4toV2Converter.cpp
index b6874490a..d924c62f0 100644
--- a/EU4toV2/Source/EU4toV2Converter.cpp
+++ b/EU4toV2/Source/EU4toV2Converter.cpp
@@ -965,7 +965,7 @@ int main(const int argc, const char * argv[])
 {
 	try
 	{
-		LOG(LogLevel::Info) << "Converter version 1.0";
+		LOG(LogLevel::Info) << "Converter version 1.0A";
 		const char* const defaultEU4SaveFileName = "input.eu4";	// the default name for a save to convert
 		string EU4SaveFileName;												// the actual name for the save to convert
 		if (argc >= 2)

From 57d2ddf98992977c71cd2ae888a74340c94c1ee5 Mon Sep 17 00:00:00 2001
From: Idhrendur <idhrendur@hotmail.com>
Date: Sun, 24 Apr 2016 10:30:02 -0700
Subject: [PATCH 2/4] Update build scripts.

---
 EU4toV2/{EU4ToV2-VS2013.sln => EU4ToV2.sln}   |  50 +-
 ...EU4ToV2-VS2013.vcxproj => EU4ToV2.vcxproj} | 482 +++++++++---------
 ...cxproj.filters => EU4ToV2.vcxproj.filters} | 444 ++++++++--------
 EU4toV2/build-VS2013.bat                      |  17 -
 EU4toV2/build.bat                             |  18 +
 ...and_test-VS2013.bat => build_and_test.bat} |   2 +-
 build_EU4ToVic2_release.bat                   |  19 +-
 7 files changed, 517 insertions(+), 515 deletions(-)
 rename EU4toV2/{EU4ToV2-VS2013.sln => EU4ToV2.sln} (87%)
 rename EU4toV2/{EU4ToV2-VS2013.vcxproj => EU4ToV2.vcxproj} (98%)
 rename EU4toV2/{EU4ToV2-VS2013.vcxproj.filters => EU4ToV2.vcxproj.filters} (97%)
 delete mode 100644 EU4toV2/build-VS2013.bat
 create mode 100644 EU4toV2/build.bat
 rename EU4toV2/{build_and_test-VS2013.bat => build_and_test.bat} (50%)

diff --git a/EU4toV2/EU4ToV2-VS2013.sln b/EU4toV2/EU4ToV2.sln
similarity index 87%
rename from EU4toV2/EU4ToV2-VS2013.sln
rename to EU4toV2/EU4ToV2.sln
index 33ff077a6..d37e8ad88 100644
--- a/EU4toV2/EU4ToV2-VS2013.sln
+++ b/EU4toV2/EU4ToV2.sln
@@ -1,25 +1,25 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Express 2013 for Windows Desktop
-VisualStudioVersion = 12.0.30723.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EU4ToV2-VS2013", "EU4ToV2-VS2013.vcxproj", "{84ABCE0D-17FE-44A5-8684-5A8AA04E80B9}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-		Release-NoCopies|Win32 = Release-NoCopies|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{84ABCE0D-17FE-44A5-8684-5A8AA04E80B9}.Debug|Win32.ActiveCfg = Debug|Win32
-		{84ABCE0D-17FE-44A5-8684-5A8AA04E80B9}.Debug|Win32.Build.0 = Debug|Win32
-		{84ABCE0D-17FE-44A5-8684-5A8AA04E80B9}.Release|Win32.ActiveCfg = Release|Win32
-		{84ABCE0D-17FE-44A5-8684-5A8AA04E80B9}.Release|Win32.Build.0 = Release|Win32
-		{84ABCE0D-17FE-44A5-8684-5A8AA04E80B9}.Release-NoCopies|Win32.ActiveCfg = Release-NoCopies|Win32
-		{84ABCE0D-17FE-44A5-8684-5A8AA04E80B9}.Release-NoCopies|Win32.Build.0 = Release-NoCopies|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Express 2013 for Windows Desktop
+VisualStudioVersion = 12.0.30723.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EU4ToV2", "EU4ToV2.vcxproj", "{84ABCE0D-17FE-44A5-8684-5A8AA04E80B9}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+		Release-NoCopies|Win32 = Release-NoCopies|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{84ABCE0D-17FE-44A5-8684-5A8AA04E80B9}.Debug|Win32.ActiveCfg = Debug|Win32
+		{84ABCE0D-17FE-44A5-8684-5A8AA04E80B9}.Debug|Win32.Build.0 = Debug|Win32
+		{84ABCE0D-17FE-44A5-8684-5A8AA04E80B9}.Release|Win32.ActiveCfg = Release|Win32
+		{84ABCE0D-17FE-44A5-8684-5A8AA04E80B9}.Release|Win32.Build.0 = Release|Win32
+		{84ABCE0D-17FE-44A5-8684-5A8AA04E80B9}.Release-NoCopies|Win32.ActiveCfg = Release-NoCopies|Win32
+		{84ABCE0D-17FE-44A5-8684-5A8AA04E80B9}.Release-NoCopies|Win32.Build.0 = Release-NoCopies|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/EU4toV2/EU4ToV2-VS2013.vcxproj b/EU4toV2/EU4ToV2.vcxproj
similarity index 98%
rename from EU4toV2/EU4ToV2-VS2013.vcxproj
rename to EU4toV2/EU4ToV2.vcxproj
index 6187aefef..a23429fc7 100644
--- a/EU4toV2/EU4ToV2-VS2013.vcxproj
+++ b/EU4toV2/EU4ToV2.vcxproj
@@ -1,242 +1,242 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release-NoCopies|Win32">
-      <Configuration>Release-NoCopies</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{84ABCE0D-17FE-44A5-8684-5A8AA04E80B9}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>EU4ToV2</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>NotSet</CharacterSet>
-    <PlatformToolset>v140_xp</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140_xp</PlatformToolset>
-    <CharacterSet>NotSet</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-NoCopies|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140_xp</PlatformToolset>
-    <CharacterSet>NotSet</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-NoCopies|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <IntDir>$(SolutionDir)\DebugIntermediate\</IntDir>
-    <IncludePath>$(UniversalCRT_IncludePath);$(BOOST_INCLUDE);$(VCInstallDir)include;$(WindowsSdkDir)include;../common_items</IncludePath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <IntDir>$(SolutionDir)\ReleaseIntermediate\</IntDir>
-    <BOOST_INCLUDE Condition=" '$(BOOST_INCLUDE)' == '' ">
-		H:\Projects\Development\Boost\boost_1_57_0
-	</BOOST_INCLUDE>
-    <IncludePath>$(UniversalCRT_IncludePath);$(BOOST_INCLUDE);$(VCInstallDir)include;$(WindowsSdkDir)include;../common_items</IncludePath>
-    <TargetName>EU4toV2Converter</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-NoCopies|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <IntDir>$(SolutionDir)\ReleaseIntermediate\</IntDir>
-    <BOOST_INCLUDE Condition=" '$(BOOST_INCLUDE)' == '' ">
-		H:\Projects\Development\Boost\boost_1_57_0
-	</BOOST_INCLUDE>
-    <IncludePath>$(UniversalCRT_IncludePath);$(BOOST_INCLUDE);$(VCInstallDir)include;$(WindowsSdkDir)include;../common_items</IncludePath>
-    <TargetName>EU4toV2Converter</TargetName>
-    <PostBuildEventUseInBuild>false</PostBuildEventUseInBuild>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>D:\Libraries\boost_1_55_0_lib;$(BOOST_INCLUDE);$(WindowsSDK_IncludePath)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>D:\Libraries\boost_1_55_0_lib\lib32-msvc-12.0;$(BOOST_LIB);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-    <PostBuildEvent>
-      <Command>Copy_Debug_Files.bat</Command>
-    </PostBuildEvent>
-    <PostBuildEvent>
-      <Message>Copying Data Files</Message>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>D:\Libraries\boost_1_55_0_lib;$(BOOST_INCLUDE);$(WindowsSDK_IncludePath)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>D:\Libraries\boost_1_55_0_lib\lib32-msvc-12.0;$(BOOST_LIB);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-    <PostBuildEvent>
-      <Command>Copy_Files.bat</Command>
-    </PostBuildEvent>
-    <PostBuildEvent>
-      <Message>Copying Data Files</Message>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-NoCopies|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(BOOST_INCLUDE);$(WindowsSDK_IncludePath)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(BOOST_LIB);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-    <PostBuildEvent>
-      <Message>
-      </Message>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\common_items\Date.cpp" />
-    <ClCompile Include="..\common_items\Log.cpp" />
-    <ClCompile Include="..\common_items\Object.cpp" />
-    <ClCompile Include="..\common_items\ParadoxParser.cpp" />
-    <ClCompile Include="Source\Color.cpp" />
-    <ClCompile Include="Source\Configuration.cpp" />
-    <ClCompile Include="Source\CountryMapping.cpp" />
-    <ClCompile Include="Source\EU4toV2Converter.cpp" />
-    <ClCompile Include="Source\EU4World\EU4Army.cpp" />
-    <ClCompile Include="Source\EU4World\EU4Country.cpp" />
-    <ClCompile Include="Source\EU4World\EU4Diplomacy.cpp" />
-    <ClCompile Include="Source\EU4World\EU4Leader.cpp" />
-    <ClCompile Include="Source\EU4World\EU4Localisation.cpp" />
-    <ClCompile Include="Source\EU4World\EU4Province.cpp" />
-    <ClCompile Include="Source\EU4World\EU4Relations.cpp" />
-    <ClCompile Include="Source\EU4World\EU4Religion.cpp" />
-    <ClCompile Include="Source\EU4World\EU4Version.cpp" />
-    <ClCompile Include="Source\EU4World\EU4World.cpp" />
-    <ClCompile Include="Source\FlagUtils.cpp" />
-    <ClCompile Include="Source\Mapper.cpp" />
-    <ClCompile Include="Source\targa.cpp" />
-    <ClCompile Include="Source\tempFuncs.cpp" />
-    <ClCompile Include="Source\V2World\V2Army.cpp" />
-    <ClCompile Include="Source\V2World\V2Country.cpp" />
-    <ClCompile Include="Source\V2World\V2Creditor.cpp" />
-    <ClCompile Include="Source\V2World\V2Diplomacy.cpp" />
-    <ClCompile Include="Source\V2World\V2Factory.cpp" />
-    <ClCompile Include="Source\V2World\V2Flags.cpp" />
-    <ClCompile Include="Source\V2World\V2Leader.cpp" />
-    <ClCompile Include="Source\V2World\V2LeaderTraits.cpp" />
-    <ClCompile Include="Source\V2World\V2Localisation.cpp" />
-    <ClCompile Include="Source\V2World\V2Party.cpp" />
-    <ClCompile Include="Source\V2World\V2Pop.cpp" />
-    <ClCompile Include="Source\V2World\V2Province.cpp" />
-    <ClCompile Include="Source\V2World\V2Reforms.cpp" />
-    <ClCompile Include="Source\V2World\V2Relations.cpp" />
-    <ClCompile Include="Source\V2World\V2State.cpp" />
-    <ClCompile Include="Source\V2World\V2TechSchools.cpp" />
-    <ClCompile Include="Source\V2World\V2World.cpp" />
-    <ClCompile Include="Source\WinUtils.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\common_items\Date.h" />
-    <ClInclude Include="..\common_items\Log.h" />
-    <ClInclude Include="..\common_items\Object.h" />
-    <ClInclude Include="..\common_items\ParadoxParser.h" />
-    <ClInclude Include="Source\Color.h" />
-    <ClInclude Include="Source\Configuration.h" />
-    <ClInclude Include="Source\CountryMapping.h" />
-    <ClInclude Include="Source\EU4World\EU4Army.h" />
-    <ClInclude Include="Source\EU4World\EU4Country.h" />
-    <ClInclude Include="Source\EU4World\EU4Diplomacy.h" />
-    <ClInclude Include="Source\EU4World\EU4Leader.h" />
-    <ClInclude Include="Source\EU4World\EU4Localisation.h" />
-    <ClInclude Include="Source\EU4World\EU4Province.h" />
-    <ClInclude Include="Source\EU4World\EU4Relations.h" />
-    <ClInclude Include="Source\EU4World\EU4Religion.h" />
-    <ClInclude Include="Source\EU4World\EU4Version.h" />
-    <ClInclude Include="Source\EU4World\EU4World.h" />
-    <ClInclude Include="Source\FlagUtils.h" />
-    <ClInclude Include="Source\Mapper.h" />
-    <ClInclude Include="Source\targa.h" />
-    <ClInclude Include="Source\V2World\V2Army.h" />
-    <ClInclude Include="Source\V2World\V2Country.h" />
-    <ClInclude Include="Source\V2World\V2Creditor.h" />
-    <ClInclude Include="Source\V2World\V2Diplomacy.h" />
-    <ClInclude Include="Source\V2World\V2Factory.h" />
-    <ClInclude Include="Source\V2World\V2Flags.h" />
-    <ClInclude Include="Source\V2World\V2Inventions.h" />
-    <ClInclude Include="Source\V2World\V2Leader.h" />
-    <ClInclude Include="Source\V2World\V2LeaderTraits.h" />
-    <ClInclude Include="Source\V2World\V2Localisation.h" />
-    <ClInclude Include="Source\V2World\V2Party.h" />
-    <ClInclude Include="Source\V2World\V2Pop.h" />
-    <ClInclude Include="Source\V2World\V2Province.h" />
-    <ClInclude Include="Source\V2World\V2Reforms.h" />
-    <ClInclude Include="Source\V2World\V2Relations.h" />
-    <ClInclude Include="Source\V2World\V2State.h" />
-    <ClInclude Include="Source\V2World\V2TechSchools.h" />
-    <ClInclude Include="Source\V2World\V2World.h" />
-    <ClInclude Include="Source\WinUtils.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-NoCopies|Win32">
+      <Configuration>Release-NoCopies</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{84ABCE0D-17FE-44A5-8684-5A8AA04E80B9}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>EU4ToV2</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>NotSet</CharacterSet>
+    <PlatformToolset>v140_xp</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v140_xp</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-NoCopies|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v140_xp</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-NoCopies|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+    <IntDir>$(SolutionDir)\DebugIntermediate\</IntDir>
+    <IncludePath>$(UniversalCRT_IncludePath);$(BOOST_INCLUDE);$(VCInstallDir)include;$(WindowsSdkDir)include;../common_items</IncludePath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <IntDir>$(SolutionDir)\ReleaseIntermediate\</IntDir>
+    <BOOST_INCLUDE Condition=" '$(BOOST_INCLUDE)' == '' ">
+		H:\Projects\Development\Boost\boost_1_57_0
+	</BOOST_INCLUDE>
+    <IncludePath>$(UniversalCRT_IncludePath);$(BOOST_INCLUDE);$(VCInstallDir)include;$(WindowsSdkDir)include;../common_items</IncludePath>
+    <TargetName>EU4toV2Converter</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-NoCopies|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <IntDir>$(SolutionDir)\ReleaseIntermediate\</IntDir>
+    <BOOST_INCLUDE Condition=" '$(BOOST_INCLUDE)' == '' ">
+		H:\Projects\Development\Boost\boost_1_57_0
+	</BOOST_INCLUDE>
+    <IncludePath>$(UniversalCRT_IncludePath);$(BOOST_INCLUDE);$(VCInstallDir)include;$(WindowsSdkDir)include;../common_items</IncludePath>
+    <TargetName>EU4toV2Converter</TargetName>
+    <PostBuildEventUseInBuild>false</PostBuildEventUseInBuild>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>D:\Libraries\boost_1_55_0_lib;$(BOOST_INCLUDE);$(WindowsSDK_IncludePath)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>D:\Libraries\boost_1_55_0_lib\lib32-msvc-12.0;$(BOOST_LIB);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+    <PostBuildEvent>
+      <Command>Copy_Debug_Files.bat</Command>
+    </PostBuildEvent>
+    <PostBuildEvent>
+      <Message>Copying Data Files</Message>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>D:\Libraries\boost_1_55_0_lib;$(BOOST_INCLUDE);$(WindowsSDK_IncludePath)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>D:\Libraries\boost_1_55_0_lib\lib32-msvc-12.0;$(BOOST_LIB);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+    <PostBuildEvent>
+      <Command>Copy_Files.bat</Command>
+    </PostBuildEvent>
+    <PostBuildEvent>
+      <Message>Copying Data Files</Message>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-NoCopies|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(BOOST_INCLUDE);$(WindowsSDK_IncludePath)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(BOOST_LIB);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+    <PostBuildEvent>
+      <Command>
+      </Command>
+    </PostBuildEvent>
+    <PostBuildEvent>
+      <Message>
+      </Message>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\common_items\Date.cpp" />
+    <ClCompile Include="..\common_items\Log.cpp" />
+    <ClCompile Include="..\common_items\Object.cpp" />
+    <ClCompile Include="..\common_items\ParadoxParser.cpp" />
+    <ClCompile Include="Source\Color.cpp" />
+    <ClCompile Include="Source\Configuration.cpp" />
+    <ClCompile Include="Source\CountryMapping.cpp" />
+    <ClCompile Include="Source\EU4toV2Converter.cpp" />
+    <ClCompile Include="Source\EU4World\EU4Army.cpp" />
+    <ClCompile Include="Source\EU4World\EU4Country.cpp" />
+    <ClCompile Include="Source\EU4World\EU4Diplomacy.cpp" />
+    <ClCompile Include="Source\EU4World\EU4Leader.cpp" />
+    <ClCompile Include="Source\EU4World\EU4Localisation.cpp" />
+    <ClCompile Include="Source\EU4World\EU4Province.cpp" />
+    <ClCompile Include="Source\EU4World\EU4Relations.cpp" />
+    <ClCompile Include="Source\EU4World\EU4Religion.cpp" />
+    <ClCompile Include="Source\EU4World\EU4Version.cpp" />
+    <ClCompile Include="Source\EU4World\EU4World.cpp" />
+    <ClCompile Include="Source\FlagUtils.cpp" />
+    <ClCompile Include="Source\Mapper.cpp" />
+    <ClCompile Include="Source\targa.cpp" />
+    <ClCompile Include="Source\tempFuncs.cpp" />
+    <ClCompile Include="Source\V2World\V2Army.cpp" />
+    <ClCompile Include="Source\V2World\V2Country.cpp" />
+    <ClCompile Include="Source\V2World\V2Creditor.cpp" />
+    <ClCompile Include="Source\V2World\V2Diplomacy.cpp" />
+    <ClCompile Include="Source\V2World\V2Factory.cpp" />
+    <ClCompile Include="Source\V2World\V2Flags.cpp" />
+    <ClCompile Include="Source\V2World\V2Leader.cpp" />
+    <ClCompile Include="Source\V2World\V2LeaderTraits.cpp" />
+    <ClCompile Include="Source\V2World\V2Localisation.cpp" />
+    <ClCompile Include="Source\V2World\V2Party.cpp" />
+    <ClCompile Include="Source\V2World\V2Pop.cpp" />
+    <ClCompile Include="Source\V2World\V2Province.cpp" />
+    <ClCompile Include="Source\V2World\V2Reforms.cpp" />
+    <ClCompile Include="Source\V2World\V2Relations.cpp" />
+    <ClCompile Include="Source\V2World\V2State.cpp" />
+    <ClCompile Include="Source\V2World\V2TechSchools.cpp" />
+    <ClCompile Include="Source\V2World\V2World.cpp" />
+    <ClCompile Include="Source\WinUtils.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\common_items\Date.h" />
+    <ClInclude Include="..\common_items\Log.h" />
+    <ClInclude Include="..\common_items\Object.h" />
+    <ClInclude Include="..\common_items\ParadoxParser.h" />
+    <ClInclude Include="Source\Color.h" />
+    <ClInclude Include="Source\Configuration.h" />
+    <ClInclude Include="Source\CountryMapping.h" />
+    <ClInclude Include="Source\EU4World\EU4Army.h" />
+    <ClInclude Include="Source\EU4World\EU4Country.h" />
+    <ClInclude Include="Source\EU4World\EU4Diplomacy.h" />
+    <ClInclude Include="Source\EU4World\EU4Leader.h" />
+    <ClInclude Include="Source\EU4World\EU4Localisation.h" />
+    <ClInclude Include="Source\EU4World\EU4Province.h" />
+    <ClInclude Include="Source\EU4World\EU4Relations.h" />
+    <ClInclude Include="Source\EU4World\EU4Religion.h" />
+    <ClInclude Include="Source\EU4World\EU4Version.h" />
+    <ClInclude Include="Source\EU4World\EU4World.h" />
+    <ClInclude Include="Source\FlagUtils.h" />
+    <ClInclude Include="Source\Mapper.h" />
+    <ClInclude Include="Source\targa.h" />
+    <ClInclude Include="Source\V2World\V2Army.h" />
+    <ClInclude Include="Source\V2World\V2Country.h" />
+    <ClInclude Include="Source\V2World\V2Creditor.h" />
+    <ClInclude Include="Source\V2World\V2Diplomacy.h" />
+    <ClInclude Include="Source\V2World\V2Factory.h" />
+    <ClInclude Include="Source\V2World\V2Flags.h" />
+    <ClInclude Include="Source\V2World\V2Inventions.h" />
+    <ClInclude Include="Source\V2World\V2Leader.h" />
+    <ClInclude Include="Source\V2World\V2LeaderTraits.h" />
+    <ClInclude Include="Source\V2World\V2Localisation.h" />
+    <ClInclude Include="Source\V2World\V2Party.h" />
+    <ClInclude Include="Source\V2World\V2Pop.h" />
+    <ClInclude Include="Source\V2World\V2Province.h" />
+    <ClInclude Include="Source\V2World\V2Reforms.h" />
+    <ClInclude Include="Source\V2World\V2Relations.h" />
+    <ClInclude Include="Source\V2World\V2State.h" />
+    <ClInclude Include="Source\V2World\V2TechSchools.h" />
+    <ClInclude Include="Source\V2World\V2World.h" />
+    <ClInclude Include="Source\WinUtils.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/EU4toV2/EU4ToV2-VS2013.vcxproj.filters b/EU4toV2/EU4ToV2.vcxproj.filters
similarity index 97%
rename from EU4toV2/EU4ToV2-VS2013.vcxproj.filters
rename to EU4toV2/EU4ToV2.vcxproj.filters
index 1788462b5..e43331b28 100644
--- a/EU4toV2/EU4ToV2-VS2013.vcxproj.filters
+++ b/EU4toV2/EU4ToV2.vcxproj.filters
@@ -1,223 +1,223 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClCompile Include="Source\Color.cpp" />
-    <ClCompile Include="Source\Configuration.cpp" />
-    <ClCompile Include="Source\CountryMapping.cpp" />
-    <ClCompile Include="Source\FlagUtils.cpp" />
-    <ClCompile Include="Source\Mapper.cpp" />
-    <ClCompile Include="Source\targa.cpp" />
-    <ClCompile Include="Source\tempFuncs.cpp" />
-    <ClCompile Include="Source\WinUtils.cpp" />
-    <ClCompile Include="Source\EU4World\EU4Army.cpp">
-      <Filter>EU4 World</Filter>
-    </ClCompile>
-    <ClCompile Include="Source\EU4World\EU4Country.cpp">
-      <Filter>EU4 World</Filter>
-    </ClCompile>
-    <ClCompile Include="Source\EU4World\EU4Diplomacy.cpp">
-      <Filter>EU4 World</Filter>
-    </ClCompile>
-    <ClCompile Include="Source\EU4World\EU4Leader.cpp">
-      <Filter>EU4 World</Filter>
-    </ClCompile>
-    <ClCompile Include="Source\EU4World\EU4Localisation.cpp">
-      <Filter>EU4 World</Filter>
-    </ClCompile>
-    <ClCompile Include="Source\EU4World\EU4Province.cpp">
-      <Filter>EU4 World</Filter>
-    </ClCompile>
-    <ClCompile Include="Source\EU4World\EU4Relations.cpp">
-      <Filter>EU4 World</Filter>
-    </ClCompile>
-    <ClCompile Include="Source\EU4World\EU4Religion.cpp">
-      <Filter>EU4 World</Filter>
-    </ClCompile>
-    <ClCompile Include="Source\EU4World\EU4Version.cpp">
-      <Filter>EU4 World</Filter>
-    </ClCompile>
-    <ClCompile Include="Source\EU4World\EU4World.cpp">
-      <Filter>EU4 World</Filter>
-    </ClCompile>
-    <ClCompile Include="Source\V2World\V2Army.cpp">
-      <Filter>Vic2 World</Filter>
-    </ClCompile>
-    <ClCompile Include="Source\V2World\V2Country.cpp">
-      <Filter>Vic2 World</Filter>
-    </ClCompile>
-    <ClCompile Include="Source\V2World\V2Creditor.cpp">
-      <Filter>Vic2 World</Filter>
-    </ClCompile>
-    <ClCompile Include="Source\V2World\V2Diplomacy.cpp">
-      <Filter>Vic2 World</Filter>
-    </ClCompile>
-    <ClCompile Include="Source\V2World\V2Factory.cpp">
-      <Filter>Vic2 World</Filter>
-    </ClCompile>
-    <ClCompile Include="Source\V2World\V2Flags.cpp">
-      <Filter>Vic2 World</Filter>
-    </ClCompile>
-    <ClCompile Include="Source\V2World\V2Leader.cpp">
-      <Filter>Vic2 World</Filter>
-    </ClCompile>
-    <ClCompile Include="Source\V2World\V2LeaderTraits.cpp">
-      <Filter>Vic2 World</Filter>
-    </ClCompile>
-    <ClCompile Include="Source\V2World\V2Localisation.cpp">
-      <Filter>Vic2 World</Filter>
-    </ClCompile>
-    <ClCompile Include="Source\V2World\V2Party.cpp">
-      <Filter>Vic2 World</Filter>
-    </ClCompile>
-    <ClCompile Include="Source\V2World\V2World.cpp">
-      <Filter>Vic2 World</Filter>
-    </ClCompile>
-    <ClCompile Include="Source\V2World\V2TechSchools.cpp">
-      <Filter>Vic2 World</Filter>
-    </ClCompile>
-    <ClCompile Include="Source\V2World\V2Pop.cpp">
-      <Filter>Vic2 World</Filter>
-    </ClCompile>
-    <ClCompile Include="Source\V2World\V2Province.cpp">
-      <Filter>Vic2 World</Filter>
-    </ClCompile>
-    <ClCompile Include="Source\V2World\V2Reforms.cpp">
-      <Filter>Vic2 World</Filter>
-    </ClCompile>
-    <ClCompile Include="Source\V2World\V2Relations.cpp">
-      <Filter>Vic2 World</Filter>
-    </ClCompile>
-    <ClCompile Include="Source\V2World\V2State.cpp">
-      <Filter>Vic2 World</Filter>
-    </ClCompile>
-    <ClCompile Include="Source\EU4toV2Converter.cpp" />
-    <ClCompile Include="..\common_items\Date.cpp">
-      <Filter>CommonItems</Filter>
-    </ClCompile>
-    <ClCompile Include="..\common_items\Log.cpp">
-      <Filter>CommonItems</Filter>
-    </ClCompile>
-    <ClCompile Include="..\common_items\Object.cpp">
-      <Filter>CommonItems</Filter>
-    </ClCompile>
-    <ClCompile Include="..\common_items\ParadoxParser.cpp">
-      <Filter>CommonItems</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="Source\Color.h" />
-    <ClInclude Include="Source\Configuration.h" />
-    <ClInclude Include="Source\CountryMapping.h" />
-    <ClInclude Include="Source\FlagUtils.h" />
-    <ClInclude Include="Source\Mapper.h" />
-    <ClInclude Include="Source\targa.h" />
-    <ClInclude Include="Source\WinUtils.h" />
-    <ClInclude Include="Source\EU4World\EU4Army.h">
-      <Filter>EU4 World</Filter>
-    </ClInclude>
-    <ClInclude Include="Source\EU4World\EU4Country.h">
-      <Filter>EU4 World</Filter>
-    </ClInclude>
-    <ClInclude Include="Source\EU4World\EU4Diplomacy.h">
-      <Filter>EU4 World</Filter>
-    </ClInclude>
-    <ClInclude Include="Source\EU4World\EU4Leader.h">
-      <Filter>EU4 World</Filter>
-    </ClInclude>
-    <ClInclude Include="Source\EU4World\EU4Localisation.h">
-      <Filter>EU4 World</Filter>
-    </ClInclude>
-    <ClInclude Include="Source\EU4World\EU4Province.h">
-      <Filter>EU4 World</Filter>
-    </ClInclude>
-    <ClInclude Include="Source\EU4World\EU4Relations.h">
-      <Filter>EU4 World</Filter>
-    </ClInclude>
-    <ClInclude Include="Source\EU4World\EU4Religion.h">
-      <Filter>EU4 World</Filter>
-    </ClInclude>
-    <ClInclude Include="Source\EU4World\EU4Version.h">
-      <Filter>EU4 World</Filter>
-    </ClInclude>
-    <ClInclude Include="Source\EU4World\EU4World.h">
-      <Filter>EU4 World</Filter>
-    </ClInclude>
-    <ClInclude Include="Source\V2World\V2Army.h">
-      <Filter>Vic2 World</Filter>
-    </ClInclude>
-    <ClInclude Include="Source\V2World\V2Country.h">
-      <Filter>Vic2 World</Filter>
-    </ClInclude>
-    <ClInclude Include="Source\V2World\V2Creditor.h">
-      <Filter>Vic2 World</Filter>
-    </ClInclude>
-    <ClInclude Include="Source\V2World\V2Diplomacy.h">
-      <Filter>Vic2 World</Filter>
-    </ClInclude>
-    <ClInclude Include="Source\V2World\V2Factory.h">
-      <Filter>Vic2 World</Filter>
-    </ClInclude>
-    <ClInclude Include="Source\V2World\V2Flags.h">
-      <Filter>Vic2 World</Filter>
-    </ClInclude>
-    <ClInclude Include="Source\V2World\V2Inventions.h">
-      <Filter>Vic2 World</Filter>
-    </ClInclude>
-    <ClInclude Include="Source\V2World\V2Leader.h">
-      <Filter>Vic2 World</Filter>
-    </ClInclude>
-    <ClInclude Include="Source\V2World\V2LeaderTraits.h">
-      <Filter>Vic2 World</Filter>
-    </ClInclude>
-    <ClInclude Include="Source\V2World\V2Localisation.h">
-      <Filter>Vic2 World</Filter>
-    </ClInclude>
-    <ClInclude Include="Source\V2World\V2Party.h">
-      <Filter>Vic2 World</Filter>
-    </ClInclude>
-    <ClInclude Include="Source\V2World\V2World.h">
-      <Filter>Vic2 World</Filter>
-    </ClInclude>
-    <ClInclude Include="Source\V2World\V2TechSchools.h">
-      <Filter>Vic2 World</Filter>
-    </ClInclude>
-    <ClInclude Include="Source\V2World\V2Pop.h">
-      <Filter>Vic2 World</Filter>
-    </ClInclude>
-    <ClInclude Include="Source\V2World\V2Province.h">
-      <Filter>Vic2 World</Filter>
-    </ClInclude>
-    <ClInclude Include="Source\V2World\V2Reforms.h">
-      <Filter>Vic2 World</Filter>
-    </ClInclude>
-    <ClInclude Include="Source\V2World\V2Relations.h">
-      <Filter>Vic2 World</Filter>
-    </ClInclude>
-    <ClInclude Include="Source\V2World\V2State.h">
-      <Filter>Vic2 World</Filter>
-    </ClInclude>
-    <ClInclude Include="..\common_items\Date.h">
-      <Filter>CommonItems</Filter>
-    </ClInclude>
-    <ClInclude Include="..\common_items\Log.h">
-      <Filter>CommonItems</Filter>
-    </ClInclude>
-    <ClInclude Include="..\common_items\Object.h">
-      <Filter>CommonItems</Filter>
-    </ClInclude>
-    <ClInclude Include="..\common_items\ParadoxParser.h">
-      <Filter>CommonItems</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="EU4 World">
-      <UniqueIdentifier>{ce1f05c1-d019-41f0-a90c-4aa12a96084e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Vic2 World">
-      <UniqueIdentifier>{e035de80-c339-40c2-9c42-6d2c8efbe506}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="CommonItems">
-      <UniqueIdentifier>{b4ecb265-1673-4f23-af86-fbe9c838c8a9}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="Source\Color.cpp" />
+    <ClCompile Include="Source\Configuration.cpp" />
+    <ClCompile Include="Source\CountryMapping.cpp" />
+    <ClCompile Include="Source\FlagUtils.cpp" />
+    <ClCompile Include="Source\Mapper.cpp" />
+    <ClCompile Include="Source\targa.cpp" />
+    <ClCompile Include="Source\tempFuncs.cpp" />
+    <ClCompile Include="Source\WinUtils.cpp" />
+    <ClCompile Include="Source\EU4World\EU4Army.cpp">
+      <Filter>EU4 World</Filter>
+    </ClCompile>
+    <ClCompile Include="Source\EU4World\EU4Country.cpp">
+      <Filter>EU4 World</Filter>
+    </ClCompile>
+    <ClCompile Include="Source\EU4World\EU4Diplomacy.cpp">
+      <Filter>EU4 World</Filter>
+    </ClCompile>
+    <ClCompile Include="Source\EU4World\EU4Leader.cpp">
+      <Filter>EU4 World</Filter>
+    </ClCompile>
+    <ClCompile Include="Source\EU4World\EU4Localisation.cpp">
+      <Filter>EU4 World</Filter>
+    </ClCompile>
+    <ClCompile Include="Source\EU4World\EU4Province.cpp">
+      <Filter>EU4 World</Filter>
+    </ClCompile>
+    <ClCompile Include="Source\EU4World\EU4Relations.cpp">
+      <Filter>EU4 World</Filter>
+    </ClCompile>
+    <ClCompile Include="Source\EU4World\EU4Religion.cpp">
+      <Filter>EU4 World</Filter>
+    </ClCompile>
+    <ClCompile Include="Source\EU4World\EU4Version.cpp">
+      <Filter>EU4 World</Filter>
+    </ClCompile>
+    <ClCompile Include="Source\EU4World\EU4World.cpp">
+      <Filter>EU4 World</Filter>
+    </ClCompile>
+    <ClCompile Include="Source\V2World\V2Army.cpp">
+      <Filter>Vic2 World</Filter>
+    </ClCompile>
+    <ClCompile Include="Source\V2World\V2Country.cpp">
+      <Filter>Vic2 World</Filter>
+    </ClCompile>
+    <ClCompile Include="Source\V2World\V2Creditor.cpp">
+      <Filter>Vic2 World</Filter>
+    </ClCompile>
+    <ClCompile Include="Source\V2World\V2Diplomacy.cpp">
+      <Filter>Vic2 World</Filter>
+    </ClCompile>
+    <ClCompile Include="Source\V2World\V2Factory.cpp">
+      <Filter>Vic2 World</Filter>
+    </ClCompile>
+    <ClCompile Include="Source\V2World\V2Flags.cpp">
+      <Filter>Vic2 World</Filter>
+    </ClCompile>
+    <ClCompile Include="Source\V2World\V2Leader.cpp">
+      <Filter>Vic2 World</Filter>
+    </ClCompile>
+    <ClCompile Include="Source\V2World\V2LeaderTraits.cpp">
+      <Filter>Vic2 World</Filter>
+    </ClCompile>
+    <ClCompile Include="Source\V2World\V2Localisation.cpp">
+      <Filter>Vic2 World</Filter>
+    </ClCompile>
+    <ClCompile Include="Source\V2World\V2Party.cpp">
+      <Filter>Vic2 World</Filter>
+    </ClCompile>
+    <ClCompile Include="Source\V2World\V2World.cpp">
+      <Filter>Vic2 World</Filter>
+    </ClCompile>
+    <ClCompile Include="Source\V2World\V2TechSchools.cpp">
+      <Filter>Vic2 World</Filter>
+    </ClCompile>
+    <ClCompile Include="Source\V2World\V2Pop.cpp">
+      <Filter>Vic2 World</Filter>
+    </ClCompile>
+    <ClCompile Include="Source\V2World\V2Province.cpp">
+      <Filter>Vic2 World</Filter>
+    </ClCompile>
+    <ClCompile Include="Source\V2World\V2Reforms.cpp">
+      <Filter>Vic2 World</Filter>
+    </ClCompile>
+    <ClCompile Include="Source\V2World\V2Relations.cpp">
+      <Filter>Vic2 World</Filter>
+    </ClCompile>
+    <ClCompile Include="Source\V2World\V2State.cpp">
+      <Filter>Vic2 World</Filter>
+    </ClCompile>
+    <ClCompile Include="Source\EU4toV2Converter.cpp" />
+    <ClCompile Include="..\common_items\Date.cpp">
+      <Filter>CommonItems</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common_items\Log.cpp">
+      <Filter>CommonItems</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common_items\Object.cpp">
+      <Filter>CommonItems</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common_items\ParadoxParser.cpp">
+      <Filter>CommonItems</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="Source\Color.h" />
+    <ClInclude Include="Source\Configuration.h" />
+    <ClInclude Include="Source\CountryMapping.h" />
+    <ClInclude Include="Source\FlagUtils.h" />
+    <ClInclude Include="Source\Mapper.h" />
+    <ClInclude Include="Source\targa.h" />
+    <ClInclude Include="Source\WinUtils.h" />
+    <ClInclude Include="Source\EU4World\EU4Army.h">
+      <Filter>EU4 World</Filter>
+    </ClInclude>
+    <ClInclude Include="Source\EU4World\EU4Country.h">
+      <Filter>EU4 World</Filter>
+    </ClInclude>
+    <ClInclude Include="Source\EU4World\EU4Diplomacy.h">
+      <Filter>EU4 World</Filter>
+    </ClInclude>
+    <ClInclude Include="Source\EU4World\EU4Leader.h">
+      <Filter>EU4 World</Filter>
+    </ClInclude>
+    <ClInclude Include="Source\EU4World\EU4Localisation.h">
+      <Filter>EU4 World</Filter>
+    </ClInclude>
+    <ClInclude Include="Source\EU4World\EU4Province.h">
+      <Filter>EU4 World</Filter>
+    </ClInclude>
+    <ClInclude Include="Source\EU4World\EU4Relations.h">
+      <Filter>EU4 World</Filter>
+    </ClInclude>
+    <ClInclude Include="Source\EU4World\EU4Religion.h">
+      <Filter>EU4 World</Filter>
+    </ClInclude>
+    <ClInclude Include="Source\EU4World\EU4Version.h">
+      <Filter>EU4 World</Filter>
+    </ClInclude>
+    <ClInclude Include="Source\EU4World\EU4World.h">
+      <Filter>EU4 World</Filter>
+    </ClInclude>
+    <ClInclude Include="Source\V2World\V2Army.h">
+      <Filter>Vic2 World</Filter>
+    </ClInclude>
+    <ClInclude Include="Source\V2World\V2Country.h">
+      <Filter>Vic2 World</Filter>
+    </ClInclude>
+    <ClInclude Include="Source\V2World\V2Creditor.h">
+      <Filter>Vic2 World</Filter>
+    </ClInclude>
+    <ClInclude Include="Source\V2World\V2Diplomacy.h">
+      <Filter>Vic2 World</Filter>
+    </ClInclude>
+    <ClInclude Include="Source\V2World\V2Factory.h">
+      <Filter>Vic2 World</Filter>
+    </ClInclude>
+    <ClInclude Include="Source\V2World\V2Flags.h">
+      <Filter>Vic2 World</Filter>
+    </ClInclude>
+    <ClInclude Include="Source\V2World\V2Inventions.h">
+      <Filter>Vic2 World</Filter>
+    </ClInclude>
+    <ClInclude Include="Source\V2World\V2Leader.h">
+      <Filter>Vic2 World</Filter>
+    </ClInclude>
+    <ClInclude Include="Source\V2World\V2LeaderTraits.h">
+      <Filter>Vic2 World</Filter>
+    </ClInclude>
+    <ClInclude Include="Source\V2World\V2Localisation.h">
+      <Filter>Vic2 World</Filter>
+    </ClInclude>
+    <ClInclude Include="Source\V2World\V2Party.h">
+      <Filter>Vic2 World</Filter>
+    </ClInclude>
+    <ClInclude Include="Source\V2World\V2World.h">
+      <Filter>Vic2 World</Filter>
+    </ClInclude>
+    <ClInclude Include="Source\V2World\V2TechSchools.h">
+      <Filter>Vic2 World</Filter>
+    </ClInclude>
+    <ClInclude Include="Source\V2World\V2Pop.h">
+      <Filter>Vic2 World</Filter>
+    </ClInclude>
+    <ClInclude Include="Source\V2World\V2Province.h">
+      <Filter>Vic2 World</Filter>
+    </ClInclude>
+    <ClInclude Include="Source\V2World\V2Reforms.h">
+      <Filter>Vic2 World</Filter>
+    </ClInclude>
+    <ClInclude Include="Source\V2World\V2Relations.h">
+      <Filter>Vic2 World</Filter>
+    </ClInclude>
+    <ClInclude Include="Source\V2World\V2State.h">
+      <Filter>Vic2 World</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common_items\Date.h">
+      <Filter>CommonItems</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common_items\Log.h">
+      <Filter>CommonItems</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common_items\Object.h">
+      <Filter>CommonItems</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common_items\ParadoxParser.h">
+      <Filter>CommonItems</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <Filter Include="EU4 World">
+      <UniqueIdentifier>{ce1f05c1-d019-41f0-a90c-4aa12a96084e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Vic2 World">
+      <UniqueIdentifier>{e035de80-c339-40c2-9c42-6d2c8efbe506}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="CommonItems">
+      <UniqueIdentifier>{b4ecb265-1673-4f23-af86-fbe9c838c8a9}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/EU4toV2/build-VS2013.bat b/EU4toV2/build-VS2013.bat
deleted file mode 100644
index 81cf0f1d2..000000000
--- a/EU4toV2/build-VS2013.bat
+++ /dev/null
@@ -1,17 +0,0 @@
-del *.zip /q
-
-call "%VS120COMNTOOLS%\vsvars32.bat"
-
-del Release /q
-rmdir Release /S /Q
-
-del ReleaseIntermediate/q
-rmdir ReleaseIntermediate /S /Q
-
-msbuild.exe EU4ToV2-VS2013.sln /p:Configuration=Release /m
-
-
-cd Release
-del *.pdb
-call "%SEVENZIP_LOC%\7z.exe" a -tzip -r "..\EU4ToV2.zip" "*" -mx5
-cd ..
\ No newline at end of file
diff --git a/EU4toV2/build.bat b/EU4toV2/build.bat
new file mode 100644
index 000000000..ad943c3fb
--- /dev/null
+++ b/EU4toV2/build.bat
@@ -0,0 +1,18 @@
+del *.zip /q
+
+call "%VS140COMNTOOLS%\vsvars32.bat"
+
+del Release /q
+rmdir Release /S /Q
+
+del ReleaseIntermediate/q
+rmdir ReleaseIntermediate /S /Q
+
+msbuild.exe EU4ToV2.sln /p:Configuration=Release /m
+
+
+cd Release
+del *.pdb
+del *.ipdb
+del *.iobj
+cd ..
\ No newline at end of file
diff --git a/EU4toV2/build_and_test-VS2013.bat b/EU4toV2/build_and_test.bat
similarity index 50%
rename from EU4toV2/build_and_test-VS2013.bat
rename to EU4toV2/build_and_test.bat
index bddebf1a1..5f3e841b2 100644
--- a/EU4toV2/build_and_test-VS2013.bat
+++ b/EU4toV2/build_and_test.bat
@@ -1,2 +1,2 @@
-call build-VS2013.bat
+call build.bat
 call test_all_saves.bat
\ No newline at end of file
diff --git a/build_EU4ToVic2_release.bat b/build_EU4ToVic2_release.bat
index a691d6b5e..720bd8535 100644
--- a/build_EU4ToVic2_release.bat
+++ b/build_EU4ToVic2_release.bat
@@ -1,16 +1,17 @@
 set /p version=Version Number?:
 
-call "%VS120COMNTOOLS%\vsvars32.bat"
-msbuild.exe "..\paradoxGameConverters - Frontend\Frontend\ParadoxConverters.Frontend\ParadoxConverters.Frontend.sln" /p:Configuration=Release /m
-xcopy "..\paradoxGameConverters - Frontend\Frontend\ParadoxConverters.Frontend\ParadoxConverters.Frontend\bin\Release" "..\EU4ToVic2-%version%"  /Y /E /I
-copy "EU4toV2\Data_Files\Eu4ToVic2DefaultConfiguration.xml" "..\EU4ToVic2-%version%\Configuration\"
+call "%VS140COMNTOOLS%\vsvars32.bat"
+msbuild.exe "Frontend\ParadoxConverters.Frontend\ParadoxConverters.Frontend.sln" /p:Configuration=Release /m
+xcopy "Frontend\ParadoxConverters.Frontend\ParadoxConverters.Frontend\bin\Release" "EU4ToVic2-%version%"  /Y /E /I
+copy "EU4toV2\Data_Files\Eu4ToVic2DefaultConfiguration.xml" "EU4ToVic2-%version%\Configuration\"
+cd "EU4ToVic2-%version%\"
+del *.pdb
 
 cd EU4toV2
-call "build-VS2013.bat"
-xcopy "Release" "..\..\EU4ToVic2-%version%\EU4ToVic2"  /Y /E /I
+call "build.bat"
+xcopy "Release" "..\EU4ToVic2-%version%\EU4ToVic2"  /Y /E /I
 cd ..
 
-cd "..\EU4ToVic2-%version%"
+cd "EU4ToVic2-%version%"
 call "%SEVENZIP_LOC%\7z.exe" a -tzip -r "..\EU4ToV2-%version%.zip" "*" -mx5
-cd paradoxGameConverters - EU4ToVic2
-
+cd ..

From 37ed488bcbd9741c47d6e770e1d9cca8180864f0 Mon Sep 17 00:00:00 2001
From: Idhrendur <idhrendur@hotmail.com>
Date: Sun, 24 Apr 2016 10:31:22 -0700
Subject: [PATCH 3/4] A slight build script fix

---
 build_EU4ToVic2_release.bat | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build_EU4ToVic2_release.bat b/build_EU4ToVic2_release.bat
index 720bd8535..8af94b3e0 100644
--- a/build_EU4ToVic2_release.bat
+++ b/build_EU4ToVic2_release.bat
@@ -6,6 +6,7 @@ xcopy "Frontend\ParadoxConverters.Frontend\ParadoxConverters.Frontend\bin\Releas
 copy "EU4toV2\Data_Files\Eu4ToVic2DefaultConfiguration.xml" "EU4ToVic2-%version%\Configuration\"
 cd "EU4ToVic2-%version%\"
 del *.pdb
+cd ..
 
 cd EU4toV2
 call "build.bat"

From 3d45565f313e1a1d66840a0c73c3dbfe49acadd4 Mon Sep 17 00:00:00 2001
From: Idhrendur <idhrendur@hotmail.com>
Date: Sun, 24 Apr 2016 18:23:48 -0700
Subject: [PATCH 4/4] Update 1.16 test save to include a configuration file.

---
 EU4toV2/EU4_Saves/Version_1_16_end.zip | Bin 4449075 -> 4450684 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/EU4toV2/EU4_Saves/Version_1_16_end.zip b/EU4toV2/EU4_Saves/Version_1_16_end.zip
index 2ffe81afcfe3c3957bc946705992d2dd39740309..dd3193693885b4e59bc7de9bc22249738d02d5b0 100644
GIT binary patch
delta 1864
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
U%$u14Run7h<>9rm6|+PA7cM(TW&i*H

delta 312
zcmWm2xm5yD06@|IM+Y}V#RXRoRNQdicV&995d%X40}3&q0MD@iOCXqY=)u5ia9{9#
ze>%zMcPDwv)Au}$Bn&ak|0^)UC}WH>L6J#HOfk(2WoDUUo&_o_vcxhgtg=Rx8tc?)
zu)!u<G}&f{UG~_g#Q}#Lam)#)oN>+tmt1kp4Y%BJ&jXJ<@yrYDUY=%O{cdrPRb%*w
Ug-W+Q$XcZsVt5T9^!l0p0keg8ivR!s