> Why does Git make me do these? arghhh...

Merge branch 'master' of https://github.com/draknyte1/GTplusplus

# Conflicts:
#	src/Java/gtPlusPlus/core/material/ALLOY.java
#	src/Java/gtPlusPlus/core/material/ELEMENT.java
#	src/Java/gtPlusPlus/core/material/Material.java
#	src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java

1 files changed, 4 insertions, 3 deletions

diff --git a/src/Java/gtPlusPlus/core/util/math/MathUtils.java b/src/Java/gtPlusPlus/core/util/math/MathUtils.java
index 3361591ce8..adb5548f1d 100644
--- a/src/Java/gtPlusPlus/core/util/math/MathUtils.java
+++ b/src/Java/gtPlusPlus/core/util/math/MathUtils.java
@@ -4,6 +4,7 @@ import java.util.Map;
 import java.util.Random;
 
 import gregtech.api.enums.GT_Values;
+import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.gregtech.api.objects.XSTR;
 
@@ -315,10 +316,10 @@ public class MathUtils {
 			temp = "0F0F0F";
 		}
 
-		Utils.LOG_WARNING("Operating with "+temp);
+		Logger.WARNING("Operating with "+temp);
 		temp = Utils.appenedHexNotationToString(String.valueOf(temp));
-		Utils.LOG_WARNING("Made "+temp+" - Hopefully it's not a mess.");
-		Utils.LOG_WARNING("It will decode into "+Integer.decode(temp)+".");
+		Logger.WARNING("Made "+temp+" - Hopefully it's not a mess.");
+		Logger.WARNING("It will decode into "+Integer.decode(temp)+".");
 		return Integer.decode(temp);
 	}