From b3feddfef372618c8a9d7a0abcaf18cfad866c18 Mon Sep 17 00:00:00 2001
From: daoge <3523206925@qq.com>
Date: Tue, 3 Mar 2026 03:04:10 +0800
Subject: feat: TU19 (Dec 2014) Features & Content (#155)

* try to resolve merge conflict

* feat: TU19 (Dec 2014) Features & Content (#32)

* December 2014 files

* Working release build

* Fix compilation issues

* Add sound to Windows64Media

* Add DLC content and force Tutorial DLC

* Revert "Add DLC content and force Tutorial DLC"

This reverts commit 97a43994725008e35fceb984d5549df9c8cea470.

* Disable broken light packing

* Disable breakpoint during DLC texture map load

Allows DLC loading but the DLC textures are still broken

* Fix post build not working

* ...

* fix vs2022 build

* fix cmake build

---------

Co-authored-by: Loki <lokirautio@gmail.com>
---
 Minecraft.World/Minecraft.World.vcxproj | 893 +++++++++++++++++++++++++++-----
 1 file changed, 749 insertions(+), 144 deletions(-)

(limited to 'Minecraft.World/Minecraft.World.vcxproj')

diff --git a/Minecraft.World/Minecraft.World.vcxproj b/Minecraft.World/Minecraft.World.vcxproj
index 5146b56c..eeef292f 100644
--- a/Minecraft.World/Minecraft.World.vcxproj
+++ b/Minecraft.World/Minecraft.World.vcxproj
@@ -17,6 +17,10 @@
       <Configuration>ContentPackage_NO_TU</Configuration>
       <Platform>PSVita</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="ContentPackage_NO_TU|Win32">
+      <Configuration>ContentPackage_NO_TU</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="ContentPackage_NO_TU|x64">
       <Configuration>ContentPackage_NO_TU</Configuration>
       <Platform>x64</Platform>
@@ -41,6 +45,10 @@
       <Configuration>CONTENTPACKAGE_SYMBOLS</Configuration>
       <Platform>PSVita</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="CONTENTPACKAGE_SYMBOLS|Win32">
+      <Configuration>CONTENTPACKAGE_SYMBOLS</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="CONTENTPACKAGE_SYMBOLS|x64">
       <Configuration>CONTENTPACKAGE_SYMBOLS</Configuration>
       <Platform>x64</Platform>
@@ -65,6 +73,10 @@
       <Configuration>ContentPackage_Vita</Configuration>
       <Platform>PSVita</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="ContentPackage_Vita|Win32">
+      <Configuration>ContentPackage_Vita</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="ContentPackage_Vita|x64">
       <Configuration>ContentPackage_Vita</Configuration>
       <Platform>x64</Platform>
@@ -89,6 +101,10 @@
       <Configuration>ContentPackage</Configuration>
       <Platform>PSVita</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="ContentPackage|Win32">
+      <Configuration>ContentPackage</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="ContentPackage|x64">
       <Configuration>ContentPackage</Configuration>
       <Platform>x64</Platform>
@@ -113,6 +129,10 @@
       <Configuration>Debug</Configuration>
       <Platform>PSVita</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
@@ -137,6 +157,10 @@
       <Configuration>ReleaseForArt</Configuration>
       <Platform>PSVita</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="ReleaseForArt|Win32">
+      <Configuration>ReleaseForArt</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="ReleaseForArt|x64">
       <Configuration>ReleaseForArt</Configuration>
       <Platform>x64</Platform>
@@ -161,6 +185,10 @@
       <Configuration>Release</Configuration>
       <Platform>PSVita</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|x64">
       <Configuration>Release</Configuration>
       <Platform>x64</Platform>
@@ -179,7 +207,6 @@
     <SccLocalPath>SAK</SccLocalPath>
     <SccProvider>SAK</SccProvider>
     <ApplicationEnvironment>title</ApplicationEnvironment>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'" Label="Configuration">
@@ -232,7 +259,11 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Durango'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
@@ -243,13 +274,22 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Durango'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
@@ -323,21 +363,41 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Durango'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
@@ -361,7 +421,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugContentPackage|Durango'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='ContentPackage|ORBIS'">
     <PlatformToolset>Clang</PlatformToolset>
@@ -424,15 +484,24 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Durango'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Durango'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
@@ -478,15 +547,27 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Durango'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
@@ -518,7 +599,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">
     <OutputFile>$(OutDir)$(ProjectName).lib</OutputFile>
-    <IncludePath>$(SCE_PSP2_SDK_DIR)/target\src\npToolkit\include;$(ProjectDir)\..\Minecraft.Client\PSVita\PSVitaExtras;$(ProjectDir)..\Minecraft.World\x64headers;$(IncludePath)</IncludePath>
+    <IncludePath>$(SCE_PSP2_SDK_DIR)/target\src\npToolkit\include;$(ProjectDir)..\Minecraft.Client\PSVita\Assert;$(ProjectDir)\..\Minecraft.Client\PSVita\PSVitaExtras;$(ProjectDir)..\Minecraft.World\x64headers;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">
     <OutputFile>$(OutDir)$(ProjectName).lib</OutputFile>
@@ -530,7 +611,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|PSVita'">
     <OutputFile>$(OutDir)$(ProjectName).lib</OutputFile>
-    <IncludePath>$(SCE_PSP2_SDK_DIR)/target\src\npToolkit\include;$(MINECRAFT_CONSOLES_DIR)\Minecraft.Client\PSVita\Assert;$(ProjectDir)\..\Minecraft.Client\PSVita\PSVitaExtras;$(ProjectDir)..\Minecraft.World\x64headers;$(IncludePath)</IncludePath>
+    <IncludePath>$(SCE_PSP2_SDK_DIR)/target\src\npToolkit\include;$(ProjectDir)\..\Minecraft.Client\PSVita\PSVitaExtras;$(ProjectDir)..\Minecraft.World\x64headers;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|PSVita'">
     <OutputFile>$(OutDir)$(ProjectName).lib</OutputFile>
@@ -542,6 +623,12 @@
     <OutDir>$(ProjectDir)\$(Platform)_$(Configuration)\</OutDir>
     <IntDir>$(Platform)_$(Configuration)\</IntDir>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutputFile>$(OutDir)$(ProjectName).lib</OutputFile>
+    <IncludePath>$(ProjectDir)\x64headers;$(IncludePath)</IncludePath>
+    <OutDir>$(ProjectDir)\$(Platform)_$(Configuration)\</OutDir>
+    <IntDir>$(Platform)_$(Configuration)\</IntDir>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Durango'">
     <OutputFile>$(OutDir)$(ProjectName).lib</OutputFile>
     <IncludePath>$(ProjectDir)..\Minecraft.Client\Durango\DurangoExtras;$(ProjectDir)\x64headers;$(Console_SdkIncludeRoot)</IncludePath>
@@ -558,12 +645,24 @@
     <OutDir>$(ProjectDir)\$(Platform)_$(Configuration)\</OutDir>
     <IntDir>$(Platform)_$(Configuration)\</IntDir>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutputFile>$(OutDir)$(ProjectName).lib</OutputFile>
+    <IncludePath>$(ProjectDir)\x64headers;$(IncludePath)</IncludePath>
+    <OutDir>$(ProjectDir)\$(Platform)_$(Configuration)\</OutDir>
+    <IntDir>$(Platform)_$(Configuration)\</IntDir>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|x64'">
     <OutputFile>$(OutDir)$(ProjectName).lib</OutputFile>
     <IncludePath>$(ProjectDir)\x64headers;$(IncludePath)</IncludePath>
     <OutDir>$(ProjectDir)\$(Platform)_$(Configuration)\</OutDir>
     <IntDir>$(Platform)_$(Configuration)\</IntDir>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Win32'">
+    <OutputFile>$(OutDir)$(ProjectName).lib</OutputFile>
+    <IncludePath>$(ProjectDir)\x64headers;$(IncludePath)</IncludePath>
+    <OutDir>$(ProjectDir)\$(Platform)_$(Configuration)\</OutDir>
+    <IntDir>$(Platform)_$(Configuration)\</IntDir>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Durango'">
     <OutputFile>$(OutDir)$(ProjectName).lib</OutputFile>
     <IncludePath>$(ProjectDir)..\Minecraft.Client\Durango\DurangoExtras;$(ProjectDir)\x64headers;$(Console_SdkIncludeRoot)</IncludePath>
@@ -602,7 +701,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PSVita'">
     <OutputFile>$(OutDir)$(ProjectName).lib</OutputFile>
-    <IncludePath>$(SCE_PSP2_SDK_DIR)/target\src\npToolkit\include;$(ProjectDir)\..\Minecraft.Client\PSVita\PSVitaExtras;$(ProjectDir)..\Minecraft.World\x64headers;$(IncludePath)</IncludePath>
+    <IncludePath>$(SCE_PSP2_SDK_DIR)/target\src\npToolkit\include;$(ProjectDir)..\Minecraft.Client\PSVita\Assert;$(ProjectDir)\..\Minecraft.Client\PSVita\PSVitaExtras;$(ProjectDir)..\Minecraft.World\x64headers;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PS3'">
     <OutputFile>$(OutDir)$(ProjectName).lib</OutputFile>
@@ -633,24 +732,46 @@
     <OutDir>$(ProjectDir)\$(Platform)_$(Configuration)\</OutDir>
     <IntDir>$(Platform)_$(Configuration)\</IntDir>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Win32'">
+    <OutputFile>$(OutDir)$(ProjectName).lib</OutputFile>
+    <IncludePath>$(ProjectDir)\x64header;$(DXSDK_DIR)include;$(IncludePath)</IncludePath>
+    <OutDir>$(ProjectDir)\$(Platform)_$(Configuration)\</OutDir>
+    <IntDir>$(Platform)_$(Configuration)\</IntDir>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|x64'">
     <OutputFile>$(OutDir)$(ProjectName).lib</OutputFile>
     <IncludePath>$(ProjectDir)\x64header;$(DXSDK_DIR)include;$(IncludePath)</IncludePath>
     <OutDir>$(ProjectDir)\$(Platform)_$(Configuration)\</OutDir>
     <IntDir>$(Platform)_$(Configuration)\</IntDir>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Win32'">
+    <OutputFile>$(OutDir)$(ProjectName).lib</OutputFile>
+    <IncludePath>$(ProjectDir)\x64header;$(DXSDK_DIR)include;$(IncludePath)</IncludePath>
+    <OutDir>$(ProjectDir)\$(Platform)_$(Configuration)\</OutDir>
+    <IntDir>$(Platform)_$(Configuration)\</IntDir>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|x64'">
     <OutputFile>$(OutDir)$(ProjectName).lib</OutputFile>
     <IncludePath>$(ProjectDir)\x64header;$(DXSDK_DIR)include;$(IncludePath)</IncludePath>
     <OutDir>$(ProjectDir)\$(Platform)_$(Configuration)\</OutDir>
     <IntDir>$(Platform)_$(Configuration)\</IntDir>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Win32'">
+    <OutputFile>$(OutDir)$(ProjectName).lib</OutputFile>
+    <IncludePath>$(ProjectDir)\x64header;$(DXSDK_DIR)include;$(IncludePath)</IncludePath>
+    <OutDir>$(ProjectDir)\$(Platform)_$(Configuration)\</OutDir>
+    <IntDir>$(Platform)_$(Configuration)\</IntDir>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|x64'">
     <OutputFile>$(OutDir)$(ProjectName).lib</OutputFile>
     <IncludePath>$(ProjectDir)\x64header;$(DXSDK_DIR)include;$(IncludePath)</IncludePath>
     <OutDir>$(ProjectDir)\$(Configuration)\</OutDir>
     <IntDir>$(ProjectDir)\$(Configuration)\</IntDir>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Win32'">
+    <OutputFile>$(OutDir)$(ProjectName).lib</OutputFile>
+    <IncludePath>$(ProjectDir)\x64header;$(DXSDK_DIR)include;$(IncludePath)</IncludePath>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Durango'">
     <OutputFile>$(OutDir)$(ProjectName).lib</OutputFile>
     <IncludePath>$(ProjectDir)\x64headers;$(Console_SdkIncludeRoot)</IncludePath>
@@ -1016,6 +1137,28 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <Optimization>Disabled</Optimization>
+      <ExceptionHandling>Sync</ExceptionHandling>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <PrecompiledHeaderOutputFile>$(OutDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PreprocessorDefinitions>_LARGE_WORLDS;_DEBUG_MENUS_ENABLED;_DEBUG;_LIB;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_SECURE_NO_WARNINGS;_WINDOWS64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <CallAttributedProfiling>Disabled</CallAttributedProfiling>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <ShowIncludes>false</ShowIncludes>
+      <UseFullPaths>false</UseFullPaths>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Durango'">
     <ClCompile>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -1026,7 +1169,7 @@
       <BufferSecurityCheck>true</BufferSecurityCheck>
       <PrecompiledHeaderOutputFile>$(OutDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PreprocessorDefinitions>SPLIT_SAVES;_LARGE_WORLDS;_EXTENDED_ACHIEVEMENTS;UNICODE;_UNICODE;__WRL_NO_DEFAULT_LIB__;WINAPI_FAMILY=WINAPI_FAMILY_TV_TITLE;WIN32_LEAN_AND_MEAN;_XM_AVX_INTRINSICS_;_DEBUG_MENUS_ENABLED;_DEBUG;_LIB;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_SECURE_NO_WARNINGS;_DURANGO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>SPLIT_SAVES;_LARGE_WORLDS;_EXTENDED_ACHIEVEMENTS;UNICODE;_UNICODE;__WRL_NO_DEFAULT_LIB__;WINAPI_FAMILY=WINAPI_FAMILY_TV_TITLE;WIN32_LEAN_AND_MEAN;_XM_AVX_INTRINSICS_;_DEBUG_MENUS_ENABLED;_DEBUG;_LIB;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_SECURE_NO_WARNINGS;_DURANGO;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <CallAttributedProfiling>Disabled</CallAttributedProfiling>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <ShowIncludes>false</ShowIncludes>
@@ -1067,6 +1210,29 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <Optimization>Full</Optimization>
+      <ExceptionHandling>Sync</ExceptionHandling>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <PrecompiledHeaderOutputFile>$(OutDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PreprocessorDefinitions>_LARGE_WORLDS;_DEBUG_MENUS_ENABLED;_LIB;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_SECURE_NO_WARNINGS;_WINDOWS64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <CallAttributedProfiling>Disabled</CallAttributedProfiling>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <ShowIncludes>false</ShowIncludes>
+      <UseFullPaths>false</UseFullPaths>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|x64'">
     <ClCompile>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -1090,6 +1256,29 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <Optimization>Full</Optimization>
+      <ExceptionHandling>Sync</ExceptionHandling>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <PrecompiledHeaderOutputFile>$(OutDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PreprocessorDefinitions>_LARGE_WORLDS;_DEBUG_MENUS_ENABLED;_LIB;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_SECURE_NO_WARNINGS;_WINDOWS64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <CallAttributedProfiling>Disabled</CallAttributedProfiling>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <ShowIncludes>false</ShowIncludes>
+      <UseFullPaths>false</UseFullPaths>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Durango'">
     <ClCompile>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -1414,6 +1603,7 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <OptimizationLevel>Level2</OptimizationLevel>
       <Branchless>Branchless2</Branchless>
+      <CppLanguageStd>Cpp11</CppLanguageStd>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -1494,6 +1684,29 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <Optimization>Full</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <StringPooling>true</StringPooling>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <ExceptionHandling>Sync</ExceptionHandling>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <PrecompiledHeaderOutputFile>$(OutDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PreprocessorDefinitions>_TU_BUILD;_FINAL_BUILD;NDEBUG;_XBOX;_LIB;_CONTENT_PACKAGE;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|x64'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
@@ -1517,6 +1730,29 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <Optimization>Full</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <StringPooling>true</StringPooling>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <ExceptionHandling>Sync</ExceptionHandling>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <PrecompiledHeaderOutputFile>$(OutDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PreprocessorDefinitions>_TU_BUILD;_FINAL_BUILD;NDEBUG;_XBOX;_LIB;_CONTENT_PACKAGE;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|x64'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
@@ -1540,6 +1776,29 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <Optimization>Full</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <StringPooling>true</StringPooling>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <ExceptionHandling>Sync</ExceptionHandling>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <PrecompiledHeaderOutputFile>$(OutDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PreprocessorDefinitions>_TU_BUILD;_FINAL_BUILD;NDEBUG;_XBOX;_LIB;_CONTENT_PACKAGE;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|x64'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
@@ -1563,6 +1822,29 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <Optimization>Full</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <StringPooling>true</StringPooling>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <ExceptionHandling>Sync</ExceptionHandling>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <PrecompiledHeaderOutputFile>$(OutDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PreprocessorDefinitions>_TU_BUILD;_FINAL_BUILD;NDEBUG;_XBOX;_LIB;_CONTENT_PACKAGE;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Durango'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
@@ -1770,7 +2052,9 @@
       <FileType>Document</FileType>
     </None>
     <None Include="Arrow.h" />
+    <None Include="EntityDiagram.cd" />
     <None Include="Minecraft.World.h" />
+    <None Include="net.minecraft.core.h" />
     <None Include="net.minecraft.world.ContainerListener.h" />
     <None Include="net.minecraft.world.damagesource.h" />
     <None Include="net.minecraft.world.level.chunk.h" />
@@ -1780,6 +2064,7 @@
   <ItemGroup>
     <ClInclude Include="AABB.h" />
     <ClInclude Include="Abilities.h" />
+    <ClInclude Include="AbsoptionMobEffect.h" />
     <ClInclude Include="AbstractContainerMenu.h" />
     <ClInclude Include="Achievement.h" />
     <ClInclude Include="Achievements.h" />
@@ -1795,7 +2080,9 @@
     <ClInclude Include="AdminLogCommand.h" />
     <ClInclude Include="AgableMob.h" />
     <ClInclude Include="AirTile.h" />
+    <ClInclude Include="AmbientCreature.h" />
     <ClInclude Include="Animal.h" />
+    <ClInclude Include="AnimalChest.h" />
     <ClInclude Include="AnimatePacket.h" />
     <ClInclude Include="AnvilTile.h" />
     <ClInclude Include="AnvilTileItem.h" />
@@ -1805,20 +2092,32 @@
     <ClInclude Include="ArmorSlot.h" />
     <ClInclude Include="Arrays.h" />
     <ClInclude Include="ArrayWithLength.h" />
-    <ClInclude Include="ArrowAttackGoal.h" />
     <ClInclude Include="ArrowDamageEnchantment.h" />
     <ClInclude Include="ArrowFireEnchantment.h" />
     <ClInclude Include="ArrowInfiniteEnchantment.h" />
     <ClInclude Include="ArrowKnockbackEnchantment.h" />
+    <ClInclude Include="AttackDamageMobEffect.h" />
+    <ClInclude Include="Attribute.h" />
+    <ClInclude Include="AttributeInstance.h" />
+    <ClInclude Include="AttributeModifier.h" />
     <ClInclude Include="AuxDataTileItem.h" />
     <ClInclude Include="AvoidPlayerGoal.h" />
     <ClInclude Include="AwardStatPacket.h" />
+    <ClInclude Include="BaseAttribute.h" />
+    <ClInclude Include="BaseAttributeMap.h" />
+    <ClInclude Include="BaseMobSpawner.h" />
+    <ClInclude Include="BasePressurePlateTile.h" />
     <ClInclude Include="BasicTree.h" />
     <ClInclude Include="BasicTypeContainers.h" />
+    <ClInclude Include="Bat.h" />
     <ClInclude Include="BeachBiome.h" />
+    <ClInclude Include="BeaconMenu.h" />
+    <ClInclude Include="BeaconTile.h" />
+    <ClInclude Include="BeaconTileEntity.h" />
     <ClInclude Include="BedItem.h" />
     <ClInclude Include="BedTile.h" />
     <ClInclude Include="BegGoal.h" />
+    <ClInclude Include="Behavior.h" />
     <ClInclude Include="BinaryHeap.h" />
     <ClInclude Include="Biome.h" />
     <ClInclude Include="BiomeCache.h" />
@@ -1832,6 +2131,8 @@
     <ClInclude Include="BlockGenMethods.h" />
     <ClInclude Include="BlockRegionUpdatePacket.h" />
     <ClInclude Include="BlockReplacements.h" />
+    <ClInclude Include="BlockSource.h" />
+    <ClInclude Include="BlockSourceImpl.h" />
     <ClInclude Include="Boat.h" />
     <ClInclude Include="BoatItem.h" />
     <ClInclude Include="BodyControl.h" />
@@ -1839,7 +2140,47 @@
     <ClInclude Include="BookItem.h" />
     <ClInclude Include="BookshelfTile.h" />
     <ClInclude Include="BossMob.h" />
-    <ClInclude Include="BossMobPart.h" />
+    <ClInclude Include="Calendar.h" />
+    <ClInclude Include="ColoredTile.h" />
+    <ClInclude Include="CommandBlock.h" />
+    <ClInclude Include="CommandBlockEntity.h" />
+    <ClInclude Include="ComparatorTile.h" />
+    <ClInclude Include="ComparatorTileEntity.h" />
+    <ClInclude Include="DaylightDetectorTile.h" />
+    <ClInclude Include="DaylightDetectorTileEntity.h" />
+    <ClInclude Include="DropperTile.h" />
+    <ClInclude Include="DropperTileEntity.h" />
+    <ClInclude Include="DummyCriteria.h" />
+    <ClInclude Include="EmptyMapItem.h" />
+    <ClInclude Include="EntityTile.h" />
+    <ClInclude Include="FireworksChargeItem.h" />
+    <ClInclude Include="FireworksItem.h" />
+    <ClInclude Include="FireworksMenu.h" />
+    <ClInclude Include="FireworksRecipe.h" />
+    <ClInclude Include="FireworksRocketEntity.h" />
+    <ClInclude Include="FlatGeneratorInfo.h" />
+    <ClInclude Include="FlatLayerInfo.h" />
+    <ClInclude Include="GameRules.h" />
+    <ClInclude Include="HayBlockTile.h" />
+    <ClInclude Include="HealthCriteria.h" />
+    <ClInclude Include="Hopper.h" />
+    <ClInclude Include="HopperMenu.h" />
+    <ClInclude Include="HopperTile.h" />
+    <ClInclude Include="HopperTileEntity.h" />
+    <ClInclude Include="HorseInventoryMenu.h" />
+    <ClInclude Include="HtmlString.h" />
+    <ClInclude Include="LargeFireball.h" />
+    <ClInclude Include="LeashItem.h" />
+    <ClInclude Include="MapCloningRecipe.h" />
+    <ClInclude Include="MapExtendingRecipe.h" />
+    <ClInclude Include="MinecartChest.h" />
+    <ClInclude Include="MinecartContainer.h" />
+    <ClInclude Include="MinecartFurnace.h" />
+    <ClInclude Include="MinecartHopper.h" />
+    <ClInclude Include="MinecartRideable.h" />
+    <ClInclude Include="MinecartSpawner.h" />
+    <ClInclude Include="MinecartTNT.h" />
+    <ClInclude Include="MultiEntityMobPart.h" />
     <ClInclude Include="BottleItem.h" />
     <ClInclude Include="BoundingBox.h" />
     <ClInclude Include="BowItem.h" />
@@ -1878,6 +2219,8 @@
     <ClInclude Include="ClockItem.h" />
     <ClInclude Include="CocoaTile.h" />
     <ClInclude Include="ColoredTileItem.h" />
+    <ClInclude Include="CombatEntry.h" />
+    <ClInclude Include="CombatTracker.h" />
     <ClInclude Include="Command.h" />
     <ClInclude Include="CommandDispatcher.h" />
     <ClInclude Include="CommandSender.h" />
@@ -1887,50 +2230,6 @@
     <ClInclude Include="CompressedTileStorage.h" />
     <ClInclude Include="ConsoleSaveFileConverter.h" />
     <ClInclude Include="ConsoleSaveFileOriginal.h" />
-    <ClInclude Include="ConsoleSaveFileSplit.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Durango'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Durango'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Durango'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Durango'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Durango'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Durango'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Durango'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|ORBIS'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|ORBIS'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|ORBIS'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ORBIS'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|ORBIS'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ORBIS'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|ORBIS'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|PS3'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|PS3'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|PS3'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PS3'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PSVita'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|PSVita'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|PSVita'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PSVita'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|PSVita'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PSVita'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Xbox 360'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Xbox 360'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Xbox 360'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Xbox 360'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Xbox 360'">true</ExcludedFromBuild>
-    </ClInclude>
     <ClInclude Include="ContainerButtonClickPacket.h" />
     <ClInclude Include="Control.h" />
     <ClInclude Include="ControlledByPlayerGoal.h" />
@@ -1938,6 +2237,8 @@
     <ClInclude Include="CustomPayloadPacket.h" />
     <ClInclude Include="DamageEnchantment.h" />
     <ClInclude Include="DamageSource.h" />
+    <ClInclude Include="DefaultDispenseItemBehavior.h" />
+    <ClInclude Include="BehaviorRegistry.h" />
     <ClInclude Include="DefaultGameModeCommand.h" />
     <ClInclude Include="DefendVillageTargetGoal.h" />
     <ClInclude Include="DelayedRelease.h" />
@@ -1945,6 +2246,7 @@
     <ClInclude Include="DesertBiome.h" />
     <ClInclude Include="DesertWellFeature.h" />
     <ClInclude Include="DirectionalTile.h" />
+    <ClInclude Include="DispenseItemBehavior.h" />
     <ClInclude Include="DoorInfo.h" />
     <ClInclude Include="DoorInteractGoal.h" />
     <ClInclude Include="DragonFireball.h" />
@@ -1978,8 +2280,10 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Xbox 360'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
     </ClInclude>
     <ClInclude Include="EatTileGoal.h" />
+    <ClInclude Include="EffectCommand.h" />
     <ClInclude Include="EggTile.h" />
     <ClInclude Include="DigDurabilityEnchantment.h" />
     <ClInclude Include="DiggingEnchantment.h" />
@@ -2001,9 +2305,12 @@
     <ClInclude Include="EnderEyeItem.h" />
     <ClInclude Include="EnderpearlItem.h" />
     <ClInclude Include="EndPodiumFeature.h" />
+    <ClInclude Include="EntityHorse.h" />
+    <ClInclude Include="EntitySelector.h" />
     <ClInclude Include="ExperienceCommand.h" />
     <ClInclude Include="ExperienceItem.h" />
     <ClInclude Include="EyeOfEnderSignal.h" />
+    <ClInclude Include="FacingEnum.h" />
     <ClInclude Include="FireAspectEnchantment.h" />
     <ClInclude Include="FireChargeItem.h" />
     <ClInclude Include="FleeSunGoal.h" />
@@ -2013,7 +2320,9 @@
     <ClInclude Include="FollowOwnerGoal.h" />
     <ClInclude Include="FollowParentGoal.h" />
     <ClInclude Include="GameCommandPacket.h" />
+    <ClInclude Include="GameDifficultyCommand.h" />
     <ClInclude Include="GameModeCommand.h" />
+    <ClInclude Include="GameRuleCommand.h" />
     <ClInclude Include="GenericStats.h" />
     <ClInclude Include="GiveItemCommand.h" />
     <ClInclude Include="Goal.h" />
@@ -2025,6 +2334,7 @@
     <ClInclude Include="HalfSlabTile.h" />
     <ClInclude Include="HangingEntity.h" />
     <ClInclude Include="HangingEntityItem.h" />
+    <ClInclude Include="HealthBoostMobEffect.h" />
     <ClInclude Include="HellFlatLevelSource.h" />
     <ClInclude Include="HurtByTargetGoal.h" />
     <ClInclude Include="IceBiome.h" />
@@ -2040,7 +2350,12 @@
     <ClInclude Include="KnockbackEnchantment.h" />
     <ClInclude Include="LavaSlime.h" />
     <ClInclude Include="LeapAtTargetGoal.h" />
+    <ClInclude Include="LeashFenceKnotEntity.h" />
+    <ClInclude Include="LevelParticlesPacket.h" />
     <ClInclude Include="LevelSoundPacket.h" />
+    <ClInclude Include="LivingEntity.h" />
+    <ClInclude Include="LocatableSource.h" />
+    <ClInclude Include="Location.h" />
     <ClInclude Include="LookAtPlayerGoal.h" />
     <ClInclude Include="LookAtTradingPlayerGoal.h" />
     <ClInclude Include="LookControl.h" />
@@ -2055,13 +2370,37 @@
     <ClInclude Include="MerchantRecipeList.h" />
     <ClInclude Include="MerchantResultSlot.h" />
     <ClInclude Include="MilkBucketItem.h" />
+    <ClInclude Include="MobGroupData.h" />
     <ClInclude Include="MobType.h" />
-    <ClInclude Include="MonsterPlacerItem.h" />
+    <ClInclude Include="ModifiableAttributeInstance.h" />
+    <ClInclude Include="NameTagItem.h" />
+    <ClInclude Include="net.minecraft.world.level.levelgen.flat.h" />
+    <ClInclude Include="net.minecraft.world.level.redstone.h" />
+    <ClInclude Include="net.minecraft.world.scores.criteria.h" />
+    <ClInclude Include="net.minecraft.world.scores.h" />
+    <ClInclude Include="Objective.h" />
+    <ClInclude Include="ObjectiveCriteria.h" />
+    <ClInclude Include="PlayerTeam.h" />
+    <ClInclude Include="ItemDispenseBehaviors.h" />
+    <ClInclude Include="PoweredMetalTile.h" />
+    <ClInclude Include="PoweredRailTile.h" />
+    <ClInclude Include="AbstractProjectileDispenseBehavior.h" />
+    <ClInclude Include="RailTile.h" />
+    <ClInclude Include="Redstone.h" />
+    <ClInclude Include="RepeaterTile.h" />
+    <ClInclude Include="RotatedPillarTile.h" />
+    <ClInclude Include="Score.h" />
+    <ClInclude Include="Scoreboard.h" />
+    <ClInclude Include="ScoreboardSaveData.h" />
+    <ClInclude Include="SimpleFoiledItem.h" />
+    <ClInclude Include="SnowItem.h" />
+    <ClInclude Include="SpawnEggItem.h" />
     <ClInclude Include="MoveControl.h" />
     <ClInclude Include="MoveIndoorsGoal.h" />
     <ClInclude Include="MoveThroughVillageGoal.h" />
     <ClInclude Include="MoveTowardsRestrictionGoal.h" />
     <ClInclude Include="MoveTowardsTargetGoal.h" />
+    <ClInclude Include="MultiEntityMob.h" />
     <ClInclude Include="MultiTextureTileItem.h" />
     <ClInclude Include="MushroomCow.h" />
     <ClInclude Include="MushroomIslandBiome.h" />
@@ -2069,6 +2408,7 @@
     <ClInclude Include="NearestAttackableTargetGoal.h" />
     <ClInclude Include="net.minecraft.commands.common.h" />
     <ClInclude Include="net.minecraft.commands.h" />
+    <ClInclude Include="net.minecraft.world.entity.ai.attributes.h" />
     <ClInclude Include="net.minecraft.world.entity.ai.control.h" />
     <ClInclude Include="net.minecraft.world.entity.ai.goal.h" />
     <ClInclude Include="net.minecraft.world.entity.ai.goal.target.h" />
@@ -2076,6 +2416,7 @@
     <ClInclude Include="net.minecraft.world.entity.ai.sensing.h" />
     <ClInclude Include="net.minecraft.world.entity.ai.util.h" />
     <ClInclude Include="net.minecraft.world.entity.ai.village.h" />
+    <ClInclude Include="net.minecraft.world.entity.ambient.h" />
     <ClInclude Include="net.minecraft.world.entity.boss.enderdragon.h" />
     <ClInclude Include="net.minecraft.world.entity.boss.h" />
     <ClInclude Include="net.minecraft.world.entity.npc.h" />
@@ -2084,72 +2425,107 @@
     <ClInclude Include="net.minecraft.world.item.trading.h" />
     <ClInclude Include="net.minecraft.world.level.tile.piston.h" />
     <ClInclude Include="NetherSphere.h" />
-    <ClInclude Include="NetherStalkTile.h" />
+    <ClInclude Include="NetherWartTile.h" />
     <ClInclude Include="NonTameRandomTargetGoal.h" />
     <ClInclude Include="Npc.h" />
     <ClInclude Include="OcelotSitOnTileGoal.h" />
     <ClInclude Include="OfferFlowerGoal.h" />
     <ClInclude Include="OpenDoorGoal.h" />
+    <ClInclude Include="OwnableEntity.h" />
     <ClInclude Include="OwnerHurtByTargetGoal.h" />
     <ClInclude Include="OwnerHurtTargetGoal.h" />
     <ClInclude Include="OxygenEnchantment.h" />
-    <ClInclude Include="Ozelot.h" />
-    <ClInclude Include="OzelotAttackGoal.h" />
+    <ClInclude Include="Ocelot.h" />
+    <ClInclude Include="OcelotAttackGoal.h" />
     <ClInclude Include="PanicGoal.h" />
     <ClInclude Include="PathNavigation.h" />
     <ClInclude Include="PerformanceTimer.h" />
     <ClInclude Include="PlayerAbilitiesPacket.h" />
     <ClInclude Include="PlayerEnderChestContainer.h" />
+    <ClInclude Include="PlayerSelector.h" />
     <ClInclude Include="PlayGoal.h" />
+    <ClInclude Include="PlaySoundCommand.h" />
+    <ClInclude Include="Position.h" />
+    <ClInclude Include="PositionImpl.h" />
     <ClInclude Include="PotatoTile.h" />
     <ClInclude Include="PotionBrewing.h" />
     <ClInclude Include="PotionItem.h" />
+    <ClInclude Include="Projectile.h" />
     <ClInclude Include="ProtectionEnchantment.h" />
     <ClInclude Include="QuartzBlockTile.h" />
     <ClInclude Include="RandomLookAroundGoal.h" />
     <ClInclude Include="RandomPos.h" />
     <ClInclude Include="RandomScatteredLargeFeature.h" />
     <ClInclude Include="RandomStrollGoal.h" />
+    <ClInclude Include="RangedAttackGoal.h" />
+    <ClInclude Include="RangedAttackMob.h" />
+    <ClInclude Include="RangedAttribute.h" />
     <ClInclude Include="Rarity.h" />
     <ClInclude Include="RedlightTile.h" />
     <ClInclude Include="RegionHillsLayer.h" />
     <ClInclude Include="RepairContainer.h" />
-    <ClInclude Include="RepairMenu.h" />
+    <ClInclude Include="AnvilMenu.h" />
     <ClInclude Include="RepairResultSlot.h" />
     <ClInclude Include="RestrictOpenDoorGoal.h" />
     <ClInclude Include="RestrictSunGoal.h" />
     <ClInclude Include="RotateHeadPacket.h" />
+    <ClInclude Include="RunAroundLikeCrazyGoal.h" />
     <ClInclude Include="ScatteredFeaturePieces.h" />
+    <ClInclude Include="ScoreHolder.h" />
     <ClInclude Include="SeedFoodItem.h" />
     <ClInclude Include="Sensing.h" />
     <ClInclude Include="ServerAuthDataPacket.h" />
+    <ClInclude Include="ServersideAttributeMap.h" />
+    <ClInclude Include="SetDisplayObjectivePacket.h" />
+    <ClInclude Include="SetObjectivePacket.h" />
+    <ClInclude Include="SetPlayerTeamPacket.h" />
+    <ClInclude Include="SetPlayerTimeoutCommand.h" />
+    <ClInclude Include="SetScorePacket.h" />
     <ClInclude Include="SharedKeyPacket.h" />
+    <ClInclude Include="SharedMonsterAttributes.h" />
+    <ClInclude Include="ShowSeedCommand.h" />
     <ClInclude Include="SitGoal.h" />
     <ClInclude Include="SkullItem.h" />
     <ClInclude Include="SkullTile.h" />
     <ClInclude Include="SkullTileEntity.h" />
+    <ClInclude Include="Source.h" />
     <ClInclude Include="SparseDataStorage.h" />
+    <ClInclude Include="SpreadPlayersCommand.h" />
+    <ClInclude Include="StainedGlassBlock.h" />
+    <ClInclude Include="StainedGlassPaneBlock.h" />
+    <ClInclude Include="StoneButtonTile.h" />
+    <ClInclude Include="StructureFeatureIO.h" />
+    <ClInclude Include="StructureFeatureSavedData.h" />
     <ClInclude Include="SwampRiversLayer.h" />
     <ClInclude Include="SwellGoal.h" />
     <ClInclude Include="TakeFlowerGoal.h" />
     <ClInclude Include="TamableAnimal.h" />
     <ClInclude Include="TargetGoal.h" />
+    <ClInclude Include="Team.h" />
     <ClInclude Include="TemptGoal.h" />
     <ClInclude Include="ThornsEnchantment.h" />
     <ClInclude Include="TileDestructionPacket.h" />
+    <ClInclude Include="TileEditorOpenPacket.h" />
     <ClInclude Include="TileEventData.h" />
     <ClInclude Include="TimeCommand.h" />
     <ClInclude Include="ToggleDownfallCommand.h" />
     <ClInclude Include="TradeWithPlayerGoal.h" />
     <ClInclude Include="TripWireSourceTile.h" />
     <ClInclude Include="TripWireTile.h" />
+    <ClInclude Include="UpdateAttributesPacket.h" />
     <ClInclude Include="Village.h" />
     <ClInclude Include="VillagerGolem.h" />
     <ClInclude Include="Villages.h" />
     <ClInclude Include="VillageSiege.h" />
     <ClInclude Include="VinesFeature.h" />
     <ClInclude Include="WallTile.h" />
+    <ClInclude Include="WeatherCommand.h" />
     <ClInclude Include="WeighedTreasure.h" />
+    <ClInclude Include="WeightedPressurePlateTile.h" />
+    <ClInclude Include="Witch.h" />
+    <ClInclude Include="WitherBoss.h" />
+    <ClInclude Include="WitherSkull.h" />
+    <ClInclude Include="WoodButtonTile.h" />
     <ClInclude Include="WoodSlabTile.h" />
     <ClInclude Include="WoodTile.h" />
     <ClInclude Include="C4JThread.h">
@@ -2162,6 +2538,8 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PSVita'">false</ExcludedFromBuild>
     </ClInclude>
     <ClInclude Include="WoolCarpetTile.h" />
+    <ClInclude Include="WorldlyContainer.h" />
+    <ClInclude Include="WrittenBookItem.h" />
     <ClInclude Include="x64headers\extraX64.h" />
     <ClInclude Include="x64headers\qnet.h" />
     <ClInclude Include="x64headers\xmcore.h" />
@@ -2172,14 +2550,12 @@
     <ClInclude Include="XZPacket.h" />
     <ClInclude Include="ShoreLayer.h" />
     <ClInclude Include="SmallFireball.h" />
-    <ClInclude Include="SmoothStoneBrickTileItem.h" />
     <ClInclude Include="SnowMan.h" />
     <ClInclude Include="NetherBridgeFeature.h" />
     <ClInclude Include="NetherBridgePieces.h" />
     <ClInclude Include="SoundTypes.h" />
     <ClInclude Include="SparseLightStorage.h" />
     <ClInclude Include="SpikeFeature.h" />
-    <ClInclude Include="StoneMonsterTileItem.h" />
     <ClInclude Include="TextureAndGeometryChangePacket.h" />
     <ClInclude Include="TextureAndGeometryPacket.h" />
     <ClInclude Include="TheEndBiome.h" />
@@ -2260,8 +2636,7 @@
     <ClInclude Include="ClayFeature.h" />
     <ClInclude Include="ClayTile.h" />
     <ClInclude Include="ClothDyeRecipes.h" />
-    <ClInclude Include="ClothTile.h" />
-    <ClInclude Include="ClothTileItem.h" />
+    <ClInclude Include="WoolTileItem.h" />
     <ClInclude Include="CoalItem.h" />
     <ClInclude Include="Color.h" />
     <ClInclude Include="com.mojang.nbt.h" />
@@ -2330,7 +2705,7 @@
     <ClInclude Include="EntityEventPacket.h" />
     <ClInclude Include="EntityIO.h" />
     <ClInclude Include="EntityPos.h" />
-    <ClInclude Include="EntityTile.h" />
+    <ClInclude Include="BaseEntityTile.h" />
     <ClInclude Include="Exceptions.h" />
     <ClInclude Include="ExplodePacket.h" />
     <ClInclude Include="Explosion.h" />
@@ -2386,9 +2761,9 @@
     <ClInclude Include="HellFireFeature.h" />
     <ClInclude Include="HellPortalFeature.h" />
     <ClInclude Include="HellRandomLevelSource.h" />
-    <ClInclude Include="HellSandTile.h" />
+    <ClInclude Include="SoulSandTile.h" />
     <ClInclude Include="HellSpringFeature.h" />
-    <ClInclude Include="HellStoneTile.h" />
+    <ClInclude Include="NetherrackTile.h" />
     <ClInclude Include="HitResult.h" />
     <ClInclude Include="HoeItem.h" />
     <ClInclude Include="HouseFeature.h" />
@@ -2457,7 +2832,7 @@
     <ClInclude Include="LevelEvent.h" />
     <ClInclude Include="LeverTile.h" />
     <ClInclude Include="LightGemFeature.h" />
-    <ClInclude Include="LightGemTile.h" />
+    <ClInclude Include="GlowstoneTile.h" />
     <ClInclude Include="LightningBolt.h" />
     <ClInclude Include="LiquidMaterial.h" />
     <ClInclude Include="LiquidTile.h" />
@@ -2477,7 +2852,7 @@
     <ClInclude Include="Monster.h" />
     <ClInclude Include="MonsterRoomFeature.h" />
     <ClInclude Include="Mushroom.h" />
-    <ClInclude Include="MusicTile.h" />
+    <ClInclude Include="NoteBlockTile.h" />
     <ClInclude Include="NbtIo.h" />
     <ClInclude Include="NbtSlotFile.h" />
     <ClInclude Include="net.minecraft.h" />
@@ -2542,16 +2917,66 @@
     <ClInclude Include="ProgressListener.h" />
     <ClInclude Include="PumpkinFeature.h" />
     <ClInclude Include="PumpkinTile.h" />
-    <ClInclude Include="RailTile.h" />
+    <ClInclude Include="BaseRailTile.h" />
     <ClInclude Include="RainforestBiome.h" />
     <ClInclude Include="Random.h" />
     <ClInclude Include="RandomLevelSource.h" />
     <ClInclude Include="Reader.h" />
-    <ClInclude Include="ReadOnlyChunkCache.h" />
+    <ClInclude Include="ReadOnlyChunkCache.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Durango'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Durango'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Durango'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Durango'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Durango'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Durango'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Durango'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|PS3'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|PS3'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|PS3'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PS3'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PSVita'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|PSVita'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|PSVita'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|PSVita'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PSVita'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PSVita'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Xbox 360'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Xbox 360'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Xbox 360'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Xbox 360'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Xbox 360'">true</ExcludedFromBuild>
+    </ClInclude>
     <ClInclude Include="Recipes.h" />
     <ClInclude Include="Recipy.h" />
     <ClInclude Include="RecordingItem.h" />
-    <ClInclude Include="RecordPlayerTile.h" />
+    <ClInclude Include="JukeboxTile.h" />
     <ClInclude Include="RedStoneDustTile.h" />
     <ClInclude Include="RedStoneItem.h" />
     <ClInclude Include="RedStoneOreTile.h" />
@@ -2584,7 +3009,7 @@
     <ClInclude Include="SetEntityMotionPacket.h" />
     <ClInclude Include="SetEquippedItemPacket.h" />
     <ClInclude Include="SetHealthPacket.h" />
-    <ClInclude Include="SetRidingPacket.h" />
+    <ClInclude Include="SetEntityLinkPacket.h" />
     <ClInclude Include="SetSpawnPositionPacket.h" />
     <ClInclude Include="SetTimePacket.h" />
     <ClInclude Include="SharedConstants.h" />
@@ -2614,7 +3039,6 @@
     <ClInclude Include="Spider.h" />
     <ClInclude Include="Sponge.h" />
     <ClInclude Include="SpringFeature.h" />
-    <ClInclude Include="SpringTile.h" />
     <ClInclude Include="SpruceFeature.h" />
     <ClInclude Include="Squid.h" />
     <ClInclude Include="Stat.h" />
@@ -2669,7 +3093,6 @@
     <ClInclude Include="TrapDoorTile.h" />
     <ClInclude Include="TrapMenu.h" />
     <ClInclude Include="TreeFeature.h" />
-    <ClInclude Include="TreeTileItem.h" />
     <ClInclude Include="UpdateMobEffectPacket.h" />
     <ClInclude Include="UpdateProgressPacket.h" />
     <ClInclude Include="UseAnim.h" />
@@ -2709,6 +3132,7 @@
   <ItemGroup>
     <ClCompile Include="AABB.cpp" />
     <ClCompile Include="Abilities.cpp" />
+    <ClCompile Include="AbsoptionMobEffect.cpp" />
     <ClCompile Include="AbstractContainerMenu.cpp" />
     <ClCompile Include="Achievement.cpp" />
     <ClCompile Include="Achievements.cpp" />
@@ -2723,7 +3147,9 @@
     <ClCompile Include="AddSnowLayer.cpp" />
     <ClCompile Include="AgableMob.cpp" />
     <ClCompile Include="AirTile.cpp" />
+    <ClCompile Include="AmbientCreature.cpp" />
     <ClCompile Include="Animal.cpp" />
+    <ClCompile Include="AnimalChest.cpp" />
     <ClCompile Include="AnimatePacket.cpp" />
     <ClCompile Include="AnvilTile.cpp" />
     <ClCompile Include="AnvilTileItem.cpp" />
@@ -2732,17 +3158,27 @@
     <ClCompile Include="ArmorRecipes.cpp" />
     <ClCompile Include="ArmorSlot.cpp" />
     <ClCompile Include="Arrow.cpp" />
-    <ClCompile Include="ArrowAttackGoal.cpp" />
     <ClCompile Include="ArrowDamageEnchantment.cpp" />
     <ClCompile Include="ArrowFireEnchantment.cpp" />
     <ClCompile Include="ArrowInfiniteEnchantment.cpp" />
     <ClCompile Include="ArrowKnockbackEnchantment.cpp" />
+    <ClCompile Include="AttackDamageMobEffect.cpp" />
+    <ClCompile Include="Attribute.cpp" />
+    <ClCompile Include="AttributeModifier.cpp" />
     <ClCompile Include="AuxDataTileItem.cpp" />
     <ClCompile Include="AvoidPlayerGoal.cpp" />
     <ClCompile Include="AwardStatPacket.cpp" />
+    <ClCompile Include="BaseAttribute.cpp" />
+    <ClCompile Include="BaseAttributeMap.cpp" />
+    <ClCompile Include="BaseMobSpawner.cpp" />
+    <ClCompile Include="BasePressurePlateTile.cpp" />
     <ClCompile Include="BasicTree.cpp" />
     <ClCompile Include="BasicTypeContainers.cpp" />
+    <ClCompile Include="Bat.cpp" />
     <ClCompile Include="BeachBiome.cpp" />
+    <ClCompile Include="BeaconMenu.cpp" />
+    <ClCompile Include="BeaconTile.cpp" />
+    <ClCompile Include="BeaconTileEntity.cpp" />
     <ClCompile Include="BedItem.cpp" />
     <ClCompile Include="BedTile.cpp" />
     <ClCompile Include="BegGoal.cpp" />
@@ -2759,14 +3195,50 @@
     <ClCompile Include="BlockGenMethods.cpp" />
     <ClCompile Include="BlockRegionUpdatePacket.cpp" />
     <ClCompile Include="BlockReplacements.cpp" />
+    <ClCompile Include="BlockSourceImpl.cpp" />
     <ClCompile Include="Boat.cpp" />
     <ClCompile Include="BoatItem.cpp" />
     <ClCompile Include="BodyControl.cpp" />
     <ClCompile Include="BonusChestFeature.cpp" />
     <ClCompile Include="BookItem.cpp" />
     <ClCompile Include="BookshelfTile.cpp" />
-    <ClCompile Include="BossMob.cpp" />
-    <ClCompile Include="BossMobPart.cpp" />
+    <ClCompile Include="Calendar.cpp" />
+    <ClCompile Include="ColoredTile.cpp" />
+    <ClCompile Include="CommandBlock.cpp" />
+    <ClCompile Include="CommandBlockEntity.cpp" />
+    <ClCompile Include="ComparatorTile.cpp" />
+    <ClCompile Include="ComparatorTileEntity.cpp" />
+    <ClCompile Include="DaylightDetectorTile.cpp" />
+    <ClCompile Include="DaylightDetectorTileEntity.cpp" />
+    <ClCompile Include="DropperTile.cpp" />
+    <ClCompile Include="DropperTileEntity.cpp" />
+    <ClCompile Include="DummyCriteria.cpp" />
+    <ClCompile Include="EmptyMapItem.cpp" />
+    <ClCompile Include="FireworksChargeItem.cpp" />
+    <ClCompile Include="FireworksItem.cpp" />
+    <ClCompile Include="FireworksMenu.cpp" />
+    <ClCompile Include="FireworksRecipe.cpp" />
+    <ClCompile Include="FireworksRocketEntity.cpp" />
+    <ClCompile Include="FlatGeneratorInfo.cpp" />
+    <ClCompile Include="FlatLayerInfo.cpp" />
+    <ClCompile Include="GameRules.cpp" />
+    <ClCompile Include="HayBlockTile.cpp" />
+    <ClCompile Include="HealthCriteria.cpp" />
+    <ClCompile Include="HopperMenu.cpp" />
+    <ClCompile Include="HopperTile.cpp" />
+    <ClCompile Include="HopperTileEntity.cpp" />
+    <ClCompile Include="HorseInventoryMenu.cpp" />
+    <ClCompile Include="HtmlString.cpp" />
+    <ClCompile Include="LargeFireball.cpp" />
+    <ClCompile Include="LeashItem.cpp" />
+    <ClCompile Include="MinecartChest.cpp" />
+    <ClCompile Include="MinecartContainer.cpp" />
+    <ClCompile Include="MinecartFurnace.cpp" />
+    <ClCompile Include="MinecartHopper.cpp" />
+    <ClCompile Include="MinecartRideable.cpp" />
+    <ClCompile Include="MinecartSpawner.cpp" />
+    <ClCompile Include="MinecartTNT.cpp" />
+    <ClCompile Include="MultiEntityMobPart.cpp" />
     <ClCompile Include="BottleItem.cpp" />
     <ClCompile Include="BoundingBox.cpp" />
     <ClCompile Include="BowItem.cpp" />
@@ -2801,9 +3273,12 @@
     <ClCompile Include="ChunkPos.cpp" />
     <ClCompile Include="ChunkStorageProfileDecorator.cpp">
       <ShowIncludes Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ShowIncludes>
+      <ShowIncludes Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ShowIncludes>
       <ShowIncludes Condition="'$(Configuration)|$(Platform)'=='Debug|Durango'">false</ShowIncludes>
       <ShowIncludes Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ShowIncludes>
+      <ShowIncludes Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ShowIncludes>
       <ShowIncludes Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|x64'">false</ShowIncludes>
+      <ShowIncludes Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Win32'">false</ShowIncludes>
       <ShowIncludes Condition="'$(Configuration)|$(Platform)'=='Release|Durango'">false</ShowIncludes>
       <ShowIncludes Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Durango'">false</ShowIncludes>
     </ClCompile>
@@ -2817,12 +3292,37 @@
     <ClCompile Include="ClientSideMerchant.cpp" />
     <ClCompile Include="ClockItem.cpp" />
     <ClCompile Include="ClothDyeRecipes.cpp" />
-    <ClCompile Include="ClothTile.cpp" />
-    <ClCompile Include="ClothTileItem.cpp" />
+    <ClCompile Include="NameTagItem.cpp" />
+    <ClCompile Include="Objective.cpp" />
+    <ClCompile Include="ObjectiveCriteria.cpp" />
+    <ClCompile Include="PlayerTeam.cpp" />
+    <ClCompile Include="ItemDispenseBehaviors.cpp" />
+    <ClCompile Include="PoweredMetalTile.cpp" />
+    <ClCompile Include="PoweredRailTile.cpp" />
+    <ClCompile Include="AbstractProjectileDispenseBehavior.cpp" />
+    <ClCompile Include="RailTile.cpp" />
+    <ClCompile Include="Redstone.cpp" />
+    <ClCompile Include="RepeaterTile.cpp" />
+    <ClCompile Include="RotatedPillarTile.cpp" />
+    <ClCompile Include="Score.cpp" />
+    <ClCompile Include="Scoreboard.cpp" />
+    <ClCompile Include="SimpleFoiledItem.cpp" />
+    <ClCompile Include="SnowItem.cpp" />
+    <ClCompile Include="StainedGlassBlock.cpp" />
+    <ClCompile Include="StainedGlassPaneBlock.cpp" />
+    <ClCompile Include="StoneButtonTile.cpp" />
+    <ClCompile Include="StructureFeatureIO.cpp" />
+    <ClCompile Include="StructureFeatureSavedData.cpp" />
+    <ClCompile Include="Team.cpp" />
+    <ClCompile Include="WeightedPressurePlateTile.cpp" />
+    <ClCompile Include="WoodButtonTile.cpp" />
+    <ClCompile Include="WoolTileItem.cpp" />
     <ClCompile Include="CoalItem.cpp" />
     <ClCompile Include="CocoaTile.cpp" />
     <ClCompile Include="Color.cpp" />
     <ClCompile Include="ColoredTileItem.cpp" />
+    <ClCompile Include="CombatEntry.cpp" />
+    <ClCompile Include="CombatTracker.cpp" />
     <ClCompile Include="Command.cpp" />
     <ClCompile Include="CommandDispatcher.cpp" />
     <ClCompile Include="CommonStats.cpp" />
@@ -2837,51 +3337,6 @@
     <ClCompile Include="Connection.cpp" />
     <ClCompile Include="ConsoleSaveFileConverter.cpp" />
     <ClCompile Include="ConsoleSaveFileOriginal.cpp" />
-    <ClCompile Include="ConsoleSaveFileSplit.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Durango'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Durango'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Durango'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Durango'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Durango'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Durango'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Durango'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|ORBIS'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|ORBIS'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|ORBIS'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ORBIS'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|ORBIS'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ORBIS'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|ORBIS'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|PS3'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|PS3'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|PS3'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PS3'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PSVita'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|PSVita'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|PSVita'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PSVita'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|PSVita'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PSVita'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Xbox 360'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Xbox 360'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Xbox 360'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Xbox 360'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Xbox 360'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Container.cpp" />
     <ClCompile Include="ContainerAckPacket.cpp" />
     <ClCompile Include="ContainerButtonClickPacket.cpp" />
     <ClCompile Include="ContainerClickPacket.cpp" />
@@ -2895,7 +3350,10 @@
     <ClCompile Include="Cow.cpp" />
     <ClCompile Include="CraftingContainer.cpp" />
     <ClCompile Include="CraftingMenu.cpp" />
+    <ClCompile Include="DefaultDispenseItemBehavior.cpp" />
+    <ClCompile Include="BehaviorRegistry.cpp" />
     <ClCompile Include="DefaultGameModeCommand.cpp" />
+    <ClCompile Include="DispenseItemBehavior.cpp" />
     <ClCompile Include="DurangoStats.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|PS3'">true</ExcludedFromBuild>
@@ -2926,21 +3384,47 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Xbox 360'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Win32'">true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="EffectCommand.cpp" />
     <ClCompile Include="EnchantItemCommand.cpp" />
+    <ClCompile Include="EntityHorse.cpp" />
+    <ClCompile Include="EntitySelector.cpp" />
     <ClCompile Include="ExperienceCommand.cpp" />
+    <ClCompile Include="FacingEnum.cpp" />
     <ClCompile Include="GameCommandPacket.cpp" />
     <ClCompile Include="GameModeCommand.cpp" />
     <ClCompile Include="GenericStats.cpp" />
     <ClCompile Include="GiveItemCommand.cpp" />
+    <ClCompile Include="HealthBoostMobEffect.cpp" />
     <ClCompile Include="KillCommand.cpp" />
+    <ClCompile Include="LeashFenceKnotEntity.cpp" />
+    <ClCompile Include="LevelParticlesPacket.cpp" />
+    <ClCompile Include="LivingEntity.cpp" />
+    <ClCompile Include="ModifiableAttributeInstance.cpp" />
     <ClCompile Include="PerformanceTimer.cpp" />
+    <ClCompile Include="RangedAttackGoal.cpp" />
+    <ClCompile Include="RangedAttribute.cpp" />
+    <ClCompile Include="RunAroundLikeCrazyGoal.cpp" />
+    <ClCompile Include="ServersideAttributeMap.cpp" />
+    <ClCompile Include="SetDisplayObjectivePacket.cpp" />
+    <ClCompile Include="SetObjectivePacket.cpp" />
+    <ClCompile Include="SetPlayerTeamPacket.cpp" />
+    <ClCompile Include="SetScorePacket.cpp" />
+    <ClCompile Include="SharedMonsterAttributes.cpp" />
+    <ClCompile Include="TileEditorOpenPacket.cpp" />
     <ClCompile Include="TimeCommand.cpp" />
     <ClCompile Include="ToggleDownfallCommand.cpp" />
     <ClCompile Include="TradeItemPacket.cpp" />
@@ -3044,7 +3528,7 @@
     <ClCompile Include="MerchantRecipeList.cpp" />
     <ClCompile Include="MerchantResultSlot.cpp" />
     <ClCompile Include="MilkBucketItem.cpp" />
-    <ClCompile Include="MonsterPlacerItem.cpp" />
+    <ClCompile Include="SpawnEggItem.cpp" />
     <ClCompile Include="MoveControl.cpp" />
     <ClCompile Include="MoveIndoorsGoal.cpp" />
     <ClCompile Include="MoveThroughVillageGoal.cpp" />
@@ -3057,7 +3541,7 @@
     <ClCompile Include="NearestAttackableTargetGoal.cpp" />
     <ClCompile Include="NetherBridgeFeature.cpp" />
     <ClCompile Include="NetherBridgePieces.cpp" />
-    <ClCompile Include="NetherStalkTile.cpp" />
+    <ClCompile Include="NetherWartTile.cpp" />
     <ClCompile Include="NonTameRandomTargetGoal.cpp" />
     <ClCompile Include="Npc.cpp" />
     <ClCompile Include="OcelotSitOnTileGoal.cpp" />
@@ -3066,8 +3550,8 @@
     <ClCompile Include="OwnerHurtByTargetGoal.cpp" />
     <ClCompile Include="OwnerHurtTargetGoal.cpp" />
     <ClCompile Include="OxygenEnchantment.cpp" />
-    <ClCompile Include="Ozelot.cpp" />
-    <ClCompile Include="OzelotAttackGoal.cpp" />
+    <ClCompile Include="Ocelot.cpp" />
+    <ClCompile Include="OcelotAttackGoal.cpp" />
     <ClCompile Include="PanicGoal.cpp" />
     <ClCompile Include="PathNavigation.cpp" />
     <ClCompile Include="PlayerAbilitiesPacket.cpp" />
@@ -3086,7 +3570,7 @@
     <ClCompile Include="RedlightTile.cpp" />
     <ClCompile Include="RegionHillsLayer.cpp" />
     <ClCompile Include="RepairContainer.cpp" />
-    <ClCompile Include="RepairMenu.cpp" />
+    <ClCompile Include="AnvilMenu.cpp" />
     <ClCompile Include="RepairResultSlot.cpp" />
     <ClCompile Include="RestrictOpenDoorGoal.cpp" />
     <ClCompile Include="RestrictSunGoal.cpp" />
@@ -3111,6 +3595,7 @@
     <ClCompile Include="TradeWithPlayerGoal.cpp" />
     <ClCompile Include="TripWireSourceTile.cpp" />
     <ClCompile Include="TripWireTile.cpp" />
+    <ClCompile Include="UpdateAttributesPacket.cpp" />
     <ClCompile Include="Village.cpp" />
     <ClCompile Include="VillagerGolem.cpp" />
     <ClCompile Include="Villages.cpp" />
@@ -3118,6 +3603,9 @@
     <ClCompile Include="VinesFeature.cpp" />
     <ClCompile Include="WallTile.cpp" />
     <ClCompile Include="WeighedTreasure.cpp" />
+    <ClCompile Include="Witch.cpp" />
+    <ClCompile Include="WitherBoss.cpp" />
+    <ClCompile Include="WitherSkull.cpp" />
     <ClCompile Include="WoodSlabTile.cpp" />
     <ClCompile Include="C4JThread.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|ORBIS'">false</ExcludedFromBuild>
@@ -3139,13 +3627,11 @@
     <ClCompile Include="WoolCarpetTile.cpp" />
     <ClCompile Include="XZPacket.cpp" />
     <ClCompile Include="ShoreLayer.cpp" />
-    <ClCompile Include="SmoothStoneBrickTileItem.cpp" />
     <ClCompile Include="SparseLightStorage.cpp" />
     <ClCompile Include="SpikeFeature.cpp" />
     <ClCompile Include="NetherSphere.cpp" />
     <ClCompile Include="SmallFireball.cpp" />
     <ClCompile Include="SnowMan.cpp" />
-    <ClCompile Include="StoneMonsterTileItem.cpp" />
     <ClCompile Include="TextureAndGeometryChangePacket.cpp" />
     <ClCompile Include="TextureAndGeometryPacket.cpp" />
     <ClCompile Include="TheEndBiome.cpp" />
@@ -3180,7 +3666,7 @@
     <ClCompile Include="EntityEventPacket.cpp" />
     <ClCompile Include="EntityIO.cpp" />
     <ClCompile Include="EntityPos.cpp" />
-    <ClCompile Include="EntityTile.cpp" />
+    <ClCompile Include="BaseEntityTile.cpp" />
     <ClCompile Include="ExperienceOrb.cpp" />
     <ClCompile Include="ExplodePacket.cpp" />
     <ClCompile Include="Explosion.cpp" />
@@ -3235,9 +3721,9 @@
     <ClCompile Include="HellFireFeature.cpp" />
     <ClCompile Include="HellPortalFeature.cpp" />
     <ClCompile Include="HellRandomLevelSource.cpp" />
-    <ClCompile Include="HellSandTile.cpp" />
+    <ClCompile Include="SoulSandTile.cpp" />
     <ClCompile Include="HellSpringFeature.cpp" />
-    <ClCompile Include="HellStoneTile.cpp" />
+    <ClCompile Include="NetherrackTile.cpp" />
     <ClCompile Include="HitResult.cpp" />
     <ClCompile Include="HoeItem.cpp" />
     <ClCompile Include="HouseFeature.cpp" />
@@ -3276,9 +3762,12 @@
     <ClCompile Include="Level.cpp" />
     <ClCompile Include="LevelChunk.cpp">
       <ShowIncludes Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ShowIncludes>
+      <ShowIncludes Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ShowIncludes>
       <ShowIncludes Condition="'$(Configuration)|$(Platform)'=='Debug|Durango'">false</ShowIncludes>
       <ShowIncludes Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ShowIncludes>
+      <ShowIncludes Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ShowIncludes>
       <ShowIncludes Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|x64'">false</ShowIncludes>
+      <ShowIncludes Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Win32'">false</ShowIncludes>
       <ShowIncludes Condition="'$(Configuration)|$(Platform)'=='Release|Durango'">false</ShowIncludes>
       <ShowIncludes Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Durango'">false</ShowIncludes>
     </ClCompile>
@@ -3290,7 +3779,7 @@
     <ClCompile Include="LevelType.cpp" />
     <ClCompile Include="LeverTile.cpp" />
     <ClCompile Include="LightGemFeature.cpp" />
-    <ClCompile Include="LightGemTile.cpp" />
+    <ClCompile Include="GlowstoneTile.cpp" />
     <ClCompile Include="LightningBolt.cpp" />
     <ClCompile Include="LiquidTile.cpp" />
     <ClCompile Include="LiquidTileDynamic.cpp" />
@@ -3320,9 +3809,13 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|PS3'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|PSVita'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Durango'">true</ExcludedFromBuild>
@@ -3338,9 +3831,12 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PSVita'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|PSVita'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ORBIS'">true</ExcludedFromBuild>
@@ -3365,9 +3861,13 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|PS3'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|PSVita'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Durango'">true</ExcludedFromBuild>
@@ -3383,9 +3883,12 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PSVita'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|PSVita'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|ORBIS'">true</ExcludedFromBuild>
@@ -3410,9 +3913,13 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|PS3'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|PSVita'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Durango'">true</ExcludedFromBuild>
@@ -3428,9 +3935,12 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PSVita'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|PSVita'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|ORBIS'">true</ExcludedFromBuild>
@@ -3464,7 +3974,7 @@
     <ClCompile Include="MovePlayerPacket.cpp" />
     <ClCompile Include="Mth.cpp" />
     <ClCompile Include="Mushroom.cpp" />
-    <ClCompile Include="MusicTile.cpp" />
+    <ClCompile Include="NoteBlockTile.cpp" />
     <ClCompile Include="MusicTileEntity.cpp" />
     <ClCompile Include="NbtIo.cpp" />
     <ClCompile Include="NbtSlotFile.cpp">
@@ -3481,9 +3991,13 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|PS3'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|PSVita'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Durango'">true</ExcludedFromBuild>
@@ -3499,9 +4013,12 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PSVita'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|PSVita'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ORBIS'">true</ExcludedFromBuild>
@@ -3550,14 +4067,64 @@
     <ClCompile Include="PrimedTnt.cpp" />
     <ClCompile Include="PumpkinFeature.cpp" />
     <ClCompile Include="PumpkinTile.cpp" />
-    <ClCompile Include="RailTile.cpp" />
+    <ClCompile Include="BaseRailTile.cpp" />
     <ClCompile Include="RainforestBiome.cpp" />
     <ClCompile Include="Random.cpp" />
     <ClCompile Include="RandomLevelSource.cpp" />
-    <ClCompile Include="ReadOnlyChunkCache.cpp" />
+    <ClCompile Include="ReadOnlyChunkCache.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Durango'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Durango'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Durango'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Durango'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Durango'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Durango'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Durango'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|PS3'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|PS3'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|PS3'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PS3'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PSVita'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|PSVita'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|PSVita'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|PSVita'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PSVita'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PSVita'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Xbox 360'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Xbox 360'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Xbox 360'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Xbox 360'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Xbox 360'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="Recipes.cpp" />
     <ClCompile Include="RecordingItem.cpp" />
-    <ClCompile Include="RecordPlayerTile.cpp" />
+    <ClCompile Include="JukeboxTile.cpp" />
     <ClCompile Include="RedStoneDustTile.cpp" />
     <ClCompile Include="RedStoneItem.cpp" />
     <ClCompile Include="RedStoneOreTile.cpp" />
@@ -3593,7 +4160,7 @@
     <ClCompile Include="SetEquippedItemPacket.cpp" />
     <ClCompile Include="SetExperiencePacket.cpp" />
     <ClCompile Include="SetHealthPacket.cpp" />
-    <ClCompile Include="SetRidingPacket.cpp" />
+    <ClCompile Include="SetEntityLinkPacket.cpp" />
     <ClCompile Include="SetSpawnPositionPacket.cpp" />
     <ClCompile Include="SetTimePacket.cpp" />
     <ClCompile Include="ShapedRecipy.cpp" />
@@ -3606,9 +4173,12 @@
     <ClCompile Include="SignTile.cpp" />
     <ClCompile Include="SignTileEntity.cpp">
       <ShowIncludes Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ShowIncludes>
+      <ShowIncludes Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ShowIncludes>
       <ShowIncludes Condition="'$(Configuration)|$(Platform)'=='Debug|Durango'">false</ShowIncludes>
       <ShowIncludes Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ShowIncludes>
+      <ShowIncludes Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ShowIncludes>
       <ShowIncludes Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|x64'">false</ShowIncludes>
+      <ShowIncludes Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Win32'">false</ShowIncludes>
       <ShowIncludes Condition="'$(Configuration)|$(Platform)'=='Release|Durango'">false</ShowIncludes>
       <ShowIncludes Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Durango'">false</ShowIncludes>
     </ClCompile>
@@ -3628,9 +4198,12 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PSVita'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|PSVita'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Xbox 360'">true</ExcludedFromBuild>
@@ -3646,9 +4219,13 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|PS3'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|PSVita'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Durango'">true</ExcludedFromBuild>
@@ -3675,7 +4252,6 @@
     <ClCompile Include="Spider.cpp" />
     <ClCompile Include="Sponge.cpp" />
     <ClCompile Include="SpringFeature.cpp" />
-    <ClCompile Include="SpringTile.cpp" />
     <ClCompile Include="SpruceFeature.cpp" />
     <ClCompile Include="Squid.cpp" />
     <ClCompile Include="Stat.cpp" />
@@ -3692,9 +4268,12 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|PSVita'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|PSVita'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Durango'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Durango'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Durango'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Xbox 360'">Create</PrecompiledHeader>
@@ -3710,18 +4289,25 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|PS3'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|PSVita'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ContentPackage|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Durango'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Durango'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Durango'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Durango'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugContentPackage|Durango'">Create</PrecompiledHeader>
       <ShowIncludes Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ShowIncludes>
+      <ShowIncludes Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ShowIncludes>
       <ShowIncludes Condition="'$(Configuration)|$(Platform)'=='Debug|Durango'">false</ShowIncludes>
       <ShowIncludes Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ShowIncludes>
+      <ShowIncludes Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ShowIncludes>
       <ShowIncludes Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|x64'">false</ShowIncludes>
+      <ShowIncludes Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Win32'">false</ShowIncludes>
       <ShowIncludes Condition="'$(Configuration)|$(Platform)'=='Release|Durango'">false</ShowIncludes>
       <ShowIncludes Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Durango'">false</ShowIncludes>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ContentPackage|ORBIS'">Create</PrecompiledHeader>
@@ -3796,7 +4382,6 @@
     <ClCompile Include="TrapDoorTile.cpp" />
     <ClCompile Include="TrapMenu.cpp" />
     <ClCompile Include="TreeFeature.cpp" />
-    <ClCompile Include="TreeTileItem.cpp" />
     <ClCompile Include="UpdateMobEffectPacket.cpp" />
     <ClCompile Include="UpdateProgressPacket.cpp" />
     <ClCompile Include="UseItemPacket.cpp" />
@@ -3837,9 +4422,13 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|PS3'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|PSVita'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Durango'">true</ExcludedFromBuild>
@@ -3855,9 +4444,12 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PSVita'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|PSVita'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ORBIS'">true</ExcludedFromBuild>
@@ -3882,9 +4474,13 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|PS3'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|PSVita'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Durango'">true</ExcludedFromBuild>
@@ -3900,9 +4496,12 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PSVita'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|PSVita'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ORBIS'">true</ExcludedFromBuild>
@@ -3927,9 +4526,13 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|PS3'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|PSVita'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Durango'">true</ExcludedFromBuild>
@@ -3945,9 +4548,12 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PSVita'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|PSVita'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ORBIS'">true</ExcludedFromBuild>
@@ -3960,8 +4566,7 @@
     </ClCompile>
     <ClCompile Include="ZoomLayer.cpp" />
   </ItemGroup>
-  <ItemGroup Condition="'$(Platform)'=='Durango'">
-    <SDKReference Include="Xbox Services API, Version=8.0" />
+  <ItemGroup>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-- 
cgit v1.2.3