TU43 Release 2

+ Added Magma Block, Nether Wart Block, Bone Block, End Stone Block
+ All Beetroot Items
+ Polar Bear (excluding audio)
+ / now opens chat for commands

Minecraft.Client/Common/App_enums.h

@@ -469,7 +469,6 @@ enum eMinecraftColour
 	eMinecraftColour_Mob_Guardian_Colour2,
 	eMinecraftColour_Mob_ElderGuardian_Colour1,
 	eMinecraftColour_Mob_ElderGuardian_Colour2,
-
 	eMinecraftColour_Armour_Default_Leather_Colour,
 
 	eMinecraftColour_Under_Water_Clear_Colour,
@@ -568,6 +567,9 @@ enum eMinecraftColour
 	//eHTMLColor_e_dark = 0x3f3f15, //r:3f , g: 3f, b: 15, i: 1e
 	//eHTMLColor_f_dark = 0x3f3f3f, //r:3f , g: 3f, b: 3f, i: 1f
 
+	eMinecraftColour_Mob_PolarBear_Colour1,
+	eMinecraftColour_Mob_PolarBear_Colour2,
+
 	eMinecraftColour_COUNT,
 };
 

Minecraft.Client/Common/Audio/SoundNames.cpp

@@ -287,7 +287,14 @@ const WCHAR *ConsoleSoundEngine::wchSoundNames[eSoundType_MAX]=
 	L"mob.guardian.curse",        
 	L"mob.guardian.elder_death",        
 	L"mob.guardian.elder_hit",         
-	L"mob.guardian.elder_idle"       
+	L"mob.guardian.elder_idle",
+
+	L"mob.polarbear.babyidle",
+	L"mob.polarbear.idle",
+	L"mob.polarbear.hurt",
+	L"mob.polarbear.death",
+	L"mob.polarbear.step",
+	L"mob.polarbear.warning"
 
 
 };

Minecraft.Client/Common/Colours/ColourTable.cpp

@@ -344,6 +344,8 @@ const wchar_t *ColourTable::ColourTableElements[eMinecraftColour_COUNT] =
 	L"Color_EnchantTextFocus",
 	L"Color_EnchantTextDisabled",
 	L"Color_RenamedItemTitle",
+	L"Mob_PolarBear_Colour1",
+	L"Mob_PolarBear_Colour2",
 };
 
 void ColourTable::staticCtor()

Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp

@@ -167,7 +167,12 @@ void IUIScene_CreativeMenu::staticCtor()
 		ITEM_AUX(Tile::dirt_Id, DirtTile::PODZOL)
 		ITEM(Tile::grass_path_Id)
 		ITEM(Tile::nether_brick_Id)
+		ITEM(Tile::red_nether_brick_Id)
 		ITEM(Tile::end_stone_Id)
+		ITEM(Tile::end_bricks_Id)
+		ITEM(Tile::magma_Id)
+		ITEM(Tile::nether_wart_block_Id)
+		ITEM(Tile::bone_block_Id)
 		ITEM_AUX(Tile::quartz_block_Id,QuartzBlockTile::TYPE_CHISELED)
 		ITEM_AUX(Tile::quartz_block_Id,QuartzBlockTile::TYPE_LINES_Y)
 		ITEM(Tile::trapdoor_Id)
@@ -499,6 +504,7 @@ void IUIScene_CreativeMenu::staticCtor()
 		ITEM_AUX(Item::spawn_egg_Id, 100 | ((EntityHorse::TYPE_MULE + 1) << 12)); // Mule
 		ITEM_AUX(Item::spawn_egg_Id, 120); // Villager
 		ITEM_AUX(Item::spawn_egg_Id, 101); // Rabbit Brown
+		ITEM_AUX(Item::spawn_egg_Id, 107); // Polar Bear
 		ITEM(Item::record_13_Id)
 		ITEM(Item::record_cat_Id)
 		ITEM(Item::record_blocks_Id)

Minecraft.Client/Common/UI/UIController.cpp

@@ -668,15 +668,11 @@ void UIController::loadSkins()
 	}
 	if(m_iggyLibraries[eLibrary_Platform] == IGGY_INVALID_LIBRARY)
 	{
-<<<<<<< Updated upstream
-		m_iggyLibraries[eLibrary_Platform] = loadSkin(L"skinHDWin.swf", L"platformskin.swf");
-=======
 		m_iggyLibraries[eLibrary_Platform] = loadSkin(L"Graphics\\ControlType\\HD\\windowsHD.swf", L"platformskinHD.swf");
 		if(m_iggyLibraries[eLibrary_Platform] == IGGY_INVALID_LIBRARY)
 		{
 			m_iggyLibraries[eLibrary_Platform] = loadSkin(L"skinHDWin.swf", L"platformskinHD.swf");
 		}
->>>>>>> Stashed changes
 	}
 
 	// Non-HD skin set (720p/480p scenes import these)

Minecraft.Client/Common/res/TitleUpdate/res/colours.xml

@@ -291,6 +291,8 @@ if __name__=="__main__": notecolors()
    <colour name="Mob_Guardian_Colour2" value="F17D30"/>
    <colour name="Mob_ElderGuardian_Colour1" value="CECCBA"/>
    <colour name="Mob_ElderGuardian_Colour2" value="747693"/>
+   <colour name="Mob_PolarBear_Colour1" value="F8F8F8"/>
+   <colour name="Mob_PolarBear_Colour2" value="8F9494"/>
 
   <colour name="Armour_Default_Leather_Colour" value="A06540"/>