2 Commits

Author	SHA1	Message	Date
Christian	a7caad10ba	Add in bukkit support for recipe change	2012-06-26 15:40:30 -04:00
Christian Weeks	2521e5b390	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