Merge remote-tracking branch 'remotes/origin/1.15' into 1.16

# Conflicts:
#	build.gradle
#	src/main/java/techreborn/client/GuiHandler.java
This commit is contained in:
modmuss50 2020-04-09 00:55:38 +01:00
commit 0bf6159801
30 changed files with 374 additions and 231 deletions

View file

@ -335,7 +335,7 @@ public class FusionControlComputerBlockEntity extends PowerAcceptorBlockEntity
if (!hasStartedCrafting) {
return 0;
}
return Integer.MAX_VALUE;
return TechRebornConfig.fusionControlComputerMaxOutput;
}
@Override