Christian c056f49796 Merge branch 'master' into snapshot15 ... Conflicts: client/cpw/mods/fml/client/TextureFXManager.java		2013-02-25 21:18:08 -05:00
..
cpw/mods/fml/client	Merge branch 'master' into snapshot15	2013-02-25 21:18:08 -05:00
net/minecraft/src	Merge branch 'master' into snapshot15	2013-02-25 21:18:08 -05:00
mcp.png	MCP deserves lots of credit. So here it is.	2012-10-25 09:02:49 -04:00