Merge remote-tracking branch 'upstream/1.11' into 1.12

This commit is contained in:
Tom Elfring committed 2017-08-04 18:49:20 +02:00
commit c9dc4c0ac0
468 files changed
+1602 -9935

No files matched your search

@@ -216,6 +216,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I
if(set.cardinality() == 0)
{
it.remove();
break;
}
next = index + 1;
@@ -233,6 +234,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I
if(set.cardinality() == 0)
{
it.remove();
break;
}
next = index + 1;