Merge remote-tracking branch 'remotes/origin/1.14' into 1.15
# Conflicts: # build.gradle # src/main/java/techreborn/client/render/DynamicBucketBakedModel.java # src/main/java/techreborn/client/render/DynamicCellBakedModel.java
This commit is contained in:
commit
2d8961589d
219 changed files with 2205 additions and 1634 deletions
|
@ -132,7 +132,7 @@ public class RollingMachineBlockEntity extends PowerAcceptorBlockEntity
|
|||
if (!currentRecipeOutput.isEmpty()) {
|
||||
boolean hasCrafted = false;
|
||||
if (inventory.getInvStack(outputSlot).isEmpty()) {
|
||||
inventory.setInvStack(outputSlot, currentRecipeOutput);
|
||||
inventory.setInvStack(outputSlot, currentRecipeOutput.copy());
|
||||
tickTime = 0;
|
||||
hasCrafted = true;
|
||||
} else {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue