increased badge stack size
Merge pull request #861 from LightAdept/master

Seadra, weepinbell, machoke, seel, Jynx, and Mr.Mime
Merge branch 'master' of https://github.com/MrMasochism/Pixelmon
moved firestone spawning to a 2 block radius horizontally around lava
Merge remote-tracking branch 'origin/master'
Moltres and Articuno.
Golduck, Nidorino, Pinsir, and the Head of Onix (onix needs work)