wip_feat(PS3): Implement SPU variants for a portion of TU19's blocks

crashes at a stack overflow, cant be assed to fix it atm

.gitignore

@@ -1,25 +1,38 @@
+/ORBIS_Debug
+/ORBIS_Release
 /PS3_Debug
 /PS3_Release
-/x360_Debug
-/x360_Release
+/PSVita_Debug
+/PSVita_Release
+/X360_Debug
+/X360_Release
 /Release
 /Debug
 /x64
 /ipch
 .vs/
 
+/Minecraft.Client/ORBIS_Debug
+/Minecraft.Client/ORBIS_Release
 /Minecraft.Client/PS3_Debug
 /Minecraft.Client/PS3_Release
-/Minecraft.Client/x360_Debug
-/Minecraft.Client/x360_Release
+/Minecraft.Client/PSVita_Debug
+/Minecraft.Client/PSVita_Release
+/Minecraft.Client/X360_Debug
+/Minecraft.Client/X360_Release
 /Minecraft.Client/Debug
 /Minecraft.Client/Release
 /Minecraft.Client/x64
+/Minecraft.Client/Windows64/GameHDD
 
+/Minecraft.World/ORBIS_Debug
+/Minecraft.World/ORBIS_Release
 /Minecraft.World/PS3_Debug
 /Minecraft.World/PS3_Release
-/Minecraft.World/x360_Debug
-/Minecraft.World/x360_Release
+/Minecraft.World/PSVita_Debug
+/Minecraft.World/PSVita_Release
+/Minecraft.World/X360_Debug
+/Minecraft.World/X360_Release
 /Minecraft.World/Debug
 /Minecraft.World/Release
 /Minecraft.World/x64_Debug
@@ -27,3 +40,16 @@
 MinecraftConsoles.opensdf
 MinecraftConsoles.v11.suo
 MinecraftConsoles.sdf
+
+/Minecraft.Client/PS3/SPU_Tasks/Texture_blit/PS3_Debug
+/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_FindNearestChunk/PS3_Debug
+/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_cull/PS3_Debug
+/Minecraft.Client/PS3/SPU_Tasks/CompressedTileStorage_compress/PS3_Debug
+/Minecraft.Client/PS3/SPU_Tasks/CompressedTile/PS3_Debug
+/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/PS3_Debug
+/Minecraft.Client/PS3/SPU_Tasks/Texture_blit/PS3_Release
+/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_FindNearestChunk/PS3_Release
+/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_cull/PS3_Release
+/Minecraft.Client/PS3/SPU_Tasks/CompressedTileStorage_compress/PS3_Release
+/Minecraft.Client/PS3/SPU_Tasks/CompressedTile/PS3_Release
+/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/PS3_Release

Minecraft.Client/Common/Audio/SoundEngine.cpp

@@ -55,8 +55,9 @@ void SoundEngine::playMusicTick() {};
 
 #else
 
+// str1k3r: previously ps4 needed the durango folder to load sound and so did windows this fixes that and makes them use there own folders.
 #ifdef _WINDOWS64
-char SoundEngine::m_szSoundPath[]={"Durango\\Sound\\"};
+char SoundEngine::m_szSoundPath[]={"Windows64Media\\Sound\\"};
 char SoundEngine::m_szMusicPath[]={"music\\"};
 char SoundEngine::m_szRedistName[]={"redist64"};
 #elif defined _DURANGO
@@ -64,15 +65,7 @@ char SoundEngine::m_szSoundPath[]={"Sound\\"};
 char SoundEngine::m_szMusicPath[]={"music\\"};
 char SoundEngine::m_szRedistName[]={"redist64"};
 #elif defined __ORBIS__
-
-#ifdef _CONTENT_PACKAGE
-char SoundEngine::m_szSoundPath[]={"Sound/"};
-#elif defined _ART_BUILD
-char SoundEngine::m_szSoundPath[]={"Sound/"};
-#else
-// just use the host Durango folder for the sound. In the content package, we'll have moved this in the .gp4 file
-char SoundEngine::m_szSoundPath[]={"Durango/Sound/"};
-#endif
+char SoundEngine::m_szSoundPath[]={"PS4/Sound/"};
 char SoundEngine::m_szMusicPath[]={"music/"};
 char SoundEngine::m_szRedistName[]={"redist64"};
 #elif defined __PSVITA__
@@ -84,6 +77,11 @@ char SoundEngine::m_szRedistName[]={"redist"};
 char SoundEngine::m_szSoundPath[]={"PS3/Sound/"};
 char SoundEngine::m_szMusicPath[]={"music/"};
 char SoundEngine::m_szRedistName[]={"redist"};
+#ifdef _CONTENT_PACKAGE
+char SoundEngine::m_szSoundPath[]={"Sound/"};
+#elif defined _ART_BUILD
+char SoundEngine::m_szSoundPath[]={"Sound/"};
+#endif
 
 #define USE_SPURS
 

Minecraft.Client/Common/Consoles_App.cpp

@@ -4417,7 +4417,9 @@ int CMinecraftApp::EthernetDisconnectReturned(void *pParam,int iPad,const C4JSto
 	else
 	{
 		//  4J-PB - turn off the PSN store icon just in case this happened when we were in one of the DLC menus
-#if defined __ORBIS__ || defined __PSVITA__
+#ifdef __ORBIS__
+		sceNpCommerceHidePsStoreIcon();
+#elif defined __PSVITA__
 		app.GetCommerce()->HidePsStoreIcon();
 #endif
 		app.SetAction(iPad,eAppAction_EthernetDisconnectedReturned_Menus);

Minecraft.Client/Common/Network/Sony/PlatformNetworkManagerSony.cpp

@@ -54,7 +54,9 @@ void CPlatformNetworkManagerSony::HandleStateChange(SQRNetworkManager::eSQRNetwo
 	else if( newState == SQRNetworkManager::SNM_STATE_JOINING )
 	{
 		// 4J Stu - We may be accepting an invite from the DLC menu, so hide the icon
-#if defined __ORBIS__ || defined __PSVITA__
+#ifdef __ORBIS__
+		sceNpCommerceHidePsStoreIcon();
+#elif defined __PSVITA__
 		app.GetCommerce()->HidePsStoreIcon();
 #endif
 		m_bLeavingGame = false;

Minecraft.Client/Common/Network/Sony/SonyCommerce.h

@@ -170,7 +170,8 @@ public:
 	virtual void CheckForTrialUpgradeKey() = 0;
 	virtual bool LicenseChecked() = 0;
 
-#if defined __ORBIS__ || defined __PSVITA__
+// str1k3r: Currently does not work on Orbis.
+#if defined __PSVITA__ // || defined __ORBIS__
 	virtual void ShowPsStoreIcon() = 0;
 	virtual void HidePsStoreIcon() = 0;
 #endif

Minecraft.Client/Common/Postbuilds/Orbis-postbuild.ps1

@@ -10,6 +10,7 @@ $directories = @(
 	"Orbis",
 	"Common",
     "Common\Media",
+	"Common\Tutorial",
     "Common\res",
     "Sound"
 )
@@ -22,12 +23,11 @@ $folderCopies = @(
     @{ Source = "music";		   Dest = "PS4_GAME\music" },
     @{ Source = "Common\Media";    Dest = "PS4_GAME\Common\Media" },
     @{ Source = "Common\res";      Dest = "PS4_GAME\Common\res" },
-    @{ Source = "Common\Tutorial"; Dest = "PS4_GAME\Common\Tutorial" },
-	@{ Source = "Common\Tutorial"; Dest = "PS4_GAME\Common\Tutorial" },
+    @{ Source = "PSVita\Tutorial"; Dest = "PS4_GAME\Common\Tutorial" },
 	@{ Source = "PS3\Sound";       Dest = "PS4_GAME\Sound" },
     @{ Source = "Common\Postbuilds\Contents\Orbis\sce_module"; Dest = "PS4_GAME\sce_module" },
-    @{ Source = "Common\Postbuilds\Contents\Orbis\sce_gls"; Dest = "PS4_GAME\sce_gls" },
-    @{ Source = "Common\Postbuilds\Contents\Orbis\sce_sys"; Dest = "PS4_GAME\sce_sys" },
+    @{ Source = "Common\Postbuilds\Contents\Orbis\sce_gls";	   Dest = "PS4_GAME\sce_gls" },
+    @{ Source = "Common\Postbuilds\Contents\Orbis\sce_sys";    Dest = "PS4_GAME\sce_sys" },
 )
 
 foreach ($copy in $folderCopies) {
@@ -52,14 +52,14 @@ foreach ($copy in $fileCopies) {
 	}
 }
 
-$builtFile = Join-Path $OutDir "Minecraft.Client.self"
+$builtFile = Join-Path $OutDir "Minecraft.Client.elf"
 $newName   = "eboot.bin"
 $destDir   = Join-Path $OutDir "PS4_GAME"
 $destPath  = Join-Path $destDir $newName
 
 if (Test-Path $builtFile) {
     New-Item -ItemType Directory -Path $destDir -Force | Out-Null
-    Move-Item -Path $builtFile -Destination $destPath -Force
+    Copy-Item -Path $builtFile -Destination $destPath -Force
 }
 
 $deleteDirs = @(
@@ -84,8 +84,8 @@ foreach ($dir in $deleteDirs) {
 }
 
 $delDirs = @(
-    "Common\Media",
-    "Common\Media\font"
+    "PS4_GAME\Common\Media",
+    "PS4_GAME\Common\Media\font"
 )
 
 foreach ($dir in $delDirs) {

Minecraft.Client/Common/Postbuilds/PS3-postbuild.ps1

@@ -9,7 +9,8 @@ $directories = @(
     "PS3_GAME\USRDIR\music",
     "PS3_GAME\USRDIR\DLC",
     "PS3_GAME\USRDIR\Common\Media",
-    "PS3_GAME\USRDIR\Common\res",
+	"PS3_GAME\USRDIR\Common\res",
+    "PS3_GAME\USRDIR\PS3\Tutorial",
 	"PS3_GAME\USRDIR\PS3\Sound"
 )
 
@@ -21,9 +22,10 @@ $folderCopies = @(
     @{ Source = "music";            Dest = "PS3_GAME\USRDIR\music" },
     @{ Source = "Common\Media";     Dest = "PS3_GAME\USRDIR\Common\Media" },
     @{ Source = "Common\res";       Dest = "PS3_GAME\USRDIR\Common\res" },
-	@{ Source = "PS3Media\DLC";  Dest = "PS3_GAME\USRDIR\DLC" },
+	@{ Source = "PS3Media\DLC";		Dest = "PS3_GAME\USRDIR\DLC" },
     @{ Source = "PS3\Sound";        Dest = "PS3_GAME\USRDIR\PS3\Sound" },
-	@{ Source = "Common\Postbuilds\Contents\PS3\PS3_GAME\LICDIR"; Dest = "PS3_GAME\LICDIR" },
+	@{ Source = "PSVita\Tutorial";  Dest = "PS3_GAME\USRDIR\PS3\Tutorial" }
+	@{ Source = "Common\Postbuilds\Contents\PS3\PS3_GAME\LICDIR";  Dest = "PS3_GAME\LICDIR" },
 	@{ Source = "Common\Postbuilds\Contents\PS3\PS3_GAME\TROPDIR"; Dest = "PS3_GAME\TROPDIR" }
 )
 
@@ -64,7 +66,7 @@ $destPath  = Join-Path $destDir $newName
 
 if (Test-Path $builtFile) {
     New-Item -ItemType Directory -Path $destDir -Force | Out-Null
-    Move-Item -Path $builtFile -Destination $destPath -Force
+    Copy-Item -Path $builtFile -Destination $destPath -Force
 }
 
 $deleteDirs = @(
@@ -89,8 +91,8 @@ foreach ($dir in $deleteDirs) {
 }
 
 $delDirs = @(
-    "Common\Media",
-    "Common\Media\font"
+    "PS3_GAME\USRDIR\Common\Media",
+    "PS3_GAME\USRDIR\Common\Media\font"
 )
 
 foreach ($dir in $delDirs) {

Minecraft.Client/Common/Postbuilds/PSVita-postbuild.ps1

@@ -24,7 +24,7 @@ $folderCopies = @(
     @{ Source = "Common\res";      Dest = "PSVITA_GAME\Common\res" },
 	@{ Source = "PSVita\Sound";    Dest = "PSVITA_GAME\Sound" },
     @{ Source = "Common\Postbuilds\Contents\PSVita\sce_module"; Dest = "PSVITA_GAME\sce_module" },
-    @{ Source = "Common\Postbuilds\Contents\PSVita\sce_sys"; Dest = "PSVITA_GAME\sce_sys" }
+    @{ Source = "Common\Postbuilds\Contents\PSVita\sce_sys";    Dest = "PSVITA_GAME\sce_sys" }
 )
 
 foreach ($copy in $folderCopies) {
@@ -38,7 +38,7 @@ foreach ($copy in $folderCopies) {
 
 $fileCopies = @(
     @{ Source = "PSVita\PSVitaProductCodes.bin"; Dest = "PSVITA_GAME\PSVita\PSVitaProductCodes.bin" },
-	@{ Source = "PSVita\session_image.png"; Dest = "PSVITA_GAME\PSVita\session_image.png" },
+	@{ Source = "PSVita\session_image.png";      Dest = "PSVITA_GAME\PSVita\session_image.png" },
     @{ Source = "Common\Postbuilds\Contents\PSVita\icon.png"; Dest = "PSVITA_GAME\icon.png" },
 )
 
@@ -57,7 +57,7 @@ $destPath  = Join-Path $destDir $newName
 
 if (Test-Path $builtFile) {
     New-Item -ItemType Directory -Path $destDir -Force | Out-Null
-    Move-Item -Path $builtFile -Destination $destPath -Force
+    Copy-Item -Path $builtFile -Destination $destPath -Force
 }
 
 $deleteDirs = @(
@@ -82,8 +82,8 @@ foreach ($dir in $deleteDirs) {
 }
 
 $delDirs = @(
-    "Common\Media",
-    "Common\Media\font"
+    "PSVITA_GAME\Common\Media",
+    "PSVITA_GAME\Common\Media\font"
 )
 
 foreach ($dir in $delDirs) {

Minecraft.Client/Common/Postbuilds/Windows64-postbuild.ps1

@@ -10,7 +10,6 @@ $directories = @(
     "Windows64\GameHDD",
     "Common\Media",
     "Common\res",
-    "Common\Tutorial",
     "Windows64Media",
 	"redist64"
 )
@@ -19,19 +18,18 @@ foreach ($dir in $directories) {
     New-Item -ItemType Directory -Path (Join-Path $OutDir $dir) -Force | Out-Null
 }
 
-$copies = @(
-    @{ Source = "music";           Dest = "music" },
-    @{ Source = "Common\Media";    Dest = "Common\Media" },
-    @{ Source = "Common\res";      Dest = "Common\res" },
-    @{ Source = "Common\Tutorial"; Dest = "Common\Tutorial" },
-    @{ Source = "Windows64\GameHDD"; Dest = "Windows64\GameHDD" },
-    @{ Source = "Windows64\Sound";  Dest = "Windows64\Sound" },
-    @{ Source = "DurangoMedia";    Dest = "Windows64Media" },
-    @{ Source = "Windows64Media";  Dest = "Windows64Media" },
+$folderCopies = @(
+    @{ Source = "Common\Media";    		Dest = "Common\Media" },
+    @{ Source = "Common\res";      		Dest = "Common\res" },
+    @{ Source = "DurangoMedia";    		Dest = "Windows64Media" },
+    @{ Source = "Windows64Media";  		Dest = "Windows64Media" },
+	@{ Source = "PSVita\Tutorial"; 		Dest = "Windows64Media\Tutorial" },
+	@{ Source = "Windows64Media\music"; Dest = "Windows64Media\music" },
+	@{ Source = "Windows64Media\Sound"; Dest = "Windows64Media\Sound" },
 	@{ Source = "Common\Postbuilds\Contents\Windows64\redist64"; Dest = "redist64" }
 )
 
-foreach ($copy in $copies) {
+foreach ($copy in $folderCopies) {
     $src = Join-Path $ProjectDir $copy.Source
     $dst = Join-Path $OutDir $copy.Dest
 

Minecraft.Client/Common/UI/UIController.cpp

@@ -2506,16 +2506,29 @@ void UIController::ClearPressStart()
 
 C4JStorage::EMessageResult UIController::RequestAlertMessage(UINT uiTitle, UINT uiText, UINT *uiOptionA,UINT uiOptionC, DWORD dwPad, int( *Func)(LPVOID,int,const C4JStorage::EMessageResult),LPVOID lpParam, WCHAR *pwchFormatString)
 {
+#ifndef __ORBIS__
 	return RequestMessageBox(uiTitle, uiText, uiOptionA, uiOptionC, dwPad, Func, lpParam, pwchFormatString, 0, false);
+#else
+	return RequestMessageBox(uiTitle, uiText, uiOptionA, uiOptionC, dwPad, Func, lpParam, NULL, pwchFormatString, 0, false);
+#endif
 }
 
 C4JStorage::EMessageResult UIController::RequestErrorMessage(UINT uiTitle, UINT uiText, UINT *uiOptionA,UINT uiOptionC, DWORD dwPad, int( *Func)(LPVOID,int,const C4JStorage::EMessageResult),LPVOID lpParam, WCHAR *pwchFormatString)
 {
+#ifndef __ORBIS__
 	return RequestMessageBox(uiTitle, uiText, uiOptionA, uiOptionC, dwPad, Func, lpParam, pwchFormatString, 0, true);
+#else
+	return RequestMessageBox(uiTitle, uiText, uiOptionA, uiOptionC, dwPad, Func, lpParam, NULL, pwchFormatString, 0, true);
+#endif
 }
 
+#ifndef __ORBIS__
 C4JStorage::EMessageResult UIController::RequestMessageBox(UINT uiTitle, UINT uiText, UINT *uiOptionA,UINT uiOptionC, DWORD dwPad,
 														   int( *Func)(LPVOID,int,const C4JStorage::EMessageResult),LPVOID lpParam, WCHAR *pwchFormatString,DWORD dwFocusButton, bool bIsError)
+#else
+C4JStorage::EMessageResult UIController::RequestMessageBox(UINT uiTitle, UINT uiText, UINT *uiOptionA,UINT uiOptionC, DWORD dwPad,
+														   int( *Func)(LPVOID,int,const C4JStorage::EMessageResult),LPVOID lpParam, C4JStringTable *pStringTable, WCHAR *pwchFormatString,DWORD dwFocusButton, bool bIsError)
+#endif
 
 {
 	MessageBoxInfo param;

Minecraft.Client/Common/UI/UIController.h

@@ -374,8 +374,15 @@ public:
 
 	virtual C4JStorage::EMessageResult RequestAlertMessage(UINT uiTitle, UINT uiText, UINT *uiOptionA,UINT uiOptionC, DWORD dwPad=XUSER_INDEX_ANY, int( *Func)(LPVOID,int,const C4JStorage::EMessageResult)=NULL,LPVOID lpParam=NULL, WCHAR *pwchFormatString=NULL);
 	virtual C4JStorage::EMessageResult RequestErrorMessage(UINT uiTitle, UINT uiText, UINT *uiOptionA,UINT uiOptionC, DWORD dwPad=XUSER_INDEX_ANY, int( *Func)(LPVOID,int,const C4JStorage::EMessageResult)=NULL,LPVOID lpParam=NULL, WCHAR *pwchFormatString=NULL);
+#ifndef __ORBIS__
 private:
-	virtual C4JStorage::EMessageResult RequestMessageBox(UINT uiTitle, UINT uiText, UINT *uiOptionA,UINT uiOptionC, DWORD dwPad,int( *Func)(LPVOID,int,const C4JStorage::EMessageResult),LPVOID lpParam, WCHAR *pwchFormatString,DWORD dwFocusButton, bool bIsError);
+	virtual C4JStorage::EMessageResult RequestMessageBox(UINT uiTitle, UINT uiText, UINT *uiOptionA,UINT uiOptionC, DWORD dwPad,
+						int( *Func)(LPVOID,int,const C4JStorage::EMessageResult),LPVOID lpParam, WCHAR *pwchFormatString,DWORD dwFocusButton, bool bIsError);
+#else
+public:
+	virtual C4JStorage::EMessageResult RequestMessageBox(UINT uiTitle, UINT uiText, UINT *uiOptionA,UINT uiOptionC, DWORD dwPad=XUSER_INDEX_ANY,
+						int( *Func)(LPVOID,int,const C4JStorage::EMessageResult)=NULL,LPVOID lpParam=NULL, C4JStringTable *pStringTable=NULL, WCHAR *pwchFormatString=NULL,DWORD dwFocusButton=0, bool bIsError = true);
+#endif
 
 public:
 	C4JStorage::EMessageResult RequestUGCMessageBox(UINT title = -1, UINT message = -1, int iPad = -1, int( *Func)(LPVOID,int,const C4JStorage::EMessageResult) = NULL, LPVOID lpParam = NULL);

Minecraft.Client/Common/UI/UIScene_DLCMainMenu.cpp

@@ -53,8 +53,10 @@ UIScene_DLCMainMenu::UIScene_DLCMainMenu(int iPad, void *initData, UILayer *pare
 	
 	TelemetryManager->RecordMenuShown(iPad, eUIScene_DLCMainMenu, 0);
 
-#if defined __ORBIS__ || defined __PSVITA__
-	app.GetCommerce()->ShowPsStoreIcon();
+#ifdef __ORBIS__
+	sceNpCommerceShowPsStoreIcon(SCE_NP_COMMERCE_PS_STORE_ICON_RIGHT);
+#elif defined __PSVITA__
+	sceNpCommerce2ShowPsStoreIcon(SCE_NP_COMMERCE2_ICON_DISP_RIGHT);
 #endif
 
 #if ( defined __PS3__ || defined __ORBIS__ || defined __PSVITA__ )
@@ -96,8 +98,10 @@ void UIScene_DLCMainMenu::handleInput(int iPad, int key, bool repeat, bool press
 	case ACTION_MENU_CANCEL:
 		if(pressed)
 		{
-#if defined __ORBIS__ || defined __PSVITA__
-			app.GetCommerce()->HidePsStoreIcon();
+#ifdef __ORBIS__
+		sceNpCommerceHidePsStoreIcon();
+#elif defined __PSVITA__
+		app.GetCommerce()->HidePsStoreIcon();
 #endif
 			navigateBack();
 		}
@@ -168,8 +172,10 @@ int UIScene_DLCMainMenu::ExitDLCMainMenu(void *pParam,int iPad,C4JStorage::EMess
 {
 	UIScene_DLCMainMenu* pClass = (UIScene_DLCMainMenu*)pParam;
 
-#if defined __ORBIS__ || defined __PSVITA__
-	app.GetCommerce()->HidePsStoreIcon();
+#ifdef __ORBIS__
+		sceNpCommerceHidePsStoreIcon();
+#elif defined __PSVITA__
+		app.GetCommerce()->HidePsStoreIcon();
 #endif
 	pClass->navigateBack();
 

Minecraft.Client/Common/UI/UIScene_DLCOffersMenu.cpp

@@ -105,7 +105,9 @@ int UIScene_DLCOffersMenu::ExitDLCOffersMenu(void *pParam,int iPad,C4JStorage::E
 {
 	UIScene_DLCOffersMenu* pClass = (UIScene_DLCOffersMenu*)pParam;
 
-#if defined __ORBIS__ || defined __PSVITA__
+#ifdef __ORBIS__
+	sceNpCommerceHidePsStoreIcon();
+#elif defined __PSVITA__
 	app.GetCommerce()->HidePsStoreIcon();
 #endif
 	ui.NavigateToHomeMenu();//iPad,eUIScene_MainMenu);

Minecraft.Client/Common/XUI/XUI_TutorialPopup.cpp

@@ -402,7 +402,7 @@ wstring CScene_TutorialPopup::_SetIcon(int icon, int iAuxVal, bool isFoil, LPCWS
 		}
 		else if(temp.find(L"{*StoneIcon*}")!=wstring::npos)
 		{
-			m_pCraftingPic->SetIcon(m_iPad, Tile::rock_Id,0,1,10,31,false);
+			m_pCraftingPic->SetIcon(m_iPad, Tile::stone_Id,0,1,10,31,false);
 		}
 		else
 		{

Minecraft.Client/Durango/Durango_Minecraft.cpp

@@ -588,7 +588,7 @@ void oldWinMainInit()
 
 	byteArray baSaveThumbnail = app.getArchiveFile(L"DefaultSaveThumbnail64x64.png");
 
-	StorageManager.InitialiseProfileData(PROFILE_VERSION_BUILD_JUNE14,
+	StorageManager.InitialiseProfileData(PROFILE_VERSION_11,
 		NUM_PROFILE_VALUES,
 		NUM_PROFILE_SETTINGS,
 		dwProfileSettingsA,

Minecraft.Client/Durango/Leaderboards/DurangoStatsDebugger.cpp

@@ -112,22 +112,22 @@ DurangoStatsDebugger *DurangoStatsDebugger::Initialize()
 	sp->addArgs(1, Tile::dirt_Id, 0); // works
 	sp->addArgs(2, Tile::dirt_Id, 0); // works
 
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id,  0); // fixed (+ach 'Rainbow Collection')
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id,  1);
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id,  2);
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id,  3);
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id,  4);
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id,  5);
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id,  6);
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id,  7);
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id,  8);
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id,  9);
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id, 10);
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id, 11);
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id, 12);
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id, 13);
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id, 14);
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id, 15);
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id,  0); // fixed (+ach 'Rainbow Collection')
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id,  1);
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id,  2);
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id,  3);
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id,  4);
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id,  5);
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id,  6);
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id,  7);
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id,  8);
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id,  9);
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id, 10);
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id, 11);
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id, 12);
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id, 13);
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id, 14);
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id, 15);
 
 	out->m_stats.push_back(sp);
 
@@ -166,20 +166,20 @@ DurangoStatsDebugger *DurangoStatsDebugger::Initialize()
 
 	sp = new StatParam(L"BlockBroken.BlockId.*");
 	sp->addArgs( Tile::dirt_Id );
-	sp->addArgs( Tile::rock_Id ); 
+	sp->addArgs( Tile::stone_Id ); 
 	sp->addArgs( Tile::emeraldOre_Id );
 	out->m_stats.push_back(sp);
 
 	sp = new StatParam(L"BlockBroken.BlockId.*.BlockAux.*");
 	sp->addArgs( Tile::dirt_Id, 0 );
-	sp->addArgs( Tile::rock_Id, 0 );
+	sp->addArgs( Tile::stone_Id, 0 );
 	out->m_stats.push_back(sp);
 
 	sp = new StatParam(L"BlockBroken.DifficultyLevelId.*.BlockId.*");
 	sp->addArgs( 1, Tile::dirt_Id );
 	sp->addArgs( 2, Tile::dirt_Id );
