Merge branch 'development' into 1.8

This commit is contained in:
Ben Spiers committed 2014-07-31 15:59:30 +01:00
commit 4faa733106
16 files changed
+15 -15

No files matched your search

@@ -39,7 +39,7 @@ import mekanism.common.network.PacketScubaTankData.ScubaTankPacket;
import mekanism.common.network.PacketWalkieTalkieState.WalkieTalkieStateMessage;
import mekanism.common.util.LangUtils;
import mekanism.common.util.MekanismUtils;
import mekanism.common.util.StackUtils;
import mekanism.api.StackUtils;
import net.minecraft.client.Minecraft;
import net.minecraft.client.entity.AbstractClientPlayer;
import net.minecraft.entity.player.EntityPlayer;