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

diff --git a/src/Java/gtPlusPlus/xmod/thaumcraft/common/ItemBlockThaumcraft.java b/src/Java/gtPlusPlus/xmod/thaumcraft/common/ItemBlockThaumcraft.java
index 465f443906..f52d48db70 100644
--- a/src/Java/gtPlusPlus/xmod/thaumcraft/common/ItemBlockThaumcraft.java
+++ b/src/Java/gtPlusPlus/xmod/thaumcraft/common/ItemBlockThaumcraft.java
@@ -22,6 +22,7 @@ public class ItemBlockThaumcraft extends ItemBlockEntityBase{
 		return super.getUnlocalizedName() + "." + par1ItemStack.getItemDamage();
 	}
 
+	@Override
 	public boolean placeBlockAt(final ItemStack stack, final EntityPlayer player, final World world, final int x,
 			final int y, final int z, final int side, final float hitX, final float hitY, final float hitZ,
 			final int metadata) {
diff --git a/src/Java/gtPlusPlus/xmod/thaumcraft/common/tile/TCTileEntities.java b/src/Java/gtPlusPlus/xmod/thaumcraft/common/tile/TCTileEntities.java
index 5366eb9cec..f2de41e308 100644
--- a/src/Java/gtPlusPlus/xmod/thaumcraft/common/tile/TCTileEntities.java
+++ b/src/Java/gtPlusPlus/xmod/thaumcraft/common/tile/TCTileEntities.java
@@ -2,14 +2,14 @@ package gtPlusPlus.xmod.thaumcraft.common.tile;
 
 import cpw.mods.fml.common.Optional;
 import cpw.mods.fml.common.registry.GameRegistry;
+import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.lib.LoadedMods;
-import gtPlusPlus.core.util.Utils;
 
 public class TCTileEntities {	
 
 	@Optional.Method(modid = "Thaumcraft")
 		public static void init() {
-			Utils.LOG_INFO("Registering TC Tile Entities.");
+			Logger.INFO("Registering TC Tile Entities.");
 			if (LoadedMods.Thaumcraft){
 				GameRegistry.registerTileEntity(TileFastAlchemyFurnace.class, "TileFastAlchemyFurnace");
 				GameRegistry.registerTileEntity(TileFastArcaneAlembic.class, "TileFastArcaneAlembic");