diff --git a/.gitignore b/.gitignore
index 92197f16..f56f134b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,6 +21,10 @@
/Minecraft.World/*Release*
/Minecraft.World/*ContentPackage*
+# Build Folders
+*/Build/*
+Build/*
+
# PS3 SPU Tasks
/Minecraft.Client/PS3/SPU_Tasks/objFiles
/Minecraft.Client/PS3/SPU_Tasks/*/PS3*
diff --git a/Minecraft.Client/Common/Media/MediaWindows64.arc b/Minecraft.Client/Common/Media/MediaWindows64.arc
index ab65ef71..fd5c7c7c 100644
Binary files a/Minecraft.Client/Common/Media/MediaWindows64.arc and b/Minecraft.Client/Common/Media/MediaWindows64.arc differ
diff --git a/Minecraft.Client/Minecraft.Client.vcxproj b/Minecraft.Client/Minecraft.Client.vcxproj
index 61af1e25..fbd5a1d2 100644
--- a/Minecraft.Client/Minecraft.Client.vcxproj
+++ b/Minecraft.Client/Minecraft.Client.vcxproj
@@ -6003,22 +6003,6 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUfalse
false
-
- true
- true
- true
- true
- true
- true
- true
- false
- false
- false
- false
- false
- false
- false
-
true
true
@@ -23019,54 +23003,6 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUfalse
false
-
- true
- true
- true
- true
- true
- true
- true
- false
- false
- false
- false
- false
- false
- false
-
-
- true
- true
- true
- true
- true
- true
- true
- false
- false
- false
- false
- false
- false
- false
-
-
- true
- true
- true
- true
- true
- true
- true
- false
- false
- false
- false
- false
- false
- false
-
true
true
@@ -23083,38 +23019,6 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUfalse
false
-
- true
- true
- true
- true
- true
- true
- true
- false
- false
- false
- false
- false
- false
- false
-
-
- true
- true
- true
- true
- true
- true
- true
- false
- false
- false
- false
- false
- false
- false
-
true
true
@@ -23131,22 +23035,6 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUfalse
false
-
- true
- true
- true
- true
- true
- true
- true
- false
- false
- false
- false
- false
- false
- false
-
true
true
diff --git a/Minecraft.Client/Minecraft.Client.vcxproj.filters b/Minecraft.Client/Minecraft.Client.vcxproj.filters
index d52e7d8d..b074857d 100644
--- a/Minecraft.Client/Minecraft.Client.vcxproj.filters
+++ b/Minecraft.Client/Minecraft.Client.vcxproj.filters
@@ -3015,9 +3015,6 @@
Common\Source Files\UI\Scenes\Help & Options
-
- Common\Source Files\UI\Scenes\Help & Options
-
Common\Source Files\UI\Controls
@@ -3045,18 +3042,6 @@
Common\Source Files\UI\Controls
-
- Common\Source Files\UI\Scenes\Help & Options
-
-
- Common\Source Files\UI\Scenes\Help & Options
-
-
- Common\Source Files\UI\Scenes\Help & Options
-
-
- Common\Source Files\UI\Scenes\Help & Options
-
Common\Source Files\Network
@@ -3105,9 +3090,6 @@
Common\Source Files\BuildVer
-
- Common\Source Files\UI\Scenes\Help & Options
-
Common\Source Files\UI\Controls
@@ -5096,9 +5078,6 @@
Common\Source Files\UI\Scenes\Help & Options
-
- Common\Source Files\UI\Scenes\Help & Options
-
Common\Source Files\UI\Controls
@@ -5126,18 +5105,6 @@
Common\Source Files\UI\Controls
-
- Common\Source Files\UI\Scenes\Help & Options
-
-
- Common\Source Files\UI\Scenes\Help & Options
-
-
- Common\Source Files\UI\Scenes\Help & Options
-
-
- Common\Source Files\UI\Scenes\Help & Options
-
Common\Source Files\UI\All Platforms
@@ -5180,9 +5147,6 @@
Common\Source Files\UI\Scenes
-
- Common\Source Files\UI\Scenes\Help & Options
-
Common\Source Files\UI\Controls
diff --git a/Minecraft.Client/stdafx.h b/Minecraft.Client/stdafx.h
index c353962e..45c9fe0b 100644
--- a/Minecraft.Client/stdafx.h
+++ b/Minecraft.Client/stdafx.h
@@ -98,18 +98,9 @@ typedef XUID PlayerUID;
typedef XNKID SessionID;
typedef XUID GameSessionUID;
#define HRESULT_SUCCEEDED(hr) (((HRESULT)(hr)) >= 0)
-#endif
-
-#ifndef _XBOX
-#include "Xbox\GameConfig\Minecraft.spa.h"
-#include "Common\Audio\SoundEngine.h"
-#include "extraX64client.h"
-#else
#include "..\Minecraft.Client\xbox\network\extra.h"
-#include "Xbox\Audio\SoundEngine.h"
+#else
#include "extraX64.h"
-#include
-#include
#endif
#ifdef __PS3__
@@ -151,6 +142,8 @@ typedef XUID GameSessionUID;
#include "..\Minecraft.World\PerformanceTimer.h"
#ifdef _XBOX
+ #include
+ #include
#include "xbox\4JLibs\inc\4J_Input.h"
#include "xbox\4JLibs\inc\4J_Profile.h"
#include "xbox\4JLibs\inc\4J_Render.h"
@@ -201,9 +194,9 @@ typedef XUID GameSessionUID;
#include "Common\XUI\XUI_Scene_Base.h"
#endif
+#include "Common\App_defines.h"
#include "Common\UI\UIEnums.h"
#include "Common\UI\UIStructs.h"
-#include "Common\App_defines.h"
#include "Common\App_enums.h"
#include "Common\Tutorial\TutorialEnum.h"
#include "Common\App_structs.h"
@@ -213,6 +206,16 @@ typedef XUID GameSessionUID;
#include "Common\Minecraft_Macros.h"
#include "Common\BuildVer.h"
+#ifndef _XBOX
+#include "Xbox\GameConfig\Minecraft.spa.h"
+#include "Common\Audio\SoundEngine.h"
+#ifndef __PS3__
+#include "extraX64client.h"
+#endif
+#else
+#include "Xbox\Audio\SoundEngine.h"
+#endif
+
#ifdef _XBOX
#include "Xbox\Xbox_App.h"
#include "Xbox\Sentient\MinecraftTelemetry.h"
@@ -260,7 +263,6 @@ typedef XUID GameSessionUID;
#include "Windows64\Sentient\SentientTelemetryCommon.h"
#include "Windows64\XML\ATGXmlParser.h"
#include "Windows64\Social\SocialManager.h"
- #include "Common\Audio\SoundEngine.h"
#include "Windows64\Iggy\include\iggy.h"
#include "Windows64\Iggy\gdraw\gdraw_d3d11.h"
#include "Windows64\Windows64_UIController.h"