Merge remote-tracking branch 'origin/master' into master

This commit is contained in:
Ell 2020-09-02 22:06:54 +02:00
commit 2ab889c467

View file

@ -56,7 +56,7 @@ public class PipeTileEntity extends TileEntity implements INamedContainerProvide
return 1;
}
};
private List<PipeItem> items;
protected List<PipeItem> items;
private int lastItemAmount;
private int priority;