-	sp->addArgs( 1, Tile::rock_Id );
-	sp->addArgs( 2, Tile::rock_Id );
+	sp->addArgs( 1, Tile::stone_Id );
+	sp->addArgs( 2, Tile::stone_Id );
 	out->m_stats.push_back(sp);
 
 	sp = new StatParam(L"BlockBroken");
@@ -188,7 +188,7 @@ DurangoStatsDebugger *DurangoStatsDebugger::Initialize()
 
 	sp = new StatParam(L"BlockPlaced.BlockId.*");
 	sp->addArgs( Tile::dirt_Id );
-	sp->addArgs( Tile::stoneBrick_Id ); 
+	sp->addArgs( Tile::cobblestone_Id ); 
 	sp->addArgs( Tile::sand_Id );		// works
 	sp->addArgs( Tile::sign_Id );		// fixed
 	sp->addArgs( Tile::wallSign_Id );	// fixed

Minecraft.Client/Durango/Sentient/TelemetryEnum.h

@@ -225,5 +225,14 @@ enum ETelemetryChallenges
 	eTelemetryTutorial_TradingMenu,
 	eTelemetryTutorial_Enderchest,
 
+	eTelemetryTutorial_Horse, // Java 1.6.4
+	eTelemetryTutorial_HorseMenu,
+	eTelemetryTutorial_Fireworks,
+	eTelemetryTutorial_FireworksMenu,
+	eTelemetryTutorial_Beacon,
+	eTelemetryTutorial_BeaconMenu,
+	eTelemetryTutorial_Hopper,
+	eTelemetryTutorial_HopperMenu,
+
 	// Sent over network as a byte
 };

Minecraft.Client/HumanoidModel.cpp

