Merge pull request #2703 from jediluke69/bleeding-edge-freeze

Adds new drinks and fixes a few things
should nerf nanopaste