> 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

7 files changed, 68 insertions, 69 deletions

diff --git a/src/Java/gtPlusPlus/core/tileentities/ModTileEntities.java b/src/Java/gtPlusPlus/core/tileentities/ModTileEntities.java
index 3d3dc66f20..a45e2218b8 100644
--- a/src/Java/gtPlusPlus/core/tileentities/ModTileEntities.java
+++ b/src/Java/gtPlusPlus/core/tileentities/ModTileEntities.java
@@ -1,6 +1,7 @@
 package gtPlusPlus.core.tileentities;
 
 import cpw.mods.fml.common.registry.GameRegistry;
+import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.tileentities.general.TileEntityFirepit;
 import gtPlusPlus.core.tileentities.general.TileEntityFishTrap;
@@ -12,13 +13,12 @@ import gtPlusPlus.core.tileentities.machines.TileEntityProjectTable;
 import gtPlusPlus.core.tileentities.machines.TileEntityTradeTable;
 import gtPlusPlus.core.tileentities.machines.TileEntityWorkbench;
 import gtPlusPlus.core.tileentities.machines.TileEntityWorkbenchAdvanced;
-import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.thaumcraft.common.tile.TCTileEntities;
 
 public class ModTileEntities {
 
 	public static void init() {
-		Utils.LOG_INFO("Registering Tile Entities.");
+		Logger.INFO("Registering Tile Entities.");
 		GameRegistry.registerTileEntity(TileEntityHeliumGenerator.class, "HeliumGenerator");
 		GameRegistry.registerTileEntity(TileEntityWorkbench.class, "TileWorkbench");
 		GameRegistry.registerTileEntity(TileEntityWorkbenchAdvanced.class, "TileWorkbenchAdvanced");
diff --git a/src/Java/gtPlusPlus/core/tileentities/base/TileEntityBase.java b/src/Java/gtPlusPlus/core/tileentities/base/TileEntityBase.java
index 9acb5ae396..81dfb1acf4 100644
--- a/src/Java/gtPlusPlus/core/tileentities/base/TileEntityBase.java
+++ b/src/Java/gtPlusPlus/core/tileentities/base/TileEntityBase.java
@@ -2,7 +2,7 @@ package gtPlusPlus.core.tileentities.base;
 
 import java.util.UUID;
 
-import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.api.objects.Logger;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.ISidedInventory;
 import net.minecraft.item.ItemStack;
@@ -60,7 +60,7 @@ public abstract class TileEntityBase extends TileEntity implements ISidedInvento
 				onPreTick();
 			}
 		} catch (Throwable t){
-			Utils.LOG_ERROR("Tile Entity Encountered an error in it's pre-tick stage.");
+			Logger.ERROR("Tile Entity Encountered an error in it's pre-tick stage.");
 			t.printStackTrace();
 		}
 		try{
@@ -68,7 +68,7 @@ public abstract class TileEntityBase extends TileEntity implements ISidedInvento
 				onTick();
 			}
 		} catch (Throwable t){
-			Utils.LOG_ERROR("Tile Entity Encountered an error in it's tick stage.");
+			Logger.ERROR("Tile Entity Encountered an error in it's tick stage.");
 			t.printStackTrace();
 		}
 		try{
@@ -76,7 +76,7 @@ public abstract class TileEntityBase extends TileEntity implements ISidedInvento
 				onPostTick();
 			}
 		} catch (Throwable t){
-			Utils.LOG_ERROR("Tile Entity Encountered an error in it's post-tick stage.");
+			Logger.ERROR("Tile Entity Encountered an error in it's post-tick stage.");
 			t.printStackTrace();
 		}
 	}
@@ -92,7 +92,7 @@ public abstract class TileEntityBase extends TileEntity implements ISidedInvento
 				processRecipe();
 			}
 		} catch (Throwable t){
-			Utils.LOG_ERROR("Tile Entity Encountered an error in it's processing of a recipe stage.");
+			Logger.ERROR("Tile Entity Encountered an error in it's processing of a recipe stage.");
 			t.printStackTrace();
 		}
 		return true;
