Merge branch '1.15' into 1.16
Need to fix up storage unit UI
This commit is contained in:
commit
390d9f7059
34 changed files with 311 additions and 87 deletions
|
@ -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);
|
||||
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue