Merge branch 'master' into flattening_test

This commit is contained in:
Vincent Lee committed 2018-03-29 19:09:19 -05:00
commit 58fa185ef4
17 files changed
+110 -128

No files matched your search

@@ -196,6 +196,7 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon
return TilePool.calculateComparatorLevel(pool.getCurrentMana(), pool.manaCap);
}
@SideOnly(Side.CLIENT)
@Override
public void renderHUD(Minecraft mc, ScaledResolution res, World world, BlockPos pos) {
((TilePool) world.getTileEntity(pos)).renderHUD(mc, res);