> 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

2 files changed, 5 insertions, 5 deletions

diff --git a/src/Java/gtPlusPlus/core/handler/Recipes/LateRegistrationHandler.java b/src/Java/gtPlusPlus/core/handler/Recipes/LateRegistrationHandler.java
index a24b08d781..5bf6374725 100644
--- a/src/Java/gtPlusPlus/core/handler/Recipes/LateRegistrationHandler.java
+++ b/src/Java/gtPlusPlus/core/handler/Recipes/LateRegistrationHandler.java
@@ -1,8 +1,8 @@
 package gtPlusPlus.core.handler.Recipes;
 
+import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.handler.COMPAT_HANDLER;
 import gtPlusPlus.core.recipe.ShapedRecipeObject;
-import gtPlusPlus.core.util.Utils;
 
 public class LateRegistrationHandler {
 
@@ -20,9 +20,9 @@ public class LateRegistrationHandler {
 		try {
 			Thread.sleep(10);
 		} catch (final InterruptedException e) {
-			Utils.LOG_INFO(e.toString());
+			Logger.INFO(e.toString());
 		}
-		Utils.LOG_INFO("Late Recipes Loaded: "+recipesSuccess+" Failed: "+recipesFailed);
+		Logger.INFO("Late Recipes Loaded: "+recipesSuccess+" Failed: "+recipesFailed);
 	}
 
 }
diff --git a/src/Java/gtPlusPlus/core/handler/Recipes/RegistrationHandler.java b/src/Java/gtPlusPlus/core/handler/Recipes/RegistrationHandler.java
index e887607827..9eb6d1171c 100644
--- a/src/Java/gtPlusPlus/core/handler/Recipes/RegistrationHandler.java
+++ b/src/Java/gtPlusPlus/core/handler/Recipes/RegistrationHandler.java
@@ -1,8 +1,8 @@
 package gtPlusPlus.core.handler.Recipes;
 
+import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.handler.COMPAT_HANDLER;
 import gtPlusPlus.core.recipe.*;
-import gtPlusPlus.core.util.Utils;
 
 public class RegistrationHandler {
 
@@ -21,7 +21,7 @@ public class RegistrationHandler {
 		RECIPE_Batteries.RECIPES_LOAD();
 		RECIPES_General.RECIPES_LOAD();
 		//RECIPES_MTWRAPPER.run();
-		Utils.LOG_INFO("Loaded: "+recipesSuccess+" Failed: "+recipesFailed);
+		Logger.INFO("Loaded: "+recipesSuccess+" Failed: "+recipesFailed);
 		COMPAT_HANDLER.areInitItemsLoaded = true;
 		//Utils.LOG_INFO("MT Loaded: "+RECIPES_MTWRAPPER.MT_RECIPES_LOADED+" MT Failed: "+RECIPES_MTWRAPPER.MT_RECIPES_FAILED);
 	}