Make fluids in pipes and tanks keep their NBT tags (#1333)

Make fluids in pipes and tanks keep their NBT tags, fixes issue #1333

Everything has been tested and works perfectly for as far as I can see.