Added IC2 Steam condenser, to remove all that nasty useless steam.

Also tried to add Waila compat. for a few blocks & retextured the Energy Buffers.

23 files changed, 154 insertions, 115 deletions

diff --git a/src/Java/mcmod.info b/src/Java/mcmod.info
deleted file mode 100644
index 0c2b859007..0000000000
--- a/src/Java/mcmod.info
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @version 0.1
- * @author Alkalus
- * In-game info for project: Hello World.
- */
-[ { "modid"        : "miscutils"
-  , "name"         : "miscutils"
-  , "description"  : "Adds a few various things. Supported mods include GregTech, EnderIO, Big Reactors, Thaumcraft, ExtraUtils, Pnuematicraft & Simply Jetpacks."
-  , "version"      : "0.7.8gtu"
-  , "mcversion"    : "1.7.10"
-  , "url"          : ""
-  , "updateUrl"    : ""
-  , "authorList"   : ["Alkalus"]
-  , "credits"      : ""
-  , "logoFile"     : ""
-  , "screenshots"  : []
-  , "dependencies" : ["Forge10.13.0.1180"]
-  }
-]
diff --git a/src/Java/miscutil/MiscUtils.java b/src/Java/miscutil/MiscUtils.java
index a70c8676df..0272d0015c 100644
--- a/src/Java/miscutil/MiscUtils.java
+++ b/src/Java/miscutil/MiscUtils.java
@@ -15,6 +15,7 @@ import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.Mod.EventHandler;
 import cpw.mods.fml.common.SidedProxy;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
+import cpw.mods.fml.common.event.FMLInterModComms;
 import cpw.mods.fml.common.event.FMLPostInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.common.event.FMLServerStartingEvent;
@@ -43,6 +44,7 @@ implements ActionListener
 		proxy.registerTileEntities();
 		proxy.registerRenderThings();
 		proxy.preInit(event);
+		FMLInterModComms.sendMessage("Waila", "register", "miscutil.core.waila.WailaCompat.load");
 	}
 
 	//Init
