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/net | |
| 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/net')
| -rw-r--r-- | src/main/java/gregtech/api/net/GT_Packet_Pollution.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/main/java/gregtech/api/net/GT_Packet_Pollution.java b/src/main/java/gregtech/api/net/GT_Packet_Pollution.java index e403cae4e9..2c67d74150 100644 --- a/src/main/java/gregtech/api/net/GT_Packet_Pollution.java +++ b/src/main/java/gregtech/api/net/GT_Packet_Pollution.java @@ -3,7 +3,6 @@ package gregtech.api.net; import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteArrayDataOutput; import com.google.common.io.ByteStreams; - import gregtech.common.GT_Pollution; import net.minecraft.world.IBlockAccess; |