Merge branch '1.12' into feature/solar-panles

Conflicts:
	build.gradle
	src/main/java/techreborn/blocks/generator/BlockSolarPanel.java
	src/main/java/techreborn/blocks/lighting/BlockLamp.java
This commit is contained in:
drcrazy 2017-11-28 17:28:47 +03:00
commit eab088c094
77 changed files with 948 additions and 967 deletions

View file

@ -169,6 +169,11 @@ public class TileFusionControlComputer extends TilePowerAcceptor implements IToo
private boolean isCoil(final int x, final int y, final int z) {
return this.world.getBlockState(new BlockPos(x, y, z)).getBlock() == ModBlocks.FUSION_COIL;
}
@Override
public void onLoad() {
this.checkCoils();
}
@Override
public void update() {