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

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/autocrafter/AC_Helper_Container.java b/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/autocrafter/AC_Helper_Container.java
index f5b066fdc2..b9a4d861b3 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/autocrafter/AC_Helper_Container.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/autocrafter/AC_Helper_Container.java
@@ -1,14 +1,9 @@
 package gtPlusPlus.xmod.gregtech.common.helpers.autocrafter;
 
-import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.api.objects.Logger;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.inventory.Container;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.inventory.InventoryCraftResult;
-import net.minecraft.inventory.InventoryCrafting;
-import net.minecraft.inventory.Slot;
-import net.minecraft.inventory.SlotCrafting;
+import net.minecraft.inventory.*;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.CraftingManager;
 import net.minecraft.world.World;
@@ -69,16 +64,18 @@ public class AC_Helper_Container extends Container
 	/**
 	 * Callback for when the crafting matrix is changed.
 	 */
+	@Override
 	public void onCraftMatrixChanged(IInventory p_75130_1_)
 	{
 		this.craftResult.setInventorySlotContents(0, CraftingManager.getInstance().findMatchingRecipe(this.craftMatrix, this.worldObj));
-		Utils.LOG_INFO("Crafted "+this.craftResult.getStackInSlot(0));
+		Logger.INFO("Crafted "+this.craftResult.getStackInSlot(0));
 	
 	}
 
 	/**
 	 * Called when the container is closed.
 	 */
+	@Override
 	public void onContainerClosed(EntityPlayer p_75134_1_)
 	{
 		super.onContainerClosed(p_75134_1_);
@@ -97,6 +94,7 @@ public class AC_Helper_Container extends Container
 		}
 	}
 
+	@Override
 	public boolean canInteractWith(EntityPlayer p_75145_1_)
 	{
 		return true;
@@ -105,11 +103,13 @@ public class AC_Helper_Container extends Container
 	/**
 	 * Called when a player shift-clicks on a slot. You must override this or you will crash when someone does that.
 	 */
+	@Override
 	public ItemStack transferStackInSlot(EntityPlayer p_82846_1_, int p_82846_2_){
 		ItemStack itemstack = null;
 		return itemstack;
 	}
 
+	@Override
 	public boolean func_94530_a(ItemStack p_94530_1_, Slot p_94530_2_)
 	{
 		return p_94530_2_.inventory != this.craftResult && super.func_94530_a(p_94530_1_, p_94530_2_);
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/autocrafter/AC_Helper_Utils.java b/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/autocrafter/AC_Helper_Utils.java
index 052b611250..84cf6067d1 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/autocrafter/AC_Helper_Utils.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/autocrafter/AC_Helper_Utils.java
@@ -6,8 +6,8 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 
+import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GT4Entity_AutoCrafter;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
@@ -26,11 +26,11 @@ public class AC_Helper_Utils {
 		if (!sAutocrafterMap.containsValue(AC)){
 			int increase = sAutocrafterMap.size()+1;
 			sAutocrafterMap.put(increase, AC);
-			Utils.LOG_INFO("[A-C] "+"Added Auto-Crafter to index on position "+increase+".");
+			Logger.INFO("[A-C] "+"Added Auto-Crafter to index on position "+increase+".");
 			return increase;
 		}
 		else {
-			Utils.LOG_INFO("[A-C] Tried adding an Auto-Crafter to Index, but found one already there.");
+			Logger.INFO("[A-C] Tried adding an Auto-Crafter to Index, but found one already there.");
 		}
 		return 0;
 	}
@@ -68,7 +68,7 @@ public class AC_Helper_Utils {
 				}
 			}
 		}
-		Utils.LOG_WARNING("Failed. [getCrafterByID]");
+		Logger.WARNING("Failed. [getCrafterByID]");
 		return null;
 	}
 
@@ -83,7 +83,7 @@ public class AC_Helper_Utils {
 				}
 			}
 		}
-		Utils.LOG_WARNING("Failed. [getIDByCrafter]");
+		Logger.WARNING("Failed. [getIDByCrafter]");
 		return 0;
 	}