diff --git a/src/Java/gtPlusPlus/core/tileentities/general/TileEntityFishTrap.java b/src/Java/gtPlusPlus/core/tileentities/general/TileEntityFishTrap.java
index d73de219e4..fea313917d 100644
--- a/src/Java/gtPlusPlus/core/tileentities/general/TileEntityFishTrap.java
+++ b/src/Java/gtPlusPlus/core/tileentities/general/TileEntityFishTrap.java
@@ -3,10 +3,10 @@ package gtPlusPlus.core.tileentities.general;
 import java.util.Random;
 
 import gregtech.api.util.GT_Utility;
+import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.inventories.InventoryFishTrap;
 import gtPlusPlus.core.lib.LoadedMods;
-import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.item.ItemUtils;
 import gtPlusPlus.core.util.math.MathUtils;
 import net.minecraft.block.Block;
@@ -81,8 +81,8 @@ public class TileEntityFishTrap extends TileEntity implements ISidedInventory {
 					return true;
 				}
 				else if ((waterCount >= 2) && (trapCount > 4)) {
-					Utils.LOG_WARNING("Too many fish traps surrounding this one.");
-					Utils.LOG_WARNING("Not adding Loot to the fishtrap at x[" + this.locationX + "] y[" + this.locationY
+					Logger.WARNING("Too many fish traps surrounding this one.");
+					Logger.WARNING("Not adding Loot to the fishtrap at x[" + this.locationX + "] y[" + this.locationY
 							+ "] z[" + this.locationZ + "] (Ticking for loot every " + this.baseTickRate + " ticks)");
 				}
 			}
@@ -187,7 +187,7 @@ public class TileEntityFishTrap extends TileEntity implements ISidedInventory {
 			loot = ItemUtils.getSimpleStack(Blocks.diamond_ore);
 		}
 		loot.stackSize=1;
-		Utils.LOG_WARNING("Adding x"+loot.stackSize+" "+loot.getDisplayName()+".");
+		Logger.WARNING("Adding x"+loot.stackSize+" "+loot.getDisplayName()+".");
 		return loot;
 	}
 
@@ -221,8 +221,8 @@ public class TileEntityFishTrap extends TileEntity implements ISidedInventory {
 						this.markDirty();
 					}
 					else {
-						Utils.LOG_WARNING("This Trap does not have enough water around it.");
-						Utils.LOG_WARNING("Not adding Loot to the fishtrap at x[" + this.locationX + "] y[" + this.locationY
+						Logger.WARNING("This Trap does not have enough water around it.");
+						Logger.WARNING("Not adding Loot to the fishtrap at x[" + this.locationX + "] y[" + this.locationY
 								+ "] z[" + this.locationZ + "] (Ticking for loot every " + this.baseTickRate + " ticks)");
 						this.markDirty();
 					}
diff --git a/src/Java/gtPlusPlus/core/tileentities/general/TileEntityInfiniteFluid.java b/src/Java/gtPlusPlus/core/tileentities/general/TileEntityInfiniteFluid.java
index 3b50fe4dea..329bbd73b8 100644
--- a/src/Java/gtPlusPlus/core/tileentities/general/TileEntityInfiniteFluid.java
+++ b/src/Java/gtPlusPlus/core/tileentities/general/TileEntityInfiniteFluid.java
@@ -6,12 +6,7 @@ import net.minecraft.network.Packet;
 import net.minecraft.network.play.server.S35PacketUpdateTileEntity;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.util.ForgeDirection;
-import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidEvent;
-import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.fluids.FluidTank;
-import net.minecraftforge.fluids.FluidTankInfo;
-import net.minecraftforge.fluids.IFluidHandler;
+import net.minecraftforge.fluids.*;
 
 public class TileEntityInfiniteFluid extends TileEntity implements IFluidHandler {
 
@@ -22,16 +17,19 @@ public class TileEntityInfiniteFluid extends TileEntity implements IFluidHandler
 	public TileEntityInfiniteFluid() {
 	}
 
+	@Override
 	public int fill(ForgeDirection from, FluidStack resource, boolean doFill) {
 		needsUpdate = true;
 		return this.tank.fill(resource, doFill);
 	}
 
+	@Override
 	public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) {
 		needsUpdate = true;
 		return this.tank.drain(resource.amount, doDrain);
 	}
 
+	@Override
 	public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) {
 		needsUpdate = true;
 		FluidStack fluid = this.tank.getFluid();
@@ -60,14 +58,17 @@ public class TileEntityInfiniteFluid extends TileEntity implements IFluidHandler
 		return stack;
 	}
 
