Merge pull request #1292 from Xwaffle1/master

Added in Chikorita
Added optifine fix
Added getter for battleList (for safari games)
Merge branch 'master' of https://github.com/MrMasochism/Pixelmon
fixed type edit
added flexible settable starter list in preparation for the new starter screen
Merge branch 'master' of https://github.com/MrMasochism/Pixelmon