Merge branch '1.15' into 1.16

Need to fix up storage unit UI
This commit is contained in:
Justin Vitale 2020-06-18 22:39:26 +10:00
commit 390d9f7059
34 changed files with 311 additions and 87 deletions

View file

@ -50,7 +50,7 @@ public class StorageUnitRenderer extends BlockEntityRenderer<StorageUnitBaseBloc
if (storage.getWorld() == null) {
return;
}
ItemStack stack = storage.getStoredStack();
ItemStack stack = storage.getDisplayedStack();
if (stack.isEmpty()) {
return;
}