Mercury is now rarer
Changed Mercury to use Forge's Fluid class
Added the mercury effects back
Merge remote branch 'origin/master'

Conflicts:
	src/floptower/fizzlecraft/Fizzlecraft.java
Merge branch 'master' of https://github.com/Floppygunk/ProjectFizzle

Conflicts:
	src/floptower/fizzlecraft/Fizzlecraft.java
Merge remote branch 'origin/master'