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

[chemicraft/chemicraft.git] / common / pcc / chemicraft / tileentity / TileEntityElectrolysisTable.java

diff --git a/common/chemicraft/tileentity/TileEntityElectrolysisTable.java b/common/pcc/chemicraft/tileentity/TileEntityElectrolysisTable.java
similarity index 76%
rename from common/chemicraft/tileentity/TileEntityElectrolysisTable.java
rename to common/pcc/chemicraft/tileentity/TileEntityElectrolysisTable.java
index c580061..b845956 100644 (file)
--- a/common/chemicraft/tileentity/TileEntityElectrolysisTable.java
+++ b/common/pcc/chemicraft/tileentity/TileEntityElectrolysisTable.java
@@ -1,11 +1,17 @@
-package chemicraft.tileentity;
+package pcc.chemicraft.tileentity;
 
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.network.packet.Packet;
 import net.minecraft.tileentity.TileEntity;
+<<<<<<< HEAD:common/pcc/chemicraft/tileentity/TileEntityElectrolysisTable.java
+import pcc.chemicraft.inventory.InventoryElectrolysisFuel;
+import pcc.chemicraft.inventory.InventoryElectrolysisMaterial;
+import pcc.chemicraft.inventory.InventoryElectrolysisResult;
+=======
 import chemicraft.inventory.InventoryElectrolysisTableFuel;
 import chemicraft.inventory.InventoryElectrolysisTableMaterial;
 import chemicraft.inventory.InventoryElectrolysisTableResult;
+>>>>>>> b8902d318f2a200d5d5a82e98d5377bd89c056a8:common/chemicraft/tileentity/TileEntityElectrolysisTable.java
 
 public class TileEntityElectrolysisTable extends TileEntity
 {