Merge branch 'master' of https://scm.sourceforge.jp/gitroot/chemicraft/chemicraft

[chemicraft/chemicraft.git] / common / pcc / chemicraft / gui / GuiChemicalCraftingTable.java

diff --git a/common/pcc/chemicraft/gui/GuiChemicalCraftingTable.java b/common/pcc/chemicraft/gui/GuiChemicalCraftingTable.java
index dfad5cd..b54bbd2 100644 (file)
--- a/common/pcc/chemicraft/gui/GuiChemicalCraftingTable.java
+++ b/common/pcc/chemicraft/gui/GuiChemicalCraftingTable.java
@@ -1,10 +1,16 @@
 package pcc.chemicraft.gui;
 
+import pcc.chemicraft.ChemiCraft;
+import pcc.chemicraft.container.ContainerChemicalCraftingTable;
+import pcc.chemicraft.tileentity.TileEntityChemicalCraftingTable;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.entity.player.EntityPlayer;
+<<<<<<< HEAD:common/pcc/chemicraft/gui/GuiChemicalCraftingTable.java
+=======
 import pcc.chemicraft.ChemiCraft;
 import pcc.chemicraft.container.ContainerChemicalCraftingTable;
 import pcc.chemicraft.tileentity.TileEntityChemicalCraftingTable;
+>>>>>>> a5e4a5c40b9001657f1e36ece533651f63183fbe:common/pcc/chemicraft/gui/GuiChemicalCraftingTable.java
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;