diff options
| author | Johannes Gäßler <updrn@student.kit.edu> | 2017-06-26 20:25:32 +0200 |
|---|---|---|
| committer | Johannes Gäßler <updrn@student.kit.edu> | 2017-06-26 20:25:32 +0200 |
| commit | ddf58e6ef45bbffa3c5ecde39114aff0bc4d1efc (patch) | |
| tree | b8e181183e63965c92d3308bdc4d4b8318e2c004 /src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java | |
| parent | eb4768ba0cbeb2e1b42f9b68bece277633771572 (diff) | |
| parent | 850f30a9d7a55608e62cc8d4ca972b03b9045e66 (diff) | |
| download | GT5-Unofficial-ddf58e6ef45bbffa3c5ecde39114aff0bc4d1efc.tar.gz GT5-Unofficial-ddf58e6ef45bbffa3c5ecde39114aff0bc4d1efc.tar.bz2 GT5-Unofficial-ddf58e6ef45bbffa3c5ecde39114aff0bc4d1efc.zip | |
Merge branch 'unstable_blood' into unstable
Conflicts:
src/main/java/gregtech/api/enums/MaterialBuilder.java
src/main/java/gregtech/common/GT_RecipeAdder.java
src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java
src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
Diffstat (limited to 'src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java')
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java index fc46874480..6a64c802bd 100644 --- a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java +++ b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java @@ -26,7 +26,6 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.network.Packet; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.world.ChunkPosition; import net.minecraft.world.EnumSkyBlock; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; |