Merge branch 'dev' into antiblocks

This commit is contained in:
CptSpaceToaster committed 2015-01-11 22:30:31 -05:00
commit bbc33601f8
5 files changed
+11 -19

No files matched your search

@@ -54,7 +54,7 @@ import java.util.List;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@Mod(modid = Chisel.MOD_ID, name = Chisel.MOD_NAME, version = Chisel.VERSION, guiFactory = "com.cricketcraft.chisel.client.gui.GuiFactory", dependencies = "after:ForgeMultipart;after:Thaumcraft")
@Mod(modid = Chisel.MOD_ID, name = Chisel.MOD_NAME, version = Chisel.VERSION, guiFactory = "com.cricketcraft.chisel.client.gui.GuiFactory", dependencies = "after:ForgeMultipart;after:Thaumcraft;after:appliedenergistics2;after:Railcraft")
public class Chisel {
public static final List<String> modsSupported = new ArrayList<String>();