Merge pull request #781 from LightAdept/master

Tauros
Colored HP bars.
Merge pull request #783 from Zariu/master

Colored HP Bars
Fixed bonemeal causing crash
made it so if in a battle with another player and they drop the battle ends
Fix to buaxite gen
Fix to moveset crash on sending out pokemon
Fix to infinite player load loop
fix to effect parsing for stat-modifying moves
made the attack instance accessible in effects applyeffect
attack now passes crit into applyEffect
removed references to test collada library
added scale factor to riding offsets
added crit to all apply effect code
updated to 2.1.2
made it so that riding players dismount on world load to fix crash
Grimer and the start of OBJ importation