@@ -241,7 +241,7 @@ void HumanoidModel::setupAnim(float time, float r, float bob, float yRot, float
 
 		if (riding)
 		{
-			if(uiBitmaskOverrideAnim&(1<<eAnim_SmallModel) == 0)
+			if ((uiBitmaskOverrideAnim&(1<<eAnim_SmallModel)) == 0)
 			{
 				arm0->xRot += -HALF_PI * 0.4f;
 				arm1->xRot += -HALF_PI * 0.4f;

Minecraft.Client/LivingEntityRenderer.cpp

@@ -491,7 +491,7 @@ void LivingEntityRenderer::renderNameTag(shared_ptr<LivingEntity> mob, const wst
 	float s = 1 / 60.0f * size;
 
 	glPushMatrix();
-	glTranslatef((float) x + 0, (float) y + 2.3f, (float) z);
+	glTranslatef((float) x, (float) y + 2.3f, (float) z);
 	glNormal3f(0, 1, 0);
 
 	glRotatef(-this->entityRenderDispatcher->playerRotY, 0, 1, 0);

Minecraft.Client/Minecraft.Client.vcxproj

@@ -608,17 +608,17 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">
     <LinkIncremental>true</LinkIncremental>
-    <ImageXexOutput>$(SolutionDir)x360_$(Configuration)\$(ProjectName).xex</ImageXexOutput>
+    <ImageXexOutput>$(SolutionDir)X360_$(Configuration)\$(ProjectName).xex</ImageXexOutput>
     <IncludePath>$(ProjectDir)\Xbox\Sentient\Include;$(IncludePath)</IncludePath>
-    <OutDir>$(SolutionDir)x360_$(Configuration)\</OutDir>
-    <IntDir>x360_$(Configuration)\</IntDir>
+    <OutDir>$(SolutionDir)X360_$(Configuration)\</OutDir>
+    <IntDir>X360_$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">
     <LinkIncremental>false</LinkIncremental>
-    <ImageXexOutput>$(SolutionDir)x360_$(Configuration)\$(ProjectName).xex</ImageXexOutput>
+    <ImageXexOutput>$(SolutionDir)X360_$(Configuration)\$(ProjectName).xex</ImageXexOutput>
     <IncludePath>$(ProjectDir)\Xbox\Sentient\Include;$(IncludePath)</IncludePath>
-    <OutDir>$(SolutionDir)x360_$(Configuration)\</OutDir>
-    <IntDir>x360_$(Configuration)\</IntDir>
+    <OutDir>$(SolutionDir)X360_$(Configuration)\</OutDir>
+    <IntDir>X360_$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Xbox 360'">
     <LinkIncremental>false</LinkIncremental>
@@ -630,6 +630,7 @@
     <ImageXexOutput>$(OutDir)$(ProjectName)_D.xex</ImageXexOutput>
     <IncludePath>$(ProjectDir)\..\Minecraft.Client\PS3\Assert;$(SCE_PS3_ROOT)\target\ppu\include;$(SCE_PS3_ROOT)\target\common\include;$(SCE_PS3_ROOT)\host-win32\sn\ppu\include;$(ProjectDir)\..\Minecraft.Client\PS3\PS3Extras;$(ProjectDir)\..\Minecraft.Client\PS3\PS3Extras\boost_1_53_0\boost\tr1\tr1;$(ProjectDir)\..\Minecraft.Client\PS3\PS3Extras\boost_1_53_0;$(ProjectDir)..\Minecraft.World\x64headers</IncludePath>
     <PreBuildEventUseInBuild>false</PreBuildEventUseInBuild>
+    <PostBuildEventUseInBuild>true</PostBuildEventUseInBuild>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">
     <LinkIncremental>true</LinkIncremental>
@@ -641,6 +642,7 @@
     <LinkIncremental>true</LinkIncremental>
     <ImageXexOutput>$(OutDir)$(ProjectName)_D.xex</ImageXexOutput>
     <IncludePath>$(ProjectDir)\..\Minecraft.Client\PS3\Assert;$(SCE_PS3_ROOT)\target\ppu\include;$(SCE_PS3_ROOT)\target\common\include;$(SCE_PS3_ROOT)\host-win32\sn\ppu\include;$(ProjectDir)\..\Minecraft.Client\PS3\PS3Extras;$(ProjectDir)\..\Minecraft.Client\PS3\PS3Extras\boost_1_53_0\boost\tr1\tr1;$(ProjectDir)\..\Minecraft.Client\PS3\PS3Extras\boost_1_53_0;$(ProjectDir)..\Minecraft.World\x64headers</IncludePath>
+    <PostBuildEventUseInBuild>true</PostBuildEventUseInBuild>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|PS3'">
     <LinkIncremental>true</LinkIncremental>
@@ -3102,7 +3104,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <PreprocessorDefinitions>SPLIT_SAVES;_LARGE_WORLDS;_EXTENDED_ACHIEVEMENTS;_DEBUG_MENUS_ENABLED</PreprocessorDefinitions>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>..\Minecraft.World\ORBIS_Release\Minecraft.World.a;Orbis\4JLibs\libs\4j_Render.a;Orbis\4JLibs\libs\4j_Input_r.a;Orbis\4JLibs\libs\4J_Storage_r.a;Orbis\4JLibs\libs\4J_Profile_r.a;Orbis\Iggy\lib\libiggy_orbis.a;Orbis\Miles\lib\mssorbis.a;Orbis\Miles\lib\binkaorbis.a;Common\Network\Sony\sceRemoteStorage\ps4\lib\sceRemoteStorage.a;-lSceGnmDriver_stub_weak;-lSceGnmx;-lSceGnm;-lSceGpuAddress;-lSceCes;-lSceVideoOut_stub_weak;-lScePad_stub_weak;-lScePngDec_stub_weak;-lScePngEnc_stub_weak;-lSceFios2_stub_weak;-lSceUlt_stub_weak;-lSceShaderBinary;-lSceUserService_stub_weak;-lSceSysmodule_stub_weak;-lSceImeDialog_stub_weak;-lScePosix_stub_weak;-lSceAudioOut_stub_weak;-lSceSaveData_stub_weak;-lSceRtc_stub_weak;-lSceSystemService_stub_weak;-lSceNetCtl_stub_weak;-lSceNpCommon_stub_weak;-lSceNpManager_stub_weak;-lSceNpToolkit_rtti;-lSceNpToolkitUtils_rtti;-lSceNpWebApi_stub_weak;-lSceNpAuth_stub_weak;-lSceNpTrophy_stub_weak;-lSceInvitationDialog_stub_weak;-lSceGameCustomDataDialog_stub_weak;-lSceNpCommerce_stub_weak;-lSceNet_stub_weak;-lSceHttp_stub_weak;-lSceSsl_stub_weak;-lSceNpMatching2_stub_weak;-lSceNpTus_stub_weak;-lSceNpUtility_stub_weak;-lSceNpScore_stub_weak;-lSceCommonDialog_stub_weak;-lSceNpSns_stub_weak;-lSceNpSnsFacebookDialog_stub_weak;-lSceRudp_stub_weak;-lSceAppContent_stub_weak;-lSceVoice_stub_weak;-lSceAudioIn_stub_weak;-lSceRemoteplay_stub_weak;-lSceSaveDataDialog_stub_weak;-lSceErrorDialog_stub_weak;-lSceMsgDialog_stub_weak;-lSceGameLiveStreaming_stub_weak;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>..\Minecraft.World\ORBIS_Release\Minecraft.World.a;Orbis\4JLibs\libs\4j_Render.a;Orbis\4JLibs\libs\4j_Input_r.a;Orbis\4JLibs\libs\4J_Storage_r.a;Orbis\4JLibs\libs\4J_Profile_r.a;Orbis\Iggy\lib\libiggy_orbis.a;Orbis\Miles\lib\mssorbis.a;Orbis\Miles\lib\binkaorbis.a;Common\Network\Sony\sceRemoteStorage\ps4\lib\sceRemoteStorage.a;-lSceGnmDriver_stub_weak;-lSceGnmx;-lSceGnm;-lSceGpuAddress;-lSceCes;-lSceVideoOut_stub_weak;-lScePad_stub_weak;-lScePngDec_stub_weak;-lScePngEnc_stub_weak;-lSceFios2_stub_weak;-lSceUlt_stub_weak;-lSceShaderBinary;-lSceUserService_stub_weak;-lSceSysmodule_stub_weak;-lSceImeDialog_stub_weak;-lScePosix_stub_weak;-lSceAudioOut_stub_weak;-lSceSaveData_stub_weak;-lSceRtc_stub_weak;-lSceSystemService_stub_weak;-lSceNetCtl_stub_weak;-lSceNpCommon_stub_weak;-lSceNpManager_stub_weak;-lSceNpToolkit;-lSceNpToolkitUtils;-lSceNpWebApi_stub_weak;-lSceNpAuth_stub_weak;-lSceNpTrophy_stub_weak;-lSceInvitationDialog_stub_weak;-lSceGameCustomDataDialog_stub_weak;-lSceNpCommerce_stub_weak;-lSceNet_stub_weak;-lSceHttp_stub_weak;-lSceSsl_stub_weak;-lSceNpMatching2_stub_weak;-lSceNpTus_stub_weak;-lSceNpUtility_stub_weak;-lSceNpScore_stub_weak;-lSceCommonDialog_stub_weak;-lSceNpSns_stub_weak;-lSceNpSnsFacebookDialog_stub_weak;-lSceRudp_stub_weak;-lSceAppContent_stub_weak;-lSceVoice_stub_weak;-lSceAudioIn_stub_weak;-lSceRemoteplay_stub_weak;-lSceSaveDataDialog_stub_weak;-lSceErrorDialog_stub_weak;-lSceMsgDialog_stub_weak;-lSceGameLiveStreaming_stub_weak;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateMapFile>true</GenerateMapFile>
     </Link>
     <ProjectReference>
@@ -3220,7 +3222,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <PreprocessorDefinitions>SPLIT_SAVES;_LARGE_WORLDS;_EXTENDED_ACHIEVEMENTS;_DEBUG_MENUS_ENABLED;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>..\Minecraft.World\ORBIS_Debug\Minecraft.World.a;Orbis\4JLibs\libs\4j_Render_d.a;Orbis\4JLibs\libs\4j_Input_d.a;Orbis\4JLibs\libs\4J_Storage_d.a;Orbis\4JLibs\libs\4J_Profile_d.a;Orbis\Iggy\lib\libiggy_orbis.a;Orbis\Miles\lib\mssorbis.a;Orbis\Miles\lib\binkaorbis.a;Common\Network\Sony\sceRemoteStorage\ps4\lib\sceRemoteStorage.a;-lSceGnmDriver_stub_weak;-lSceGnmx;-lSceGnm;-lSceGpuAddress;-lSceCes;-lSceVideoOut_stub_weak;-lScePad_stub_weak;-lScePngDec_stub_weak;-lScePngEnc_stub_weak;-lSceFios2_stub_weak;-lSceUlt_stub_weak;-lSceShaderBinary;-lSceUserService_stub_weak;-lSceSysmodule_stub_weak;-lScePerf_stub_weak;-lSceImeDialog_stub_weak;-lScePosix_stub_weak;-lSceAudioOut_stub_weak;-lSceSaveData_stub_weak;-lSceRtc_stub_weak;-lSceSystemService_stub_weak;-lSceNetCtl_stub_weak;-lSceNpCommon_stub_weak;-lSceNpManager_stub_weak;-lSceNpToolkit_rtti;-lSceNpToolkitUtils_rtti;-lSceNpWebApi_stub_weak;-lSceNpAuth_stub_weak;-lSceNpTrophy_stub_weak;-lSceInvitationDialog_stub_weak;-lSceGameCustomDataDialog_stub_weak;-lSceNpCommerce_stub_weak;-lSceNet_stub_weak;-lSceHttp_stub_weak;-lSceSsl_stub_weak;-lSceNpMatching2_stub_weak;-lSceNpTus_stub_weak;-lSceNpUtility_stub_weak;-lSceNpScore_stub_weak;-lSceCommonDialog_stub_weak;-lSceNpSns_stub_weak;-lSceRudp_stub_weak;-lSceAppContent_stub_weak;-lSceVoice_stub_weak;-lSceAudioIn_stub_weak;-lSceNpSnsFacebookDialog_stub_weak;-lSceRemotePlay_stub_weak;-lSceSaveDataDialog_stub_weak;-lSceErrorDialog_stub_weak;-lSceMsgDialog_stub_weak;-lSceGameLiveStreaming_stub_weak</AdditionalDependencies>
+      <AdditionalDependencies>..\Minecraft.World\ORBIS_Debug\Minecraft.World.a;Orbis\4JLibs\libs\4j_Render_d.a;Orbis\4JLibs\libs\4j_Input_d.a;Orbis\4JLibs\libs\4J_Storage_d.a;Orbis\4JLibs\libs\4J_Profile_d.a;Orbis\Iggy\lib\libiggy_orbis.a;Orbis\Miles\lib\mssorbis.a;Orbis\Miles\lib\binkaorbis.a;Common\Network\Sony\sceRemoteStorage\ps4\lib\sceRemoteStorage.a;-lSceGnmDriver_stub_weak;-lSceGnmx;-lSceGnm;-lSceGpuAddress;-lSceCes;-lSceVideoOut_stub_weak;-lScePad_stub_weak;-lScePngDec_stub_weak;-lScePngEnc_stub_weak;-lSceFios2_stub_weak;-lSceUlt_stub_weak;-lSceShaderBinary;-lSceUserService_stub_weak;-lSceSysmodule_stub_weak;-lScePerf_stub_weak;-lSceImeDialog_stub_weak;-lScePosix_stub_weak;-lSceAudioOut_stub_weak;-lSceSaveData_stub_weak;-lSceRtc_stub_weak;-lSceSystemService_stub_weak;-lSceNetCtl_stub_weak;-lSceNpCommon_stub_weak;-lSceNpManager_stub_weak;-lSceNpToolkit;-lSceNpToolkitUtils;-lSceNpWebApi_stub_weak;-lSceNpAuth_stub_weak;-lSceNpTrophy_stub_weak;-lSceInvitationDialog_stub_weak;-lSceGameCustomDataDialog_stub_weak;-lSceNpCommerce_stub_weak;-lSceNet_stub_weak;-lSceHttp_stub_weak;-lSceSsl_stub_weak;-lSceNpMatching2_stub_weak;-lSceNpTus_stub_weak;-lSceNpUtility_stub_weak;-lSceNpScore_stub_weak;-lSceCommonDialog_stub_weak;-lSceNpSns_stub_weak;-lSceRudp_stub_weak;-lSceAppContent_stub_weak;-lSceVoice_stub_weak;-lSceAudioIn_stub_weak;-lSceNpSnsFacebookDialog_stub_weak;-lSceRemotePlay_stub_weak;-lSceSaveDataDialog_stub_weak;-lSceErrorDialog_stub_weak;-lSceMsgDialog_stub_weak;-lSceGameLiveStreaming_stub_weak</AdditionalDependencies>
     </Link>
     <ProjectReference>
       <LinkLibraryDependencies>false</LinkLibraryDependencies>
@@ -12954,6 +12956,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PSVita'">true</ExcludedFromBuild>
     </ClInclude>
+    <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\BaseRailTile_SPU.h" />
     <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\BedTile_SPU.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Win32'">true</ExcludedFromBuild>
@@ -13494,6 +13497,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PSVita'">true</ExcludedFromBuild>
     </ClInclude>
+    <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\DaylightDetectorTile_SPU.h" />
     <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\DetectorRailTile_SPU.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Win32'">true</ExcludedFromBuild>
@@ -13809,6 +13813,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PSVita'">true</ExcludedFromBuild>
     </ClInclude>
+    <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\DropperTile_SPU.h" />
     <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\EggTile_SPU.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Win32'">true</ExcludedFromBuild>
@@ -14394,6 +14399,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PSVita'">true</ExcludedFromBuild>
     </ClInclude>
+    <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\HayBlockTile_SPU.h" />
     <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\HugeMushroomTile_SPU.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Win32'">true</ExcludedFromBuild>
@@ -15114,7 +15120,8 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PSVita'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\PressurePlateTile_SPU.h">
+    <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\PoweredRailTile_SPU.h" />
+    <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\BasePressurePlateTile_SPU.h">
       <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>
@@ -15159,6 +15166,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PSVita'">true</ExcludedFromBuild>
     </ClInclude>
+    <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\PressurePlateTile_SPU.h" />
     <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\PumpkinTile_SPU.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Win32'">true</ExcludedFromBuild>
@@ -15204,51 +15212,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PSVita'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\RailTile_SPU.h">
-      <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)'=='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|Xbox 360'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Xbox 360'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Xbox 360'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Xbox 360'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|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)'=='ContentPackage|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|ORBIS'">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>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Durango'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugContentPackage|Durango'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Durango'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Durango'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Durango'">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>
-    </ClInclude>
+    <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\RailTile_SPU.h" />
     <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\RecordPlayerTile_SPU.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Win32'">true</ExcludedFromBuild>
@@ -15429,6 +15393,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PSVita'">true</ExcludedFromBuild>
     </ClInclude>
+    <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\RotatedPillarTile_SPU.h" />
     <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\SandStoneTile_SPU.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Win32'">true</ExcludedFromBuild>
@@ -16509,6 +16474,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PSVita'">true</ExcludedFromBuild>
     </ClInclude>
+    <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\WeightedPressurePlateTile_SPU.h" />
     <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\WoodTile_SPU.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Win32'">true</ExcludedFromBuild>
@@ -17167,6 +17133,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <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>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PSVita'">true</ExcludedFromBuild>
     </ClInclude>
     <ClInclude Include="PSVita\Network\PSVita_NPToolkit.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Durango'">true</ExcludedFromBuild>
@@ -17485,6 +17452,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Xbox 360'">true</ExcludedFromBuild>
     </ClInclude>
+    <ClInclude Include="PSVita\OldSdk.h" />
     <ClInclude Include="PSVita\PSVitaExtras\Conf.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Durango'">true</ExcludedFromBuild>
@@ -32375,7 +32343,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PSVita'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="PS3\SPU_Tasks\ChunkUpdate\PressurePlateTile_SPU.cpp">
+    <ClCompile Include="PS3\SPU_Tasks\ChunkUpdate\BasePressurePlateTile_SPU.cpp">
       <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>
@@ -32817,6 +32785,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <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>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PSVita'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="PSVita\Network\PSVita_NPToolkit.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Durango'">true</ExcludedFromBuild>
@@ -33133,6 +33102,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Xbox 360'">true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="PSVita\OldSdk.cpp" />
     <ClCompile Include="PSVita\PSVitaExtras\CustomMap.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Durango'">true</ExcludedFromBuild>

Minecraft.Client/Minecraft.Client.vcxproj.filters

@@ -2665,15 +2665,9 @@
     <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\PortalTile_SPU.h">
       <Filter>PS3\ChunkRebuild_SPU</Filter>
     </ClInclude>
-    <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\PressurePlateTile_SPU.h">
-      <Filter>PS3\ChunkRebuild_SPU</Filter>
-    </ClInclude>
     <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\PumpkinTile_SPU.h">
       <Filter>PS3\ChunkRebuild_SPU</Filter>
     </ClInclude>
-    <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\RailTile_SPU.h">
-      <Filter>PS3\ChunkRebuild_SPU</Filter>
-    </ClInclude>
     <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\RecordPlayerTile_SPU.h">
       <Filter>PS3\ChunkRebuild_SPU</Filter>
     </ClInclude>
@@ -3772,6 +3766,39 @@
     <ClInclude Include="Common\Leaderboards\LeaderboardInterface.h">
       <Filter>Common\Source Files\Leaderboards</Filter>
     </ClInclude>
+    <ClInclude Include="PSVita\OldSdk.h">
+      <Filter>PSVita</Filter>
+    </ClInclude>
+    <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\BaseRailTile_SPU.h">
+      <Filter>PS3\ChunkRebuild_SPU</Filter>
+    </ClInclude>
+    <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\RailTile_SPU.h">
+      <Filter>PS3\ChunkRebuild_SPU</Filter>
+    </ClInclude>
+    <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\PoweredRailTile_SPU.h">
+      <Filter>PS3\ChunkRebuild_SPU</Filter>
+    </ClInclude>
+    <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\DropperTile_SPU.h">
+      <Filter>PS3\ChunkRebuild_SPU</Filter>
+    </ClInclude>
+    <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\HayBlockTile_SPU.h">
+      <Filter>PS3\ChunkRebuild_SPU</Filter>
+    </ClInclude>
+    <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\RotatedPillarTile_SPU.h">
+      <Filter>PS3\ChunkRebuild_SPU</Filter>
+    </ClInclude>
+    <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\BasePressurePlateTile_SPU.h">
+      <Filter>PS3\ChunkRebuild_SPU</Filter>
+    </ClInclude>
+    <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\PressurePlateTile_SPU.h">
+      <Filter>PS3\ChunkRebuild_SPU</Filter>
+    </ClInclude>
+    <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\WeightedPressurePlateTile_SPU.h">
+      <Filter>PS3\ChunkRebuild_SPU</Filter>
+    </ClInclude>
+    <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\DaylightDetectorTile_SPU.h">
+      <Filter>PS3\ChunkRebuild_SPU</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="stdafx.cpp">
@@ -4998,9 +5025,6 @@
     <ClCompile Include="PS3\SPU_Tasks\ChunkUpdate\LiquidTile_SPU.cpp">
       <Filter>PS3\ChunkRebuild_SPU</Filter>
     </ClCompile>
-    <ClCompile Include="PS3\SPU_Tasks\ChunkUpdate\PressurePlateTile_SPU.cpp">
-      <Filter>PS3\ChunkRebuild_SPU</Filter>
-    </ClCompile>
     <ClCompile Include="PS3\SPU_Tasks\ChunkUpdate\StairTile_SPU.cpp">
       <Filter>PS3\ChunkRebuild_SPU</Filter>
     </ClCompile>
@@ -5913,6 +5937,12 @@
     <ClCompile Include="Common\Leaderboards\LeaderboardInterface.cpp">
       <Filter>Common\Source Files\Leaderboards</Filter>
     </ClCompile>
+    <ClCompile Include="PSVita\OldSdk.cpp">
+      <Filter>PSVita</Filter>
+    </ClCompile>
+    <ClCompile Include="PS3\SPU_Tasks\ChunkUpdate\BasePressurePlateTile_SPU.cpp">
+      <Filter>PS3\ChunkRebuild_SPU</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Library Include="Xbox\4JLibs\libs\4J_Render_d.lib">
@@ -6287,7 +6317,7 @@
   <ItemGroup Condition="'$(Platform)'=='Durango'">
     <AppxManifest Include="Durango\Autogenerated.appxmanifest" />
   </ItemGroup>
-  <ItemGroup Condition="'$(Platform)'=='Durango'">
+  <ItemGroup>
     <Xml Include="Durango\manifest.xml" />
   </ItemGroup>
 </Project>

Minecraft.Client/Minecraft.cpp

@@ -2934,14 +2934,15 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures)
 							{
 								*piUse=IDS_TOOLTIPS_UNLEASH;
 							}
-							else if (heldItemId == Item::lead_Id)
+							// 4J: fix improper tooltips for TU20
+							/*else if (heldItemId == Item::lead_Id)
 							{
 								if (!pig->isLeashed()) *piUse=IDS_TOOLTIPS_LEASH;
 							}
 							else if (heldItemId == Item::nameTag_Id)
 							{
 								*piUse = IDS_TOOLTIPS_NAME;
-							}
+							}*/
 							else if (pig->hasSaddle()) // does the pig have a saddle?
 							{
 								*piUse=IDS_TOOLTIPS_MOUNT;

Minecraft.Client/Orbis/OrbisExtras/OrbisStubs.cpp

@@ -720,7 +720,7 @@ DWORD XGetLanguage()
 	case SCE_SYSTEM_PARAM_LANG_FRENCH			: return XC_LANGUAGE_FRENCH;
 
 	case SCE_SYSTEM_PARAM_LANG_SPANISH			: return XC_LANGUAGE_SPANISH;
-	case SCE_SYSTEM_PARAM_LANG_SPANISH_LA		: return XC_LANGUAGE_LATINAMERICANSPANISH;
+	case SCE_SYSTEM_PARAM_LANG_SPANISH_LA		: return XC_LOCALE_LATIN_AMERICA;
 
 	case SCE_SYSTEM_PARAM_LANG_GERMAN			: return XC_LANGUAGE_GERMAN;
 	case SCE_SYSTEM_PARAM_LANG_ITALIAN			: return XC_LANGUAGE_ITALIAN;

Minecraft.Client/Orbis/Orbis_Minecraft.cpp

@@ -969,7 +969,7 @@ int main(int argc, const char *argv[] )
 
 	ProfileManager.Initialise(	&commsId, //SQRNetworkManager::GetSceNpCommsId(),
 								&commsSig, //SQRNetworkManager::GetSceNpCommsSig(),
-								PROFILE_VERSION_BUILD_JUNE14,
+								PROFILE_VERSION_11,
 								NUM_PROFILE_VALUES,
 								NUM_PROFILE_SETTINGS,
 								dwProfileSettingsA,
@@ -1003,7 +1003,7 @@ int main(int argc, const char *argv[] )
 	byteArray baSaveThumbnail = app.getArchiveFile(L"DefaultSaveThumbnail64x64.png");
 	byteArray baSaveImage = app.getArchiveFile(L"DefaultSaveImage228x128.png");
 
-	StorageManager.InitialiseProfileData(PROFILE_VERSION_BUILD_JUNE14,
+	StorageManager.InitialiseProfileData(PROFILE_VERSION_11,
 		NUM_PROFILE_VALUES,
 		NUM_PROFILE_SETTINGS,
 		dwProfileSettingsA,

Minecraft.Client/Orbis/Sentient/TelemetryEnum.h

@@ -225,5 +225,14 @@ enum ETelemetryChallenges
 	eTelemetryTutorial_TradingMenu,
 	eTelemetryTutorial_Enderchest,
 
+	eTelemetryTutorial_Horse, // Java 1.6.4
+	eTelemetryTutorial_HorseMenu,
+	eTelemetryTutorial_Fireworks,
+	eTelemetryTutorial_FireworksMenu,
+	eTelemetryTutorial_Beacon,
+	eTelemetryTutorial_BeaconMenu,
+	eTelemetryTutorial_Hopper,
+	eTelemetryTutorial_HopperMenu,
+
 	// Sent over network as a byte
 };

Minecraft.Client/PS3/PS3Extras/C4JSpursJob.cpp

@@ -242,11 +242,10 @@ C4JSpursJob_ChunkUpdate::C4JSpursJob_ChunkUpdate(ChunkRebuildData* pDataIn, Chun
 	extern const CellSpursJobHeader JOBHEADER_SYMBOL(ChunkUpdate);
 	//E create job
 	m_job256.header   = JOBHEADER_SYMBOL(ChunkUpdate);
-	m_job256.header.sizeStack = (60*1024)>>4;
+	m_job256.header.sizeStack = (58*1024)>>4;
 	m_job256.workArea.userData[0] = (uintptr_t)pDataIn;
 	m_job256.workArea.userData[1] = (uintptr_t)pDataOut;
 	assert(cellSpursJobQueueCheckJob(&m_job256, 256, 256) == CELL_OK);
-
 }
 
 C4JSpursJob_LevelRenderer_cull::C4JSpursJob_LevelRenderer_cull(LevelRenderer_cull_DataIn* pDataIn) 

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ActivatorRailTile_SPU.h

@@ -0,0 +1,21 @@
+#pragma once
+
+#include "BaseRailTile_SPU.h"
+
+class ActivatorRailTile_SPU : public BaseRailTile_SPU
+{
+public:
+	ActivatorRailTile_SPU(int id) : BaseRailTile_SPU(id) {}
+
+	Icon_SPU *getTexture(int face, int data)
+	{
+		if ((data & RAIL_DATA_BIT) == 0)
+		{
+			return &ms_pTileData->activatorRailTile_icon;
+		}
+		else
+		{
+			return &ms_pTileData->activatorRailTile_iconPowered;
+		}
+	};
+};

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/BasePressurePlateTile_SPU.cpp

@@ -0,0 +1,41 @@
+#include "stdafx.h"
+#include "BasePressurePlateTile_SPU.h"
+#include "ChunkRebuildData.h"
+
+
+bool BasePressurePlateTile_SPU::isSolidRender(bool isServerLevel)
+{
+	return false;
+}
+
+bool BasePressurePlateTile_SPU::blocksLight()
+{
+	return false;
+}
+
+
+void BasePressurePlateTile_SPU::updateShape(ChunkRebuildData *level, int x, int y, int z, int forceData, TileEntity* forceEntity) // 4J added forceData, forceEntity param
+{
+	int data = level->getData(x, y, z);
+    bool pressed = getSignalForData(data) > 0; // 0 is Redstone::SIGNAL_NONE
+	float o = 1 / 16.0f;
+
+	if (pressed)
+	{
+		setShape(o, 0, o, 1 - o, 0.5f / 16.0f, 1 - o);
+	}
+	else
+	{
+		setShape(o, 0, o, 1 - o, 1 / 16.0f, 1 - o);
+	}
+}
+
+
+void BasePressurePlateTile_SPU::updateDefaultShape()
+{
+    float x = 8 / 16.0f;
+	float y = 2 / 16.0f;
+	float z = 8 / 16.0f;
+	setShape(0.5f - x, 0.5f - y, 0.5f - z, 0.5f + x, 0.5f + y, 0.5f + z);
+}
+

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/BasePressurePlateTile_SPU.h

@@ -0,0 +1,16 @@
+#pragma once
+#include "Tile_SPU.h"
+
+
+class BasePressurePlateTile_SPU : public Tile_SPU
+{
+public:
+	BasePressurePlateTile_SPU(int id) : Tile_SPU(id) {}
+    virtual bool isSolidRender(bool isServerLevel = false);
+	virtual bool blocksLight();
+
+	virtual void updateShape(ChunkRebuildData *level, int x, int y, int z, int forceData = -1, TileEntity* forceEntity = NULL);	// 4J added forceData, forceEntity param
+    virtual void updateDefaultShape();
+protected:
+	virtual int getSignalForData(int data) = 0;
+};

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/BaseRailTile_SPU.h

@@ -0,0 +1,31 @@
+#pragma once
+#include "Tile_SPU.h"
+
+class BaseRailTile_SPU : public Tile_SPU
+{
+
+public:
+	static const int RAIL_DATA_BIT = 8;
+	static const int RAIL_DIRECTION_MASK = 7;
+
+	BaseRailTile_SPU(int id) : Tile_SPU(id) {}
+    virtual bool isSolidRender(bool isServerLevel = false) { return false; }
+    virtual void updateShape(ChunkRebuildData *level, int x, int y, int z, int forceData = -1, TileEntity* forceEntity = NULL)	// 4J added forceData, forceEntity param
+	{
+		int data = level->getData(x, y, z);
+		if (data >= 2 && data <= 5)
+		{
+			setShape(0, 0, 0, 1, 2 / 16.0f + 0.5f, 1);
+		} else
+		{
+			setShape(0, 0, 0, 1, 2 / 16.0f, 1);
+		}
+	}
+    virtual int getRenderShape() { return Tile_SPU::SHAPE_RAIL; }
+	bool isUsesDataBit()
+	{
+		if(id == goldenRail_Id || id == detectorRail_Id || id == activatorRail_Id)
+			return true;
+		return false;
+	}
+};

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ButtonTile_SPU.h

@@ -13,7 +13,7 @@ public:
 		if(id == Tile_SPU::button_wood_Id) 
 			return TileRef_SPU(wood_Id)->getTexture(Facing::UP);
 		else 
-			return TileRef_SPU(rock_Id)->getTexture(Facing::UP);
+			return TileRef_SPU(stone_Id)->getTexture(Facing::UP);
 	}
     virtual bool blocksLight() { return false; }
     virtual bool isSolidRender(bool isServerLevel = false) { return false; }

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ChunkRebuildData.cpp

@@ -39,7 +39,7 @@ static const int Level_MAX_BRIGHTNESS = 15;
 #include "TileRenderer_SPU.h"
 #include "Tile_SPU.h"
 #include "ChunkRebuildData.h"
-TileData_SPU g_tileSPUData;
+//TileData_SPU g_tileSPUData;
 
 static const int MAX_LEVEL_SIZE = 30000000;
 static const int MAX_BRIGHTNESS = 15;
@@ -89,30 +89,30 @@ void ChunkRebuildData::disableUnseenTiles()
 
 				// Establish whether this tile and its neighbours are all made of rock, dirt, unbreakable tiles, or have already
 				// been determined to meet this criteria themselves and have a tile of 255 set.
-				if( !( ( tileID == Tile_SPU::rock_Id ) || ( tileID == Tile_SPU::dirt_Id ) || ( tileID == Tile_SPU::unbreakable_Id ) || ( flags & e_flag_NoRender) ) ) continue;
+				if( !( ( tileID == Tile_SPU::stone_Id ) || ( tileID == Tile_SPU::dirt_Id ) || ( tileID == Tile_SPU::unbreakable_Id ) || ( flags & e_flag_NoRender) ) ) continue;
 				tileID = getTile(iX-1, iY, iZ);
 				flags = getFlags(iX-1, iY, iZ);
-				if( !( ( tileID == Tile_SPU::rock_Id ) || ( tileID == Tile_SPU::dirt_Id ) || ( tileID == Tile_SPU::unbreakable_Id ) || ( flags & e_flag_NoRender) ) ) continue;
+				if( !( ( tileID == Tile_SPU::stone_Id ) || ( tileID == Tile_SPU::dirt_Id ) || ( tileID == Tile_SPU::unbreakable_Id ) || ( flags & e_flag_NoRender) ) ) continue;
 				tileID = getTile(iX+1, iY, iZ);
 				flags = getFlags(iX+1, iY, iZ);
-				if( !( ( tileID == Tile_SPU::rock_Id ) || ( tileID == Tile_SPU::dirt_Id ) || ( tileID == Tile_SPU::unbreakable_Id ) || ( flags & e_flag_NoRender) ) ) continue;
+				if( !( ( tileID == Tile_SPU::stone_Id ) || ( tileID == Tile_SPU::dirt_Id ) || ( tileID == Tile_SPU::unbreakable_Id ) || ( flags & e_flag_NoRender) ) ) continue;
 				tileID = getTile(iX, iY, iZ-1);
 				flags = getFlags(iX, iY, iZ-1);
-				if( !( ( tileID == Tile_SPU::rock_Id ) || ( tileID == Tile_SPU::dirt_Id ) || ( tileID == Tile_SPU::unbreakable_Id ) || ( flags & e_flag_NoRender) ) ) continue;
+				if( !( ( tileID == Tile_SPU::stone_Id ) || ( tileID == Tile_SPU::dirt_Id ) || ( tileID == Tile_SPU::unbreakable_Id ) || ( flags & e_flag_NoRender) ) ) continue;
 				tileID = getTile(iX, iY, iZ+1);
 				flags = getFlags(iX, iY, iZ+1);
-				if( !( ( tileID == Tile_SPU::rock_Id ) || ( tileID == Tile_SPU::dirt_Id ) || ( tileID == Tile_SPU::unbreakable_Id ) || ( flags & e_flag_NoRender) ) ) continue;
+				if( !( ( tileID == Tile_SPU::stone_Id ) || ( tileID == Tile_SPU::dirt_Id ) || ( tileID == Tile_SPU::unbreakable_Id ) || ( flags & e_flag_NoRender) ) ) continue;
 				// Treat the bottom of the world differently - we shouldn't ever be able to look up at this, so consider tiles as invisible
 				// if they are surrounded on sides other than the bottom
 				if( iY > 0 )
 				{
 					tileID = getTile(iX, iY-1, iZ);
 					flags = getFlags(iX, iY-1, iZ);
-					if( !( ( tileID == Tile_SPU::rock_Id ) || ( tileID == Tile_SPU::dirt_Id ) || ( tileID == Tile_SPU::unbreakable_Id ) || ( flags & e_flag_NoRender) ) ) continue;
+					if( !( ( tileID == Tile_SPU::stone_Id ) || ( tileID == Tile_SPU::dirt_Id ) || ( tileID == Tile_SPU::unbreakable_Id ) || ( flags & e_flag_NoRender) ) ) continue;
 				}
 				tileID = getTile(iX, iY+1, iZ);
 				flags = getFlags(iX, iY+1, iZ);
-				if( !( ( tileID == Tile_SPU::rock_Id ) || ( tileID == Tile_SPU::dirt_Id ) || ( tileID == Tile_SPU::unbreakable_Id ) || ( flags & e_flag_NoRender) ) ) continue;
+				if( !( ( tileID == Tile_SPU::stone_Id ) || ( tileID == Tile_SPU::dirt_Id ) || ( tileID == Tile_SPU::unbreakable_Id ) || ( flags & e_flag_NoRender) ) ) continue;
 
 				// This tile is surrounded. Flag it as not requiring to be rendered by setting its id to 255.
 				setFlag(iX, iY, iZ, e_flag_NoRender);
@@ -157,7 +157,7 @@ void ChunkRebuildData::buildMaterials()
 	buildMaterial(Material_SPU::plant_Id,				Material::plant);				
 	buildMaterial(Material_SPU::replaceable_plant_Id,	Material::replaceable_plant);	
 	buildMaterial(Material_SPU::sponge_Id,				Material::sponge);				
-	buildMaterial(Material_SPU::cloth_Id,				Material::cloth);				
+	buildMaterial(Material_SPU::wool_Id,				Material::cloth);				
 	buildMaterial(Material_SPU::fire_Id,				Material::fire);				
 	buildMaterial(Material_SPU::sand_Id,				Material::sand);				
 	buildMaterial(Material_SPU::decoration_Id,			Material::decoration);		
@@ -195,7 +195,7 @@ int ChunkRebuildData::getMaterialID(Tile* pTile)
 	if(m == Material::plant)  			return Material_SPU::plant_Id;					
 	if(m == Material::replaceable_plant)return Material_SPU::replaceable_plant_Id;		
 	if(m == Material::sponge)  			return Material_SPU::sponge_Id;					
-	if(m == Material::cloth)  			return Material_SPU::cloth_Id;					
+	if(m == Material::cloth)  			return Material_SPU::wool_Id;					
 	if(m == Material::fire)  			return Material_SPU::fire_Id;				
 	if(m == Material::sand)  			return Material_SPU::sand_Id;				
 	if(m == Material::decoration)  		return Material_SPU::decoration_Id;			
@@ -341,9 +341,17 @@ void ChunkRebuildData::createTileData()
 	setIconSPUFromIcon(&m_tileData.dispenserTile_iconFront, ((DispenserTile*)Tile::dispenser)->iconFront);
 	setIconSPUFromIcon(&m_tileData.dispenserTile_iconFrontVertical, ((DispenserTile*)Tile::dispenser)->iconFrontVertical);
 
+	setIconSPUFromIcon(&m_tileData.dropperTile_iconFront, ((DropperTile*)Tile::dropper)->iconFront);
+	setIconSPUFromIcon(&m_tileData.dropperTile_iconFrontVertical, ((DropperTile*)Tile::dropper)->iconFrontVertical);
+
 	// RailTile
 	setIconSPUFromIcon(&m_tileData.railTile_iconTurn, ((RailTile*)Tile::rail)->iconTurn);
-	setIconSPUFromIcon(&m_tileData.railTile_iconTurnGolden, ((RailTile*)Tile::goldenRail)->iconTurn);
+
+	setIconSPUFromIcon(&m_tileData.poweredRailTile_icon, ((PoweredRailTile*)Tile::goldenRail)->icon);
+	setIconSPUFromIcon(&m_tileData.poweredRailTile_iconPowered, ((PoweredRailTile*)Tile::goldenRail)->iconPowered);
+
+	setIconSPUFromIcon(&m_tileData.activatorRailTile_icon, ((PoweredRailTile*)Tile::activatorRail)->icon);
+	setIconSPUFromIcon(&m_tileData.activatorRailTile_iconPowered, ((PoweredRailTile*)Tile::activatorRail)->iconPowered);
 
 	for(int i=0;i<2;i++)
 		setIconSPUFromIcon(&m_tileData.detectorRailTile_icons[i], ((DetectorRailTile*)Tile::detectorRail)->icons[i]);
@@ -413,8 +421,12 @@ void ChunkRebuildData::createTileData()
 
 	setIconSPUFromIcon(&m_tileData.stoneSlab_iconSide, ((StoneSlabTile*)(Tile::stoneSlab))->iconSide);
 
+	//ColoredTile
 	for(int i=0;i<16;i++)
-		setIconSPUFromIcon(&m_tileData.clothTile_icons[i], ((ColoredTile*)Tile::wool)->icons[i]);
+		setIconSPUFromIcon(&m_tileData.woolTile_icons[i], ((ColoredTile*)Tile::wool)->icons[i]);
+
+	for(int i=0;i<16;i++)
+		setIconSPUFromIcon(&m_tileData.clayHardened_colored_icons[i], ((ColoredTile*)Tile::clayHardened_colored)->icons[i]);
 
 	// CarrotTile
 	for(int i=0;i<4;i++)
@@ -438,6 +450,13 @@ void ChunkRebuildData::createTileData()
 	setIconSPUFromIcon(&m_tileData.quartzBlock_iconTop, ((QuartzBlockTile*)Tile::quartzBlock)->iconTop);
 	setIconSPUFromIcon(&m_tileData.quartzBlock_iconBottom, ((QuartzBlockTile*)Tile::quartzBlock)->iconBottom);
 
+	// HayBlockTile
+	setIconSPUFromIcon(&m_tileData.hayBlockTile_iconTop, ((HayBlockTile*)Tile::hayBlock)->iconTop);
+	setIconSPUFromIcon(&m_tileData.hayBlockTile_icon, ((HayBlockTile*)Tile::hayBlock)->icon);
+
+	// DaylightDetectorTile
+	for(int i=0;i<1;i++)
+		setIconSPUFromIcon(&m_tileData.daylightDetector_icons[i], ((DaylightDetectorTile*)Tile::daylightDetector)->icons[i]);
 }
 
 // extern int g_lastHitBlockX;

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ChunkUpdate.spu.vcxproj

@@ -115,6 +115,7 @@
     <ClInclude Include="WorkbenchTile_SPU.h" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="BasePressurePlateTile_SPU.cpp" />
     <ClCompile Include="ChunkRebuildData.cpp" />
     <ClCompile Include="DiodeTile_SPU.cpp" />
     <ClCompile Include="Direction_SPU.cpp" />
@@ -126,7 +127,6 @@
     <ClCompile Include="Icon_SPU.cpp" />
     <ClCompile Include="LeafTile_SPU.cpp" />
     <ClCompile Include="LiquidTile_SPU.cpp" />
-    <ClCompile Include="PressurePlateTile_SPU.cpp" />
     <ClCompile Include="StairTile_SPU.cpp" />
     <ClCompile Include="TallGrass_SPU.cpp" />
     <ClCompile Include="task.cpp" />

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ChunkUpdate.spu.vcxproj.filters

@@ -142,9 +142,6 @@
     <ClCompile Include="LiquidTile_SPU.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="PressurePlateTile_SPU.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="StairTile_SPU.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -166,5 +163,8 @@
     <ClCompile Include="TileRenderer_SPU.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="BasePressurePlateTile_SPU.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ClothTile_SPU.h

@@ -1,11 +0,0 @@
-#pragma once
-#include "Tile_SPU.h"
-
-class ClothTile_SPU : public Tile_SPU
-{
-public:
-	ClothTile_SPU(int id) : Tile_SPU(id) {}
-	virtual Icon_SPU *getTexture(int face, int data) {	return &ms_pTileData->clothTile_icons[data]; }
-
-
-};

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ColoredClay_SPU.h

@@ -0,0 +1,11 @@
+#pragma once
+#include "Tile_SPU.h"
+
+class ColoredClay_SPU : public Tile_SPU
+{
+public:
+	ColoredClay_SPU(int id) : Tile_SPU(id) {}
+	virtual Icon_SPU *getTexture(int face, int data) {	return &ms_pTileData->clayHardened_colored_icons[data]; }
+
+
+};

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/DaylightDetectorTile_SPU.h

@@ -0,0 +1,21 @@
+#pragma once
+#include "EntityTile_SPU.h"
+
+class DaylightDetectorTile_SPU : public EntityTile_SPU
+{
+public:
+	DaylightDetectorTile_SPU(int id) : EntityTile_SPU(id) {}
+
+	Icon_SPU *getTexture(int face, int data) {
+		if (face == Facing::UP)
+		{
+			return &ms_pTileData->daylightDetector_icons[0];
+		}
+		return &ms_pTileData->daylightDetector_icons[1];
+	};
+
+	virtual bool isSolidRender(bool isServerLevel = false) { return false; }
+
+	virtual void updateDefaultShape() { setShape(0, 0, 0, 1, 6.0f / 16.0f, 1); };
+	virtual void updateShape() { setShape(0, 0, 0, 1, 6.0f / 16.0f, 1); };
+};

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/DetectorRailTile_SPU.h

@@ -2,10 +2,10 @@
 #include "RailTile_SPU.h"
 
 
-class DetectorRailTile_SPU : public RailTile_SPU
+class DetectorRailTile_SPU : public BaseRailTile_SPU
 {
 public:
-	DetectorRailTile_SPU(int id) : RailTile_SPU(id) {}
+	DetectorRailTile_SPU(int id) : BaseRailTile_SPU(id) {}
 	Icon_SPU *getTexture(int face, int data)
 	{
 		if ((data & RAIL_DATA_BIT) != 0)

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/DiodeTile_SPU.h

@@ -21,9 +21,9 @@ public:
 		{
 			if (id==diode_on_Id)
 			{
-				return TileRef_SPU(notGate_on_Id)->getTexture(face);
+				return TileRef_SPU(redstoneTorch_on_Id)->getTexture(face);
 			}
-			return TileRef_SPU(notGate_off_Id)->getTexture(face);
+			return TileRef_SPU(redstoneTorch_off_Id)->getTexture(face);
 		}
 		if (face == Facing::UP)
 		{

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/DropperTile_SPU.h

@@ -0,0 +1,37 @@
+#pragma once
+#include "DispenserTile_SPU.h"
+#include "Facing_SPU.h"
+
+
+class DropperTile_SPU : public DispenserTile_SPU
+{
+public:
+	DropperTile_SPU(int id) : DispenserTile_SPU(id) {}
+
+public:
+	virtual Icon_SPU *getTexture(int face, int data)
+	{
+		int dir = data & FACING_MASK;
+		if (face == dir)
+		{
+			if (dir == Facing::UP || dir == Facing::DOWN)
+			{
+				return &ms_pTileData->dropperTile_iconFrontVertical;
+			}
+			else
+			{
+				return &ms_pTileData->dropperTile_iconFront;
+			}
+		}
+
+		if (dir == Facing::UP || dir == Facing::DOWN)
+		{
+			return &ms_pTileData->dispenserTile_iconTop;
+		}
+		else if (face == Facing::UP || face == Facing::DOWN)
+		{
+			return &ms_pTileData->dispenserTile_iconTop;
+		}
+		return icon();
+	}
+};

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/FireTile_SPU.h

@@ -33,7 +33,7 @@ public:
 		case Tile_SPU::bookshelf_Id:
 		case Tile_SPU::tnt_Id:
 		case Tile_SPU::tallgrass_Id:
-		case Tile_SPU::cloth_Id:
+		case Tile_SPU::wool_Id:
 		case Tile_SPU::vine_Id:
 			return true;
 		default:

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/HayBlockTile_SPU.h

@@ -0,0 +1,19 @@
+#pragma once
+
+#include "RotatedPillarTile_SPU.h"
+
+class HayBlockTile_SPU : public RotatedPillarTile_SPU
+{
+	friend class ChunkRebuildData;
+public:
+	HayBlockTile_SPU(int id) : RotatedPillarTile_SPU(id) {}
+
+protected:
+	Icon_SPU *getTopTexture(int type) {
+		return &ms_pTileData->hayBlockTile_iconTop;
+	};
+
+	Icon_SPU *getTypeTexture(int type) {
+		return &ms_pTileData->hayBlockTile_icon;
+	};
+};

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/HugeMushroomTile_SPU.h

@@ -14,8 +14,8 @@ public:
     Icon_SPU *getTexture(int face, int data)
 	{
 		Icon_SPU* icons = ms_pTileData->hugeMushroom_icons;
-		int type = 0; // hugeMushroom1_Id
-		if(id == hugeMushroom2_Id)
+		int type = 0; // hugemushroom_brown_Id
+		if(id == hugeMushroom_red_Id)
 			type = 1;
 		// 123
 		// 456 10

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Material_SPU.h

@@ -19,7 +19,7 @@ public:
 	static const int plant_Id = 9;
 	static const int replaceable_plant_Id = 10;
 	static const int sponge_Id = 11;
-	static const int cloth_Id = 12;
+	static const int wool_Id = 12;
 	static const int fire_Id = 13;
 	static const int sand_Id = 14;
 	static const int decoration_Id = 15;

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/PoweredRailTile_SPU.h

@@ -0,0 +1,21 @@
+#pragma once
+
+#include "BaseRailTile_SPU.h"
+
+class PoweredRailTile_SPU : public BaseRailTile_SPU
+{
+public:
+	PoweredRailTile_SPU(int id) : BaseRailTile_SPU(id) {}
+
+	Icon_SPU *getTexture(int face, int data)
+	{
+		if ((data & RAIL_DATA_BIT) == 0)
+		{
+			return &ms_pTileData->poweredRailTile_icon;
+		}
+		else
+		{
+			return &ms_pTileData->poweredRailTile_iconPowered;
+		}
+	};
+};

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/PressurePlateTile_SPU.cpp

@@ -1,41 +0,0 @@
-#include "stdafx.h"
-#include "PressurePlateTile_SPU.h"
-#include "ChunkRebuildData.h"
-
-
-bool PressurePlateTile_SPU::isSolidRender(bool isServerLevel)
-{
-	return false;
-}
-
-bool PressurePlateTile_SPU::blocksLight()
-{
-	return false;
-}
-
-
-void PressurePlateTile_SPU::updateShape(ChunkRebuildData *level, int x, int y, int z, int forceData, TileEntity* forceEntity) // 4J added forceData, forceEntity param
-{
-    bool pressed = level->getData(x, y, z) == 1;
-
-    float o = 1 / 16.0f;
-    if (pressed)
-	{
-        this->setShape(o, 0, o, 1 - o, 0.5f / 16.0f, 1 - o);
-    }
-	else
-	{
-        setShape(o, 0, o, 1 - o, 1 / 16.0f, 1 - o);
-    }
-}
-
-
-void PressurePlateTile_SPU::updateDefaultShape()
-{
-    float x = 8 / 16.0f;
-    float y = 2 / 16.0f;
-    float z = 8 / 16.0f;
-    setShape(0.5f - x, 0.5f - y, 0.5f - z, 0.5f + x, 0.5f + y, 0.5f + z);
-
-}
-

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/PressurePlateTile_SPU.h

@@ -1,21 +1,23 @@
 #pragma once
-#include "Tile_SPU.h"
+#include "BasePressurePlateTile_SPU.h"
 
-
-class PressurePlateTile_SPU : public Tile_SPU
+class PressurePlateTile_SPU : public BasePressurePlateTile_SPU
 {
 public:
-    enum Sensitivity
+	enum Sensitivity
 	{
-        everything,
-		mobs,
-		players
-    };
+		everything, mobs, players
+	};
 
-	PressurePlateTile_SPU(int id) : Tile_SPU(id) {}
-    virtual bool isSolidRender(bool isServerLevel = false);
-    virtual bool blocksLight();
+private:
+	Sensitivity sensitivity;
 
-	virtual void updateShape(ChunkRebuildData *level, int x, int y, int z, int forceData = -1, TileEntity* forceEntity = NULL);	// 4J added forceData, forceEntity param
-    virtual void updateDefaultShape();
-};
+public:
+	PressurePlateTile_SPU(int id) : BasePressurePlateTile_SPU(id) {}
+
+protected:
+	virtual int getSignalForData(int data) {
+		// 15 is Redstone::SIGNAL_MAX
+		return data == 1 ? 15 : 0;
+	};
+};

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/RailTile_SPU.h

@@ -1,58 +1,21 @@
 #pragma once
-#include "Tile_SPU.h"
 
-class RailTile_SPU : public Tile_SPU
+#include "BaseRailTile_SPU.h"
+
+class RailTile_SPU : public BaseRailTile_SPU
 {
-
 public:
-	static const int RAIL_DATA_BIT = 8;
-	static const int RAIL_DIRECTION_MASK = 7;
+	RailTile_SPU(int id) : BaseRailTile_SPU(id) {}
 
-	RailTile_SPU(int id) : Tile_SPU(id) {}
-    virtual bool isSolidRender(bool isServerLevel = false) { return false; }
-    virtual void updateShape(ChunkRebuildData *level, int x, int y, int z, int forceData = -1, TileEntity* forceEntity = NULL)	// 4J added forceData, forceEntity param
+	Icon_SPU *getTexture(int face, int data)
 	{
-		int data = level->getData(x, y, z);
-		if (data >= 2 && data <= 5)
+		if (data >= 6)
 		{
-			setShape(0, 0, 0, 1, 2 / 16.0f + 0.5f, 1);
-		} else
-		{
-			setShape(0, 0, 0, 1, 2 / 16.0f, 1);
+			return &ms_pTileData->railTile_iconTurn;
 		}
-	}
-    virtual Icon_SPU *getTexture(int face, int data)
-	{
-		bool usesDataBit = false;
-		Icon_SPU* iconTurn = &ms_pTileData->railTile_iconTurn;
-		if(id == goldenRail_Id)
+		else
 		{
-			usesDataBit = true;
-			iconTurn = &ms_pTileData->railTile_iconTurnGolden;
+			return icon();
 		}
-
-		if (usesDataBit)
-		{
-// 			if (id == Tile::goldenRail_Id)
-// 			{
-				if ((data & RAIL_DATA_BIT) == 0)
-				{
-					return icon();
-				}
-				else
-				{
-					return iconTurn; // Actually the powered rail on version
-				}
-// 			}
-		} else if (data >= 6) return iconTurn;
-		return icon();
-
-	}
-    virtual int getRenderShape() { return Tile_SPU::SHAPE_RAIL; }
-	bool isUsesDataBit()
-	{
-		if(id == goldenRail_Id || id == detectorRail_Id)
-			return true;
-		return false;
-	}
+	};
 };

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/RotatedPillarTile_SPU.h

@@ -0,0 +1,45 @@
+#pragma once
+
+#include "Tile_SPU.h"
+#include "Facing_SPU.h"
+
+class RotatedPillarTile_SPU : public Tile_SPU
+{
+public:
+	static const int MASK_TYPE = 0x3;
+	static const int MASK_FACING = 0xC;
+	static const int FACING_Y = 0 << 2;
+	static const int FACING_X = 1 << 2;
+	static const int FACING_Z = 2 << 2;
+
+protected:
+	RotatedPillarTile_SPU(int id) : Tile_SPU(id) {}
+
+public:
+	virtual int getRenderShape() { return Tile_SPU::SHAPE_TREE; };
+
+	virtual Icon_SPU *getTexture(int face, int data) {
+		int dir = data & MASK_FACING;
+		int type = data & MASK_TYPE;
+
+		if (dir == FACING_Y && (face == Facing::UP || face == Facing::DOWN))
+		{
+			return getTopTexture(type);
+		}
+		else if (dir == FACING_X && (face == Facing::EAST || face == Facing::WEST))
+		{
+			return getTopTexture(type);
+		}
+		else if (dir == FACING_Z && (face == Facing::NORTH || face == Facing::SOUTH))
+		{
+			return getTopTexture(type);
+		}
+
+		return getTypeTexture(type);
+	};
+
+protected:
+	virtual Icon_SPU *getTypeTexture(int type) = 0;
+
+	virtual Icon_SPU *getTopTexture(int type) = 0;
+};

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/SkullTile_SPU.h

@@ -43,5 +43,5 @@ public:
 		}
 	}
 
-	Icon_SPU *getTexture(int face, int data) { 	return TileRef_SPU(hellSand_Id)->getTexture(face); }
+	Icon_SPU *getTexture(int face, int data) { 	return TileRef_SPU(netherRack_Id)->getTexture(face); }
 };

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/StairTile_SPU.cpp

