Christian 9cdbadb66c Merge branch 'master' into repackage ... Conflicts: patches/minecraft/net/minecraft/client/EntityFX.java.patch		2012-12-03 17:31:29 -05:00
..
cpw/mods/fml/client	Merge branch 'master' into repackage	2012-12-03 17:31:29 -05:00
net/minecraft/src	Update FML imports	2012-11-20 03:14:36 -08:00
mcp.png	MCP deserves lots of credit. So here it is.	2012-10-25 09:02:49 -04:00