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

tile/networking/TileEnergyAcceptor.java

@@ -77,12 +77,10 @@ public class TileEnergyAcceptor extends AENetworkPowerTile
 		try
 		{
 			IEnergyGrid grid = gridProxy.getEnergy();
-			double overFlow = grid.injectPower( newPower, Actionable.SIMULATE );
-
-			if ( mode == Actionable.MODULATE )
-				grid.injectPower( Math.max( 0.0, newPower - overFlow ), Actionable.MODULATE );
-
-			return super.funnelPowerIntoStorage( overFlow, mode );
+			double leftOver = grid.injectPower( newPower, mode );
+			if ( mode == Actionable.SIMULATE )
+				return leftOver;
+			return 0.0;
 		}
 		catch (GridAccessException e)
 		{

tile/powersink/IC2.java

@@ -73,7 +73,6 @@ public abstract class IC2 extends MinecraftJoules6 implements IEnergySink
 		super.setPowerSides( sides );
 		removeFromENet();
 		addToENet();
-
 	}
 
 	final private void addToENet()

tile/powersink/MinecraftJoules6.java

@@ -30,6 +30,10 @@ public abstract class MinecraftJoules6 extends MinecraftJoules5 implements IBatt
 	@Method(iname = "MJ6")
 	public double addEnergy(double amount)
 	{
+		double demand = getExternalPowerDemand( PowerUnits.MJ, Double.MAX_VALUE );
+		if ( amount > demand )
+			amount = demand;
+
 		double overflow = injectExternalPower( PowerUnits.MJ, amount );
 		return amount - overflow;
 	}