@@ -39,7 +39,7 @@ bool StairTile_SPU::isStairs(int id)
 	case Tile_SPU::stairs_wood_Id:
 	case Tile_SPU::stairs_stone_Id:
 	case Tile_SPU::stairs_bricks_Id:	
-	case Tile_SPU::stairs_stoneBrickSmooth_Id:
+	case Tile_SPU::stairs_stoneBrick_Id:
 	case Tile_SPU::stairs_netherBricks_Id:
 	case Tile_SPU::stairs_sandstone_Id:
 	case Tile_SPU::stairs_sprucewood_Id:

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/StoneMonsterTile_SPU.h

@@ -21,12 +21,12 @@ public:
 	{
 		if (data == HOST_COBBLE)
 		{
-			return TileRef_SPU(stoneBrick_Id)->getTexture(face);
+			return TileRef_SPU(cobblestone_Id)->getTexture(face);
 		}
 		if (data == HOST_STONEBRICK)
 		{
-			return TileRef_SPU(stoneBrickSmooth_Id)->getTexture(face);
+			return TileRef_SPU(stoneBrick_Id)->getTexture(face);
 		}
-		return TileRef_SPU(rock_Id)->getTexture(face);
+		return TileRef_SPU(stone_Id)->getTexture(face);
 	}
 };

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/StoneSlabTile_SPU.h

@@ -41,11 +41,11 @@ public:
 		case WOOD_SLAB:
 			return TileRef_SPU(wood_Id)->getTexture(face); //Tile::wood->getTexture(face);
 		case COBBLESTONE_SLAB:
-			return TileRef_SPU(stoneBrick_Id)->getTexture(face); //Tile::stoneBrick->getTexture(face);
+			return TileRef_SPU(cobblestone_Id)->getTexture(face); //Tile::stoneBrick->getTexture(face);
 		case BRICK_SLAB:
 			return TileRef_SPU(redBrick_Id)->getTexture(face); //Tile::redBrick->getTexture(face);
  		case SMOOTHBRICK_SLAB:
- 			return TileRef_SPU(stoneBrickSmooth_Id)->getTexture(face); //Tile::stoneBrickSmooth->getTexture(face, SmoothStoneBrickTile::TYPE_DEFAULT);
+ 			return TileRef_SPU(stoneBrick_Id)->getTexture(face); //Tile::stoneBrickSmooth->getTexture(face, SmoothStoneBrickTile::TYPE_DEFAULT);
  		case NETHERBRICK_SLAB:
  			return TileRef_SPU(netherBrick_Id)->getTexture(Facing::UP); //Tile::netherBrick->getTexture(Facing::UP);
 		case QUARTZ_SLAB:

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tile_SPU.cpp

@@ -12,6 +12,7 @@
 #include "DirtTile_SPU.h"
 #include "DoorTile_SPU.h"
 #include "PressurePlateTile_SPU.h"
+#include "WeightedPressurePlateTile_SPU.h"
 #include "FarmTile_SPU.h"
 #include "Bush_SPU.h"
 #include "TallGrass_SPU.h"
@@ -32,7 +33,10 @@
 #include "IceTile_SPU.h"
 #include "PortalTile_SPU.h"
 #include "DispenserTile_SPU.h"
+#include "DropperTile_SPU.h"
 #include "RailTile_SPU.h"
+#include "PoweredRailTile_SPU.h"
+#include "ActivatorRailTile_SPU.h"
 #include "DetectorRailTile_SPU.h"
 #include "TntTile_SPU.h"
 #include "BookshelfTile_SPU.h"
@@ -71,7 +75,7 @@
 #include "EggTile_SPU.h"
 #include "CocoaTile_SPU.h"
 #include "RedlightTile_SPU.h"
-#include "ClothTile_SPU.h"
+#include "WoolTile_SPU.h"
 #include "SkullTile_SPU.h"
 #include "MobSpawnerTile_SPU.h"
 #include "EnderChestTile_SPU.h"
@@ -83,6 +87,9 @@
 #include "PotatoTile_SPU.h"
 #include "QuartzBlockTile_SPU.h"
 #include "WoolCarpetTile_SPU.h"
+#include "ColoredClay_SPU.h"
+#include "HayBlockTile_SPU.h"
+#include "DaylightDetectorTile_SPU.h"
 
 #ifdef SN_TARGET_PS3_SPU
 #include "..\Common\spu_assert.h"
@@ -514,7 +521,7 @@ void Tile_SPU::updateDefaultShape()
 // void Tile_SPU::playerDestroy(Level *level, shared_ptr<Player> player, int x, int y, int z, int data)
 // {
 // 	// 4J Stu - Special case - only record a crop destroy if is fully grown
-// 	if(id==Tile_SPU::crops_Id)
+// 	if(id==Tile_SPU::wheat_Id)
 // 	{
 // 		if( Tile_SPU::crops->getResource(data, NULL, 0) > 0 )
 // 			player->awardStat(Stats::blocksMined[id], 1);
@@ -681,6 +688,7 @@ void Tile_SPU::initTilePointers()
 	CREATE_TILE_TYPE(woodSlabHalf_Id, WoodSlabTile_SPU);
 
 	CREATE_TILE_TYPE(chest_Id, ChestTile_SPU);
+	CREATE_TILE_TYPE(chest_trap_Id, ChestTile_SPU);
 
 	CREATE_TILE_TYPE(ironFence_Id, ThinFenceTile_SPU);
 	CREATE_TILE_TYPE(thinGlass_Id, ThinFenceTile_SPU);
@@ -691,7 +699,7 @@ void Tile_SPU::initTilePointers()
 	CREATE_TILE_TYPE(stairs_wood_Id, StairTile_SPU);
 	CREATE_TILE_TYPE(stairs_stone_Id, StairTile_SPU);
 	CREATE_TILE_TYPE(stairs_bricks_Id, StairTile_SPU);	
-	CREATE_TILE_TYPE(stairs_stoneBrickSmooth_Id, StairTile_SPU);
+	CREATE_TILE_TYPE(stairs_stoneBrick_Id, StairTile_SPU);
 	CREATE_TILE_TYPE(stairs_netherBricks_Id, StairTile_SPU);
 	CREATE_TILE_TYPE(stairs_sandstone_Id, StairTile_SPU);
 	CREATE_TILE_TYPE(stairs_sprucewood_Id, StairTile_SPU);
@@ -706,6 +714,9 @@ void Tile_SPU::initTilePointers()
 	CREATE_TILE_TYPE(pressurePlate_stone_Id, PressurePlateTile_SPU);
 	CREATE_TILE_TYPE(pressurePlate_wood_Id, PressurePlateTile_SPU);
 
+	CREATE_TILE_TYPE(weightedPlate_light_Id, WeightedPressurePlateTile_SPU);
+	CREATE_TILE_TYPE(weightedPlate_heavy_Id, WeightedPressurePlateTile_SPU);
+
 	CREATE_TILE_TYPE(farmland_Id, FarmTile_SPU);
 
 	CREATE_TILE_TYPE(flower_Id, Bush_SPU);
@@ -722,19 +733,19 @@ void Tile_SPU::initTilePointers()
 
 	CREATE_TILE_TYPE(leaves_Id, LeafTile_SPU);
 
-	CREATE_TILE_TYPE(crops_Id, CropTile_SPU);
+	CREATE_TILE_TYPE(wheat_Id, CropTile_SPU);
 
 	CREATE_TILE_TYPE(reeds_Id, ReedTile_SPU);
 
 	CREATE_TILE_TYPE(torch_Id, TorchTile_SPU);
-	CREATE_TILE_TYPE(notGate_off_Id, TorchTile_SPU); // TorchTile->NotGateTile
-	CREATE_TILE_TYPE(notGate_on_Id, TorchTile_SPU);	// TorchTile->NotGateTile
+	CREATE_TILE_TYPE(redstoneTorch_off_Id, TorchTile_SPU); // TorchTile->NotGateTile
+	CREATE_TILE_TYPE(redstoneTorch_on_Id, TorchTile_SPU);	// TorchTile->NotGateTile
 
-	CREATE_TILE_TYPE(mushroom1_Id, Mushroom_SPU);
-	CREATE_TILE_TYPE(mushroom2_Id, Mushroom_SPU);
+	CREATE_TILE_TYPE(mushroom_brown_Id, Mushroom_SPU);
+	CREATE_TILE_TYPE(mushroom_red_Id, Mushroom_SPU);
 
 	CREATE_TILE_TYPE(mobSpawner_Id, MobSpawnerTile_SPU);
-	CREATE_TILE_TYPE(musicBlock_Id, EntityTile_SPU);	// MusicTile->EntityTile
+	CREATE_TILE_TYPE(noteblock_Id, EntityTile_SPU);	// MusicTile->EntityTile
 
 	CREATE_TILE_TYPE(furnace_Id, FurnaceTile_SPU);
 	CREATE_TILE_TYPE(furnace_lit_Id, FurnaceTile_SPU);
@@ -757,9 +768,12 @@ void Tile_SPU::initTilePointers()
 	CREATE_TILE_TYPE(portalTile_Id, PortalTile_SPU);
 
 	CREATE_TILE_TYPE(dispenser_Id, DispenserTile_SPU);
+	CREATE_TILE_TYPE(dropper_Id, DropperTile_SPU);
 
 	CREATE_TILE_TYPE(rail_Id, RailTile_SPU);
-	CREATE_TILE_TYPE(goldenRail_Id, RailTile_SPU);
+
+	CREATE_TILE_TYPE(goldenRail_Id, PoweredRailTile_SPU);
+	CREATE_TILE_TYPE(activatorRail_Id, ActivatorRailTile_SPU);
 
 	CREATE_TILE_TYPE(detectorRail_Id, DetectorRailTile_SPU);
 
@@ -781,7 +795,7 @@ void Tile_SPU::initTilePointers()
 
 	CREATE_TILE_TYPE(cactus_Id, CactusTile_SPU);
 
-	CREATE_TILE_TYPE(recordPlayer_Id, RecordPlayerTile_SPU);
+	CREATE_TILE_TYPE(jukebox_Id, RecordPlayerTile_SPU);
 
 	CREATE_TILE_TYPE(pumpkin_Id, PumpkinTile_SPU);
 	CREATE_TILE_TYPE(litPumpkin_Id, PumpkinTile_SPU);
@@ -792,10 +806,10 @@ void Tile_SPU::initTilePointers()
 
 	CREATE_TILE_TYPE(monsterStoneEgg_Id, StoneMonsterTile_SPU);
 
-	CREATE_TILE_TYPE(stoneBrickSmooth_Id, SmoothStoneBrickTile_SPU);
+	CREATE_TILE_TYPE(stoneBrick_Id, SmoothStoneBrickTile_SPU);
 
-	CREATE_TILE_TYPE(hugeMushroom1_Id, HugeMushroomTile_SPU);
-	CREATE_TILE_TYPE(hugeMushroom2_Id, HugeMushroomTile_SPU);
+	CREATE_TILE_TYPE(hugeMushroom_brown_Id, HugeMushroomTile_SPU);
+	CREATE_TILE_TYPE(hugeMushroom_red_Id, HugeMushroomTile_SPU);
 
 	CREATE_TILE_TYPE(melon_Id, MelonTile_SPU);
 
@@ -847,16 +861,18 @@ void Tile_SPU::initTilePointers()
 
 	CREATE_TILE_TYPE(skull_Id, SkullTile_SPU);
 
-		// these tile types don't have any additional code that we need.
-	CREATE_TILE_TYPE(stoneBrick_Id, Tile_SPU);		// Tile
+	// these tile types don't have any additional code that we need.
+	CREATE_TILE_TYPE(cobblestone_Id, Tile_SPU);		// Tile
 	CREATE_TILE_TYPE(lapisBlock_Id, Tile_SPU);
 	CREATE_TILE_TYPE(redBrick_Id, Tile_SPU);
-	CREATE_TILE_TYPE(mossStone_Id, Tile_SPU);
+	CREATE_TILE_TYPE(mossyCobblestone_Id, Tile_SPU);
 	CREATE_TILE_TYPE(netherBrick_Id, Tile_SPU);
-	CREATE_TILE_TYPE(whiteStone_Id, Tile_SPU);
+	CREATE_TILE_TYPE(endStone_Id, Tile_SPU);
 	CREATE_TILE_TYPE(unbreakable_Id, Tile_SPU);
 	CREATE_TILE_TYPE(sponge_Id, Tile_SPU);
-	CREATE_TILE_TYPE(rock_Id, Tile_SPU);			// StoneTile
+	CREATE_TILE_TYPE(coalBlock_Id, Tile_SPU);
+	CREATE_TILE_TYPE(redstoneBlock_Id, Tile_SPU);
+	CREATE_TILE_TYPE(stone_Id, Tile_SPU);			// StoneTile
 	CREATE_TILE_TYPE(obsidian_Id, Tile_SPU);		// StoneTile->ObsidianTile
 	CREATE_TILE_TYPE(sand_Id, Tile_SPU);			// HeavyTile
 	CREATE_TILE_TYPE(gravel_Id, Tile_SPU);			// GravelTile
@@ -872,12 +888,15 @@ void Tile_SPU::initTilePointers()
 	CREATE_TILE_TYPE(ironBlock_Id, Tile_SPU);		// MetalTile
 	CREATE_TILE_TYPE(diamondBlock_Id, Tile_SPU);	// MetalTile
 	CREATE_TILE_TYPE(snow_Id, Tile_SPU);			// SnowTile
-	CREATE_TILE_TYPE(hellRock_Id, Tile_SPU);		// HellStoneTile
-	CREATE_TILE_TYPE(hellSand_Id, Tile_SPU);		// HellSandTile
-	CREATE_TILE_TYPE(lightGem_Id, Tile_SPU);		// LightGemTile
-	CREATE_TILE_TYPE(aprilFoolsJoke_Id, Tile_SPU); // LockedChestTile
+	CREATE_TILE_TYPE(netherRack_Id, Tile_SPU);		// NetherrackTile
+	CREATE_TILE_TYPE(soulsand_Id, Tile_SPU);		// SoulSandTile
+	CREATE_TILE_TYPE(glowstone_Id, Tile_SPU);		// Glowstonetile
+	// got replaced by stained_glass_Id, rest in peace locked chest
+	//CREATE_TILE_TYPE(aprilFoolsJoke_Id , Tile_SPU); // LockedChestTile
+	CREATE_TILE_TYPE(clayHardened_Id, Tile_SPU); // ColoredTile
 
-	CREATE_TILE_TYPE(cloth_Id, ClothTile_SPU); // wool
+	CREATE_TILE_TYPE(wool_Id, WoolTile_SPU); // wool
+	CREATE_TILE_TYPE(clayHardened_colored_Id, ColoredClay_SPU); // wool
 
 
 	CREATE_TILE_TYPE(emeraldOre_Id, Tile_SPU);		// OreTile
@@ -895,5 +914,6 @@ void Tile_SPU::initTilePointers()
  	CREATE_TILE_TYPE(quartzBlock_Id, QuartzBlockTile_SPU);
 	CREATE_TILE_TYPE(stairs_quartz_Id, StairTile_SPU);
  	CREATE_TILE_TYPE(woolCarpet_Id, WoolCarpetTile_SPU);
-
+	CREATE_TILE_TYPE(hayBlock_Id, HayBlockTile_SPU);
+	CREATE_TILE_TYPE(daylightDetector_Id, DaylightDetectorTile_SPU);
 };

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tile_SPU.h

@@ -129,8 +129,14 @@ public:
 	Icon_SPU dispenserTile_iconFront;
 	Icon_SPU dispenserTile_iconFrontVertical;
 
+	Icon_SPU dropperTile_iconFront;
+	Icon_SPU dropperTile_iconFrontVertical;
+
 	Icon_SPU railTile_iconTurn;
-	Icon_SPU railTile_iconTurnGolden;
+	Icon_SPU poweredRailTile_icon;
+	Icon_SPU poweredRailTile_iconPowered;
+	Icon_SPU activatorRailTile_icon;
+	Icon_SPU activatorRailTile_iconPowered;
 
 	Icon_SPU detectorRailTile_icons[2];
 
@@ -178,7 +184,7 @@ public:
 	Icon_SPU redStoneDust_iconCrossOver;
 	Icon_SPU redStoneDust_iconLineOver;
 
-	Icon_SPU clothTile_icons[16];	
+	Icon_SPU woolTile_icons[16];	
 
 	Icon_SPU stoneSlab_iconSide;
 
@@ -193,6 +199,12 @@ public:
 	Icon_SPU quartzBlock_iconTop;
 	Icon_SPU quartzBlock_iconBottom;
 
+	Icon_SPU clayHardened_colored_icons[16];	
+	Icon_SPU hayBlockTile_icon;
+	Icon_SPU hayBlockTile_iconTop;
+
+	Icon_SPU daylightDetector_icons[2];
+
 
 	int anvilPart; // normally part of the AnvilTile class
 
@@ -296,19 +308,24 @@ public:
 	static const int SHAPE_FLOWER_POT = 33;
 	static const int SHAPE_BEACON = 34;
 	static const int SHAPE_ANVIL = 35;
+	static const int SHAPE_HOPPER = 38;
 	static const int SHAPE_QUARTZ = 39;
+	static const int SHAPE_THIN_PANE = 40;
+
+	static const int SHAPE_COUNT = 41;
 
 	// 4J - this array of simple constants made so the compiler can optimise references to Ids that were previous of the form Tile_SPU::<whatever>->id, and are now simply Tile_SPU::whatever_Id
-	static const int rock_Id = 1;
+	static const int stone_Id = 1;
 	static const int grass_Id = 2;
 	static const int dirt_Id = 3;
-	static const int stoneBrick_Id = 4;
+	static const int cobblestone_Id = 4;
 	static const int wood_Id = 5;
 	static const int sapling_Id = 6;
 	static const int unbreakable_Id = 7;
 	static const int water_Id = 8;
 	static const int calmWater_Id = 9;
 	static const int lava_Id = 10;
+
 	static const int calmLava_Id = 11;
 	static const int sand_Id = 12;
 	static const int gravel_Id = 13;
@@ -319,26 +336,29 @@ public:
 	static const int leaves_Id = 18;
 	static const int sponge_Id = 19;
 	static const int glass_Id = 20;
+
 	static const int lapisOre_Id = 21;
 	static const int lapisBlock_Id = 22;
 	static const int dispenser_Id = 23;
 	static const int sandStone_Id = 24;
-	static const int musicBlock_Id = 25;
+	static const int noteblock_Id = 25;
 	static const int bed_Id = 26;
 	static const int goldenRail_Id = 27;
 	static const int detectorRail_Id = 28;
 	static const int pistonStickyBase_Id = 29;
 	static const int web_Id = 30;
+
 	static const int tallgrass_Id = 31;
 	static const int deadBush_Id = 32;
 	static const int pistonBase_Id = 33;
 	static const int pistonExtensionPiece_Id = 34;
-	static const int cloth_Id = 35;
+	static const int wool_Id = 35;
 	static const int pistonMovingPiece_Id = 36;
 	static const int flower_Id = 37;
 	static const int rose_Id = 38;
-	static const int mushroom1_Id = 39;
-	static const int mushroom2_Id = 40;
+	static const int mushroom_brown_Id = 39;
+	static const int mushroom_red_Id = 40;
+
 	static const int goldBlock_Id = 41;
 	static const int ironBlock_Id = 42;
 	static const int stoneSlab_Id = 43;
@@ -346,9 +366,10 @@ public:
 	static const int redBrick_Id = 45;
 	static const int tnt_Id = 46;
 	static const int bookshelf_Id = 47;
-	static const int mossStone_Id = 48;
+	static const int mossyCobblestone_Id = 48;
 	static const int obsidian_Id = 49;
 	static const int torch_Id = 50;
+
 	static const int fire_Id = 51;
 	static const int mobSpawner_Id = 52;
 	static const int stairs_wood_Id = 53;
@@ -357,8 +378,9 @@ public:
 	static const int diamondOre_Id = 56;
 	static const int diamondBlock_Id = 57;
 	static const int workBench_Id = 58;
-	static const int crops_Id = 59;
+	static const int wheat_Id = 59;
 	static const int farmland_Id = 60;
+
 	static const int furnace_Id = 61;
 	static const int furnace_lit_Id = 62;
 	static const int sign_Id = 63;
@@ -369,37 +391,40 @@ public:
 	static const int wallSign_Id = 68;
 	static const int lever_Id = 69;
 	static const int pressurePlate_stone_Id = 70;
+
 	static const int door_iron_Id = 71;
 	static const int pressurePlate_wood_Id = 72;
 	static const int redStoneOre_Id = 73;
 	static const int redStoneOre_lit_Id = 74;
-	static const int notGate_off_Id = 75;
-	static const int notGate_on_Id = 76;
+	static const int redstoneTorch_off_Id = 75;
+	static const int redstoneTorch_on_Id = 76;
 	static const int button_stone_Id = 77;
 	static const int topSnow_Id = 78;
 	static const int ice_Id = 79;
 	static const int snow_Id = 80;
+
 	static const int cactus_Id = 81;
 	static const int clay_Id = 82;
 	static const int reeds_Id = 83;
-	static const int recordPlayer_Id = 84;
+	static const int jukebox_Id = 84;
 	static const int fence_Id = 85;
 	static const int pumpkin_Id = 86;
-	static const int hellRock_Id = 87;
-	static const int hellSand_Id = 88;
-	static const int lightGem_Id = 89;
+	static const int netherRack_Id = 87;
+	static const int soulsand_Id = 88;
+	static const int glowstone_Id = 89;
 	static const int portalTile_Id = 90;
+
 	static const int litPumpkin_Id = 91;
 	static const int cake_Id = 92;
 	static const int diode_off_Id = 93;
 	static const int diode_on_Id = 94;
