> 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, 7 insertions, 7 deletions

diff --git a/src/Java/gtPlusPlus/core/util/gregtech/recipehandlers/GregtechRecipe.java b/src/Java/gtPlusPlus/core/util/gregtech/recipehandlers/GregtechRecipe.java
index 8ba355d57f..9bc5ee804d 100644
--- a/src/Java/gtPlusPlus/core/util/gregtech/recipehandlers/GregtechRecipe.java
+++ b/src/Java/gtPlusPlus/core/util/gregtech/recipehandlers/GregtechRecipe.java
@@ -3,23 +3,23 @@ package gtPlusPlus.core.util.gregtech.recipehandlers;
 import java.lang.reflect.Method;
 
 import gregtech.api.util.GT_ModHandler;
+import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.Utils;
 import net.minecraft.item.ItemStack;
 
 public final class GregtechRecipe {
 
 	public LibraryProxy ourProxy;
 	public GregtechRecipe(){
-		Utils.LOG_INFO("Initializing a recipe handler for different versions of Gregtech 5.");
+		Logger.INFO("Initializing a recipe handler for different versions of Gregtech 5.");
 		try {
 			if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){
 				this.ourProxy = new LibProxy1();
-				Utils.LOG_INFO("Selecting GT 5.7/5.8 Recipe Set");
+				Logger.INFO("Selecting GT 5.7/5.8 Recipe Set");
 			}
 			if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){
 				this.ourProxy = new LibProxy2();
-				Utils.LOG_INFO("Selecting GT 5.9 Recipe Set");
+				Logger.INFO("Selecting GT 5.9 Recipe Set");
 			}
 		} catch (final NoSuchMethodException e) {
 			this.ourProxy = null;
@@ -27,7 +27,7 @@ public final class GregtechRecipe {
 	}
 
 	public boolean addSmeltingAndAlloySmeltingRecipe(final ItemStack aInput, final ItemStack aOutput) {
-		Utils.LOG_WARNING("Adding a GT Furnace/Alloy Smelter Recipe"+"| Input:"+aInput.getDisplayName()+" | Output:"+aOutput.getDisplayName()+" |");
+		Logger.WARNING("Adding a GT Furnace/Alloy Smelter Recipe"+"| Input:"+aInput.getDisplayName()+" | Output:"+aOutput.getDisplayName()+" |");
 		return this.ourProxy.addSmeltingAndAlloySmeltingRecipe(aInput, aOutput);
 	}
 
@@ -47,7 +47,7 @@ class LibProxy1 extends LibraryProxy {
 	@Override
 	public boolean addSmeltingAndAlloySmeltingRecipe(final ItemStack aInput, final ItemStack aOutput) {
 		try {
-			Utils.LOG_INFO("Trying with Gt 5.7/5.8 Method.");
+			Logger.INFO("Trying with Gt 5.7/5.8 Method.");
 			return (boolean) this.m1.invoke(null, aInput, aOutput);
 		} catch (final Exception e) {
 			throw new RuntimeException(e);
@@ -65,7 +65,7 @@ class LibProxy2 extends LibraryProxy {
 	@Override
 	public boolean addSmeltingAndAlloySmeltingRecipe(final ItemStack aInput, final ItemStack aOutput) {
 		try {
-			Utils.LOG_INFO("Trying with Gt 5.9 Method.");
+			Logger.INFO("Trying with Gt 5.9 Method.");
 			return (boolean) this.m2.invoke(null, aInput, aOutput, true);
 		} catch (final Exception e) {
 			throw new RuntimeException(e);