+	@Override
 	public boolean canFill(ForgeDirection from, Fluid fluid) {
 		return true;
 	}
 
+	@Override
 	public boolean canDrain(ForgeDirection from, Fluid fluid) {
 		return true;
 	}
 
+	@Override
 	public FluidTankInfo[] getTankInfo(ForgeDirection from) {
 		return new FluidTankInfo[] { this.tank.getInfo() };
 	}
@@ -80,6 +81,7 @@ public class TileEntityInfiniteFluid extends TileEntity implements IFluidHandler
 		return volume;
 	}
 
+	@Override
 	public void updateEntity() {
 		
 		if (this.tank.getFluid() != null){
diff --git a/src/Java/gtPlusPlus/core/tileentities/general/TileEntityXpConverter.java b/src/Java/gtPlusPlus/core/tileentities/general/TileEntityXpConverter.java
index b886299afd..d94f4704d9 100644
--- a/src/Java/gtPlusPlus/core/tileentities/general/TileEntityXpConverter.java
+++ b/src/Java/gtPlusPlus/core/tileentities/general/TileEntityXpConverter.java
@@ -2,7 +2,7 @@ package gtPlusPlus.core.tileentities.general;
 
 import org.lwjgl.input.Keyboard;
 
-import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.util.enchanting.EnchantingUtils;
 import gtPlusPlus.core.util.player.PlayerUtils;
 import net.minecraft.entity.player.EntityPlayer;
@@ -54,26 +54,26 @@ public class TileEntityXpConverter extends TileEntity implements IFluidHandler {
 	@Override
 	public int fill(final ForgeDirection from, final FluidStack resource, final boolean doFill) {
 		this.needsUpdate = true;
-		Utils.LOG_WARNING("Ticking. | mConvertToEssence: "+this.mConvertToEssence);
+		Logger.WARNING("Ticking. | mConvertToEssence: "+this.mConvertToEssence);
 		if (this.mConvertToEssence){
 			if (resource.isFluidEqual(EnchantingUtils.getLiquidXP(1))){
-				Utils.LOG_WARNING("fill(tankLiquidXp)");
+				Logger.WARNING("fill(tankLiquidXp)");
 				return this.tankLiquidXp.fill(resource, doFill);
 			}
 			else {
-				Utils.LOG_WARNING("Looking for Liquid Xp, Instead found "+resource.getLocalizedName()+".");
+				Logger.WARNING("Looking for Liquid Xp, Instead found "+resource.getLocalizedName()+".");
 			}
 		}
 		else {
 			if (resource.isFluidEqual(EnchantingUtils.getMobEssence(1))){
-				Utils.LOG_WARNING("fill(tankEssence)");
+				Logger.WARNING("fill(tankEssence)");
 				return this.tankEssence.fill(resource, doFill);
 			}
 			else {
-				Utils.LOG_WARNING("Looking for Essence, Instead found "+resource.getLocalizedName()+".");
+				Logger.WARNING("Looking for Essence, Instead found "+resource.getLocalizedName()+".");
 			}
 		}
-		Utils.LOG_WARNING("fill(0)");
+		Logger.WARNING("fill(0)");
 		return 0;
 	}
 
@@ -82,24 +82,24 @@ public class TileEntityXpConverter extends TileEntity implements IFluidHandler {
 		this.needsUpdate = true;
 		if (this.mConvertToEssence){
 			if (resource.isFluidEqual(EnchantingUtils.getMobEssence(1))){
-				Utils.LOG_WARNING("drain(mConvertToEssence)");
+				Logger.WARNING("drain(mConvertToEssence)");
 				return this.tankEssence.drain(resource.amount, doDrain);
 			}
 		}
 		else {
 			if (resource.isFluidEqual(EnchantingUtils.getLiquidXP(1))){
-				Utils.LOG_WARNING("drain(tankLiquidXp)");
+				Logger.WARNING("drain(tankLiquidXp)");
 				return this.tankLiquidXp.drain(resource.amount, doDrain);
 			}
 		}
-		Utils.LOG_WARNING("drain(null)");
+		Logger.WARNING("drain(null)");
 		return null;
 	}
 
 	@Override
 	public FluidStack drain(final ForgeDirection from, final int maxDrain, final boolean doDrain) {
 		this.needsUpdate = true;
-		Utils.LOG_WARNING("drain(Ex)");
+		Logger.WARNING("drain(Ex)");
 		final FluidStack fluid_Essence = this.tankEssence.getFluid();
 		final FluidStack fluid_Xp = this.tankLiquidXp.getFluid();
 		if ((fluid_Essence == null) && (fluid_Xp == null)) {
@@ -144,7 +144,7 @@ public class TileEntityXpConverter extends TileEntity implements IFluidHandler {
 			this.tankLiquidXp = tank;
 		}
 
-		Utils.LOG_WARNING("drain(Ex2)");
+		Logger.WARNING("drain(Ex2)");
 		return stack;
 	}
 
@@ -152,17 +152,17 @@ public class TileEntityXpConverter extends TileEntity implements IFluidHandler {
 	public boolean canFill(final ForgeDirection from, final Fluid fluid) {
 		if (this.mConvertToEssence){
 			if (this.tankEssence.getFluidAmount() < this.tankEssence.getCapacity()){
-				Utils.LOG_WARNING("canFill(mConvertToEssence)");
+				Logger.WARNING("canFill(mConvertToEssence)");
 				return true;
 			}
 		}
 		else {
 			if (this.tankLiquidXp.getFluidAmount()  < this.tankLiquidXp.getCapacity()){
-				Utils.LOG_WARNING("canFill(tankLiquidXp)");
+				Logger.WARNING("canFill(tankLiquidXp)");
 				return true;
 			}
 		}
-		Utils.LOG_WARNING("canFill(false)");
+		Logger.WARNING("canFill(false)");
 		return false;
 	}
 
@@ -178,7 +178,7 @@ public class TileEntityXpConverter extends TileEntity implements IFluidHandler {
 				return true;
 			}
 		}
-		Utils.LOG_WARNING("canDrain(false)");
+		Logger.WARNING("canDrain(false)");
 		return false;
 	}
 
@@ -193,7 +193,7 @@ public class TileEntityXpConverter extends TileEntity implements IFluidHandler {
 	}
 
 	public float getAdjustedVolume() {
-		Utils.LOG_WARNING("AdjustedVolume()");
+		Logger.WARNING("AdjustedVolume()");
 		this.needsUpdate = true;
 		final float amount = this.tankLiquidXp.getFluidAmount();
 		final float capacity = this.tankLiquidXp.getCapacity();
@@ -226,7 +226,7 @@ public class TileEntityXpConverter extends TileEntity implements IFluidHandler {
 					this.tankEssence.fill(bigStorage, true);
 					this.tankLiquidXp.drain(100, true);
 					this.needsUpdate = true;
-					Utils.LOG_WARNING("B->A");
+					Logger.WARNING("B->A");
 				}
 			}
 			else {
@@ -236,7 +236,7 @@ public class TileEntityXpConverter extends TileEntity implements IFluidHandler {
 					this.tankLiquidXp.fill(bigStorage, true);
 					this.tankEssence.drain((int) rm, true);
 					this.needsUpdate = true;
-					Utils.LOG_WARNING("A->B");
+					Logger.WARNING("A->B");
 				}
 			}
 		}
diff --git a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityModularityTable.java b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityModularityTable.java
index 9d466ccdba..252b92984e 100644
--- a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityModularityTable.java
+++ b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityModularityTable.java
@@ -1,21 +1,15 @@
 package gtPlusPlus.core.tileentities.machines;
 
-import static gtPlusPlus.core.tileentities.machines.TileEntityModularityTable.mValidUpgradeList;
-import static gtPlusPlus.core.tileentities.machines.TileEntityModularityTable.mValidUpgradeListFormChange;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
+import java.util.*;
 import java.util.Map.Entry;
 
 import gregtech.api.enums.ItemList;
-import gregtech.api.enums.Materials;
+import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.container.Container_ModularityTable;
 import gtPlusPlus.core.inventories.modulartable.InventoryModularMain;
 import gtPlusPlus.core.inventories.modulartable.InventoryModularOutput;
 import gtPlusPlus.core.item.bauble.ModularBauble;
 import gtPlusPlus.core.tileentities.base.TileEntityBase;
-import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.array.Pair;
 import gtPlusPlus.core.util.item.ItemUtils;
 import gtPlusPlus.core.util.nbt.ModularArmourUtils;
@@ -56,6 +50,7 @@ public class TileEntityModularityTable extends TileEntityBase implements ISidedI
 		return this.mRecipeTimeRemaining;
 	}
 
+	@Override
 	@SuppressWarnings("static-method")
 	public NBTTagCompound getTag(final NBTTagCompound nbt, final String tag) {
 		if (!nbt.hasKey(tag)) {
@@ -331,7 +326,7 @@ public class TileEntityModularityTable extends TileEntityBase implements ISidedI
 
 	@Override
 	public boolean canInsertItem(int slot, ItemStack item, int side) {
-		Utils.LOG_INFO("Slot:"+slot+" | side? "+side);
+		Logger.INFO("Slot:"+slot+" | side? "+side);
 
 		/*if (side == 1){
 			return this.inventoryOutputs.isItemValidForSlot(slot-9, item);
@@ -346,17 +341,19 @@ public class TileEntityModularityTable extends TileEntityBase implements ISidedI
 
 	@Override
 	public boolean canExtractItem(int slot, ItemStack item, int side) {
-		Utils.LOG_INFO("Slot:"+slot+" | side? "+side);
+		Logger.INFO("Slot:"+slot+" | side? "+side);
 		if (slot == 11 || slot <= 8){
 			return true;
 		}
 		return false;
 	}
 
+	@Override
 	public String getCustomName() {
 		return this.customName;
 	}
 
+	@Override
 	public void setCustomName(String customName) {
 		this.customName = customName;
 	}
diff --git a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityProjectTable.java b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityProjectTable.java
index d209688d99..d76b66b4cd 100644
--- a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityProjectTable.java
+++ b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityProjectTable.java
@@ -5,12 +5,12 @@ import java.util.Vector;
 
 import gregtech.api.enums.ItemList;
 import gregtech.common.items.GT_MetaGenerated_Item_01;
+import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.container.Container_ProjectTable;
 import gtPlusPlus.core.inventories.projecttable.InventoryProjectMain;
 import gtPlusPlus.core.inventories.projecttable.InventoryProjectOutput;
 import gtPlusPlus.core.item.ModItems;
 import gtPlusPlus.core.item.bauble.ModularBauble;
-import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.item.ItemUtils;
 import gtPlusPlus.core.util.nbt.ModularArmourUtils;
 import gtPlusPlus.core.util.nbt.ModularArmourUtils.BT;
@@ -139,7 +139,7 @@ public class TileEntityProjectTable extends TileEntity implements INetworkDataPr
 						|| (dataStick == GregtechItemList.Old_Tool_DataStick.get(1)) 
 						|| (dataStick.getItem() instanceof MetaGeneratedGregtechItems && dataStick.getItemDamage() == 32208)){				
 
-					Utils.LOG_INFO("Found Data Stick and valid container.");
+					Logger.INFO("Found Data Stick and valid container.");
 
 
 					ItemStack outputComponent = container.getOutputContent();
@@ -151,17 +151,17 @@ public class TileEntityProjectTable extends TileEntity implements INetworkDataPr
 					NBTUtils.setBookTitle(newStick, "Encrypted Project Data");
 					NBTUtils.setBoolean(newStick, "mEncrypted", true);
 					int slotm=0;
-					Utils.LOG_WARNING("Uploading to Data Stick.");
+					Logger.WARNING("Uploading to Data Stick.");
 					for (ItemStack is : NBTUtils.readItemsFromNBT(newStick)){
 						if (is != null){
-							Utils.LOG_WARNING("Uploaded "+is.getDisplayName()+" into memory slot "+slotm+".");
+							Logger.WARNING("Uploaded "+is.getDisplayName()+" into memory slot "+slotm+".");
 						}
 						else {					
-							Utils.LOG_WARNING("Left memory slot "+slotm+" blank.");
+							Logger.WARNING("Left memory slot "+slotm+" blank.");
 						}
 						slotm++;
 					}
-					Utils.LOG_WARNING("Encrypting Data Stick.");
+					Logger.WARNING("Encrypting Data Stick.");
 					this.inventoryOutputs.setInventorySlotContents(1, newStick);
 					this.inventoryOutputs.setInventorySlotContents(0, null);
 				}
@@ -170,12 +170,12 @@ public class TileEntityProjectTable extends TileEntity implements INetworkDataPr
 			//Utils.LOG_INFO("Doing thing 1");
 			if (dataStick != null)
 				if (dataStick.getItem() instanceof ModularBauble){
-					Utils.LOG_INFO("Doing thing 2");
+					Logger.INFO("Doing thing 2");
 					ItemStack tBauble = dataStick;
 					dataStick = null;
 					this.inventoryOutputs.setInventorySlotContents(0, dataStick);
 					if (this.inventoryGrid != null){
-						Utils.LOG_INFO("Doing things");
+						Logger.INFO("Doing things");
 						ItemStack[] tStack = container.getInputComponents();
 						if (tStack != null){
 							//Utils.LOG_INFO(""+tStack.length);
@@ -184,29 +184,29 @@ public class TileEntityProjectTable extends TileEntity implements INetworkDataPr
 
 									ItemStack testStack;
 									if ((testStack = container.inventoryGrid.getStackInSlot(i)) != null){
-										Utils.LOG_INFO("FOUND: "+testStack.getDisplayName());
+										Logger.INFO("FOUND: "+testStack.getDisplayName());
 									}
 
 									if (tStack[i] != null){					
-										Utils.LOG_INFO("found "+tStack[i].getDisplayName());
+										Logger.INFO("found "+tStack[i].getDisplayName());
 										try {
 											if (tStack[i].getItem() == Items.feather){
 												ModularArmourUtils.setBaubleType(tBauble, BT.TYPE_BELT);
-												Utils.LOG_INFO("buffed Modular bauble");
+												Logger.INFO("buffed Modular bauble");
 												tStack[i] = null;
 												container.inventoryGrid.setInventorySlotContents(i, null);
 												this.inventoryGrid.setInventorySlotContents(i, null);
 											}
 											if (tStack[i].getItem() == Items.bed){
 												ModularArmourUtils.setBaubleType(tBauble, BT.TYPE_RING);
-												Utils.LOG_INFO("buffed Modular bauble");
+												Logger.INFO("buffed Modular bauble");
 												tStack[i] = null;
 												container.inventoryGrid.setInventorySlotContents(i, null);
 												this.inventoryGrid.setInventorySlotContents(i, null);
 											}
 											if (tStack[i].getItem() == Items.boat){
 												ModularArmourUtils.setBaubleType(tBauble, BT.TYPE_AMULET);
-												Utils.LOG_INFO("buffed Modular bauble");
+												Logger.INFO("buffed Modular bauble");
 												tStack[i] = null;
 												container.inventoryGrid.setInventorySlotContents(i, null);
 												this.inventoryGrid.setInventorySlotContents(i, null);
@@ -214,7 +214,7 @@ public class TileEntityProjectTable extends TileEntity implements INetworkDataPr
 
 											if (tStack[i].getItem() == Items.egg){
 												ModularArmourUtils.setModifierLevel(tBauble, Modifiers.BOOST_HOLY, ModularArmourUtils.getModifierLevel(tBauble, Modifiers.BOOST_HOLY)+1);
-												Utils.LOG_INFO("buffed Modular bauble");
+												Logger.INFO("buffed Modular bauble");
 												tStack[i] = null;
 												container.inventoryGrid.setInventorySlotContents(i, null);
 												this.inventoryGrid.setInventorySlotContents(i, null);
@@ -222,7 +222,7 @@ public class TileEntityProjectTable extends TileEntity implements INetworkDataPr
 											
 											if (tStack[i].getItem() == Items.baked_potato){
 												ModularArmourUtils.setModifierLevel(tBauble, Modifiers.BOOST_DEF, ModularArmourUtils.getModifierLevel(tBauble, Modifiers.BOOST_DEF)+1);
-												Utils.LOG_INFO("buffed Modular bauble");
+												Logger.INFO("buffed Modular bauble");
 												tStack[i] = null;
 												container.inventoryGrid.setInventorySlotContents(i, null);
 												this.inventoryGrid.setInventorySlotContents(i, null);
@@ -230,7 +230,7 @@ public class TileEntityProjectTable extends TileEntity implements INetworkDataPr
 
 											if (tStack[i].getItem() == Items.cooked_beef){
 												ModularArmourUtils.setModifierLevel(tBauble, Modifiers.BOOST_HP, ModularArmourUtils.getModifierLevel(tBauble, Modifiers.BOOST_HP)+1);
-												Utils.LOG_INFO("buffed Modular bauble");
+												Logger.INFO("buffed Modular bauble");
 												tStack[i] = null;
 												container.inventoryGrid.setInventorySlotContents(i, null);
 												this.inventoryGrid.setInventorySlotContents(i, null);
@@ -238,25 +238,25 @@ public class TileEntityProjectTable extends TileEntity implements INetworkDataPr
 
 											if (tStack[i] == ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:17019", 17019, 1)){
 												ModularArmourUtils.setModifierLevel(tBauble, Modifiers.BOOST_DEF, ModularArmourUtils.getModifierLevel(tBauble, Modifiers.BOOST_DEF)+1);
-												Utils.LOG_INFO("buffed Modular bauble");
+												Logger.INFO("buffed Modular bauble");
 												tStack[i] = null;
 												container.inventoryGrid.setInventorySlotContents(i, null);
 											}
 											if (tStack[i] == ItemList.Electric_Motor_LV.get(1)){
 												ModularArmourUtils.setModifierLevel(tBauble, Modifiers.BOOST_DAMAGE, ModularArmourUtils.getModifierLevel(tBauble, Modifiers.BOOST_DAMAGE)+1);
-												Utils.LOG_INFO("buffed Modular bauble");
+												Logger.INFO("buffed Modular bauble");
 												tStack[i] = null;
 												container.inventoryGrid.setInventorySlotContents(i, null);
 											}
 											else if (tStack[i] == ItemList.Electric_Motor_MV.get(1)){
 												ModularArmourUtils.setModifierLevel(tBauble, Modifiers.BOOST_DAMAGE, ModularArmourUtils.getModifierLevel(tBauble, Modifiers.BOOST_DAMAGE)+2);
-												Utils.LOG_INFO("buffed Modular bauble");
+												Logger.INFO("buffed Modular bauble");
 												tStack[i] = null;
 												container.inventoryGrid.setInventorySlotContents(i, null);
 											}
 											else if (tStack[i] == ItemList.Electric_Motor_HV.get(1)){
 												ModularArmourUtils.setModifierLevel(tBauble, Modifiers.BOOST_DAMAGE, ModularArmourUtils.getModifierLevel(tBauble, Modifiers.BOOST_DAMAGE)+3);
-												Utils.LOG_INFO("buffed Modular bauble");
+												Logger.INFO("buffed Modular bauble");
 												tStack[i] = null;
 												container.inventoryGrid.setInventorySlotContents(i, null);
 											}
@@ -266,7 +266,7 @@ public class TileEntityProjectTable extends TileEntity implements INetworkDataPr
 										}
 									}
 								}
-								Utils.LOG_INFO("set new Modular bauble");
+								Logger.INFO("set new Modular bauble");
 								this.inventoryOutputs.setInventorySlotContents(1, tBauble);
 							}
 						}