Add quartz_ore tool init, more mojang special casing -.-
Changed ToolMaterial's repair material to ItemStack version to allow metadata sensitive versions.
Improved Control of Enchantment.canApplyTogether() in Mod Enchantments, allowing both enchantments to determine if they can apply together.
Expand PlayerWakupEvent to expose the three parameters passed into EntityPlayer.wakeUp.