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

@ -66,7 +66,7 @@ public class StackToolTipHandler implements ItemTooltipCallback {
ItemTooltipCallback.EVENT.register(new StackToolTipHandler());
// WIP injection
wipBlocks.add(TRContent.Machine.DRAIN.block);
// wipBlocks.add(TRContent.Machine.NAME.block);
}