-	static const int aprilFoolsJoke_Id = 95;
+	static const int stained_glass_Id = 95;
 	static const int trapdoor_Id = 96;
-
 	static const int monsterStoneEgg_Id = 97;
-	static const int stoneBrickSmooth_Id = 98;
-	static const int hugeMushroom1_Id = 99;
-	static const int hugeMushroom2_Id = 100;
+	static const int stoneBrick_Id = 98;
+	static const int hugeMushroom_brown_Id = 99;
+	static const int hugeMushroom_red_Id = 100;
+
 	static const int ironFence_Id = 101;
 	static const int thinGlass_Id = 102;
 	static const int melon_Id = 103;
@@ -408,9 +433,9 @@ public:
 	static const int vine_Id = 106;
 	static const int fenceGate_Id = 107;
 	static const int stairs_bricks_Id = 108;
-	static const int stairs_stoneBrickSmooth_Id = 109;
-
+	static const int stairs_stoneBrick_Id = 109;
 	static const int mycel_Id = 110;
+
 	static const int waterLily_Id = 111;
 	static const int netherBrick_Id = 112;
 	static const int netherFence_Id = 113;
@@ -421,36 +446,55 @@ public:
 	static const int cauldron_Id = 118;
 	static const int endPortalTile_Id = 119;
 	static const int endPortalFrameTile_Id = 120;
-	static const int whiteStone_Id = 121;
+
+	static const int endStone_Id = 121;
 	static const int dragonEgg_Id = 122;
 	static const int redstoneLight_Id = 123;
 	static const int redstoneLight_lit_Id = 124;
-
-
 	static const int woodSlab_Id = 125;
 	static const int woodSlabHalf_Id = 126;
 	static const int cocoa_Id = 127;
 	static const int stairs_sandstone_Id = 128;
-	static const int stairs_sprucewood_Id = 134;
-	static const int stairs_birchwood_Id = 135;
-	static const int stairs_junglewood_Id = 136;
 	static const int emeraldOre_Id = 129;
 	static const int enderChest_Id = 130;
+
 	static const int tripWireSource_Id = 131;
 	static const int tripWire_Id = 132;
 	static const int emeraldBlock_Id = 133;
-
+	static const int stairs_sprucewood_Id = 134;
+	static const int stairs_birchwood_Id = 135;
+	static const int stairs_junglewood_Id = 136;
+	static const int commandBlock_Id = 137;
+	static const int beacon_Id = 138;
 	static const int cobbleWall_Id = 139;
 	static const int flowerPot_Id = 140;
+
 	static const int carrots_Id = 141;
 	static const int potatoes_Id = 142;
-	static const int anvil_Id = 145;
 	static const int button_wood_Id = 143;
 	static const int skull_Id = 144;
+	static const int anvil_Id = 145;
+	static const int chest_trap_Id = 146;
+	static const int weightedPlate_light_Id = 147;
+	static const int weightedPlate_heavy_Id = 148;
+	static const int comparator_off_Id = 149;
+	static const int comparator_on_Id = 150;
+
+	static const int daylightDetector_Id = 151;
+	static const int redstoneBlock_Id = 152;
 	static const int netherQuartz_Id = 153;
+	static const int hopper_Id = 154;
 	static const int quartzBlock_Id = 155;
 	static const int stairs_quartz_Id = 156;
+	static const int activatorRail_Id = 157;
+	static const int dropper_Id = 158;
+	static const int clayHardened_colored_Id = 159;
+	static const int stained_glass_pane_Id = 160;
+
+	static const int hayBlock_Id = 170;
 	static const int woolCarpet_Id = 171;
+	static const int clayHardened_Id = 172;
+	static const int coalBlock_Id = 173;
 
 	static Tile_SPU m_tiles[256];
 

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/TreeTile_SPU.h

@@ -1,10 +1,10 @@
 #pragma once
 
-#include "Tile_SPU.h"
+#include "RotatedPillarTile_SPU.h"
 
 class Player;
 
-class TreeTile_SPU : public Tile_SPU
+class TreeTile_SPU : public RotatedPillarTile_SPU
 {	
 public:
 	static const int DARK_TRUNK = 1;
@@ -19,29 +19,14 @@ public:
 
 	static const int TREE_NAMES_LENGTH = 4;
 
-	TreeTile_SPU(int id) : Tile_SPU(id) {}
-	int getRenderShape() {	return Tile_SPU::SHAPE_TREE; }
-
+	TreeTile_SPU(int id) : RotatedPillarTile_SPU(id) {}
 
 public:
-	Icon_SPU *getTexture(int face, int data)
-	{
-		int dir = data & MASK_FACING;
-		int type = data & MASK_TYPE;
-
-		if (dir == FACING_Y && (face == Facing::UP || face == Facing::DOWN))
-		{
-			return &ms_pTileData->treeTile_icons_top[type];
-		}
-		else if (dir == FACING_X && (face == Facing::EAST || face == Facing::WEST))
-		{
-			return &ms_pTileData->treeTile_icons_top[type];
-		}
-		else if (dir == FACING_Z && (face == Facing::NORTH || face == Facing::SOUTH))
-		{
-			return &ms_pTileData->treeTile_icons_top[type];
-		}
-
+	Icon_SPU *getTypeTexture(int type) {
 		return &ms_pTileData->treeTile_icons_side[type];
-	}
+	};
+
+	Icon_SPU *getTopTexture(int type) {
+		return &ms_pTileData->treeTile_icons_top[type];
+	};
 };

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/WallTile_SPU.h

@@ -22,7 +22,7 @@ public:
 	{
 		if (data == TYPE_MOSSY)
 		{
-			return TileRef_SPU(mossStone_Id)->getTexture(face);
+			return TileRef_SPU(mossyCobblestone_Id)->getTexture(face);
 		}
 		return TileRef_SPU(stoneBrick_Id)->getTexture(face);
 

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/WeightedPressurePlateTile_SPU.h

@@ -0,0 +1,22 @@
+#pragma once
+#include "BasePressurePlateTile_SPU.h"
+
+class WeightedPressurePlateTile_SPU : public BasePressurePlateTile_SPU
+{
+public:
+	enum Sensitivity
+	{
+		everything, mobs, players
+	};
+
+private:
+	Sensitivity sensitivity;
+
+public:
+	WeightedPressurePlateTile_SPU(int id) : BasePressurePlateTile_SPU(id) {}
+
+protected:
+	virtual int getSignalForData(int data) {
+		return data;
+	};
+};

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/WoolCarpetTile_SPU.h

@@ -7,7 +7,7 @@ class WoolCarpetTile_SPU : public Tile_SPU
 public:
 	WoolCarpetTile_SPU(int id) : Tile_SPU(id) {}
 
-	Icon_SPU *getTexture(int face, int data) { return TileRef_SPU(cloth_Id)->getTexture(face, data); }
+	Icon_SPU *getTexture(int face, int data) { return TileRef_SPU(wool_Id)->getTexture(face, data); }
 	bool isSolidRender(bool isServerLevel = false) { return false; }
 	void updateDefaultShape() { updateShape(0); }
 	void updateShape(ChunkRebuildData *level, int x, int y, int z) { updateShape(level->getData(x, y, z)); }

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/WoolTile_SPU.h

@@ -0,0 +1,11 @@
+#pragma once
+#include "Tile_SPU.h"
+
+class WoolTile_SPU : public Tile_SPU
+{
+public:
+	WoolTile_SPU(int id) : Tile_SPU(id) {}
+	virtual Icon_SPU *getTexture(int face, int data) {	return &ms_pTileData->woolTile_icons[data]; }
+
+
+};

Minecraft.Client/PS3Media/strings.h

@@ -1,7 +1,7 @@
 #pragma once
 // Auto-generated by StringTable builder — do not edit manually.
 // Source language: en-US
-// Total strings:   2281
+// Total strings:   2272
 
 #define IDS_OK                                                 0
 #define IDS_BACK                                               1
@@ -2239,48 +2239,40 @@
 #define IDS_HOST_OPTION_DISABLES_ACHIEVEMENTS                  2233
 #define IDS_SIGNIN_PSN                                         2234
 #define IDS_KICK_PLAYER_DESCRIPTION                            2235
-#define IDS_PLATFORM_NAME                                      2236
-#define IDS_TOOLTIP_CHANGE_NETWORK_MODE                        2237
-#define IDS_SELECT_NETWORK_MODE_TITLE                          2238
-#define IDS_SELECT_NETWORK_MODE_TEXT                           2239
-#define IDS_NETWORK_ADHOC                                      2240
-#define IDS__NETWORK_PSN                                       2241
-#define IDS_TOOLTIPS_SAVETRANSFER_DOWNLOAD                     2242
-#define IDS_TOOLTIPS_SAVETRANSFER_UPLOAD                       2243
-#define IDS_CANCEL_UPLOAD_TITLE                                2244
-#define IDS_CANCEL_UPLOAD_TEXT                                 2245
-#define IDS_SAVETRANSFER_STAGE_PUT_DATA                        2246
-#define IDS_SAVETRANSFER_STAGE_GET_DATA                        2247
-#define IDS_SAVE_TRANSFER_TEXT                                 2248
-#define IDS_SAVETRANSFER_STAGE_CONVERTING                      2249
-#define IDS_SAVETRANSFER_STAGE_SAVING                          2250
-#define IDS_SAVE_TRANSFER_UPLOADCOMPLETE                       2251
-#define IDS_SAVE_TRANSFER_UPLOADFAILED                         2252
-#define IDS_SAVE_TRANSFER_DOWNLOADCOMPLETE                     2253
-#define IDS_SAVE_TRANSFER_DOWNLOADFAILED                       2254
-#define IDS_DISCONNECTED_NAT_TYPE_MISMATCH                     2255
-#define IDS_SAVE_TRANSFER_NOT_AVAILABLE_TEXT                   2256
-#define IDS_SAVE_TRANSFER_WRONG_VERSION                        2257
-#define IDS_SAVE_INCOMPLETE_TITLE                              2258
-#define IDS_SAVE_INCOMPLETE_EXPLANATION_QUOTA                  2259
-#define IDS_RICHPRESENCE_GAMESTATE                             2260
-#define IDS_RICHPRESENCE_IDLE                                  2261
-#define IDS_RICHPRESENCE_MENUS                                 2262
-#define IDS_RICHPRESENCE_MULTIPLAYER                           2263
-#define IDS_RICHPRESENCE_MULTIPLAYEROFFLINE                    2264
-#define IDS_RICHPRESENCE_MULTIPLAYER_1P                        2265
-#define IDS_RICHPRESENCE_MULTIPLAYER_1POFFLINE                 2266
-#define IDS_RICHPRESENCESTATE_BLANK                            2267
-#define IDS_RICHPRESENCESTATE_RIDING_PIG                       2268
-#define IDS_RICHPRESENCESTATE_RIDING_MINECART                  2269
-#define IDS_RICHPRESENCESTATE_BOATING                          2270
-#define IDS_RICHPRESENCESTATE_FISHING                          2271
-#define IDS_RICHPRESENCESTATE_CRAFTING                         2272
-#define IDS_RICHPRESENCESTATE_FORGING                          2273
-#define IDS_RICHPRESENCESTATE_NETHER                           2274
-#define IDS_RICHPRESENCESTATE_CD                               2275
-#define IDS_RICHPRESENCESTATE_MAP                              2276
-#define IDS_RICHPRESENCESTATE_ENCHANTING                       2277
-#define IDS_RICHPRESENCESTATE_BREWING                          2278
-#define IDS_RICHPRESENCESTATE_ANVIL                            2279
-#define IDS_RICHPRESENCESTATE_TRADING                          2280
+#define IDS_TOOLTIPS_SAVETRANSFER_DOWNLOAD                     2236
+#define IDS_TOOLTIPS_SAVETRANSFER_UPLOAD                       2237
+#define IDS_CANCEL_UPLOAD_TITLE                                2238
+#define IDS_CANCEL_UPLOAD_TEXT                                 2239
+#define IDS_SAVETRANSFER_STAGE_PUT_DATA                        2240
+#define IDS_SAVETRANSFER_STAGE_GET_DATA                        2241
+#define IDS_SAVE_TRANSFER_TEXT                                 2242
+#define IDS_SAVETRANSFER_STAGE_CONVERTING                      2243
+#define IDS_SAVETRANSFER_STAGE_SAVING                          2244
+#define IDS_DISCONNECTED_NAT_TYPE_MISMATCH                     2245
+#define IDS_SAVE_TRANSFER_UPLOADCOMPLETE                       2246
+#define IDS_SAVE_TRANSFER_UPLOADFAILED                         2247
+#define IDS_SAVE_TRANSFER_DOWNLOADCOMPLETE                     2248
+#define IDS_SAVE_TRANSFER_DOWNLOADFAILED                       2249
+#define IDS_SAVE_TRANSFER_NOT_AVAILABLE_TEXT                   2250
+#define IDS_SAVE_TRANSFER_WRONG_VERSION						   2251
+#define IDS_RICHPRESENCE_GAMESTATE                             2252
+#define IDS_RICHPRESENCE_IDLE                                  2253
+#define IDS_RICHPRESENCE_MENUS                                 2254
+#define IDS_RICHPRESENCE_MULTIPLAYER                           2255
+#define IDS_RICHPRESENCE_MULTIPLAYEROFFLINE                    2256
+#define IDS_RICHPRESENCE_MULTIPLAYER_1P                        2257
+#define IDS_RICHPRESENCE_MULTIPLAYER_1POFFLINE                 2258
+#define IDS_RICHPRESENCESTATE_BLANK                            2259
+#define IDS_RICHPRESENCESTATE_RIDING_PIG                       2260
+#define IDS_RICHPRESENCESTATE_RIDING_MINECART                  2261
+#define IDS_RICHPRESENCESTATE_BOATING                          2262
+#define IDS_RICHPRESENCESTATE_FISHING                          2263
+#define IDS_RICHPRESENCESTATE_CRAFTING                         2264
+#define IDS_RICHPRESENCESTATE_FORGING                          2265
+#define IDS_RICHPRESENCESTATE_NETHER                           2266
+#define IDS_RICHPRESENCESTATE_CD                               2267
+#define IDS_RICHPRESENCESTATE_MAP                              2268
+#define IDS_RICHPRESENCESTATE_ENCHANTING                       2269
+#define IDS_RICHPRESENCESTATE_BREWING                          2270
+#define IDS_RICHPRESENCESTATE_ANVIL                            2271
+#define IDS_RICHPRESENCESTATE_TRADING                          2272

Minecraft.Client/PSVita/Network/SQRNetworkManager_Vita.h

@@ -10,6 +10,8 @@
 
 #include "..\..\Common\Network\Sony\SQRNetworkManager.h"
 
+#include "../OldSdk.h"
+
 class SQRNetworkPlayer;
 class ISQRNetworkManagerListener;
 class SonyVoiceChat_Vita;

Minecraft.Client/PSVita/OldSdk.cpp

@@ -0,0 +1,52 @@
+#include "OldSdk.h"
+#ifdef __PSVITA__
+
+int sceNpBasicGetFriendOnlineStatus(const SceNpId *friendId, SceNpBasicOnlineStatus *status) {
+	if (status) *status = SCE_NP_BASIC_ONLINE_STATUS_UNKNOWN;
+	return -1;
+}
+
+int sceNpBasicGetFriendContextState(const SceNpId *friendId, SceNpBasicFriendContextState *state) {
+	if (state) *state = SCE_NP_BASIC_FRIEND_CONTEXT_STATE_UNKNOWN;
+	return -1;
+}
+
+int sceNpBasicGetGamePresenceOfFriend(const SceNpId *friendId, SceNpBasicGamePresence *presence) {
+	if (presence) memset(presence, 0, sizeof(SceNpBasicGamePresence));
+	return -1;
+}
+
+int sceNpBasicGetFriendListEntryCount(SceSize *count) {
+	if (count) *count = 0;
+	return 0;
+}
+
+int sceNpBasicGetFriendListEntries(unsigned int startIndex, SceNpId *entries, SceSize numEntries, SceSize *retrieved) {
+	if (retrieved) *retrieved = 0;
+	return 0;
+}
+
+int sceNpBasicGetFriendRequestEntryCount(SceSize *count) {
+	if (count) *count = 0;
+	return 0;
+}
+
+int sceNpBasicGetFriendRequestEntries(unsigned int startIndex, SceNpId *entries, SceSize numEntries, SceSize *retrieved) {
+	if (retrieved) *retrieved = 0;
+	return 0;
+}
+
+int sceNpBasicGetRequestedFriendRequestEntryCount(SceSize *count) {
+	if (count) *count = 0;
+	return 0;
+}
+
+int sceNpBasicGetRequestedFriendRequestEntries(unsigned int startIndex, SceNpId *entries, SceSize numEntries, SceSize *retrieved) {
+	if (retrieved) *retrieved = 0;
+	return 0;
+}
+
+SceInt32 sceAppUtilAppEventParseNpBasicJoinablePresence(const SceAppUtilAppEventParam *eventParam, SceAppUtilNpBasicJoinablePresenceParam *param) {
+	return -1;
+}
+#endif

Minecraft.Client/PSVita/OldSdk.h

@@ -0,0 +1,55 @@
+#pragma once
+#ifdef __PSVITA__
+#ifndef _OLD_SDK_H
+#define _OLD_SDK_H 1 
+
+#include <np.h>
+#include <np/np_basic.h>
+#include <apputil.h>
+#include <np_toolkit.h>
+#include <np_toolkit\friends_interface.h>
+
+typedef enum {
+	SCE_NP_BASIC_ONLINE_STATUS_UNKNOWN = 0,
+	SCE_NP_BASIC_ONLINE_STATUS_OFFLINE = 1,
+	SCE_NP_BASIC_ONLINE_STATUS_AFK = 2,
+	SCE_NP_BASIC_ONLINE_STATUS_ONLINE = 3
+} SceNpBasicOnlineStatus;
+
+typedef void(*SceNpBasicFriendOnlineStatusEventHandler)(
+	const SceNpId *friendId,
+	SceNpBasicOnlineStatus status,
+	void *userdata
+	);
+
+typedef enum {
+	SCE_NP_BASIC_FRIEND_CONTEXT_STATE_UNKNOWN = 0,
+	SCE_NP_BASIC_FRIEND_CONTEXT_STATE_OUT_OF_CONTEXT = 1,
+	SCE_NP_BASIC_FRIEND_CONTEXT_STATE_IN_CONTEXT = 2
+} SceNpBasicFriendContextState;
+
+typedef void(*SceNpBasicFriendContextEventHandler)(
+	const SceNpId *friendId,
+	SceNpBasicFriendContextState state,
+	void *userdata
+	);
+typedef struct SceAppUtilNpBasicJoinablePresenceParam {
+	SceNpCommunicationId	commId;
+	SceNpId					npId;
+} SceAppUtilNpBasicJoinablePresenceParam;
+
+int sceNpBasicGetFriendOnlineStatus(const SceNpId *friendId, SceNpBasicOnlineStatus *status);
+int sceNpBasicGetFriendContextState(const SceNpId *friendId, SceNpBasicFriendContextState *state);
+int sceNpBasicGetGamePresenceOfFriend(const SceNpId *friendId, SceNpBasicGamePresence *presence);
+int sceNpBasicGetFriendListEntryCount(SceSize *count);
+int sceNpBasicGetFriendListEntries(unsigned int startIndex, SceNpId *entries, SceSize numEntries, SceSize *retrieved);
+int sceNpBasicGetFriendRequestEntryCount(SceSize *count);
+int sceNpBasicGetFriendRequestEntries(unsigned int startIndex, SceNpId *entries, SceSize numEntries, SceSize *retrieved);
+int sceNpBasicGetRequestedFriendRequestEntryCount(SceSize *count);
+int sceNpBasicGetRequestedFriendRequestEntries(unsigned int startIndex, SceNpId *entries, SceSize numEntries, SceSize *retrieved);
+SceInt32 sceAppUtilAppEventParseNpBasicJoinablePresence(const SceAppUtilAppEventParam *eventParam, SceAppUtilNpBasicJoinablePresenceParam *param);
+
+#define SCE_APPUTIL_APPEVENT_TYPE_NP_BASIC_JOINABLE_PRESENCE	(3)	
+
+#endif
+#endif

Minecraft.Client/PlayerRenderer.cpp

@@ -445,7 +445,7 @@ void PlayerRenderer::additionalRendering(shared_ptr<LivingEntity> _mob, float a)
 	}
 }
 
-void PlayerRenderer::renderNameTags(shared_ptr<LivingEntity> player, double x, double y, double z, wstring msg, float scale, double dist)
+void PlayerRenderer::renderNameTags(shared_ptr<LivingEntity> player, double x, double y, double z, const wstring &msg, float scale, double dist)
 {
 #if 0
     if (dist < 10 * 10)
@@ -471,7 +471,17 @@ void PlayerRenderer::renderNameTags(shared_ptr<LivingEntity> player, double x, d
     }
 #endif
 
-    LivingEntityRenderer::renderNameTags(player, x, y, z, msg, scale, dist);
+    shared_ptr<Player> pPlayer = dynamic_pointer_cast<Player>(player);
+	int color = getNametagColour(pPlayer->getPlayerIndex());
+
+	if (player->isSleeping())
+	{
+		renderNameTag(player, msg, x, y - 1.5f, z, 64, color);
+	}
+	else
+	{
+		renderNameTag(player, msg, x, y, z, 64, color);
+	}
 }
 
 void PlayerRenderer::scale(shared_ptr<LivingEntity> player, float a)

Minecraft.Client/PlayerRenderer.h

@@ -37,7 +37,7 @@ public:
 
 protected:
     virtual void additionalRendering(shared_ptr<LivingEntity> _mob, float a);
-	void renderNameTags(shared_ptr<LivingEntity> player, double x, double y, double z, wstring msg, float scale, double dist);
+	void renderNameTags(shared_ptr<LivingEntity> player, double x, double y, double z, const wstring &msg, float scale, double dist);
 
     virtual void scale(shared_ptr<LivingEntity> _player, float a);
 public:

Minecraft.Client/Windows64Media/OLD_loc/4J_stringsGeneric.xml

@@ -1,211 +0,0 @@
-<root>
-	<data name="IDS_NULL">
-		<value>Not Used</value>
-	</data>	
-
-	<data name="IDS_OK">
-		<value>OK</value>
-	</data>	
-
-	<data name="IDS_BACK">
-		<value>Back</value>
-	</data>	
-
-	<data name="IDS_CANCEL">
-		<value>Cancel</value>
-	</data>	
-
-	<data name="IDS_YES">
-		<value>Yes</value>
-	</data>	
-
-	<data name="IDS_NO">
-		<value>No</value>
-	</data>	
-
-	<data name="IDS_CORRUPTSAVE_TITLE">
-		<value>Corrupt Save</value>
-	</data>	
-
-	<data name="IDS_CORRUPTSAVE_TEXT">
-		<value>Your save data appears to be corrupt.  Create a new save and overwrite the corrupt one?</value>
-	</data>	
-
-	<data name="IDS_NOFREESPACE_TITLE">
-		<value>No Free Space</value>
-	</data>	
-
-	<data name="IDS_NOFREESPACE_TEXT">
-		<value>Your selected storage device doesn't have enough free space to create a game save.</value>
-	</data>	
-
-	<data name="IDS_SELECTAGAIN">
-		<value>Select again</value>
-	</data>	
-
-	<data name="IDS_PLAYWITHOUTSAVING">
-		<value>Play without saving</value>
-	</data>	
-
-	<data name="IDS_CREATEANEWSAVE">
-		<value>Create a new save</value>
-	</data>	
-
-	<data name="IDS_OVERWRITESAVE_TITLE">
-		<value>Overwrite save?</value>
-	</data>	
-
-	<data name="IDS_OVERWRITESAVE_TEXT">
-		<value>Your selected storage device already contains this save.  Is it OK to overwrite it?</value>
-	</data>	
-
-	<data name="IDS_OVERWRITESAVE_NO">
-		<value>No - don't overwrite</value>
-	</data>	
-
-	<data name="IDS_OVERWRITESAVE_YES">
-		<value>Overwrite and save</value>
-	</data>	
-
-	<data name="IDS_FAILED_TO_SAVE_TITLE">
-		<value>Save failed</value>
-	</data>	
-
-	<data name="IDS_STORAGEDEVICEPROBLEM_TITLE">
-		<value>Storage Device Problem</value>
-	</data>	
-
-	<data name="IDS_FAILED_TO_SAVE_TEXT">
-		<value>Your storage device is unavailable or has an error</value>
-	</data>	
-
-	<data name="IDS_FAILED_TO_LOADSAVE_TEXT">
-		<value>Your storage device is unavailable or has an error. Please select a new storage device.</value>
-	</data>	
-
-	<data name="IDS_SELECTANEWDEVICE">
-		<value>Select a new storage device</value>
-	</data>	
-
-	<data name="IDS_NODEVICE_TITLE">
-		<value>No storage device selected</value>
-	</data>	
-
-	<data name="IDS_NODEVICE_TEXT">
-		<value>If you do not select a storage device, game saves will be disabled</value>
-	</data>	
-
-	<data name="IDS_NODEVICE_ACCEPT">
-		<value>Select a storage device</value>
-	</data>	
-
-	<data name="IDS_NODEVICE_DECLINE">
-		<value>Continue without saving</value>
-	</data>	
-
-	<data name="IDS_DEVICEGONE_TEXT">
-		<value>Your storage device has been removed.  Please select a new one.</value>
-	</data>	
-
-	<data name="IDS_DEVICEGONE_TITLE">
-		<value>Loading failed</value>
-	</data>	
-
-	<data name="IDS_KEYBOARDUI_SAVEGAME_TITLE">
-		<value>Name the save</value>
-	</data>	
-
-	<data name="IDS_KEYBOARDUI_SAVEGAME_TEXT">
-		<value>Enter a name for your savegame</value>
-	</data>	
-
-	<data name="IDS_WARNING_ARCADE_TITLE">
-		<value>Return to Xbox Dashboard</value>
-	</data>	
-
-	<data name="IDS_WARNING_ARCADE_TEXT">
-		<value>Are you sure you want to exit the game?</value>
-	</data>	
-
-	<data name="IDS_PRO_RETURNEDTOMENU_TITLE">
-		<value>Signed out</value>
-	</data>	
-
-	<data name="IDS_PRO_RETURNEDTOTITLESCREEN_TEXT">
-		<value>You have been returned to the title screen because your gamer profile was signed out</value>
-	</data>	
-
-	<data name="IDS_PRO_RETURNEDTOMENU_TEXT">
-		<value>The match has ended because a gamer profile was signed out</value>
-	</data>	
-
-	<data name="IDS_PRO_RETURNEDTOMENU_ACCEPT">
-		<value>Continue playing</value>
-	</data>	
-
-	<data name="IDS_PRO_NOTONLINE_TITLE">
-		<value>Gamer profile not online</value>
-	</data>	
-
-	<data name="IDS_PRO_NOTONLINE_TEXT">
-		<value>This game has some features which require an Xbox LIVE enabled gamer profile, but you are currently offline.</value>
-	</data>	
-
-	<data name="IDS_PRO_XBOXLIVE_NOTIFICATION">
-		<value>This feature requires a gamer profile which is signed into Xbox LIVE.</value>
-	</data>	
-
-	<data name="IDS_PRO_NOTONLINE_ACCEPT">
-		<value>Connect to Xbox LIVE</value>
-	</data>	
-
-	<data name="IDS_PRO_NOTONLINE_DECLINE">
-		<value>Continue playing offline</value>
-	</data>	
-
-	<data name="IDS_PRO_ACHIEVEMENTPROBLEM_TITLE">
-		<value>Achievement Award Problem</value>
-	</data>	
-
-	<data name="IDS_PRO_ACHIEVEMENTPROBLEM_TEXT">
-		<value> There was a problem accessing your gamer profile. Your achievement could not be awarded at this time.</value>
-	</data>	
-
-	<data name="IDS_PRO_NOPROFILE_TITLE">
-		<value>Gamer profile problem</value>
-	</data>	
-
-	<data name="IDS_PRO_NOPROFILEOPTIONS_TEXT">
-		<value>Saving of settings to gamer profile has failed.</value>
-	</data>	
-
-	<data name="IDS_PRO_GUESTPROFILE_TITLE">
-		<value>Guest Gamer Profile</value>
-	</data>	
-
-	<data name="IDS_PRO_GUESTPROFILE_TEXT">
-		<value>Guest gamer profile cannot access this feature. Please use a different gamer profile.</value>
-	</data>	
-
-	<data name="IDS_STO_SAVING_SHORT">
-		<value>Saving…</value>
-	</data>	
-
-	<data name="IDS_STO_SAVING_LONG">
-		<value>Saving content. Please don't turn off your console.</value>
-	</data>	
-
-	<data name="IDS_PRO_UNLOCKGAME_TITLE">
-		<value>Unlock Full Game</value>
-	</data>	
-
-	<data name="IDS_PRO_UNLOCKGAME_TEXT">
-		<value>This is the Minecraft trial game. If you had the full game, you would just have earned an achievement! 
-Unlock the full game to experience the joy of Minecraft and to play with your friends across the globe through Xbox LIVE.
-Would you like to unlock the full game?</value>
-	</data>	
-
-	<data name="IDS_PRO_PROFILEPROBLEM_TEXT">
-		<value>You are being returned to the main menu because of a problem reading your profile.</value>
-	</data>	
-</root>

