Fixed refrence to Minecraft.getMinecraft
Merge remote-tracking branch 'origin/1.7' into 1.7