Cleared out old LockedInBattle effect stuff for coming rewrite
Updated moves with database effect column importing to make more generic
code
Replaced setEntityHealth with attackEntityFrom, we missed that one
Added HealOther
Worked on disable stuff
Nothing really
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/MrMasochism/Pixelmon.git
Pokedex updates on evolving a pokemon
I dunno what I did, but FireBreather is able to be custom spawned now
O.o
Merge remote-tracking branch 'origin/master'
Nearly finished Disable, and Started on generalized OHKO class
Removed unused class and I have no idea what went on with Skeleton
Quadruped
Forgot to clear out other stuff from old Restore class
Disable stuff some more
Probably should ignore this commit
Wrote generalized class for OHKO Moves. Accuracy methods weren't working
too.
Sigh, eclipse issues
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	minecraft/pixelmon/client/models/pokemon/ModelBulbasaur.java