修正・変更

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

diff --git a/common/pcc/chemicraft/tileentity/TileEntityPyrolysisTable.java b/common/pcc/chemicraft/tileentity/TileEntityPyrolysisTable.java
index 3f7e43d..315aa53 100644 (file)
--- a/common/pcc/chemicraft/tileentity/TileEntityPyrolysisTable.java
+++ b/common/pcc/chemicraft/tileentity/TileEntityPyrolysisTable.java
@@ -5,26 +5,16 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Random;
 
-import pcc.chemicraft.debug.DebugData;
-import pcc.chemicraft.debug.DebugTick;
-import pcc.chemicraft.inventory.InventoryPyrolysisTableFuel;
-import pcc.chemicraft.inventory.InventoryPyrolysisTableMaterial;
-import pcc.chemicraft.inventory.InventoryPyrolysisTableResult;
-import pcc.chemicraft.system.PacketHandler;
-
 import net.minecraft.block.Block;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import net.minecraft.network.packet.Packet;
 import net.minecraft.tileentity.TileEntity;
-<<<<<<< HEAD:common/pcc/chemicraft/tileentity/TileEntityPyrolysisTable.java
-=======
 import pcc.chemicraft.inventory.InventoryPyrolysisTableFuel;
 import pcc.chemicraft.inventory.InventoryPyrolysisTableMaterial;
 import pcc.chemicraft.inventory.InventoryPyrolysisTableResult;
 import pcc.chemicraft.system.PacketHandler;
->>>>>>> a5e4a5c40b9001657f1e36ece533651f63183fbe:common/pcc/chemicraft/tileentity/TileEntityPyrolysisTable.java
 
 import com.google.common.io.ByteArrayDataInput;