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:
commit
0bf6159801
30 changed files with 374 additions and 231 deletions
|
@ -335,7 +335,7 @@ public class FusionControlComputerBlockEntity extends PowerAcceptorBlockEntity
|
|||
if (!hasStartedCrafting) {
|
||||
return 0;
|
||||
}
|
||||
return Integer.MAX_VALUE;
|
||||
return TechRebornConfig.fusionControlComputerMaxOutput;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue