Merge branch 'development' into 1.9.4

* development:
  Fixed Robit AI
  Fixed Robit dupe glitch
  Fixed the stupid invalid frequency issue

Conflicts:
	src/main/java/mekanism/client/ClientProxy.java
	src/main/java/mekanism/client/gui/GuiRobitCrafting.java
	src/main/java/mekanism/client/gui/GuiRobitRepair.java
	src/main/java/mekanism/common/CommonProxy.java
	src/main/java/mekanism/common/RobitAIPickup.java
	src/main/java/mekanism/common/inventory/container/ContainerRobitCrafting.java
	src/main/java/mekanism/common/inventory/container/ContainerRobitRepair.java
	src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java
This commit is contained in:
aidancbrady committed 2016-07-05 18:42:43 -04:00
commit 3505d553d9
15 files changed
+91 -69

No files matched your search

+19 -9
View File
@@ -741,23 +741,33 @@ public class ClientProxy extends CommonProxy
return new GuiRobitMain(player.inventory, robit);
}
case 22:
return new GuiRobitCrafting(player.inventory, world, pos.getX());
case 23:
EntityRobit robit1 = (EntityRobit)world.getEntityByID(pos.getX());
robit = (EntityRobit)world.getEntityByID(pos.getX());
if(robit1 != null)
if(robit != null)
{
return new GuiRobitInventory(player.inventory, robit1);
return new GuiRobitCrafting(player.inventory, robit);
}
case 23:
robit = (EntityRobit)world.getEntityByID(pos.getX());
if(robit != null)
{
return new GuiRobitInventory(player.inventory, robit);
}
case 24:
EntityRobit robit2 = (EntityRobit)world.getEntityByID(pos.getX());
robit = (EntityRobit)world.getEntityByID(pos.getX());
if(robit2 != null)
if(robit != null)
{
return new GuiRobitSmelting(player.inventory, robit2);
return new GuiRobitSmelting(player.inventory, robit);
}
case 25:
return new GuiRobitRepair(player.inventory, world, pos.getX());
robit = (EntityRobit)world.getEntityByID(pos.getX());
if(robit != null)
{
return new GuiRobitRepair(player.inventory, robit);
}
case 29:
return new GuiChemicalOxidizer(player.inventory, (TileEntityChemicalOxidizer)tileEntity);
case 30: