Christian 22831e6b63 Merge branch 'master' into snapshot15 ... Conflicts: patches/minecraft/net/minecraft/client/renderer/RenderEngine.java.patch		2013-02-25 21:53:56 -05:00
..
net/minecraft	Merge branch 'master' into snapshot15	2013-02-25 21:53:56 -05:00