keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity
906 commits 1 branch 2 tags 103 MiB
Commit graph

4 commits

Author SHA1 Message Date
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
b2b4551df8 Damn you bukkit with your same names for different classes!!!! EntityPlayer->EntityHuman 2012-04-16 01:00:06 -04:00
Christian Weeks
a08eefa261 Bukkit version 2012-04-14 23:01:03 -04:00