Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1

2014-05-10 17:19:26 -05:00
parent 08d6942643 570f098f81
commit d84ec9c0bf
8 changed files with 36 additions and 34 deletions
@@ -34,12 +34,6 @@ public abstract class RedstoneFlux extends RotaryCraft implements IEnergyHandler
 		return 0;
 	}

-	@Deprecated
-	final public boolean canInterface(ForgeDirection from)
-	{
-		return canConnectEnergy(from);
-	}
-	
 	final public boolean canConnectEnergy(ForgeDirection from)
 	{
 		return internalCanAcceptPower && getPowerSides().contains( from );