merged TileEntity changes