Merge branch 'development' into 1.8

Conflicts:
	src/main/java/mekanism/common/EnergyNetwork.java

src/main/java/mekanism/client/gui/GuiRobitMain.java

@@ -107,7 +107,7 @@ public class GuiRobitMain extends GuiMekanism
 		if(!displayNameChange)
 		{
 			CharSequence owner = robit.getOwnerName().length() > 14 ? robit.getOwnerName().subSequence(0, 14) : robit.getOwnerName();
-			fontRendererObj.drawString(MekanismUtils.localize("gui.robit.greeting") + " " + robit.getTranslatedEntityName() + "!", 29, 18, 0x00CD00);
+			fontRendererObj.drawString(MekanismUtils.localize("gui.robit.greeting") + " " + robit.getCommandSenderName() + "!", 29, 18, 0x00CD00);
 			fontRendererObj.drawString(MekanismUtils.localize("gui.energy") + ": " + MekanismUtils.getEnergyDisplay(robit.getEnergy()), 29, 36-4, 0x00CD00);
 			fontRendererObj.drawString(MekanismUtils.localize("gui.robit.following") + ": " + robit.getFollowing(), 29, 45-4, 0x00CD00);
 			fontRendererObj.drawString(MekanismUtils.localize("gui.robit.dropPickup") + ": " + robit.getDropPickup(), 29, 54-4, 0x00CD00);

src/main/java/mekanism/common/FuelHandler.java

@@ -1,15 +1,12 @@
-package mekanism.api.gas;
+package mekanism.common;
 
 import java.util.HashMap;
 
-import mekanism.common.Mekanism;
+import mekanism.api.gas.Gas;
-
 import net.minecraftforge.fluids.FluidContainerRegistry;
-
-import cpw.mods.fml.common.ModAPIManager;
-
 import buildcraft.api.fuels.IronEngineFuel;
 import buildcraft.api.fuels.IronEngineFuel.Fuel;
+import cpw.mods.fml.common.ModAPIManager;
 
 public class FuelHandler
 {

src/main/java/mekanism/common/Mekanism.java

@@ -18,7 +18,6 @@ import mekanism.api.MekanismAPI;
 import mekanism.api.MekanismAPI.BoxBlacklistEvent;
 import mekanism.api.PressurizedProducts;
 import mekanism.api.PressurizedReactants;
-import mekanism.api.gas.FuelHandler;
 import mekanism.api.gas.Gas;
 import mekanism.api.gas.GasNetwork.GasTransferEvent;
 import mekanism.api.gas.GasRegistry;

src/main/java/mekanism/common/entity/EntityRobit.java

@@ -19,7 +19,6 @@ import mekanism.common.item.ItemConfigurator;
 import mekanism.common.item.ItemRobit;
 import mekanism.common.tile.TileEntityChargepad;
 import mekanism.common.util.MekanismUtils;
-
 import micdoodle8.mods.galacticraft.api.entity.IEntityBreathable;
 import net.minecraft.entity.EntityCreature;
 import net.minecraft.entity.SharedMonsterAttributes;
@@ -43,7 +42,6 @@ import net.minecraftforge.common.ForgeHooks;
 import net.minecraftforge.common.util.Constants;
 import cpw.mods.fml.common.Optional.Interface;
 import cpw.mods.fml.common.Optional.Method;
-
 import cofh.api.energy.IEnergyContainerItem;
 
 @Interface(iface = "micdoodle8.mods.galacticraft.api.entity.IEntityBreathable", modid = "Galacticrat API")
@@ -405,7 +403,7 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine
 		ItemRobit item = (ItemRobit)entityItem.getEntityItem().getItem();
 		item.setEnergy(entityItem.getEntityItem(), getEnergy());
 		item.setInventory(getInventory(), entityItem.getEntityItem());
-		item.setName(entityItem.getEntityItem(), getTranslatedEntityName());
+		item.setName(entityItem.getEntityItem(), getCommandSenderName());
 
 		float k = 0.05F;
 		entityItem.motionX = 0;
@@ -723,7 +721,8 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine
 		return tagList;
 	}
 
-	public String getTranslatedEntityName()
+	@Override
+    public String getCommandSenderName()
 	{
 		return getName().isEmpty() ? "Robit" : getName();
 	}

src/main/java/mekanism/common/item/ItemAtomicDisassembler.java

@@ -97,6 +97,11 @@ public class ItemAtomicDisassembler extends ItemEnergized
 		{
 			Block block = player.worldObj.getBlock(x, y, z);
 			int meta = player.worldObj.getBlockMetadata(x, y, z);
+			
+			if(block == Blocks.lit_redstone_ore)
+			{
+				block = Blocks.redstone_ore;
+			}
 
 			ItemStack stack = new ItemStack(block, 1, meta);
 			Coord4D orig = new Coord4D(x, y, z, player.worldObj.provider.dimensionId);

src/main/java/mekanism/common/network/PacketLogisticalSorterGui.java

@@ -185,7 +185,7 @@ public class PacketLogisticalSorterGui implements IMessageHandler<LogisticalSort
 					}
 					else if(type == 5)
 					{
-						return new GuiTModIDFilter(player, (TileEntityLogisticalSorter)world.getTileEntity(x, y, z));
+						return new GuiTModIDFilter(player, (TileEntityLogisticalSorter)world.getTileEntity(x, y, z), index);
 					}
 				}
 			}

src/main/java/mekanism/generators/common/MekanismGenerators.java

@@ -4,9 +4,9 @@ import io.netty.buffer.ByteBuf;
 
 import java.io.IOException;
 
-import mekanism.api.gas.FuelHandler;
 import mekanism.api.gas.Gas;
 import mekanism.api.gas.GasRegistry;
+import mekanism.common.FuelHandler;
 import mekanism.common.IModule;
 import mekanism.common.Mekanism;
 import mekanism.common.Version;

src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java

@@ -4,8 +4,6 @@ import io.netty.buffer.ByteBuf;
 
 import java.util.ArrayList;
 
-import mekanism.api.gas.FuelHandler;
-import mekanism.api.gas.FuelHandler.FuelGas;
 import mekanism.api.gas.Gas;
 import mekanism.api.gas.GasRegistry;
 import mekanism.api.gas.GasStack;
@@ -14,8 +12,10 @@ import mekanism.api.gas.GasTransmission;
 import mekanism.api.gas.IGasHandler;
 import mekanism.api.gas.IGasItem;
 import mekanism.api.gas.ITubeConnection;
+import mekanism.common.FuelHandler;
 import mekanism.common.ISustainedData;
 import mekanism.common.Mekanism;
+import mekanism.common.FuelHandler.FuelGas;
 import mekanism.common.util.ChargeUtils;
 import mekanism.common.util.MekanismUtils;
 import net.minecraft.item.ItemStack;