From 7ba1c1c52e426bead2f5d1799dc77b333fcedd5d Mon Sep 17 00:00:00 2001
From: Calclavia <admin@calclavia.com>
Date: Tue, 18 Feb 2014 20:52:59 +0800
Subject: [PATCH] Fixed iron and tin wire resistance too high

---
 .../electrical/wire/EnumWireMaterial.java              |  6 +++---
 .../electrical/wire/framed/PartFramedWire.java         | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/electrical/src/main/java/resonantinduction/electrical/wire/EnumWireMaterial.java b/electrical/src/main/java/resonantinduction/electrical/wire/EnumWireMaterial.java
index c21dfa0f6..f3b4e06ec 100644
--- a/electrical/src/main/java/resonantinduction/electrical/wire/EnumWireMaterial.java
+++ b/electrical/src/main/java/resonantinduction/electrical/wire/EnumWireMaterial.java
@@ -19,11 +19,11 @@ public enum EnumWireMaterial
 	/** Copper: General. */
 	COPPER("Copper", 1.68f, 5, 300, 184, 115, 51),
 	/** Tin: Low shock, cheap */
-	TIN("Tin", 11f, 1, 2000, 132, 132, 130),
+	TIN("Tin", 3.1f, 1, 2000, 132, 132, 130),
 	/** Iron: High Capacity */
-	IRON("Iron", 10f, 3, 8000, 97, 102, 105),
+	IRON("Iron", 3f, 3, 8000, 97, 102, 105),
 	/** Aluminum: High Shock */
-	ALUMINUM("Aluminum", 2.82f, 10, 3200, 215, 205, 181),
+	ALUMINUM("Aluminum", 2.6f, 10, 3200, 215, 205, 181),
 	/** Aluminum: Low Resistance */
 	SILVER("Silver", 1.59f, 5, 4000, 192, 192, 192),
 	/** Superconductor: Over-powered */
diff --git a/electrical/src/main/java/resonantinduction/electrical/wire/framed/PartFramedWire.java b/electrical/src/main/java/resonantinduction/electrical/wire/framed/PartFramedWire.java
index bc6c3f1e9..0c046f61c 100644
--- a/electrical/src/main/java/resonantinduction/electrical/wire/framed/PartFramedWire.java
+++ b/electrical/src/main/java/resonantinduction/electrical/wire/framed/PartFramedWire.java
@@ -50,11 +50,6 @@ public class PartFramedWire extends PartFramedConnection<EnumWireMaterial, ICond
 		breakIcon = RenderFramedWire.breakIcon;
 	}
 
-	public PartFramedWire(int typeID)
-	{
-		this(EnumWireMaterial.values()[typeID]);
-	}
-
 	public PartFramedWire(EnumWireMaterial type)
 	{
 		super();
@@ -62,6 +57,11 @@ public class PartFramedWire extends PartFramedConnection<EnumWireMaterial, ICond
 		material = type;
 	}
 
+	public PartFramedWire(int typeID)
+	{
+		this(EnumWireMaterial.values()[typeID]);
+	}
+
 	@Override
 	public String getType()
 	{