Added fix for out of memory loop on repeated player reconnection (should hopefully also fix pokemon going missing on reconnection)
Extended API to handle events on pokemon fainting and trainer being beaten
Merge branch 'master' of https://github.com/MrMasochism/Pixelmon
fix to events api
made it so all players withing 10 distance can see healer working
formatted some files
added workaround for minecraft potions crashing the game.
Added hovering to baseStats
added a catch for a crash in battles
added PlayerNotLoadedException
updated to forge 686
fixed bug in base stat loading and changed the way it picks up the database from the file server
ninetales and small change to moltres
Machamp and machop
Nidoking
Merge pull request #905 from LightAdept/master

Models
made pokespawn work with command blocks
Fix to trade machine
Fix to download helper
Fixed disconnecting from a server and reconnecting providing pokemon in the side bar