Christian Weeks
|
bcc35775f4
|
Merge branch 'bukkit' - massive code reorganization for fml 2.0
Conflicts:
common/cpw/mods/fml/common/IWorldGenerator.java
common/cpw/mods/fml/common/registry/FMLRegistry.java
common/cpw/mods/fml/common/registry/IMinecraftRegistry.java
common/net/minecraft/server/CommonRegistry.java
common/net/minecraft/server/IMinecraftRegistry.java
common/net/minecraft/src/CommonRegistry.java
common/net/minecraft/src/IMinecraftRegistry.java
|
2012-05-31 22:45:19 -04:00 |
|