#2438: Implemented forge energy capabilities. Removed other disabled energy units for the time being.

2016-10-19 20:57:59 +02:00
parent 433d575fd4
commit a72c97e666
21 changed files with 146 additions and 447 deletions
@@ -193,16 +193,6 @@ public class Platform
 		final String[] preFixes = { "k", "M", "G", "T", "P", "T", "P", "E", "Z", "Y" };
 		String unitName = displayUnits.name();

-		if( displayUnits == PowerUnits.WA )
-		{
-			unitName = "J";
-		}
-
-		if( displayUnits == PowerUnits.MK )
-		{
-			unitName = "J";
-		}
-
 		String level = "";
 		int offset = 0;
 		while( p > 1000 && offset < preFixes.length )