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

@@ -42,8 +42,6 @@ public abstract class TileEntityBasicBlock extends TileEntity implements ITileNe
public EnumFacing clientFacing = facing;
public HashSet<EntityPlayer> openedThisTick = new HashSet<EntityPlayer>();
/** The players currently using this block. */
public HashSet<EntityPlayer> playersUsing = new HashSet<EntityPlayer>();
@@ -80,8 +78,6 @@ public abstract class TileEntityBasicBlock extends TileEntity implements ITileNe
if(!worldObj.isRemote)
{
openedThisTick.clear();
if(doAutoSync && playersUsing.size() > 0)
{
for(EntityPlayer player : playersUsing)