diff --git a/src/Java/miscutil/core/lib/Strings.java b/src/Java/miscutil/core/lib/Strings.java
index 0142101c76..01976b9bdd 100644
--- a/src/Java/miscutil/core/lib/Strings.java
+++ b/src/Java/miscutil/core/lib/Strings.java
@@ -7,7 +7,7 @@ public class Strings {
 	public static final String name = "Misc. Utils";	
 	public static final String MODID = "miscutils";
 	public static final String VERSION = "0.7.8gtu";
-	public static final boolean DEBUG = true;	
+	public static final boolean DEBUG = false;	
 	public static final boolean LOAD_ALL_CONTENT = false;
 	public static final int GREG_FIRST_ID = 760;
 	
diff --git a/src/Java/miscutil/core/util/Utils.java b/src/Java/miscutil/core/util/Utils.java
index 00acfba45f..7565d1e308 100644
--- a/src/Java/miscutil/core/util/Utils.java
+++ b/src/Java/miscutil/core/util/Utils.java
@@ -1,9 +1,14 @@
 package miscutil.core.util;
 
+import static gregtech.api.enums.GT_Values.F;
+
 import java.awt.Graphics;
 
 import miscutil.core.lib.Strings;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidRegistry;
+import net.minecraftforge.fluids.FluidStack;
 import cpw.mods.fml.common.FMLLog;
 
 public class Utils {
@@ -58,4 +63,23 @@ public class Utils {
     	    g.drawRect (MinA, MinB, MaxA, MaxB);  
     }
     
+    public static void messagePlayer(EntityPlayer P, String S){
+    	gregtech.api.util.GT_Utility.sendChatToPlayer(P, S);
+    }
+    
+	/**
+	 * Returns if that Liquid is IC2Steam.
+	 */
+	public static boolean isIC2Steam(FluidStack aFluid) {
+		if (aFluid == null) return F;
+		return aFluid.isFluidEqual(getIC2Steam(1));
+	}
+	
+	/**
+	 * Returns a Liquid Stack with given amount of IC2Steam.
+	 */
+	public static FluidStack getIC2Steam(long aAmount) {
+		return FluidRegistry.getFluidStack("ic2steam", (int)aAmount);
+	}
+    
 }
diff --git a/src/Java/miscutil/enderio/conduit/gas/AbstractGasConduit.java b/src/Java/miscutil/enderio/conduit/gas/AbstractGasConduit.java
index 2bc3be3d67..0cdee252b0 100644
--- a/src/Java/miscutil/enderio/conduit/gas/AbstractGasConduit.java
+++ b/src/Java/miscutil/enderio/conduit/gas/AbstractGasConduit.java
@@ -1,5 +1,14 @@
-package crazypants.enderio.conduit.gas;
+package miscutil.enderio.conduit.gas;
 
+import java.util.EnumMap;
+import java.util.HashMap;
+import java.util.Map;
+
+import mekanism.api.gas.IGasHandler;
+import net.minecraft.block.Block;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraftforge.common.util.ForgeDirection;
 import crazypants.enderio.conduit.AbstractConduit;
 import crazypants.enderio.conduit.ConduitUtil;
 import crazypants.enderio.conduit.ConnectionMode;
@@ -9,17 +18,6 @@ import crazypants.enderio.machine.RedstoneControlMode;
 import crazypants.enderio.machine.reservoir.TileReservoir;
 import crazypants.util.BlockCoord;
 import crazypants.util.DyeColor;
-import java.util.EnumMap;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import mekanism.api.gas.IGasHandler;
-import net.minecraft.block.Block;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
-import net.minecraftforge.common.util.ForgeDirection;
 
 public abstract class AbstractGasConduit
   extends AbstractConduit
diff --git a/src/Java/miscutil/enderio/conduit/gas/AbstractGasTankConduit.java b/src/Java/miscutil/enderio/conduit/gas/AbstractGasTankConduit.java
index 5a0b50c370..7b8e36f498 100644
--- a/src/Java/miscutil/enderio/conduit/gas/AbstractGasTankConduit.java
+++ b/src/Java/miscutil/enderio/conduit/gas/AbstractGasTankConduit.java
@@ -1,22 +1,18 @@
-package crazypants.enderio.conduit.gas;
+package miscutil.enderio.conduit.gas;
 
-import crazypants.enderio.conduit.AbstractConduitNetwork;
-import crazypants.enderio.conduit.ConduitUtil;
-import crazypants.enderio.conduit.ConnectionMode;
-import crazypants.enderio.conduit.IConduitBundle;
-import crazypants.enderio.conduit.RaytraceResult;
-import crazypants.enderio.conduit.geom.CollidableComponent;
-import crazypants.enderio.tool.ToolUtil;
-import crazypants.util.BlockCoord;
 import java.util.List;
+
 import mekanism.api.gas.GasStack;
 import mekanism.api.gas.IGasHandler;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.MovingObjectPosition;
-import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
+import crazypants.enderio.conduit.AbstractConduitNetwork;
+import crazypants.enderio.conduit.ConduitUtil;
+import crazypants.enderio.conduit.ConnectionMode;
+import crazypants.enderio.conduit.RaytraceResult;
+import crazypants.enderio.tool.ToolUtil;
+import crazypants.util.BlockCoord;
 
 public abstract class AbstractGasTankConduit
   extends AbstractGasConduit
diff --git a/src/Java/miscutil/enderio/conduit/gas/AbstractGasTankConduitNetwork.java b/src/Java/miscutil/enderio/conduit/gas/AbstractGasTankConduitNetwork.java
index 62d8daa205..ec75d1319e 100644
--- a/src/Java/miscutil/enderio/conduit/gas/AbstractGasTankConduitNetwork.java
+++ b/src/Java/miscutil/enderio/conduit/gas/AbstractGasTankConduitNetwork.java
@@ -1,7 +1,7 @@
-package crazypants.enderio.conduit.gas;
+package miscutil.enderio.conduit.gas;
 
-import crazypants.enderio.conduit.AbstractConduitNetwork;
 import mekanism.api.gas.GasStack;
+import crazypants.enderio.conduit.AbstractConduitNetwork;
 
 public class AbstractGasTankConduitNetwork<T extends AbstractGasTankConduit>
   extends AbstractConduitNetwork<IGasConduit, T>
diff --git a/src/Java/miscutil/enderio/conduit/gas/ConduitGasTank.java b/src/Java/miscutil/enderio/conduit/gas/ConduitGasTank.java
index 521e08a589..3e944a2f2c 100644
--- a/src/Java/miscutil/enderio/conduit/gas/ConduitGasTank.java
+++ b/src/Java/miscutil/enderio/conduit/gas/ConduitGasTank.java
@@ -1,6 +1,5 @@
-package crazypants.enderio.conduit.gas;
+package miscutil.enderio.conduit.gas;
 
-import mekanism.api.gas.Gas;
 import mekanism.api.gas.GasStack;
 import mekanism.api.gas.GasTank;
 import net.minecraft.nbt.NBTTagCompound;
diff --git a/src/Java/miscutil/enderio/conduit/gas/GasConduit.java b/src/Java/miscutil/enderio/conduit/gas/GasConduit.java
index 59300c4aa8..bac24cabfd 100644
--- a/src/Java/miscutil/enderio/conduit/gas/GasConduit.java
+++ b/src/Java/miscutil/enderio/conduit/gas/GasConduit.java
@@ -1,26 +1,25 @@
-package crazypants.enderio.conduit.gas;
+package miscutil.enderio.conduit.gas;
 
+import java.util.HashMap;
+import java.util.Map;
+
+import mekanism.api.gas.Gas;
+import mekanism.api.gas.GasStack;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.World;
+import net.minecraftforge.common.util.ForgeDirection;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import crazypants.enderio.EnderIO;
 import crazypants.enderio.conduit.AbstractConduitNetwork;
 import crazypants.enderio.conduit.ConnectionMode;
 import crazypants.enderio.conduit.IConduit;
-import crazypants.enderio.conduit.IConduitBundle;
 import crazypants.enderio.conduit.geom.CollidableComponent;
 import crazypants.enderio.config.Config;
 import crazypants.render.IconUtil;
-import crazypants.render.IconUtil.IIconProvider;
 import crazypants.util.BlockCoord;
-import java.util.HashMap;
-import java.util.Map;
-import mekanism.api.gas.Gas;
-import mekanism.api.gas.GasStack;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.IIcon;
-import net.minecraft.world.World;
-import net.minecraftforge.common.util.ForgeDirection;
 
 public class GasConduit
   extends AbstractGasTankConduit
diff --git a/src/Java/miscutil/enderio/conduit/gas/GasConduitNetwork.java b/src/Java/miscutil/enderio/conduit/gas/GasConduitNetwork.java
index 43db642248..a93a418627 100644
--- a/src/Java/miscutil/enderio/conduit/gas/GasConduitNetwork.java
+++ b/src/Java/miscutil/enderio/conduit/gas/GasConduitNetwork.java
@@ -1,21 +1,18 @@
-package crazypants.enderio.conduit.gas;
+package miscutil.enderio.conduit.gas;
 
-import cpw.mods.fml.common.gameevent.TickEvent.ServerTickEvent;
-import crazypants.enderio.conduit.ConduitNetworkTickHandler;
-import crazypants.enderio.conduit.ConduitNetworkTickHandler.TickListener;
-import crazypants.enderio.conduit.ConnectionMode;
-import crazypants.enderio.conduit.IConduit;
-import crazypants.enderio.conduit.IConduitBundle;
-import crazypants.util.BlockCoord;
 import java.util.HashSet;
 import java.util.Iterator;
-import java.util.List;
 import java.util.Set;
+
 import mekanism.api.gas.GasStack;
 import mekanism.api.gas.IGasHandler;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
+import cpw.mods.fml.common.gameevent.TickEvent;
+import crazypants.enderio.conduit.ConduitNetworkTickHandler;
+import crazypants.enderio.conduit.IConduit;
+import crazypants.util.BlockCoord;
 
 public class GasConduitNetwork
   extends AbstractGasTankConduitNetwork<GasConduit>
@@ -27,7 +24,7 @@ public class GasConduitNetwork
   private boolean lastSyncedActive = false;
   private int lastSyncedVolume = -1;
   private long timeAtLastApply;
-  private final InnerTickHandler tickHandler = new InnerTickHandler(null);
+  private final InnerTickHandler tickHandler = new InnerTickHandler();
   
   public GasConduitNetwork()
   {
diff --git a/src/Java/miscutil/enderio/conduit/gas/GasConduitRenderer.java b/src/Java/miscutil/enderio/conduit/gas/GasConduitRenderer.java
index 9b53361b44..b8b6450a47 100644
--- a/src/Java/miscutil/enderio/conduit/gas/GasConduitRenderer.java
+++ b/src/Java/miscutil/enderio/conduit/gas/GasConduitRenderer.java
@@ -1,7 +1,13 @@
-package crazypants.enderio.conduit.gas;
+package miscutil.enderio.conduit.gas;
 
+import java.util.List;
+
+import mekanism.api.gas.GasStack;
+import net.minecraft.client.renderer.RenderBlocks;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.util.IIcon;
+import net.minecraftforge.common.util.ForgeDirection;
 import crazypants.enderio.EnderIO;
-import crazypants.enderio.conduit.BlockConduitBundle;
 import crazypants.enderio.conduit.ConnectionMode;
 import crazypants.enderio.conduit.IConduit;
 import crazypants.enderio.conduit.IConduitBundle;
@@ -13,16 +19,8 @@ import crazypants.enderio.conduit.render.DefaultConduitRenderer;
 import crazypants.render.BoundingBox;
 import crazypants.render.CubeRenderer;
 import crazypants.render.RenderUtil;
-import crazypants.vecmath.Vector2f;
 import crazypants.vecmath.Vector3d;
 import crazypants.vecmath.Vertex;
-import java.util.List;
-import mekanism.api.gas.Gas;
-import mekanism.api.gas.GasStack;
-import net.minecraft.client.renderer.RenderBlocks;
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.util.IIcon;
-import net.minecraftforge.common.util.ForgeDirection;
 
 public class GasConduitRenderer
   extends DefaultConduitRenderer
@@ -146,7 +144,7 @@ public class GasConduitRenderer
   {
     int[] res = { -1, -1 };
     boolean highest = (edge.offsetX > 0) || (edge.offsetY > 0) || (edge.offsetZ > 0);
-    double minMax = highest ? -1.797693134862316E+308D : 1.7976931348623157E+308D;
+    double minMax = /*highest ? -1.797693134862316E+308D :*/ 1.7976931348623157E+308D;
     int index = 0;
     for (Vertex v : vertices)
     {
diff --git a/src/Java/miscutil/enderio/conduit/gas/GasOutput.java b/src/Java/miscutil/enderio/conduit/gas/GasOutput.java
index f8757b204d..ff0c699700 100644
--- a/src/Java/miscutil/enderio/conduit/gas/GasOutput.java
+++ b/src/Java/miscutil/enderio/conduit/gas/GasOutput.java
@@ -1,7 +1,7 @@
-package crazypants.enderio.conduit.gas;
+package miscutil.enderio.conduit.gas;
 
-import crazypants.util.BlockCoord;
 import net.minecraftforge.common.util.ForgeDirection;
+import crazypants.util.BlockCoord;
 
 public class GasOutput
 {
diff --git a/src/Java/miscutil/enderio/conduit/gas/GasUtil.java b/src/Java/miscutil/enderio/conduit/gas/GasUtil.java
index fcc02ca942..7b85ee017b 100644
--- a/src/Java/miscutil/enderio/conduit/gas/GasUtil.java
+++ b/src/Java/miscutil/enderio/conduit/gas/GasUtil.java
@@ -1,16 +1,14 @@
-package crazypants.enderio.conduit.gas;
+package miscutil.enderio.conduit.gas;
 
+import mekanism.api.gas.GasStack;
+import mekanism.api.gas.IGasHandler;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.IBlockAccess;
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.ModContainer;
 import crazypants.enderio.conduit.IConduitBundle;
 import crazypants.enderio.config.Config;
 import crazypants.util.BlockCoord;
-import java.util.Map;
-import mekanism.api.gas.Gas;
-import mekanism.api.gas.GasStack;
-import mekanism.api.gas.IGasHandler;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.IBlockAccess;
 
 public final class GasUtil
 {
diff --git a/src/Java/miscutil/enderio/conduit/gas/IGasConduit.java b/src/Java/miscutil/enderio/conduit/gas/IGasConduit.java
index 6b09293e63..1f79988a82 100644
--- a/src/Java/miscutil/enderio/conduit/gas/IGasConduit.java
+++ b/src/Java/miscutil/enderio/conduit/gas/IGasConduit.java
@@ -1,9 +1,9 @@
-package crazypants.enderio.conduit.gas;
+package miscutil.enderio.conduit.gas;
 
-import crazypants.enderio.conduit.IConduit;
-import crazypants.enderio.conduit.IExtractor;
 import mekanism.api.gas.IGasHandler;
 import net.minecraftforge.common.util.ForgeDirection;
+import crazypants.enderio.conduit.IConduit;
+import crazypants.enderio.conduit.IExtractor;
 
 public abstract interface IGasConduit
   extends IConduit, IGasHandler, IExtractor
diff --git a/src/Java/miscutil/enderio/conduit/gas/ItemGasConduit.java b/src/Java/miscutil/enderio/conduit/gas/ItemGasConduit.java
index d09e657023..887b0edd28 100644
--- a/src/Java/miscutil/enderio/conduit/gas/ItemGasConduit.java
+++ b/src/Java/miscutil/enderio/conduit/gas/ItemGasConduit.java
@@ -1,5 +1,9 @@
-package crazypants.enderio.conduit.gas;
+package miscutil.enderio.conduit.gas;
 
+import java.util.List;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import crazypants.enderio.ModObject;
@@ -10,9 +14,6 @@ import crazypants.enderio.config.Config;
 import crazypants.enderio.gui.IAdvancedTooltipProvider;
 import crazypants.enderio.gui.TooltipAddera;
 import crazypants.util.Lang;
-import java.util.List;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
 
 public class ItemGasConduit
   extends AbstractItemConduit
diff --git a/src/Java/miscutil/enderio/conduit/gas/PacketGasLevel.java b/src/Java/miscutil/enderio/conduit/gas/PacketGasLevel.java
index 15ea65840a..a7f90f67a4 100644
--- a/src/Java/miscutil/enderio/conduit/gas/PacketGasLevel.java
+++ b/src/Java/miscutil/enderio/conduit/gas/PacketGasLevel.java
@@ -1,15 +1,13 @@
-package crazypants.enderio.conduit.gas;
+package miscutil.enderio.conduit.gas;
 
+import io.netty.buffer.ByteBuf;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
 import cpw.mods.fml.common.network.ByteBufUtils;
 import cpw.mods.fml.common.network.simpleimpl.IMessage;
 import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
 import cpw.mods.fml.common.network.simpleimpl.MessageContext;
-import crazypants.enderio.conduit.IConduitBundle;
 import crazypants.enderio.network.MessageTileEntity;
-import crazypants.util.ClientUtil;
-import io.netty.buffer.ByteBuf;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
 
 public class PacketGasLevel
   extends MessageTileEntity<TileEntity>
@@ -40,7 +38,7 @@ public class PacketGasLevel
   
   public IMessage onMessage(PacketGasLevel message, MessageContext ctx)
   {
-    ClientUtil.doGasLevelUpdate(message.x, message.y, message.z, message);
+    //ClientUtil.doGasLevelUpdate(message.x, message.y, message.z, message);
     return null;
   }
 }
diff --git a/src/Java/miscutil/gregtech/enums/GregtechItemList.java b/src/Java/miscutil/gregtech/enums/GregtechItemList.java
index fb09dc36cb..9e663e05c8 100644
--- a/src/Java/miscutil/gregtech/enums/GregtechItemList.java
+++ b/src/Java/miscutil/gregtech/enums/GregtechItemList.java
@@ -31,7 +31,8 @@ public enum GregtechItemList implements GregtechItemContainer {
  Energy_Buffer_CREATIVE,
 	//Energy Buffes
 	Energy_Buffer_1by1_ULV, Energy_Buffer_1by1_LV, Energy_Buffer_1by1_MV, Energy_Buffer_1by1_HV, Energy_Buffer_1by1_EV, Energy_Buffer_1by1_IV, Energy_Buffer_1by1_LuV, Energy_Buffer_1by1_ZPM, Energy_Buffer_1by1_UV, Energy_Buffer_1by1_MAX,
-	Cobble_Generator_ULV, Cobble_Generator_LV, Cobble_Generator_MV, Cobble_Generator_HV, Cobble_Generator_EV, Cobble_Generator_IV, Cobble_Generator_LuV, Cobble_Generator_ZPM, Cobble_Generator_UV, Cobble_Generator_MAX;
+	Cobble_Generator_ULV, Cobble_Generator_LV, Cobble_Generator_MV, Cobble_Generator_HV, Cobble_Generator_EV, Cobble_Generator_IV, Cobble_Generator_LuV, Cobble_Generator_ZPM, Cobble_Generator_UV, Cobble_Generator_MAX,
+	Condensor_MAX;
 
 	public static final GregtechItemList[]
  DYE_ONLY_ITEMS = {
diff --git a/src/Java/miscutil/gregtech/init/InitGregtech.java b/src/Java/miscutil/gregtech/init/InitGregtech.java
index cabb0357cb..635443e70d 100644
--- a/src/Java/miscutil/gregtech/init/InitGregtech.java
+++ b/src/Java/miscutil/gregtech/init/InitGregtech.java
@@ -4,6 +4,7 @@ import static miscutil.core.lib.LoadedMods.Gregtech;
 import miscutil.core.util.Utils;
 import miscutil.gregtech.init.machines.GregtechConduits;
 import miscutil.gregtech.init.machines.GregtechEnergyBuffer;
+import miscutil.gregtech.init.machines.GregtechSteamCondenser;
 
 public class InitGregtech {
 
@@ -22,6 +23,7 @@ public class InitGregtech {
 		// GregtechCobbleGenerator.run(); TODO - Weird Textures
 		GregtechEnergyBuffer.run();
 		GregtechConduits.run();
+		GregtechSteamCondenser.run();
 
 	}
 }
diff --git a/src/Java/miscutil/gregtech/init/machines/GregtechConduits.java b/src/Java/miscutil/gregtech/init/machines/GregtechConduits.java
index 9f1847f9a3..c0822f5c4e 100644
--- a/src/Java/miscutil/gregtech/init/machines/GregtechConduits.java
+++ b/src/Java/miscutil/gregtech/init/machines/GregtechConduits.java
@@ -28,7 +28,7 @@ public class GregtechConduits {
 	
 	private static void run1(){
 		wireFactory("Blutonium", 8196, 30600, 1, 8, 2);
-		wireFactory("Cheese", 8, 30615, 3,6,9);
+		wireFactory("Helium", 8, 30615, 3,6,9);
 		wireFactory("HSLA", 128, 30630, 4, 8, 1);
 	}	
 	
diff --git a/src/Java/miscutil/gregtech/init/machines/GregtechEnergyBuffer.java b/src/Java/miscutil/gregtech/init/machines/GregtechEnergyBuffer.java
index 4823f446fb..6142a2dc0c 100644
--- a/src/Java/miscutil/gregtech/init/machines/GregtechEnergyBuffer.java
+++ b/src/Java/miscutil/gregtech/init/machines/GregtechEnergyBuffer.java
@@ -71,7 +71,7 @@ public class GregtechEnergyBuffer
 		GT_ModHandler.addCraftingRecipe(GregtechItemList.Energy_Buffer_1by1_ZPM.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_ZPM, Character.valueOf('W'), OrePrefixes.wireGt08.get(Materials.Osmium), Character.valueOf('T'), ExtraOreDictNames.buffer_core });
 		GT_ModHandler.addCraftingRecipe(GregtechItemList.Energy_Buffer_1by1_UV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_UV, Character.valueOf('W'), OrePrefixes.wireGt08.get(Materials.Osmium), Character.valueOf('T'), ExtraOreDictNames.buffer_core });
 		GT_ModHandler.addCraftingRecipe(GregtechItemList.Energy_Buffer_1by1_MAX.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_MAX, Character.valueOf('W'), OrePrefixes.wireGt08.get(Materials.Superconductor), Character.valueOf('T'), ExtraOreDictNames.buffer_core });
-		GT_ModHandler.addCraftingRecipe(
+		/*GT_ModHandler.addCraftingRecipe(
 				GregtechItemList.Energy_Buffer_1by1_MAX.get(1L, new Object[0]),
 				GT_ModHandler.RecipeBits.DISMANTLEABLE
 						| GT_ModHandler.RecipeBits.NOT_REMOVABLE
@@ -80,7 +80,7 @@ public class GregtechEnergyBuffer
 						"WTW", "WMW", Character.valueOf('M'),
 						ItemList.Hull_MAX, Character.valueOf('W'),
 						OrePrefixes.wireGt08.get(Materials.Superconductor),
-						Character.valueOf('T'), ExtraOreDictNames.buffer_core });
+						Character.valueOf('T'), ExtraOreDictNames.buffer_core });*/
 		
 		
 		
diff --git a/src/Java/miscutil/gregtech/metatileentity/implementations/GregtechMetaEnergyBuffer.java b/src/Java/miscutil/gregtech/metatileentity/implementations/GregtechMetaEnergyBuffer.java
index 46add14c15..7f70b7bff6 100644
--- a/src/Java/miscutil/gregtech/metatileentity/implementations/GregtechMetaEnergyBuffer.java
+++ b/src/Java/miscutil/gregtech/metatileentity/implementations/GregtechMetaEnergyBuffer.java
@@ -18,14 +18,21 @@ import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_Utility;
 import ic2.api.item.IElectricItem;
+
+import java.util.List;
+
 import miscutil.core.handler.GuiHandler;
 import miscutil.core.util.Utils;
-import miscutil.gregtech.util.IMessage;
+import miscutil.core.waila.IWailaInfoProvider;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.world.World;
+import crazypants.enderio.gui.TooltipAddera;
+import crazypants.util.Lang;
+import crazypants.util.Util;
 
 /**
  * NEVER INCLUDE THIS FILE IN YOUR MOD!!!
@@ -33,7 +40,7 @@ import net.minecraft.world.World;
  * This is the main construct for my Basic Machines such as the Automatic Extractor
  * Extend this class to make a simple Machine
  */
-public class GregtechMetaEnergyBuffer extends GregtechMetaTileEntity {
+public class GregtechMetaEnergyBuffer extends GregtechMetaTileEntity implements IWailaInfoProvider{
 
 	/*
 	 * public GregtechMetaEnergyBuffer() { super.this
@@ -45,6 +52,7 @@ public class GregtechMetaEnergyBuffer extends GregtechMetaTileEntity {
 
 	public GregtechMetaEnergyBuffer(int aID, String aName, String aNameRegional, int aTier, String aDescription, int aSlotCount) {
 		super(aID, aName, aNameRegional, aTier, aSlotCount, aDescription);
+		//setCreativeTab(AddToCreativeTab.tabMachines);
 	}
 
 	public GregtechMetaEnergyBuffer(String aName, int aTier, String aDescription, ITexture[][][] aTextures, int aSlotCount) {
@@ -53,7 +61,7 @@ public class GregtechMetaEnergyBuffer extends GregtechMetaTileEntity {
 
 	@Override
 	public String[] getDescription() {
-		return new String[] {mDescription, mInventory.length + " Slots"};
+		return new String[] {mDescription, "Added by: "	+ EnumChatFormatting.DARK_GREEN+"Alkalus"};
 	}
 
 	/*
@@ -64,10 +72,10 @@ public class GregtechMetaEnergyBuffer extends GregtechMetaTileEntity {
 		ITexture[][][] rTextures = new ITexture[2][17][];
 		for (byte i = -1; i < 16; i++) {
 			rTextures[0][i + 1] = new ITexture[] { new GT_RenderedTexture(
-					Textures.BlockIcons.MACHINE_CASING_FROST_PROOF) };
+					Textures.BlockIcons.MACHINE_HEATPROOFCASING) };
 			rTextures[1][i + 1] = new ITexture[] {
 					new GT_RenderedTexture(
-							Textures.BlockIcons.MACHINE_CASING_FROST_PROOF),
+							Textures.BlockIcons.MACHINE_HEATPROOFCASING),
 					mInventory.length > 4 ? Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[mTier]
 							: Textures.BlockIcons.OVERLAYS_ENERGY_OUT[mTier] };
 		}
@@ -171,7 +179,7 @@ public class GregtechMetaEnergyBuffer extends GregtechMetaTileEntity {
 		final double c = ((double) getProgresstime() / maxProgresstime()) * 100;
 		Utils.LOG_WARNING(""+c);
 		final double roundOff = Math.round(c * 100.0) / 100.0;
-		IMessage.messageThePlayer("Energy: " + getProgresstime() + " EU at "+V[mTier]+"v ("+roundOff+"%)");
+		Utils.messagePlayer(playerIn, "Energy: " + getProgresstime() + " EU at "+V[mTier]+"v ("+roundOff+"%)");
 		Utils.LOG_WARNING("Making new instance of Guihandler");
 		GuiHandler block = new GuiHandler();
 		Utils.LOG_WARNING("Guihandler.toString(): "+block.toString());
@@ -398,4 +406,40 @@ public class GregtechMetaEnergyBuffer extends GregtechMetaTileEntity {
 		// TODO Auto-generated method stub
 		return false;
 	}
+
+	@Override
+	public void getWailaInfo(List<String> tooltip, EntityPlayer player, World world, int x, int y, int z) {
+	        String format = Util.TAB + Util.ALIGNRIGHT + EnumChatFormatting.WHITE;
+	        if(TooltipAddera.showAdvancedTooltips()) {
+	          tooltip.add(String.format("%s : %s%s%sRF/t ", Lang.localize("capbank.maxIO"), format, fmt.format(this.maxEUStore()), Util.TAB + Util.ALIGNRIGHT));
+	          tooltip
+	              .add(String.format("%s : %s%s%sRF/t ", Lang.localize("capbank.maxIn"), format, fmt.format(this.maxEUInput()), Util.TAB + Util.ALIGNRIGHT));
+	          tooltip
+	              .add(String.format("%s : %s%s%sRF/t ", Lang.localize("capbank.maxOut"), format, fmt.format(this.maxEUOutput()), Util.TAB + Util.ALIGNRIGHT));
+
+	          tooltip.add("");
+	        }
+
+	        long stored = this.getProgresstime();
+	        long max = this.maxEUStore();
+	        tooltip.add(String.format("%s%s%s / %s%s%s RF", EnumChatFormatting.WHITE, fmt.format(stored), EnumChatFormatting.RESET, EnumChatFormatting.WHITE,
+	            fmt.format(max),
+	            EnumChatFormatting.RESET));
+
+	        //int change = Math.round(nw.getAverageChangePerTick());
+	        String color = EnumChatFormatting.WHITE.toString();
+	       /* if(change > 0) {
+	          color = EnumChatFormatting.GREEN.toString() + "+";
+	        } else if(change < 0) {
+	          color = EnumChatFormatting.RED.toString();
+	        }*/
+	        tooltip
+	            .add(String.format("%s%s%sRF/t ", color, fmt.format("null"), " " + EnumChatFormatting.RESET.toString()));
+
+	      }
+
+	@Override
+	public int getDefaultDisplayMask(World paramWorld, int paramInt1, int paramInt2, int paramInt3) {
+		return IWailaInfoProvider.BIT_DETAILED;
+	}
 }
\ No newline at end of file
diff --git a/src/Java/miscutil/gregtech/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java b/src/Java/miscutil/gregtech/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java
index a4ebe2e9c2..11aa483a15 100644
--- a/src/Java/miscutil/gregtech/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java
+++ b/src/Java/miscutil/gregtech/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java
@@ -222,7 +222,7 @@ public class GregtechMetaPipeEntity_Cable extends GT_MetaPipeEntity_Cable implem
 				"Max Voltage: "			+ EnumChatFormatting.GREEN	+ mVoltage + " (" + VN[GT_Utility.getTier(mVoltage)]	+ ")" + EnumChatFormatting.GRAY,
 				"Max Amperage: "		+ EnumChatFormatting.YELLOW	+ mAmperage + EnumChatFormatting.GRAY,
 				"Loss/Meter/Ampere: "	+ EnumChatFormatting.RED	+ mCableLossPerMeter + EnumChatFormatting.GRAY + " EU-Volt",
-				"Added by: "	+ EnumChatFormatting.RED+" Alkalus"
+				"Added by:"	+ EnumChatFormatting.DARK_GREEN+" Alkalus"
 		};
 	}
 
diff --git a/src/Java/miscutil/gregtech/metatileentity/implementations/GregtechMetaTileEntity.java b/src/Java/miscutil/gregtech/metatileentity/implementations/GregtechMetaTileEntity.java
index c95c7ba75a..669786c423 100644
--- a/src/Java/miscutil/gregtech/metatileentity/implementations/GregtechMetaTileEntity.java
+++ b/src/Java/miscutil/gregtech/metatileentity/implementations/GregtechMetaTileEntity.java
@@ -34,6 +34,7 @@ public abstract class GregtechMetaTileEntity extends MetaTileEntity {
 		mTier = (byte)aTier;
 		mDescription = aDescription;
 		mTextures = aTextures;
+		
 	}
 	
 	@Override