Christian 5347caa1c4 Merge branch 'master' into snapshot15 ...

Conflicts:
	patches/minecraft/net/minecraft/client/renderer/RenderEngine.java.patch

2013-02-25 21:53:56 -05:00

..

cpw/mods/fml

Merge branch 'master' into snapshot15

2013-02-25 21:53:56 -05:00

fml_at.cfg

MCP compilation works

2013-02-01 22:42:28 -05:00

fml_marker.cfg

MCP compilation works

2013-02-01 22:42:28 -05:00

mcpmod.info

Merge branch 'master' into snapshot15

2013-01-22 15:21:22 -05:00