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

diff --git a/src/Java/gtPlusPlus/core/item/init/ItemsMultiTools.java b/src/Java/gtPlusPlus/core/item/init/ItemsMultiTools.java
index cc73ba3d32..fc7381354a 100644
--- a/src/Java/gtPlusPlus/core/item/init/ItemsMultiTools.java
+++ b/src/Java/gtPlusPlus/core/item/init/ItemsMultiTools.java
@@ -1,12 +1,12 @@
 package gtPlusPlus.core.item.init;
 
 import gregtech.api.enums.Materials;
+import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.item.ModItems;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.material.ALLOY;
 import gtPlusPlus.core.material.Material;
-import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.item.ItemUtils;
 
 public class ItemsMultiTools {
@@ -64,7 +64,7 @@ public class ItemsMultiTools {
 	}
 
 	private static boolean toolFactory(final Material m){
-		Utils.LOG_WARNING("Generating Multi-Tools for "+m.getLocalizedName());
+		Logger.WARNING("Generating Multi-Tools for "+m.getLocalizedName());
 		ModItems.MP_GTMATERIAL = ItemUtils.generateMultiPick(m);
 		ModItems.MS_GTMATERIAL = ItemUtils.generateMultiShovel(m);
 		return true;