Minecraft.Client/Windows64Media/OLD_loc/4J_stringsPlatformSpecific.xml

@@ -1,105 +0,0 @@
-<root>
-  <data name="IDS_NOFREESPACE_TEXT">
-    <value>Your selected storage device doesn't have enough free space to create a game save.</value>
-  </data>
-
-  <data name="IDS_OVERWRITESAVE_TEXT">
-    <value>Your selected storage device already contains this save.  Is it OK to overwrite it?</value>
-  </data>
-
-  <data name="IDS_STORAGEDEVICEPROBLEM_TITLE">
-    <value>Storage Device Problem</value>
-  </data>
-
-  <data name="IDS_FAILED_TO_SAVE_TEXT">
-    <value>Your storage device is unavailable or has an error</value>
-  </data>
-
-  <data name="IDS_FAILED_TO_LOADSAVE_TEXT">
-    <value>Your storage device is unavailable or has an error. Please select a new storage device.</value>
-  </data>
-
-  <data name="IDS_SELECTANEWDEVICE">
-    <value>Select a new storage device</value>
-  </data>
-
-  <data name="IDS_NODEVICE_TITLE">
-    <value>No storage device selected</value>
-  </data>
-
-  <data name="IDS_NODEVICE_TEXT">
-    <value>If you do not select a storage device, game saves will be disabled</value>
-  </data>
-
-  <data name="IDS_NODEVICE_ACCEPT">
-    <value>Select a storage device</value>
-  </data>
-
-  <data name="IDS_DEVICEGONE_TEXT">
-    <value>Your storage device has been removed.  Please select a new one.</value>
-  </data>
-
-  <data name="IDS_WARNING_ARCADE_TITLE">
-    <value>Return to Xbox Dashboard</value>
-  </data>
-
-  <data name="IDS_PRO_RETURNEDTOTITLESCREEN_TEXT">
-    <value>You have been returned to the title screen because your gamer profile was signed out</value>
-  </data>
-
-  <data name="IDS_PRO_RETURNEDTOMENU_TEXT">
-    <value>The match has ended because a gamer profile was signed out</value>
-  </data>
-
-  <data name="IDS_PRO_NOTONLINE_TITLE">
-    <value>Gamer profile not online</value>
-  </data>
-
-  <data name="IDS_PRO_NOTONLINE_TEXT">
-    <value>This game has some features which require an Xbox Live enabled gamer profile, but you are currently offline.</value>
-  </data>
-
-  <data name="IDS_PRO_XBOXLIVE_NOTIFICATION">
-    <value>This feature requires a gamer profile which is signed into Xbox Live.</value>
-  </data>
-
-  <data name="IDS_PRO_NOTONLINE_ACCEPT">
-    <value>Connect to Xbox Live</value>
-  </data>
-
-  <data name="IDS_PRO_ACHIEVEMENTPROBLEM_TITLE">
-    <value>Achievement Award Problem</value>
-  </data>
-
-  <data name="IDS_PRO_ACHIEVEMENTPROBLEM_TEXT">
-    <value> There was a problem accessing your gamer profile. Your achievement could not be awarded at this time.</value>
-  </data>
-
-  <data name="IDS_PRO_NOPROFILE_TITLE">
-    <value>Gamer profile problem</value>
-  </data>
-
-  <data name="IDS_PRO_NOPROFILEOPTIONS_TEXT">
-    <value>Saving of settings to gamer profile has failed.</value>
-  </data>
-
-  <data name="IDS_PRO_GUESTPROFILE_TITLE">
-    <value>Guest Gamer Profile</value>
-  </data>
-
-  <data name="IDS_PRO_GUESTPROFILE_TEXT">
-    <value>Guest gamer profile cannot access this feature. Please use a different gamer profile.</value>
-  </data>
-
-  <data name="IDS_PRO_UNLOCKGAME_TEXT">
-    <value>
-      This is the Minecraft trial game. If you had the full game, you would just have earned an achievement!
-      Unlock the full game to experience the joy of Minecraft and to play with your friends across the globe through Xbox Live.
-      Would you like to unlock the full game?
-    </value>
-  </data>
-
-  <data name="IDS_PRO_PROFILEPROBLEM_TEXT">
-    <value>You are being returned to the main menu because of a problem reading your profile.</value>
-  </data>
-</root>

Minecraft.Client/Windows64Media/OLD_loc/de-DE/4J_stringsGeneric.xml

@@ -1,211 +0,0 @@
-<root>
-	<data name="IDS_NULL">
-		<value>Nicht verwendet</value>
-	</data>	
-
-	<data name="IDS_OK">
-		<value>OK</value>
-	</data>	
-
-	<data name="IDS_BACK">
-		<value>Zurück</value>
-	</data>	
-
-	<data name="IDS_CANCEL">
-		<value>Abbrechen</value>
-	</data>	
-
-	<data name="IDS_YES">
-		<value>Ja</value>
-	</data>	
-
-	<data name="IDS_NO">
-		<value>Nein</value>
-	</data>	
-
-	<data name="IDS_CORRUPTSAVE_TITLE">
-		<value>Beschädigte Speicherdatei</value>
-	</data>	
-
-	<data name="IDS_CORRUPTSAVE_TEXT">
-		<value>Deine Speicherdatei ist beschädigt. Beschädigte Speicherdatei überschreiben und neue erstellen?</value>
-	</data>	
-
-	<data name="IDS_NOFREESPACE_TITLE">
-		<value>Kein freier Speicherplatz</value>
-	</data>	
-
-	<data name="IDS_NOFREESPACE_TEXT">
-		<value>Auf dem ausgewählten Speichergerät steht nicht genug freier Speicherplatz zur Verfügung, um eine Speicherdatei für das Spiel zu erstellen.</value>
-	</data>	
-
-	<data name="IDS_SELECTAGAIN">
-		<value>Erneut auswählen</value>
-	</data>	
-
-	<data name="IDS_PLAYWITHOUTSAVING">
-		<value>Ohne Speichern spielen</value>
-	</data>	
-
-	<data name="IDS_CREATEANEWSAVE">
-		<value>Neue Speicherdatei erstellen</value>
-	</data>	
-
-	<data name="IDS_OVERWRITESAVE_TITLE">
-		<value>Speicherdatei überschreiben?</value>
-	</data>	
-
-	<data name="IDS_OVERWRITESAVE_TEXT">
-		<value>Diese Speicherdatei existiert bereits auf deinem ausgewählten Speichergerät. Möchtest du sie überschreiben?</value>
-	</data>	
-
-	<data name="IDS_OVERWRITESAVE_NO">
-		<value>Nein, nicht überschreiben</value>
-	</data>	
-
-	<data name="IDS_OVERWRITESAVE_YES">
-		<value>Überschreiben und speichern</value>
-	</data>	
-
-	<data name="IDS_FAILED_TO_SAVE_TITLE">
-		<value>Fehler beim Speichern</value>
-	</data>	
-
-	<data name="IDS_STORAGEDEVICEPROBLEM_TITLE">
-		<value>Problem mit dem Speichergerät</value>
-	</data>	
-
-	<data name="IDS_FAILED_TO_SAVE_TEXT">
-		<value>Dein Speichergerät ist nicht verfügbar oder hat einen Fehler verursacht.</value>
-	</data>	
-
-	<data name="IDS_FAILED_TO_LOADSAVE_TEXT">
-		<value>Dein Speichergerät ist nicht verfügbar oder hat einen Fehler verursacht. Wähl ein neues Speichergerät aus.</value>
-	</data>	
-
-	<data name="IDS_SELECTANEWDEVICE">
-		<value>Neues Speichergerät auswählen</value>
-	</data>	
-
-	<data name="IDS_NODEVICE_TITLE">
-		<value>Kein Speichergerät ausgewählt</value>
-	</data>	
-
-	<data name="IDS_NODEVICE_TEXT">
-		<value>Wenn du kein Speichergerät auswählst, wird die Speicherfunktion deaktiviert.</value>
-	</data>	
-
-	<data name="IDS_NODEVICE_ACCEPT">
-		<value>Speichergerät auswählen</value>
-	</data>	
-
-	<data name="IDS_NODEVICE_DECLINE">
-		<value>Ohne Speichern fortsetzen</value>
-	</data>	
-
-	<data name="IDS_DEVICEGONE_TEXT">
-		<value>Dein Speichergerät wurde entfernt. Wähl ein neues aus.</value>
-	</data>	
-
-	<data name="IDS_DEVICEGONE_TITLE">
-		<value>Fehler beim Laden</value>
-	</data>	
-
-	<data name="IDS_KEYBOARDUI_SAVEGAME_TITLE">
-		<value>Speicherdatei benennen</value>
-	</data>	
-
-	<data name="IDS_KEYBOARDUI_SAVEGAME_TEXT">
-		<value>Gib einen Namen für deine Speicherdatei ein.</value>
-	</data>	
-
-	<data name="IDS_WARNING_ARCADE_TITLE">
-		<value>Zurück zur Xbox Steuerung</value>
-	</data>	
-
-	<data name="IDS_WARNING_ARCADE_TEXT">
-		<value>Bist du sicher, dass du das Spiel verlassen möchtest?</value>
-	</data>	
-
-	<data name="IDS_PRO_RETURNEDTOMENU_TITLE">
-		<value>Abgemeldet</value>
-	</data>	
-
-	<data name="IDS_PRO_RETURNEDTOTITLESCREEN_TEXT">
-		<value>Du bist zum Titelbildschirm zurückgekehrt, weil dein Spielerprofil abgemeldet wurde.</value>
-	</data>	
-
-	<data name="IDS_PRO_RETURNEDTOMENU_TEXT">
-		<value>Das Spiel wurde beendet, weil ein Spielerprofil abgemeldet wurde.</value>
-	</data>	
-
-	<data name="IDS_PRO_RETURNEDTOMENU_ACCEPT">
-		<value>Weiterspielen</value>
-	</data>	
-
-	<data name="IDS_PRO_NOTONLINE_TITLE">
-		<value>Spielerprofil nicht online</value>
-	</data>	
-
-	<data name="IDS_PRO_NOTONLINE_TEXT">
-		<value>Dieses Spiel verfügt über Funktionen, die ein Spielerprofil mit Xbox LIVE-Berechtigung erfordern, du bist derzeit aber offline.</value>
-	</data>	
-
-	<data name="IDS_PRO_XBOXLIVE_NOTIFICATION">
-		<value>Diese Funktion erfordert ein Spielerprofil, das bei Xbox LIVE angemeldet ist.</value>
-	</data>	
-
-	<data name="IDS_PRO_NOTONLINE_ACCEPT">
-		<value>Mit Xbox LIVE verbinden</value>
-	</data>	
-
-	<data name="IDS_PRO_NOTONLINE_DECLINE">
-		<value>Offline weiterspielen</value>
-	</data>	
-
-	<data name="IDS_PRO_ACHIEVEMENTPROBLEM_TITLE">
-		<value>Verleihen des Erfolgs misslungen</value>
-	</data>	
-
-	<data name="IDS_PRO_ACHIEVEMENTPROBLEM_TEXT">
-		<value> Beim Zugriff auf dein Spielerprofil ist ein Problem aufgetreten. Dein Erfolg kann derzeit nicht verliehen werden.</value>
-	</data>	
-
-	<data name="IDS_PRO_NOPROFILE_TITLE">
-		<value>Problem mit Spielerprofil</value>
-	</data>	
-
-	<data name="IDS_PRO_NOPROFILEOPTIONS_TEXT">
-		<value>Fehler beim Speichern der Einstellungen im Spielerprofil.</value>
-	</data>	
-
-	<data name="IDS_PRO_GUESTPROFILE_TITLE">
-		<value>Gast-Spielerprofil</value>
-	</data>	
-
-	<data name="IDS_PRO_GUESTPROFILE_TEXT">
-		<value>Ein Gast-Spielerprofil kann diese Funktion nicht verwenden. Verwende bitte ein anderes Spielerprofil.</value>
-	</data>	
-
-	<data name="IDS_STO_SAVING_SHORT">
-		<value>Speichern ...</value>
-	</data>	
-
-	<data name="IDS_STO_SAVING_LONG">
-		<value>Inhalt wird gespeichert. Bitte schalten Sie Ihre Konsole nicht aus.</value>
-	</data>	
-
-	<data name="IDS_PRO_UNLOCKGAME_TITLE">
-		<value>Vollständiges Spiel freischalten</value>
-	</data>	
-
-	<data name="IDS_PRO_UNLOCKGAME_TEXT">
-		<value>Dies ist die Testversion von Minecraft. Würdest du das vollständige Spiel besitzen, hättest du dir gerade einen Erfolg verdient! 
-Schalte das vollständige Spiel frei, um den ganzen Spaß von Minecraft zu erleben und zusammen mit deinen Freunden auf der ganzen Welt über Xbox LIVE zu spielen.
-Möchtest du jetzt das vollständige Spiel freischalten?</value>
-	</data>	
-
-	<data name="IDS_PRO_PROFILEPROBLEM_TEXT">
-		<value>Du bist zum Hauptmenü zurückgekehrt, weil beim Lesen deines Profils ein Fehler aufgetreten ist.</value>
-	</data>	
-</root>

Minecraft.Client/Windows64Media/OLD_loc/de-DE/4J_stringsPlatformSpecific.xml

@@ -1,103 +0,0 @@
-<root>
-	<data name="IDS_NOFREESPACE_TEXT">
-		<value>Auf dem ausgewählten Speichergerät steht nicht genug freier Speicherplatz zur Verfügung, um eine Speicherdatei für das Spiel zu erstellen.</value>
-	</data>	
-
-	<data name="IDS_OVERWRITESAVE_TEXT">
-		<value>Diese Speicherdatei existiert bereits auf deinem ausgewählten Speichergerät. Möchtest du sie überschreiben?</value>
-	</data>	
-
-	<data name="IDS_STORAGEDEVICEPROBLEM_TITLE">
-		<value>Problem mit dem Speichergerät</value>
-	</data>	
-
-	<data name="IDS_FAILED_TO_SAVE_TEXT">
-		<value>Dein Speichergerät ist nicht verfügbar oder hat einen Fehler verursacht.</value>
-	</data>	
-
-	<data name="IDS_FAILED_TO_LOADSAVE_TEXT">
-		<value>Dein Speichergerät ist nicht verfügbar oder hat einen Fehler verursacht. Wähl ein neues Speichergerät aus.</value>
-	</data>	
-
-	<data name="IDS_SELECTANEWDEVICE">
-		<value>Neues Speichergerät auswählen</value>
-	</data>	
-
-	<data name="IDS_NODEVICE_TITLE">
-		<value>Kein Speichergerät ausgewählt</value>
-	</data>	
-
-	<data name="IDS_NODEVICE_TEXT">
-		<value>Wenn du kein Speichergerät auswählst, wird die Speicherfunktion deaktiviert.</value>
-	</data>	
-
-	<data name="IDS_NODEVICE_ACCEPT">
-		<value>Speichergerät auswählen</value>
-	</data>	
-
-	<data name="IDS_DEVICEGONE_TEXT">
-		<value>Dein Speichergerät wurde entfernt. Wähl ein neues aus.</value>
-	</data>	
-
-	<data name="IDS_WARNING_ARCADE_TITLE">
-		<value>Zurück zur Xbox Steuerung</value>
-	</data>	
-
-	<data name="IDS_PRO_RETURNEDTOTITLESCREEN_TEXT">
-		<value>Du bist zum Titelbildschirm zurückgekehrt, weil dein Spielerprofil abgemeldet wurde.</value>
-	</data>	
-
-	<data name="IDS_PRO_RETURNEDTOMENU_TEXT">
-		<value>Das Spiel wurde beendet, weil ein Spielerprofil abgemeldet wurde.</value>
-	</data>	
-
-	<data name="IDS_PRO_NOTONLINE_TITLE">
-		<value>Spielerprofil nicht online</value>
-	</data>	
-
-	<data name="IDS_PRO_NOTONLINE_TEXT">
-		<value>Dieses Spiel verfügt über Funktionen, die ein Spielerprofil mit Xbox LIVE-Berechtigung erfordern, du bist derzeit aber offline.</value>
-	</data>	
-
-	<data name="IDS_PRO_XBOXLIVE_NOTIFICATION">
-		<value>Diese Funktion erfordert ein Spielerprofil, das bei Xbox LIVE angemeldet ist.</value>
-	</data>	
-
-	<data name="IDS_PRO_NOTONLINE_ACCEPT">
-		<value>Mit Xbox LIVE verbinden</value>
-	</data>	
-
-	<data name="IDS_PRO_ACHIEVEMENTPROBLEM_TITLE">
-		<value>Verleihen des Erfolgs misslungen</value>
-	</data>	
-
-	<data name="IDS_PRO_ACHIEVEMENTPROBLEM_TEXT">
-		<value> Beim Zugriff auf dein Spielerprofil ist ein Problem aufgetreten. Dein Erfolg kann derzeit nicht verliehen werden.</value>
-	</data>	
-
-	<data name="IDS_PRO_NOPROFILE_TITLE">
-		<value>Problem mit Spielerprofil</value>
-	</data>	
-
-	<data name="IDS_PRO_NOPROFILEOPTIONS_TEXT">
-		<value>Fehler beim Speichern der Einstellungen im Spielerprofil.</value>
-	</data>	
-
-	<data name="IDS_PRO_GUESTPROFILE_TITLE">
-		<value>Gast-Spielerprofil</value>
-	</data>	
-
-	<data name="IDS_PRO_GUESTPROFILE_TEXT">
-		<value>Ein Gast-Spielerprofil kann diese Funktion nicht verwenden. Verwende bitte ein anderes Spielerprofil.</value>
-	</data>	
-
-	<data name="IDS_PRO_UNLOCKGAME_TEXT">
-		<value>Dies ist die Testversion von Minecraft. Würdest du das vollständige Spiel besitzen, hättest du dir gerade einen Erfolg verdient! 
-Schalte das vollständige Spiel frei, um den ganzen Spaß von Minecraft zu erleben und zusammen mit deinen Freunden auf der ganzen Welt über Xbox LIVE zu spielen.
-Möchtest du jetzt das vollständige Spiel freischalten?</value>
-	</data>	
-
-	<data name="IDS_PRO_PROFILEPROBLEM_TEXT">
-		<value>Du bist zum Hauptmenü zurückgekehrt, weil beim Lesen deines Profils ein Fehler aufgetreten ist.</value>
-	</data>	
-</root>

Minecraft.Client/Windows64Media/OLD_loc/de-DE/stringsLeaderboards.xml

@@ -1,47 +0,0 @@
-<root>
-  <data name="IDS_LEADERBOARD_KILLS_EASY">
-    <value>Kills Easy</value>
-  </data>
-  <data name="IDS_LEADERBOARD_KILLS_NORMAL">
-    <value>Kills Normal</value>
-  </data>
-  <data name="IDS_LEADERBOARD_KILLS_HARD">
-    <value>Kills Hard</value>
-  </data>
-  <data name="IDS_LEADERBOARD_MINING_BLOCKS_PEACEFUL">
-    <value>Mining Blocks Peaceful</value>
-  </data>
-  <data name="IDS_LEADERBOARD_MINING_BLOCKS_EASY">
-    <value>Mining Blocks Easy</value>
-  </data>
-  <data name="IDS_LEADERBOARD_MINING_BLOCKS_NORMAL">
-    <value>Mining Blocks Normal</value>
-  </data>
-  <data name="IDS_LEADERBOARD_MINING_BLOCKS_HARD">
-    <value>Mining Blocks Hard</value>
-  </data>
-  <data name="IDS_LEADERBOARD_FARMING_PEACEFUL">
-    <value>Farming Peaceful</value>
-  </data>
-  <data name="IDS_LEADERBOARD_FARMING_EASY">
-    <value>Farming Easy</value>
-  </data>
-  <data name="IDS_LEADERBOARD_FARMING_NORMAL">
-    <value>Farming Normal</value>
-  </data>
-  <data name="IDS_LEADERBOARD_FARMING_HARD">
-    <value>Farming Hard</value>
-  </data>
-  <data name="IDS_LEADERBOARD_TRAVELLING_PEACEFUL">
-    <value>Traveling Peaceful</value>
-  </data>
-  <data name="IDS_LEADERBOARD_TRAVELLING_EASY">
-    <value>Traveling Easy</value>
-  </data>
-  <data name="IDS_LEADERBOARD_TRAVELLING_NORMAL">
-    <value>Traveling Normal</value>
-  </data>
-  <data name="IDS_LEADERBOARD_TRAVELLING_HARD">
-    <value>Traveling Hard</value>
-  </data>
-</root>

Minecraft.Client/Windows64Media/OLD_loc/de-DE/stringsPlatformSpecific.xml

