Christian
|
331e6bcf62
|
Merge branch 'master' into snapshot15
Fix up compilation and patching errors
Conflicts:
common/cpw/mods/fml/common/registry/GameRegistry.java
conf/joined.srg
conf/params.csv
conf/version.cfg
patches/minecraft/net/minecraft/server/dedicated/DedicatedServer.java.patch
|
2013-01-22 15:21:22 -05:00 |
|
Christian
|
2c58102515
|
Update MCP to MCP7.26a and refresh MCP names
|
2013-01-20 10:30:36 -05:00 |
|
Christian
|
964c51f4ae
|
Update for MC 1.4.7
|
2012-12-28 10:07:53 -05:00 |
|
Christian
|
5770708e75
|
Update to MC 1.4.6
|
2012-12-17 21:48:29 -05:00 |
|
Christian
|
25a10d6fc4
|
Fix up MCP version
|
2012-11-20 08:47:14 -05:00 |
|
Christian
|
719f5f2bde
|
Update FML for MC 1.4.5
|
2012-11-16 16:31:06 -05:00 |
|
Christian
|
3dbe774ec1
|
Update to MC 1.4.4
|
2012-11-08 17:55:20 -05:00 |
|
Christian
|
c2f4738c8c
|
MCP deserves lots of credit. So here it is.
|
2012-10-25 09:02:49 -04:00 |
|