Merge branch 'experimental' of https://github.com/GTNewHorizons/GT5-Unofficial into experimental

1 files changed, 3 insertions, 1 deletions

diff --git a/src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java b/src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java
index 7129c174df..6b66b64fa0 100644
--- a/src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java
+++ b/src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java
@@ -2,7 +2,6 @@ package gregtech.api.metatileentity;
 

 import cpw.mods.fml.relauncher.Side;

 import cpw.mods.fml.relauncher.SideOnly;

-import gregtech.GT_Mod;

 import gregtech.api.GregTech_API;

 import gregtech.api.interfaces.metatileentity.IConnectable;

 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;

@@ -838,4 +837,7 @@ public abstract class MetaPipeEntity implements IMetaTileEntity, IConnectable {
 

 	public boolean canConnect(byte aSide, TileEntity tTileEntity) { return false; }

 	public boolean getGT6StyleConnection() { return false; }

+

+    public boolean shouldJoinIc2Enet() { return false; }

+

 }