@@ -1,243 +0,0 @@
-<root>
-	<data name="IDS_TIPS_GAMETIP_0">
-		<value>Wenn du dieses Spiel im HD-Modus spielst, können auf einer Konsole mit geteiltem Bildschirm bis zu vier Spieler spielen!</value>
-	</data>	
-
-	<data name="IDS_TIPS_GAMETIP_1">
-		<value>Schließ zusätzliche Controller an deine Konsole an und drück auf ihnen START, um jederzeit einem Spiel beizutreten.</value>
-	</data>	
-
-	<data name="IDS_TIPS_GAMETIP_44">
-		<value>Die neuesten Informationen von 4J Studios und Kappische zu diesem Spiel findest du auf Twitter!</value>
-	</data>	
-
-	<data name="IDS_TIPS_GAMETIP_45">
-		<value>Beeindrucke deine Freunde, indem du vom Pause-Menü aus Screenshots deiner Minecraft-Werke auf Facebook freigibst!</value>
-	</data>	
-
-	<data name="IDS_TIPS_GAMETIP_48">
-		<value>minecraftforum hat einen eigenen Bereich zur Xbox 360 Edition.</value>
-	</data>	
-
-	<data name="IDS_TIPS_TRIVIA_4">
-		<value>Wir glauben, dass 4J Studios Herobrine aus dem Xbox 360 Konsolenspiel entfernt haben, aber wir sind uns nicht ganz sicher.</value>
-	</data>	
-
-	<data name="IDS_TIPS_TRIVIA_17">
-		<value>Minecraft: Xbox 360 Edition hat jede Menge Rekorde gebrochen!</value>
-	</data>	
-
-	<data name="IDS_HOW_TO_PLAY_MULTIPLAYER">
-		<value>{*T3*}SO WIRD GESPIELT: MULTIPLAYER{*ETW*}{*B*}{*B*}
-Minecraft auf der Xbox 360 Konsole ist als Standard ein Multiplayer-Spiel. Wenn du in einem HD-Modus spielst, weitere Controller anschließt und START drückst, können lokale Spieler jederzeit deinem Spiel beitreten.{*B*}{*B*}
-Wenn du ein Onlinespiel startest oder einem beitrittst, können die Spieler in deiner Freundesliste es sehen (es sei denn, du hostest das Spiel und hast "Nur mit Einladung" ausgewählt), und wenn sie dem Spiel beitreten, können Spieler in ihrer Freundesliste es auch sehen (falls du die Option "Freunde von Freunden zulassen" ausgewählt hast).
-Wenn du in einem Spiel bist, kannst du durch Drücken der BACK-Taste eine Liste aller anderen Spieler im Spiel aufrufen, dir ihre Spielerkarten ansehen, Spieler aus dem Spiel ausschließen und andere ins Spiel einladen.
-  </value>
-	</data>	
-
-	<data name="IDS_HOW_TO_PLAY_SOCIALMEDIA">
-		<value>{*T3*}SO WIRD GESPIELT: SCREENSHOTS GETEILT{*ETW*}{*B*} {*B*}
-Du kannst einen Screenshot von deinem Spiel erstellen, indem du das Pause-Menü aufrufst und{*CONTROLLER_VK_Y*} drückst, um den Screenshot auf Facebook zu veröffentlichen. Es wird eine verkleinerte Version deines Screenshots angezeigt, und du kannst den Begleittext deines Facebook-Beitrags bearbeiten.{*B*}{*B*}
-Es gibt einen eigenen Kameramodus für das Erstellen solcher Screenshots, damit du auf dem Bild deine Spielfigur von vorn sehen kannst. Drück{*CONTROLLER_ACTION_CAMERA*}, bis du deine Spielfigur von vorn siehst, bevor du zum Teilen{*CONTROLLER_VK_Y*} drückst.{*B*}{*B*}
-Gamertags werden auf Screenshots nicht angezeigt.
-  </value>
-	</data>	
-
-	<data name="IDS_HOW_TO_PLAY_CREATIVE">
-		<value>{*T3*}SO WIRD GESPIELT: KREATIVMODUS{*ETW*}{*B*}{*B*}
-Die Oberfläche des Kreativmodus erlaubt es dir, alle Gegenstände im Spiel in dein Inventar zu verschieben, ohne dass du sie vorher abbauen oder herstellen musst. 
-Die Gegenstände werden nicht aus deinem Inventar entfernt, wenn du sie in der Welt platzierst oder sie verbrauchst. Dadurch kannst du dich ganz aufs Bauen konzentrieren anstatt auf das Sammeln von Ressourcen. {*B*}
-Wenn du eine Welt im Kreativmodus erstellst, lädst oder speicherst, sind Erfolge und Bestenlisten-
-Aktualisierungen in dieser Welt deaktiviert, selbst wenn du die Welt später im Überlebensmodus lädst.{*B*}
-Um im Kreativmodus zu fliegen, drücke zweimal schnell {*CONTROLLER_ACTION_JUMP*}. Um das Fliegen zu beenden, wiederhole die Aktion. Um schneller zu fliegen, drück beim Fliegen{*CONTROLLER_ACTION_MOVE*} zweimal schnell nach vorn.
-Im Flugmodus halte{*CONTROLLER_ACTION_JUMP*} nach unten gedrückt, um dich nach oben zu bewegen, und{*CONTROLLER_ACTION_SNEAK*}, um dich nach unten zu bewegen. Oder verwende{*CONTROLLER_ACTION_DPAD_UP*}, um dich nach oben zu bewegen, {*CONTROLLER_ACTION_DPAD_DOWN*}, um dich nach unten zu bewegen, 
-{*CONTROLLER_ACTION_DPAD_LEFT*}, um dich nach links zu bewegen, und {*CONTROLLER_ACTION_DPAD_RIGHT*}, um dich nach rechts zu bewegen.</value>
-	</data>	
-
-	<data name="IDS_TUTORIAL_TASK_FLY">
-		<value>Drücke zweimal schnell nacheinander {*CONTROLLER_ACTION_JUMP*}, um zu fliegen. Um das Fliegen zu beenden, wiederhole die Aktion. Um schneller zu fliegen, drück{*CONTROLLER_ACTION_MOVE*} beim Fliegen zweimal schnell nach vorn. 
-Im Flugmodus halte{*CONTROLLER_ACTION_JUMP*} nach unten gedrückt, um dich nach oben zu bewegen, und{*CONTROLLER_ACTION_SNEAK*}, um dich nach unten zu bewegen, oder verwende das Steuerkreuz, um dich nach oben, nach unten, nach links oder nach rechts zu bewegen.</value>
-	</data>	
-
-	<data name="IDS_TOOLTIPS_SELECTDEVICE">
-		<value>Speichergerät auswählen</value>
-	</data>	
-
-	<data name="IDS_TOOLTIPS_CHANGEDEVICE">
-		<value>Gerät wechseln</value>
-	</data>	
-
-	<data name="IDS_TOOLTIPS_VIEW_GAMERCARD">
-		<value>Spielerkarte</value>
-	</data>	
-
-	<data name="IDS_TOOLTIPS_VIEW_GAMERPROFILE">
-		<value>Spielerprofil ansehen</value>
-	</data>	
-
-	<data name="IDS_TOOLTIPS_INVITE_PARTY">
-		<value>Xbox Live Party Einladung</value>
-	</data>	
-
-	<data name="IDS_CONFIRM_START_CREATIVE">
-		<value>Wenn du eine Welt im Kreativmodus erstellst, lädst oder speicherst, sind in dieser Welt Erfolge und Bestenlisten-Aktualisierungen deaktiviert, selbst wenn sie später im Überlebensmodus geladen wird. Möchtest du wirklich fortfahren?</value>
-	</data>	
-
-	<data name="IDS_CONFIRM_START_SAVEDINCREATIVE">
-		<value>Diese Welt wurde früher im Kreativmodus gespeichert, Erfolge und Bestenlisten-Aktualisierungen sind deaktiviert. Möchtest du wirklich fortfahren?</value>
-	</data>	
-
-	<data name="IDS_CONFIRM_START_SAVEDINCREATIVE_CONTINUE">
-		<value>Diese Welt wurde im Kreativmodus gespeichert, Erfolge und Bestenlisten-Aktualisierungen sind deaktiviert.</value>
-	</data>	
-
-	<data name="IDS_CONFIRM_START_HOST_PRIVILEGES">
-		<value>Wenn du eine Welt mit aktivierten Hostprivilegien erstellst, lädst oder speicherst, sind in diese Welt Erfolge und Bestenlisten-Aktualisierungen deaktiviert, selbst wenn sie später ohne diese Privilegien geladen wird. Möchtest du wirklich fortfahren?</value>
-	</data>	
-
-	<data name="IDS_CONNECTION_LOST_LIVE">
-		<value>Die Verbindung zu Xbox Live wurde unterbrochen. Zurück zum Hauptmenü.</value>
-	</data>	
-
-	<data name="IDS_CONNECTION_LOST_LIVE_NO_EXIT">
-		<value>Die Verbindung zu Xbox Live wurde unterbrochen.</value>
-	</data>	
-
-	<data name="IDS_AWARD_AVATAR1">
-		<value>Hurra – du hast einen Avatar-Gegenstand gewonnen – ein Minecraft: Xbox 360 Edition-T-Shirt!
-Geh zur Xbox Steuerung, um es deinem Avatar anzuziehen!</value>
-	</data>	
-
-	<data name="IDS_AWARD_AVATAR2">
-		<value>Hurra – du hast einen Avatar-Gegenstand gewonnen – eine Minecraft: Xbox 360 Edition-Uhr!
-Geh zur Xbox Steuerung, um sie deinem Avatar anzulegen!</value>
-	</data>	
-
-	<data name="IDS_AWARD_AVATAR3">
-		<value>Hurra – du hast einen Avatar-Gegenstand gewonnen – eine Creeper-Basecap!
-Geh zur Xbox Steuerung, um sie deinem Avatar aufzusetzen!</value>
-	</data>	
-
-	<data name="IDS_AWARD_THEME">
-		<value>Hurra – du hast das Minecraft: Xbox 360 Edition-Design gewonnen!
-Geh zur Xbox Steuerung, um dieses Design auszuwählen!</value>
-	</data>	
-
-	<data name="IDS_UNLOCK_ACHIEVEMENT_TEXT">
-		<value>Dies ist die Testversion von Minecraft: Xbox 360 Edition. Würdest du das vollständige Spiel besitzen, hättest du dir gerade einen Erfolg verdient!
-Jetzt das vollständige Spiel freischalten?</value>
-	</data>	
-
-	<data name="IDS_UNLOCK_AVATAR_TEXT">
-		<value>Dies ist die Testversion von Minecraft: Xbox 360 Edition. Würdest du das vollständige Spiel besitzen, hättest du dir gerade eine Avatar-Auszeichnung verdient!
-Jetzt das vollständige Spiel freischalten?</value>
-	</data>	
-
-	<data name="IDS_UNLOCK_GAMERPIC_TEXT">
-		<value>Dies ist die Testversion von Minecraft: Xbox 360 Edition. Würdest du das vollständige Spiel besitzen, hättest du dir gerade ein Spielerbild verdient!
-Jetzt das vollständige Spiel freischalten?</value>
-	</data>	
-
-	<data name="IDS_UNLOCK_THEME_TEXT">
-		<value>Dies ist die Testversion von Minecraft: Xbox 360 Edition. Würdest du das vollständige Spiel besitzen, hättest du dir gerade ein Design verdient!
-Jetzt das vollständige Spiel freischalten?</value>
-	</data>	
-
-	<data name="IDS_UNLOCK_ACCEPT_INVITE">
-		<value>Dies ist die Testversion von Minecraft: Xbox 360 Edition. Du brauchst das vollständige Spiel, um diese Einladung anzunehmen. 
-Möchtest du das vollständige Spiel freischalten?</value>
-	</data>	
-
-	<data name="IDS_UNLOCK_GUEST_TEXT">
-		<value>Gastspieler können das vollständige Spiel nicht freischalten. Melde dich mit einer Xbox Live-Benutzer-ID an.</value>
-	</data>	
-
-	<data name="IDS_LEADERBOARD_GAMERTAG">
-		<value>Gamertag</value>
-	</data>	
-
-	<data name="IDS_GROUPNAME_POTIONS_480">
-		<value>Brauen</value>
-	</data>	
-
-	<data name="IDS_RETURNEDTOTITLESCREEN_TEXT">
-		<value>Du bist zum Titelbildschirm zurückgekehrt, weil dein Spielerprofil abgemeldet wurde.</value>
-	</data>	
-
-	<data name="IDS_TRIALOVER_TEXT">
-		<value>Du hast die Testversion von Minecraft: Xbox 360 Edition die maximal erlaubte Zeit lang gespielt! Möchtest du jetzt das vollständige Spiel freischalten, um weiterhin Minecraft spielen zu können? </value>
-	</data>	
-
-	<data name="IDS_FATAL_ERROR_TEXT">
-		<value>Minecraft: Xbox 360 Edition konnte nicht geladen werden und kann daher nicht fortgesetzt werden.</value>
-	</data>	
-
-	<data name="IDS_NO_MULTIPLAYER_PRIVILEGE_JOIN_TEXT">
-		<value>Beitritt zum Spiel nicht möglich: Einer oder mehrere Spieler haben keine Multiplayer-Berechtigung für Xbox Live.</value>
-	</data>	
-
-	<data name="IDS_NO_MULTIPLAYER_PRIVILEGE_HOST_TEXT">
-		<value>Erstellen des Online-Spiels nicht möglich: Einer oder mehrere Spieler haben keine Multiplayer-Berechtigung für Xbox Live. Deaktiviere die Option "Onlinespiel", um offline zu spielen.</value>
-	</data>	
-
-	<data name="IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_SINGLE_LOCAL">
-		<value>Du kannst dieser Spielsitzung nicht beitreten, weil deine Rechteeinstellung für Inhalte von Mitgliedern zu streng ist. Ändere diese Einstellung bitte unter den Datenschutz- und Onlineeinstellungen in der Xbox Steuerung, wenn du dieser Sitzung beitreten möchtest.</value>
-	</data>	
-
-	<data name="IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_ALL_LOCAL">
-		<value>Du kannst dieser Spielsitzung nicht beitreten, weil die Rechteeinstellung für Inhalte von Mitgliedern eines deiner lokalen Spieler zu streng ist.</value>
-	</data>	
-
-	<data name="IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_REMOTE">
-		<value>Du kannst dieser Spielsitzung nicht beitreten, weil die Rechteeinstellung für Inhalte von Mitgliedern eines Spielers in der Sitzung "Nur Freunde" ist und du nicht auf seiner Freundesliste bist.</value>
-	</data>	
-
-	<data name="IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_CREATE">
-		<value>Du kannst diese Spielsitzung nicht erstellen, weil die Rechteeinstellung für Inhalte von Mitgliedern eines deiner lokalen Spieler zu streng ist. Entferne die Markierung bei "Online-Spiel", um ein Offline-Spiel zu starten, oder ändere diese Einstellung unter den Datenschutz- und Onlineeinstellungen in der Xbox Steuerung.</value>
-	</data>	
-
-	<data name="IDS_SAVE_ICON_MESSAGE">
-		<value>Dieses Spiel verfügt eine automatische Levelspeicherfunktion. Wenn du das obige Symbol siehst, speichert das Spiel deine Daten.
-Bitte schalte deine Xbox 360 Konsole nicht aus, solange dieses Symbol angezeigt wird.</value>
-	</data>	
-
-	<data name="IDS_GAMEOPTION_HOST_PRIVILEGES">
-		<value>Aktiviert, dass der Host das Fliegen nutzen, Erschöpfung deaktivieren und sich selbst im Spielmenü unsichtbar machen kann. Deaktiviert Erfolge und Bestenlisten-Aktualisierungen.</value>
-	</data>	
-
-	<data name="IDS_CHECKBOX_DISPLAY_SPLITSCREENGAMERTAGS">
-		<value>Gamertags auf geteiltem Bildschirm</value>
-	</data>	
-
-	<data name="IDS_ACHIEVEMENTS">
-		<value>Erfolge</value>
-	</data>	
-
-	<data name="IDS_LABEL_GAMERTAGS">
-		<value>Gamertags:</value>
-	</data>	
-
-	<data name="IDS_IN_GAME_GAMERTAGS">
-		<value>Gamertags im Spiel</value>
-	</data>	
-
-	<data name="IDS_SOCIAL_DEFAULT_DESCRIPTION">
-		<value>Schau mal, was ich in Minecraft: Xbox 360 Edition erschaffen habe!</value>
-	</data>	
-
-	<data name="IDS_TITLE_UPDATE_NAME">
-		<value>Title-Update 14</value>
-	</data>	
-
-	<data name="IDS_PLATFORM_NAME">
-		<value>Xbox 360</value>
-	</data>	
-
-	<data name="IDS_BACK_BUTTON">
-		<value>Back</value>
-	</data>	
-
-	<data name="IDS_HOST_OPTION_DISABLES_ACHIEVEMENTS">
-		<value>Diese Option deaktiviert für diese Welt Erfolge und Bestenlisten-Aktualisierungen während des Spielens und wenn nach dem Speichern mit aktivierter Option erneut geladen wird.</value>
-	</data>	
-</root>

Minecraft.Client/Windows64Media/OLD_loc/es-ES/4J_stringsGeneric.xml

@@ -1,211 +0,0 @@
-<root>
-	<data name="IDS_NULL">
-		<value>Sin usar</value>
-	</data>	
-
-	<data name="IDS_OK">
-		<value>Aceptar</value>
-	</data>	
-
-	<data name="IDS_BACK">
-		<value>Atrás</value>
-	</data>	
-
-	<data name="IDS_CANCEL">
-		<value>Cancelar</value>
-	</data>	
-
-	<data name="IDS_YES">
-		<value>Sí</value>
-	</data>	
-
-	<data name="IDS_NO">
-		<value>No</value>
-	</data>	
-
-	<data name="IDS_CORRUPTSAVE_TITLE">
-		<value>Archivo dañado</value>
-	</data>	
-
-	<data name="IDS_CORRUPTSAVE_TEXT">
-		<value>Parece que tus datos guardados están dañados. ¿Crear un nuevo archivo de guardado y sobrescribir el archivo dañado?</value>
-	</data>	
-
-	<data name="IDS_NOFREESPACE_TITLE">
-		<value>No hay espacio libre</value>
-	</data>	
-
-	<data name="IDS_NOFREESPACE_TEXT">
-		<value>El dispositivo de almacenamiento seleccionado no tiene suficiente espacio libre para crear un archivo de guardado.</value>
-	</data>	
-
-	<data name="IDS_SELECTAGAIN">
-		<value>Volver a seleccionar</value>
-	</data>	
-
-	<data name="IDS_PLAYWITHOUTSAVING">
-		<value>Jugar sin guardar</value>
-	</data>	
-
-	<data name="IDS_CREATEANEWSAVE">
-		<value>Crear nuevo archivo de guardado</value>
-	</data>	
-
-	<data name="IDS_OVERWRITESAVE_TITLE">
-		<value>¿Sobrescribir archivo guardado?</value>
-	</data>	
-
-	<data name="IDS_OVERWRITESAVE_TEXT">
-		<value>El dispositivo de almacenamiento seleccionado ya contiene este archivo guardado. ¿Te parece bien sobrescribirlo?</value>
-	</data>	
-
-	<data name="IDS_OVERWRITESAVE_NO">
-		<value>No, no sobrescribir.</value>
-	</data>	
-
-	<data name="IDS_OVERWRITESAVE_YES">
-		<value>Sobrescribir y guardar.</value>
-	</data>	
-
-	<data name="IDS_FAILED_TO_SAVE_TITLE">
-		<value>Error al guardar</value>
-	</data>	
-
-	<data name="IDS_STORAGEDEVICEPROBLEM_TITLE">
-		<value>Problema con disp. almacenaje</value>
-	</data>	
-
-	<data name="IDS_FAILED_TO_SAVE_TEXT">
-		<value>El dispositivo de almacenamiento no está disponible o produce un error.</value>
-	</data>	
-
-	<data name="IDS_FAILED_TO_LOADSAVE_TEXT">
-		<value>El dispositivo de almacenamiento no está disponible o produce un error. Selecciona un nuevo dispositivo de almacenamiento.</value>
-	</data>	
-
-	<data name="IDS_SELECTANEWDEVICE">
-		<value>Sel. nuevo disp. almacenamiento.</value>
-	</data>	
-
-	<data name="IDS_NODEVICE_TITLE">
-		<value>No disp. de almacenaje selec.</value>
-	</data>	
-
-	<data name="IDS_NODEVICE_TEXT">
-		<value>Si no seleccionas un dispositivo de almacenamiento, se deshabilitará la función de guardado de juegos.</value>
-	</data>	
-
-	<data name="IDS_NODEVICE_ACCEPT">
-		<value>Selecciona disp. almacenamiento</value>
-	</data>	
-
-	<data name="IDS_NODEVICE_DECLINE">
-		<value>Continuar sin guardar</value>
-	</data>	
-
-	<data name="IDS_DEVICEGONE_TEXT">
-		<value>Se ha extraído el dispositivo de almacenamiento. Selecciona uno nuevo.</value>
-	</data>	
-
-	<data name="IDS_DEVICEGONE_TITLE">
-		<value>Error al cargar</value>
-	</data>	
-
-	<data name="IDS_KEYBOARDUI_SAVEGAME_TITLE">
-		<value>Nombrar el archivo de guardado</value>
-	</data>	
-
-	<data name="IDS_KEYBOARDUI_SAVEGAME_TEXT">
-		<value>Escribe un nombre para tu archivo de guardado.</value>
-	</data>	
-
-	<data name="IDS_WARNING_ARCADE_TITLE">
-		<value>Volver a la Interfaz Xbox</value>
-	</data>	
-
-	<data name="IDS_WARNING_ARCADE_TEXT">
-		<value>¿Seguro que quieres salir del juego?</value>
-	</data>	
-
-	<data name="IDS_PRO_RETURNEDTOMENU_TITLE">
-		<value>Sesión cerrada</value>
-	</data>	
-
-	<data name="IDS_PRO_RETURNEDTOTITLESCREEN_TEXT">
-		<value>Has vuelto a la pantalla de título porque tu perfil de jugador ha cerrado la sesión.</value>
-	</data>	
-
-	<data name="IDS_PRO_RETURNEDTOMENU_TEXT">
-		<value>La partida ha finalizado porque un perfil de jugador ha cerrado la sesión.</value>
-	</data>	
-
-	<data name="IDS_PRO_RETURNEDTOMENU_ACCEPT">
-		<value>Seguir jugando</value>
-	</data>	
-
-	<data name="IDS_PRO_NOTONLINE_TITLE">
-		<value>Perfil de jugador no en línea</value>
-	</data>	
-
-	<data name="IDS_PRO_NOTONLINE_TEXT">
-		<value>Este juego ofrece características que requieren un perfil de jugador habilitado para Xbox LIVE, pero en estos momentos estás desconectado.</value>
-	</data>	
-
-	<data name="IDS_PRO_XBOXLIVE_NOTIFICATION">
-		<value>Esta característica requiere un perfil de jugador con sesión iniciada en Xbox LIVE.</value>
-	</data>	
-
-	<data name="IDS_PRO_NOTONLINE_ACCEPT">
-		<value>Conectarse a Xbox LIVE</value>
-	</data>	
-
-	<data name="IDS_PRO_NOTONLINE_DECLINE">
-		<value>Seguir jugando sin conexión</value>
-	</data>	
-
-	<data name="IDS_PRO_ACHIEVEMENTPROBLEM_TITLE">
-		<value>Problema con el premio de logro</value>
-	</data>	
-
-	<data name="IDS_PRO_ACHIEVEMENTPROBLEM_TEXT">
-		<value> Se ha producido un problema al acceder a tu perfil de jugador. No se puede conceder tu logro en este momento.</value>
-	</data>	
-
-	<data name="IDS_PRO_NOPROFILE_TITLE">
-		<value>Problema con perfil de jugador</value>
-	</data>	
-
-	<data name="IDS_PRO_NOPROFILEOPTIONS_TEXT">
-		<value>Se ha producido un error al guardar la configuración en el perfil de jugador.</value>
-	</data>	
-
-	<data name="IDS_PRO_GUESTPROFILE_TITLE">
-		<value>Perfil de jugador de invitado</value>
-	</data>	
-
-	<data name="IDS_PRO_GUESTPROFILE_TEXT">
-		<value>El perfil de jugador de invitado no puede acceder a esta característica. Usa un perfil de jugador diferente.</value>
-	</data>	
-
-	<data name="IDS_STO_SAVING_SHORT">
-		<value>Guardando…</value>
-	</data>	
-
-	<data name="IDS_STO_SAVING_LONG">
-		<value>Guardando contenido. No apagues tu consola.</value>
-	</data>	
-
-	<data name="IDS_PRO_UNLOCKGAME_TITLE">
-		<value>Desbloquear juego completo</value>
-	</data>	
-
-	<data name="IDS_PRO_UNLOCKGAME_TEXT">
-		<value>Esta es la versión de prueba de Minecraft. Si tuvieras el juego completo, ¡habrías conseguido un logro! 
-Desbloquea el juego completo para vivir toda la emoción de Minecraft y jugar con amigos de todo el mundo a través de Xbox LIVE.
-¿Te gustaría desbloquear el juego completo?</value>
-	</data>	
-
-	<data name="IDS_PRO_PROFILEPROBLEM_TEXT">
-		<value>Volverás al menú principal porque se ha producido un error al leer tu perfil.</value>
-	</data>	
-</root>

Minecraft.Client/Windows64Media/OLD_loc/es-ES/4J_stringsPlatformSpecific.xml

@@ -1,103 +0,0 @@
-<root>
-	<data name="IDS_NOFREESPACE_TEXT">
-		<value>El dispositivo de almacenamiento seleccionado no tiene suficiente espacio libre para crear un archivo de guardado.</value>
-	</data>	
-
-	<data name="IDS_OVERWRITESAVE_TEXT">
-		<value>El dispositivo de almacenamiento seleccionado ya contiene este archivo guardado. ¿Te parece bien sobrescribirlo?</value>
-	</data>	
-
-	<data name="IDS_STORAGEDEVICEPROBLEM_TITLE">
-		<value>Problema con disp. almacenaje</value>
-	</data>	
-
-	<data name="IDS_FAILED_TO_SAVE_TEXT">
-		<value>El dispositivo de almacenamiento no está disponible o produce un error.</value>
-	</data>	
-
-	<data name="IDS_FAILED_TO_LOADSAVE_TEXT">
-		<value>El dispositivo de almacenamiento no está disponible o produce un error. Selecciona un nuevo dispositivo de almacenamiento.</value>
-	</data>	
-
-	<data name="IDS_SELECTANEWDEVICE">
-		<value>Sel. nuevo disp. almacenamiento.</value>
-	</data>	
-
-	<data name="IDS_NODEVICE_TITLE">
-		<value>No disp. de almacenaje selec.</value>
-	</data>	
-
-	<data name="IDS_NODEVICE_TEXT">
-		<value>Si no seleccionas un dispositivo de almacenamiento, se deshabilitará la función de guardado de juegos.</value>
-	</data>	
-
-	<data name="IDS_NODEVICE_ACCEPT">
-		<value>Selecciona disp. almacenamiento</value>
-	</data>	
-
-	<data name="IDS_DEVICEGONE_TEXT">
-		<value>Se ha extraído el dispositivo de almacenamiento. Selecciona uno nuevo.</value>
-	</data>	
-
-	<data name="IDS_WARNING_ARCADE_TITLE">
-		<value>Volver a la Interfaz Xbox</value>
-	</data>	
-
-	<data name="IDS_PRO_RETURNEDTOTITLESCREEN_TEXT">
-		<value>Has vuelto a la pantalla de título porque tu perfil de jugador ha cerrado la sesión.</value>
-	</data>	
-
-	<data name="IDS_PRO_RETURNEDTOMENU_TEXT">
-		<value>La partida ha finalizado porque un perfil de jugador ha cerrado la sesión.</value>
-	</data>	
-
-	<data name="IDS_PRO_NOTONLINE_TITLE">
-		<value>Perfil de jugador no en línea</value>
-	</data>	
-
-	<data name="IDS_PRO_NOTONLINE_TEXT">
-		<value>Este juego ofrece características que requieren un perfil de jugador habilitado para Xbox LIVE, pero en estos momentos estás desconectado.</value>
-	</data>	
-
-	<data name="IDS_PRO_XBOXLIVE_NOTIFICATION">
-		<value>Esta característica requiere un perfil de jugador con sesión iniciada en Xbox LIVE.</value>
-	</data>	
-
-	<data name="IDS_PRO_NOTONLINE_ACCEPT">
-		<value>Conectarse a Xbox LIVE</value>
-	</data>	
-
-	<data name="IDS_PRO_ACHIEVEMENTPROBLEM_TITLE">
-		<value>Problema con el premio de logro</value>
-	</data>	
-
-	<data name="IDS_PRO_ACHIEVEMENTPROBLEM_TEXT">
-		<value> Se ha producido un problema al acceder a tu perfil de jugador. No se puede conceder tu logro en este momento.</value>
-	</data>	
-
-	<data name="IDS_PRO_NOPROFILE_TITLE">
-		<value>Problema con perfil de jugador</value>
-	</data>	
-
-	<data name="IDS_PRO_NOPROFILEOPTIONS_TEXT">
-		<value>Se ha producido un error al guardar la configuración en el perfil de jugador.</value>
-	</data>	
-
-	<data name="IDS_PRO_GUESTPROFILE_TITLE">
-		<value>Perfil de jugador de invitado</value>
-	</data>	
-
-	<data name="IDS_PRO_GUESTPROFILE_TEXT">
-		<value>El perfil de jugador de invitado no puede acceder a esta característica. Usa un perfil de jugador diferente.</value>
-	</data>	
-
-	<data name="IDS_PRO_UNLOCKGAME_TEXT">
-		<value>Esta es la versión de prueba de Minecraft. Si tuvieras el juego completo, ¡habrías conseguido un logro! 
-Desbloquea el juego completo para vivir toda la emoción de Minecraft y jugar con amigos de todo el mundo a través de Xbox LIVE.
-¿Te gustaría desbloquear el juego completo?</value>
-	</data>	
-
-	<data name="IDS_PRO_PROFILEPROBLEM_TEXT">
-		<value>Volverás al menú principal porque se ha producido un error al leer tu perfil.</value>
-	</data>	
-</root>

