From 1f0612c0d46f238a60255a4af67e1fccf9b19e67 Mon Sep 17 00:00:00 2001
From: Calclavia <admin@calclavia.com>
Date: Sun, 2 Feb 2014 14:16:50 +0800
Subject: [PATCH] Fixed multimeter merging in wrong direction

---
 .../archaic/firebox/TileFirebox.java                  |  5 +++--
 .../electrical/multimeter/PartMultimeter.java         | 11 +++++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/main/java/resonantinduction/archaic/firebox/TileFirebox.java b/src/main/java/resonantinduction/archaic/firebox/TileFirebox.java
index 46692e4b..e276ea74 100644
--- a/src/main/java/resonantinduction/archaic/firebox/TileFirebox.java
+++ b/src/main/java/resonantinduction/archaic/firebox/TileFirebox.java
@@ -45,7 +45,7 @@ public class TileFirebox extends TileElectricalInventory implements IPacketRecei
 	 * The power of the firebox in terms of thermal energy. The thermal energy can be transfered
 	 * into fluids to increase their internal energy.
 	 */
-	private final long POWER = 50000;
+	private final long POWER = 100000;
 
 	@Synced
 	private int burnTime;
@@ -141,6 +141,7 @@ public class TileFirebox extends TileElectricalInventory implements IPacketRecei
 				else if (blockID == Block.waterStill.blockID)
 				{
 					usedHeat = true;
+
 					if (heatEnergy >= getRequiredBoilWaterEnergy())
 					{
 						if (FluidRegistry.getFluid("steam") != null)
@@ -173,7 +174,7 @@ public class TileFirebox extends TileElectricalInventory implements IPacketRecei
 	{
 		int temperatureChange = 373 - ThermalPhysics.getTemperatureForCoordinate(worldObj, xCoord, zCoord);
 		int mass = ThermalPhysics.getMass(1000, 1);
-		return ThermalPhysics.getEnergyForTemperatureChange(mass, 4200, temperatureChange) + ThermalPhysics.getEnergyForStateChange(mass, 2260000);
+		return ThermalPhysics.getEnergyForTemperatureChange(mass, 4200, temperatureChange) + ThermalPhysics.getEnergyForStateChange(mass, 2257000);
 	}
 
 	public long getMeltIronEnergy()
diff --git a/src/main/java/resonantinduction/electrical/multimeter/PartMultimeter.java b/src/main/java/resonantinduction/electrical/multimeter/PartMultimeter.java
index 8f4b401a..b19e368f 100644
--- a/src/main/java/resonantinduction/electrical/multimeter/PartMultimeter.java
+++ b/src/main/java/resonantinduction/electrical/multimeter/PartMultimeter.java
@@ -562,11 +562,14 @@ public class PartMultimeter extends JCuboidPart implements IConnector<Multimeter
 
 		for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS)
 		{
-			universalelectricity.api.vector.Vector3 vector = getPosition().translate(dir);
-
-			if (hasMultimeter(vector.intX(), vector.intY(), vector.intZ()))
+			if (dir != getDirection() && dir != getDirection().getOpposite())
 			{
-				connections[dir.ordinal()] = getMultimeter(vector.intX(), vector.intY(), vector.intZ());
+				universalelectricity.api.vector.Vector3 vector = getPosition().translate(dir);
+
+				if (hasMultimeter(vector.intX(), vector.intY(), vector.intZ()))
+				{
+					connections[dir.ordinal()] = getMultimeter(vector.intX(), vector.intY(), vector.intZ());
+				}
 			}
 		}