aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core/common
diff options
context:
space:
mode:
authorDraknyte1 <Draknyte1@hotmail.com>2016-11-06 22:12:41 +1000
committerDraknyte1 <Draknyte1@hotmail.com>2016-11-06 22:12:41 +1000
commita858b50d7fe80dd2d030500d931c40411ce13676 (patch)
tree2c7919aea3a89cdcaebdb0f8412a3bb54fe33c64 /src/Java/gtPlusPlus/core/common
parentcbe0e497be8e466c380a5b4fa781b314ede9ada3 (diff)
downloadGT5-Unofficial-a858b50d7fe80dd2d030500d931c40411ce13676.tar.gz
GT5-Unofficial-a858b50d7fe80dd2d030500d931c40411ce13676.tar.bz2
GT5-Unofficial-a858b50d7fe80dd2d030500d931c40411ce13676.zip
+ Added two new recipes for etched IV wiring. Should help with #35
+ Re-did imports again, from the desktop, with looser rules.
Diffstat (limited to 'src/Java/gtPlusPlus/core/common')
-rw-r--r--src/Java/gtPlusPlus/core/common/CommonProxy.java9
-rw-r--r--src/Java/gtPlusPlus/core/common/compat/COMPAT_IC2.java2
2 files changed, 3 insertions, 8 deletions
diff --git a/src/Java/gtPlusPlus/core/common/CommonProxy.java b/src/Java/gtPlusPlus/core/common/CommonProxy.java
index 53c4256ed6..6f2c0d0023 100644
--- a/src/Java/gtPlusPlus/core/common/CommonProxy.java
+++ b/src/Java/gtPlusPlus/core/common/CommonProxy.java
@@ -3,9 +3,7 @@ package gtPlusPlus.core.common;
import static gtPlusPlus.core.lib.CORE.DEBUG;
import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.handler.COMPAT_HANDLER;
-import gtPlusPlus.core.handler.COMPAT_IntermodStaging;
-import gtPlusPlus.core.handler.GuiHandler;
+import gtPlusPlus.core.handler.*;
import gtPlusPlus.core.handler.events.PickaxeBlockBreakEventHandler;
import gtPlusPlus.core.item.ModItems;
import gtPlusPlus.core.lib.CORE;
@@ -24,10 +22,7 @@ import net.minecraft.item.ItemStack;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.oredict.OreDictionary;
import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.event.FMLInitializationEvent;
-import cpw.mods.fml.common.event.FMLPostInitializationEvent;
-import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-import cpw.mods.fml.common.event.FMLServerStartingEvent;
+import cpw.mods.fml.common.event.*;
public class CommonProxy {
diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_IC2.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_IC2.java
index c1546bba63..960afc1ea1 100644
--- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_IC2.java
+++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_IC2.java
@@ -2,8 +2,8 @@ package gtPlusPlus.core.common.compat;
import static gtPlusPlus.core.handler.COMPAT_HANDLER.RemoveRecipeQueue;
-import gtPlusPlus.core.lib.LoadedMods;
import gtPlusPlus.core.lib.CORE.configSwitches;
+import gtPlusPlus.core.lib.LoadedMods;
import gtPlusPlus.core.recipe.ShapedRecipeObject;
import gtPlusPlus.core.util.item.ItemUtils;
import net.minecraft.item.ItemStack;