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
This commit is contained in:
Christian Weeks committed 2012-05-31 22:45:19 -04:00
commit bcc35775f4
13 files changed
+1753

No files matched your search

+5
View File
@@ -0,0 +1,5 @@
package net.minecraft.src;
public interface ItemStack {
}