diff --git a/common/mekanism/client/render/tileentity/RenderDynamicTank.java b/common/mekanism/client/render/tileentity/RenderDynamicTank.java index 6f2edf07a..fb020e04f 100644 --- a/common/mekanism/client/render/tileentity/RenderDynamicTank.java +++ b/common/mekanism/client/render/tileentity/RenderDynamicTank.java @@ -61,7 +61,7 @@ public class RenderDynamicTank extends TileEntitySpecialRenderer if(tileEntity.structure.fluidStored.getFluid().isGaseous()) { - GL11.glColor4f(1F, 1F, 1F, (float)tileEntity.structure.fluidStored.amount / (float)tileEntity.clientCapacity); + GL11.glColor4f(1F, 1F, 1F, Math.min(1, ((float)tileEntity.structure.fluidStored.amount / (float)tileEntity.clientCapacity)+0.3F)); GL11.glCallList(displayList[getStages(data.height)-1]); } else { diff --git a/common/mekanism/common/item/ItemBlockOre.java b/common/mekanism/common/item/ItemBlockOre.java index 703487692..29a4837b8 100644 --- a/common/mekanism/common/item/ItemBlockOre.java +++ b/common/mekanism/common/item/ItemBlockOre.java @@ -48,6 +48,20 @@ public class ItemBlockOre extends ItemBlock list.add("It is known to have many uses in"); list.add("the construction of machinery."); } + else if(itemstack.getItemDamage() == 1) + { + list.add("A common, conductive material that"); + list.add("can be used in the production of."); + list.add("wires. It's ability to withstand"); + list.add("high heats also makes it essential"); + list.add("to advanced machinery."); + } + else if(itemstack.getItemDamage() == 2) + { + list.add("A lightweight, yet sturdy, conductive"); + list.add("material that is found slighly less"); + list.add("commonly than Copper."); + } } } diff --git a/common/mekanism/common/item/ItemConfigurator.java b/common/mekanism/common/item/ItemConfigurator.java index 9f77208c0..faed05fbd 100644 --- a/common/mekanism/common/item/ItemConfigurator.java +++ b/common/mekanism/common/item/ItemConfigurator.java @@ -23,8 +23,9 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChatMessageComponent; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; +import buildcraft.api.tools.IToolWrench; -public class ItemConfigurator extends ItemEnergized +public class ItemConfigurator extends ItemEnergized implements IToolWrench { public final int ENERGY_PER_CONFIGURE = 400; public final int ENERGY_PER_ITEM_DUMP = 8; @@ -302,4 +303,13 @@ public class ItemConfigurator extends ItemEnergized { return false; } + + @Override + public boolean canWrench(EntityPlayer player, int x, int y, int z) + { + return true; + } + + @Override + public void wrenchUsed(EntityPlayer player, int x, int y, int z) {} }