From 6d93b645e257726d493ab50102cca3f9adc40487 Mon Sep 17 00:00:00 2001
From: Krapht <kraphteu@gmail.com>
Date: Thu, 28 Mar 2013 16:44:03 +0100
Subject: [PATCH] Fir merge error

---
 common/buildcraft/transport/TileGenericPipe.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/buildcraft/transport/TileGenericPipe.java b/common/buildcraft/transport/TileGenericPipe.java
index 99952f45..fc41e147 100644
--- a/common/buildcraft/transport/TileGenericPipe.java
+++ b/common/buildcraft/transport/TileGenericPipe.java
@@ -408,7 +408,7 @@ public class TileGenericPipe extends TileEntity implements IPowerReceptor, ITank
 	@Override
 	public int powerRequest(ForgeDirection from) {
 		if (BlockGenericPipe.isValid(pipe) && pipe instanceof IPowerReceptor)
-			return ((IPowerReceptor) pipe).powerRequest();
+			return ((IPowerReceptor) pipe).powerRequest(from);
 		return 0;
 	}