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	Update FML imports	2012-11-20 03:14:36 -08:00
fml_at.cfg	Update to MC 1.4.4	2012-11-08 17:55:20 -05:00
fml_marker.cfg	Update to 1.4.3	2012-11-01 23:53:13 -04:00
mcpmod.info	Fix up MCP version	2012-11-20 08:47:14 -05:00