Minecraft.Client/Windows64Media/OLD_loc/es-ES/stringsLeaderboards.xml

@@ -1,47 +0,0 @@
-<root>
-  <data name="IDS_LEADERBOARD_KILLS_EASY">
-    <value>Kills Easy</value>
-  </data>
-  <data name="IDS_LEADERBOARD_KILLS_NORMAL">
-    <value>Kills Normal</value>
-  </data>
-  <data name="IDS_LEADERBOARD_KILLS_HARD">
-    <value>Kills Hard</value>
-  </data>
-  <data name="IDS_LEADERBOARD_MINING_BLOCKS_PEACEFUL">
-    <value>Mining Blocks Peaceful</value>
-  </data>
-  <data name="IDS_LEADERBOARD_MINING_BLOCKS_EASY">
-    <value>Mining Blocks Easy</value>
-  </data>
-  <data name="IDS_LEADERBOARD_MINING_BLOCKS_NORMAL">
-    <value>Mining Blocks Normal</value>
-  </data>
-  <data name="IDS_LEADERBOARD_MINING_BLOCKS_HARD">
-    <value>Mining Blocks Hard</value>
-  </data>
-  <data name="IDS_LEADERBOARD_FARMING_PEACEFUL">
-    <value>Farming Peaceful</value>
-  </data>
-  <data name="IDS_LEADERBOARD_FARMING_EASY">
-    <value>Farming Easy</value>
-  </data>
-  <data name="IDS_LEADERBOARD_FARMING_NORMAL">
-    <value>Farming Normal</value>
-  </data>
-  <data name="IDS_LEADERBOARD_FARMING_HARD">
-    <value>Farming Hard</value>
-  </data>
-  <data name="IDS_LEADERBOARD_TRAVELLING_PEACEFUL">
-    <value>Traveling Peaceful</value>
-  </data>
-  <data name="IDS_LEADERBOARD_TRAVELLING_EASY">
-    <value>Traveling Easy</value>
-  </data>
-  <data name="IDS_LEADERBOARD_TRAVELLING_NORMAL">
-    <value>Traveling Normal</value>
-  </data>
-  <data name="IDS_LEADERBOARD_TRAVELLING_HARD">
-    <value>Traveling Hard</value>
-  </data>
-</root>

Minecraft.Client/Windows64Media/OLD_loc/es-ES/stringsPlatformSpecific.xml

@@ -1,243 +0,0 @@
-<root>
-	<data name="IDS_TIPS_GAMETIP_0">
-		<value>¡Si juegas en el modo de alta definición puedes incluir a un máximo de cuatro jugadores en pantalla dividida en la misma consola!</value>
-	</data>	
-
-	<data name="IDS_TIPS_GAMETIP_1">
-		<value>Conecta más mandos a tu consola y pulsa START sobre ellos para unirte al juego en cualquier momento.</value>
-	</data>	
-
-	<data name="IDS_TIPS_GAMETIP_44">
-		<value>¡En Twitter obtendrás la información más reciente sobre 4J Studios y Kappische!</value>
-	</data>	
-
-	<data name="IDS_TIPS_GAMETIP_45">
-		<value>¡Impresiona a tus amigos publicando capturas de pantalla de tus creaciones de Minecraft en Facebook desde el menú de pausa del juego!</value>
-	</data>	
-
-	<data name="IDS_TIPS_GAMETIP_48">
-		<value>minecraftforum cuenta con una sección dedicada a la edición para Xbox 360.</value>
-	</data>	
-
-	<data name="IDS_TIPS_TRIVIA_4">
-		<value>Creemos que 4J Studios ha eliminado a Herobrine del juego para la Consola Xbox 360, pero no estamos seguros.</value>
-	</data>	
-
-	<data name="IDS_TIPS_TRIVIA_17">
-		<value>¡Minecraft: Xbox 360 Edition ha batido todos los récords!</value>
-	</data>	
-
-	<data name="IDS_HOW_TO_PLAY_MULTIPLAYER">
-		<value>{*T3*}CÓMO SE JUEGA: MULTIJUGADOR{*ETW*}{*B*}{*B*}
-Minecraft para la consola Xbox 360 es, de forma predeterminada, un juego multijugador. En el modo de alta definición los jugadores locales pueden unirse a tu partida conectando un mando y pulsando el Botón START en cualquier momento del juego.{*B*}{*B*}
-Si inicias o te unes a una partida en línea, los miembros de tu lista de amigos podrán verla (a menos que selecciones Solo por invitación cuando crees la partida), y si ellos se unen a la partida, los miembros de su lista de amigos también podrán verla (a menos que selecciones la opción Permitir amigos de amigos).
-Una vez en la partida, pulsa el Botón BACK para mostrar la lista de todos los jugadores, ver sus tarjetas de jugador, expulsar a jugadores de la partida e invitar a otros miembros a la partida.
-  </value>
-	</data>	
-
-	<data name="IDS_HOW_TO_PLAY_SOCIALMEDIA">
-		<value>{*T3*}CÓMO SE JUEGA: COMPARTIR CAPTURAS DE PANTALLA{*ETW*}{*B*}{*B*}
-Si quieres realizar una captura de pantalla de tu partida, ve al menú de pausa y pulsa {*CONTROLLER_VK_Y*} para compartirla en Facebook. Obtendrás una versión en miniatura de tu captura y podrás editar el texto asociado a la publicación de Facebook.{*B*}{*B*}
-Existe un modo de cámara especial para tomar estas capturas, de forma que podrás ver la parte frontal de tu personaje en la imagen. Pulsa{*CONTROLLER_ACTION_CAMERA*} hasta que veas la parte frontal del personaje y después pulsa{*CONTROLLER_VK_Y*} para compartir.{*B*}{*B*}
-En la captura de pantalla no se mostrarán los gamertags.
-  </value>
-	</data>	
-
-	<data name="IDS_HOW_TO_PLAY_CREATIVE">
-		<value>{*T3*}CÓMO SE JUEGA: MODO CREATIVO{*ETW*}{*B*}{*B*}
-La interfaz de modo Creativo del juego permite mover cualquier objeto del juego al inventario del jugador sin tener que extraerlo o crearlo. 
-Los objetos del inventario del jugador no se eliminan cuando se colocan o se usan en el mundo, lo que permite al jugador centrarse en la construcción más que en la recolección de recursos.{*B*}
-Si creas, cargas o guardas un mundo en el modo Creativo, ese mundo tendrá deshabilitado los logros y las actualizaciones de marcador, aunque después lo cargues en el modo Supervivencia.{*B*}
-Para volar en el modo Creativo, pulsa {*CONTROLLER_ACTION_JUMP*} dos veces con rapidez. Para dejar de volar, repite la acción. Para volar más rápido, pulsa{*CONTROLLER_ACTION_MOVE*} dos veces en una sucesión rápida mientras vuelas. 
-En modo de vuelo, puedes mantener pulsado{*CONTROLLER_ACTION_JUMP*} para subir y{*CONTROLLER_ACTION_SNEAK*} para bajar, o usa{*CONTROLLER_ACTION_DPAD_UP*} para subir, {*CONTROLLER_ACTION_DPAD_DOWN*} para bajar, 
-{*CONTROLLER_ACTION_DPAD_LEFT*} para ir a la izquierda y {*CONTROLLER_ACTION_DPAD_RIGHT*} para ir a la derecha.</value>
-	</data>	
-
-	<data name="IDS_TUTORIAL_TASK_FLY">
-		<value>Pulsa{*CONTROLLER_ACTION_JUMP*} dos veces con rapidez para volar. Para dejar de volar, repite la acción. Para volar más rápido, pulsa{*CONTROLLER_ACTION_MOVE*} dos veces en una sucesión rápida mientras vuelas. 
-En el modo de vuelo, mantén pulsado{*CONTROLLER_ACTION_JUMP*} para moverte hacia arriba y{*CONTROLLER_ACTION_SNEAK*} para moverte hacia abajo, o usa el mando D para moverte hacia arriba, hacia abajo, hacia la izquierda o hacia la derecha.</value>
-	</data>	
-
-	<data name="IDS_TOOLTIPS_SELECTDEVICE">
-		<value>Seleccionar disp. de alm.</value>
-	</data>	
-
-	<data name="IDS_TOOLTIPS_CHANGEDEVICE">
-		<value>Cambiar disp. de alm.</value>
-	</data>	
-
-	<data name="IDS_TOOLTIPS_VIEW_GAMERCARD">
-		<value>Ver tarjeta de jugador</value>
-	</data>	
-
-	<data name="IDS_TOOLTIPS_VIEW_GAMERPROFILE">
-		<value>Ver perfil de jugador</value>
-	</data>	
-
-	<data name="IDS_TOOLTIPS_INVITE_PARTY">
-		<value>Invitar a Xbox Live Party</value>
-	</data>	
-	
-
-	<data name="IDS_CONFIRM_START_CREATIVE">
-		<value>Si creas, cargas o guardas un mundo en el modo Creativo, ese mundo tendrá deshabilitado los logros y las actualizaciones de marcador, aunque después lo cargues en el modo Supervivencia. ¿Seguro que quieres continuar?</value>
-	</data>	
-
-	<data name="IDS_CONFIRM_START_SAVEDINCREATIVE">
-		<value>Este mundo se ha guardado en el modo Creativo y tiene deshabilitados los logros y las actualizaciones de marcador. ¿Seguro que quieres continuar?</value>
-	</data>	
-
-	<data name="IDS_CONFIRM_START_SAVEDINCREATIVE_CONTINUE">
-		<value>Este mundo se ha guardado en el modo Creativo y tiene deshabilitados los logros y las actualizaciones de marcador.</value>
-	</data>	
-
-	<data name="IDS_CONFIRM_START_HOST_PRIVILEGES">
-		<value>Si creas, cargas o guardas un mundo con los privilegios de host habilitados, ese mundo tendrá deshabilitado los logros y las actualizaciones de marcador, aunque después lo cargues con esas opciones deshabilitadas. ¿Seguro que quieres continuar?</value>
-	</data>	
-
-	<data name="IDS_CONNECTION_LOST_LIVE">
-		<value>Se ha perdido la conexión con Xbox Live. Saliendo al menú principal.</value>
-	</data>	
-
-	<data name="IDS_CONNECTION_LOST_LIVE_NO_EXIT">
-		<value>Se ha perdido la conexión con Xbox Live.</value>
-	</data>	
-
-	<data name="IDS_AWARD_AVATAR1">
-		<value>¡Hurra! ¡Has obtenido un objeto de avatar: una camiseta de Minecraft: Xbox 360 Edition!
-Ve a la Interfaz para ponerle la camiseta a tu avatar.</value>
-	</data>	
-
-	<data name="IDS_AWARD_AVATAR2">
-		<value>¡Hurra! ¡Has obtenido un objeto de avatar: un reloj de Minecraft: Xbox 360 Edition!
-Ve a la Interfaz para ponerle el reloj a tu avatar.</value>
-	</data>	
-
-	<data name="IDS_AWARD_AVATAR3">
-		<value>¡Hurra! ¡Has obtenido un objeto de avatar: una gorra de béisbol de Creeper!
-Ve a la Interfaz para ponerle la gorra a tu avatar.</value>
-	</data>	
-
-	<data name="IDS_AWARD_THEME">
-		<value>¡Hurra! ¡Has obtenido el tema de Minecraft: Xbox 360 Edition!
-Ve a la Interfaz para seleccionar este tema.</value>
-	</data>	
-
-	<data name="IDS_UNLOCK_ACHIEVEMENT_TEXT">
-		<value>Esta es la versión de prueba de Minecraft: Xbox 360 Edition. Si tuvieras el juego completo, ¡habrías conseguido un logro!
-¿Te gustaría desbloquear el juego completo?</value>
-	</data>	
-
-	<data name="IDS_UNLOCK_AVATAR_TEXT">
-		<value>Esta es la versión de prueba de Minecraft: Xbox 360 Edition. Si tuvieras el juego completo, ¡habrías conseguido un premio de avatar!
-¿Te gustaría desbloquear el juego completo?</value>
-	</data>	
-
-	<data name="IDS_UNLOCK_GAMERPIC_TEXT">
-		<value>Esta es la versión de prueba de Minecraft: Xbox 360 Edition. Si tuvieras el juego completo, ¡habrías conseguido una imagen de jugador!
-¿Te gustaría desbloquear el juego completo?</value>
-	</data>	
-
-	<data name="IDS_UNLOCK_THEME_TEXT">
-		<value>Esta es la versión de prueba de Minecraft: Xbox 360 Edition. Si tuvieras el juego completo, ¡habrías conseguido un tema!
-¿Te gustaría desbloquear el juego completo?</value>
-	</data>	
-
-	<data name="IDS_UNLOCK_ACCEPT_INVITE">
-		<value>Esta es la versión de prueba de Minecraft: Xbox 360 Edition. Necesitas la versión completa para aceptar esta invitación.
-¿Quieres desbloquear la versión completa del juego?</value>
-	</data>	
-
-	<data name="IDS_UNLOCK_GUEST_TEXT">
-		<value>Los jugadores invitados no pueden desbloquear el juego completo. Inicia sesión con un ID de usuario de Xbox Live.</value>
-	</data>	
-
-	<data name="IDS_LEADERBOARD_GAMERTAG">
-		<value>Gamertag</value>
-	</data>	
-
-	<data name="IDS_GROUPNAME_POTIONS_480">
-		<value>Destilado</value>
-	</data>	
-
-	<data name="IDS_RETURNEDTOTITLESCREEN_TEXT">
-		<value>Has vuelto a la pantalla de título porque tu perfil de jugador ha cerrado la sesión.</value>
-	</data>	
-
-	<data name="IDS_TRIALOVER_TEXT">
-		<value>Has jugado a la versión de prueba de Minecraft: Xbox 360 Edition durante la cantidad máxima de tiempo permitida. Para continuar divirtiéndote, ¿quieres desbloquear el juego completo? </value>
-	</data>	
-
-	<data name="IDS_FATAL_ERROR_TEXT">
-		<value>Minecraft: Xbox 360 Edition ha experimentado un error al cargar y no puede continuar.</value>
-	</data>	
-
-	<data name="IDS_NO_MULTIPLAYER_PRIVILEGE_JOIN_TEXT">
-		<value>No te has podido unir al juego porque uno o más jugadores no tienen autorización para participar en juegos multijugador en Xbox Live.</value>
-	</data>	
-
-	<data name="IDS_NO_MULTIPLAYER_PRIVILEGE_HOST_TEXT">
-		<value>No has podido crear un juego en línea porque uno o más jugadores no tienen autorización para participar en juegos multijugador en Xbox Live. Desmarca la casilla "Juego en línea" para jugar sin conexión.</value>
-	</data>	
-
-	<data name="IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_SINGLE_LOCAL">
-		<value>No te puedes unir a esta sesión de juego porque la configuración de privilegios de Contenido de miembro es demasiado restrictiva. Cambia esta configuración en la sección Privacidad, Privacidad y conexión de la Interfaz Xbox si quieres unirte a la sesión.</value>
-	</data>	
-
-	<data name="IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_ALL_LOCAL">
-		<value>No te puedes unir a esta sesión de juego porque uno de los jugadores locales tiene una configuración de privilegios de Contenido de miembro demasiado restrictiva.</value>
-	</data>	
-
-	<data name="IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_REMOTE">
-		<value>No te puedes unir a esta sesión de juego porque uno de los jugadores de la sesión tiene una configuración de privilegios de Contenido de miembro de Solo amigos y no estás en su lista de amigos.</value>
-	</data>	
-
-	<data name="IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_CREATE">
-		<value>No puedes crear esta sesión de juego porque uno de los jugadores locales tiene una configuración de privilegios de Contenido de miembro demasiado restrictiva. Desmarca la casilla "Juego en línea" para iniciar un juego sin conexión o cambia este ajuste en la sección Privacidad, Privacidad y conexión de la Interfaz Xbox</value>
-	</data>	
-
-	<data name="IDS_SAVE_ICON_MESSAGE">
-		<value>Este juego utiliza la función de autoguardado. Si ves este icono, el juego está guardando los datos.
-No apagues la Consola Xbox 360 cuando aparezca este icono en pantalla.</value>
-	</data>	
-
-	<data name="IDS_GAMEOPTION_HOST_PRIVILEGES">
-		<value>Si está habilitado, el host puede volar, deshabilitar la extenuación y hacerse invisible desde el menú de juego. Deshabilita los logros y las actualizaciones del marcador.</value>
-	</data>	
-
-	<data name="IDS_CHECKBOX_DISPLAY_SPLITSCREENGAMERTAGS">
-		<value>Gamertags en pantalla dividida</value>
-	</data>	
-
-	<data name="IDS_ACHIEVEMENTS">
-		<value>Logros</value>
-	</data>	
-
-	<data name="IDS_LABEL_GAMERTAGS">
-		<value>Gamertags:</value>
-	</data>	
-
-	<data name="IDS_IN_GAME_GAMERTAGS">
-		<value>Gamertags del juego</value>
-	</data>	
-
-	<data name="IDS_SOCIAL_DEFAULT_DESCRIPTION">
-		<value>¡Mira lo que he hecho en Minecraft: Xbox 360 Edition!</value>
-	</data>	
-
-	<data name="IDS_TITLE_UPDATE_NAME">
-		<value>Actualización de título 14</value>
-	</data>	
-
-	<data name="IDS_PLATFORM_NAME">
-		<value>Xbox 360</value>
-	</data>	
-
-	<data name="IDS_BACK_BUTTON">
-		<value>Atrás</value>
-	</data>	
-
-	<data name="IDS_HOST_OPTION_DISABLES_ACHIEVEMENTS">
-		<value>Esta opción deshabilita los logros y las actualizaciones del marcador de este mundo cuando se juega y si se vuelve a cargar después de guardarlo con esta opción activada.</value>
-	</data>	
-</root>

Minecraft.Client/Windows64Media/OLD_loc/fr-FR/4J_stringsGeneric.xml

@@ -1,211 +0,0 @@
-<root>
-	<data name="IDS_NULL">
-		<value>Inutilisé</value>
-	</data>	
-
-	<data name="IDS_OK">
-		<value>OK</value>
-	</data>	
-
-	<data name="IDS_BACK">
-		<value>Retour</value>
-	</data>	
-
-	<data name="IDS_CANCEL">
-		<value>Annuler</value>
-	</data>	
-
-	<data name="IDS_YES">
-		<value>Oui</value>
-	</data>	
-
-	<data name="IDS_NO">
-		<value>Non</value>
-	</data>	
-
-	<data name="IDS_CORRUPTSAVE_TITLE">
-		<value>Sauvegarde endommagée</value>
-	</data>	
-
-	<data name="IDS_CORRUPTSAVE_TEXT">
-		<value>Vos données de sauvegarde semblent endommagées. Créer une nouvelle sauvegarde et écraser le fichier endommagé ?</value>
-	</data>	
-
-	<data name="IDS_NOFREESPACE_TITLE">
-		<value>Espace libre insuffisant</value>
-	</data>	
-
-	<data name="IDS_NOFREESPACE_TEXT">
-		<value>Le périphérique de stockage sélectionné ne dispose pas de suffisamment d'espace libre pour créer une sauvegarde.</value>
-	</data>	
-
-	<data name="IDS_SELECTAGAIN">
-		<value>Resélectionner</value>
-	</data>	
-
-	<data name="IDS_PLAYWITHOUTSAVING">
-		<value>Jouer sans sauvegarder</value>
-	</data>	
-
-	<data name="IDS_CREATEANEWSAVE">
-		<value>Créer une sauvegarde</value>
-	</data>	
-
-	<data name="IDS_OVERWRITESAVE_TITLE">
-		<value>Écraser la sauvegarde ?</value>
-	</data>	
-
-	<data name="IDS_OVERWRITESAVE_TEXT">
-		<value>Le périphérique de stockage sélectionné contient déjà une sauvegarde. L'écraser ?</value>
-	</data>	
-
-	<data name="IDS_OVERWRITESAVE_NO">
-		<value>Non, ne pas écraser</value>
-	</data>	
-
-	<data name="IDS_OVERWRITESAVE_YES">
-		<value>Écraser et sauvegarder</value>
-	</data>	
-
-	<data name="IDS_FAILED_TO_SAVE_TITLE">
-		<value>Échec de la sauvegarde</value>
-	</data>	
-
-	<data name="IDS_STORAGEDEVICEPROBLEM_TITLE">
-		<value>Problème de périph. de stockage</value>
-	</data>	
-
-	<data name="IDS_FAILED_TO_SAVE_TEXT">
-		<value>Votre périphérique de stockage n'est pas disponible ou présente une erreur.</value>
-	</data>	
-
-	<data name="IDS_FAILED_TO_LOADSAVE_TEXT">
-		<value>Votre périphérique de stockage est inaccessible ou présente une erreur. Veuillez sélectionner un autre périphérique de stockage.</value>
-	</data>	
-
-	<data name="IDS_SELECTANEWDEVICE">
-		<value>Sélectionner autre périphérique</value>
-	</data>	
-
-	<data name="IDS_NODEVICE_TITLE">
-		<value>Aucun périph. sélectionné</value>
-	</data>	
-
-	<data name="IDS_NODEVICE_TEXT">
-		<value>Si vous ne sélectionnez pas de périphérique de stockage, la fonction de sauvegarde sera désactivée.</value>
-	</data>	
-
-	<data name="IDS_NODEVICE_ACCEPT">
-		<value>Sélectionner un périphérique</value>
-	</data>	
-
-	<data name="IDS_NODEVICE_DECLINE">
-		<value>Continuer sans sauvegarder</value>
-	</data>	
-
-	<data name="IDS_DEVICEGONE_TEXT">
-		<value>Votre périphérique de stockage a été retiré. Sélectionnez-en un autre.</value>
-	</data>	
-
-	<data name="IDS_DEVICEGONE_TITLE">
-		<value>Échec du chargement</value>
-	</data>	
-
-	<data name="IDS_KEYBOARDUI_SAVEGAME_TITLE">
-		<value>Nommer la sauvegarde</value>
-	</data>	
-
-	<data name="IDS_KEYBOARDUI_SAVEGAME_TEXT">
-		<value>Saisir un nom pour la sauvegarde</value>
-	</data>	
-
-	<data name="IDS_WARNING_ARCADE_TITLE">
-		<value>Retour à l'Interface Xbox</value>
-	</data>	
-
-	<data name="IDS_WARNING_ARCADE_TEXT">
-		<value>Voulez-vous vraiment quitter le jeu ?</value>
-	</data>	
-
-	<data name="IDS_PRO_RETURNEDTOMENU_TITLE">
-		<value>Déconnexion</value>
-	</data>	
-
-	<data name="IDS_PRO_RETURNEDTOTITLESCREEN_TEXT">
-		<value>Votre profil de joueur a été déconnecté : retour à l'écran titre</value>
-	</data>	
-
-	<data name="IDS_PRO_RETURNEDTOMENU_TEXT">
-		<value>Un profil de joueur s'est déconnecté : partie interrompue</value>
-	</data>	
-
-	<data name="IDS_PRO_RETURNEDTOMENU_ACCEPT">
-		<value>Continuer à jouer</value>
-	</data>	
-
-	<data name="IDS_PRO_NOTONLINE_TITLE">
-		<value>Profil de joueur hors ligne</value>
-	</data>	
-
-	<data name="IDS_PRO_NOTONLINE_TEXT">
-		<value>Ce jeu intègre des fonctionnalités qui nécessitent un profil de joueur autorisé sur Xbox LIVE, mais vous êtes actuellement hors ligne.</value>
-	</data>	
-
-	<data name="IDS_PRO_XBOXLIVE_NOTIFICATION">
-		<value>Cette fonctionnalité nécessite un profil de joueur connecté à Xbox LIVE.</value>
-	</data>	
-
-	<data name="IDS_PRO_NOTONLINE_ACCEPT">
-		<value>Connexion à Xbox LIVE</value>
-	</data>	
-
-	<data name="IDS_PRO_NOTONLINE_DECLINE">
-		<value>Continuer à jouer hors ligne</value>
-	</data>	
-
-	<data name="IDS_PRO_ACHIEVEMENTPROBLEM_TITLE">
-		<value>Problème d'attribution de succès</value>
-	</data>	
-
-	<data name="IDS_PRO_ACHIEVEMENTPROBLEM_TEXT">
-		<value> Un problème est survenu lors de l'accès à votre profil du joueur. Votre succès n'a pas pu être attribué.</value>
-	</data>	
-
-	<data name="IDS_PRO_NOPROFILE_TITLE">
-		<value>Problème de profil du joueur</value>
-	</data>	
-
-	<data name="IDS_PRO_NOPROFILEOPTIONS_TEXT">
-		<value>La sauvegarde des paramètres sur le profil du joueur a échoué.</value>
-	</data>	
-
-	<data name="IDS_PRO_GUESTPROFILE_TITLE">
-		<value>Profil du joueur invité</value>
-	</data>	
-
-	<data name="IDS_PRO_GUESTPROFILE_TEXT">
-		<value>Le profil du joueur invité ne peut pas accéder à cette fonctionnalité. Veuillez utiliser un autre profil de joueur.</value>
-	</data>	
-
-	<data name="IDS_STO_SAVING_SHORT">
-		<value>Sauvegarde...</value>
-	</data>	
-
-	<data name="IDS_STO_SAVING_LONG">
-		<value>Enregistrement en cours. N'éteignez pas votre console.</value>
-	</data>	
-
-	<data name="IDS_PRO_UNLOCKGAME_TITLE">
-		<value>Déverrouiller le jeu complet</value>
-	</data>	
-
-	<data name="IDS_PRO_UNLOCKGAME_TEXT">
-		<value>Vous jouez à la version d'évaluation de Minecraft. Si vous possédiez le jeu complet, vous auriez déjà remporté un succès !
-Déverrouillez le jeu complet pour profiter au mieux de Minecraft et jouer avec vos amis partout dans le monde via Xbox LIVE.
-Voulez-vous déverrouiller le jeu complet ?</value>
-	</data>	
-
-	<data name="IDS_PRO_PROFILEPROBLEM_TEXT">
-		<value>Un problème s'est produit lors de la lecture de votre profil : retour au menu principal.</value>
-	</data>	
-</root>