getting there with the upgrade to 1.5
Merge branch 'master' of https://github.com/MrMasochism/Pixelmon