Commit graph

6 commits

Author SHA1 Message Date
Christian
a7caad10ba Add in bukkit support for recipe change 2012-06-26 15:40:30 -04:00
Christian
58d6e58b93 Update bukkit with changes 2012-06-20 12:36:48 -04:00
Christian
b8ae8664ac Fix up bukkit for biome code 2012-06-09 10:47:43 -04:00
Christian Weeks
4085617ca2 Bukkitside fixup 2012-06-01 00:27:46 -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
Christian Weeks
a08eefa261 Bukkit version 2012-04-14 23:01:03 -04:00