Merge branch 'bukkit'
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
This commit is contained in:
commit
72ad8bcde1