Merged current master into branch (with manual changes)

This commit is contained in:
Timmeey86 2018-11-30 21:33:09 +01:00
commit 149f7a1d9d
102 changed files with 1684 additions and 1604 deletions

View file

@ -96,6 +96,10 @@ public class PowerTestFixture{
tile.entity.power = new PowerModule();
tile.entity.power.graph.add(tile);
}
// Assign incredibly high health so the block does not get destroyed on e.g. burning Blast Compound
block.health *= 100.0f;
return tile;
}catch(Exception ex){
return null;