Fixed poisonBadly, using latest move data (look it up Mr M, you old
school guy you)
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/MrMasochism/Pixelmon
Merge branch 'master' of https://github.com/MrMasochism/Pixelmon
working on fixing choice items - its messy
Added Last Resort, fully working, tested
Fixed moves that miss adding to the attackList
Merge remote-tracking branch 'origin/master'
Updated to mc 1.6.2 - Check readme.md!
Merged rods and hooks into single classes - needs testing
Gotta commit to update.
Merge branch 'master' of https://github.com/MrMasochism/Pixelmon

Conflicts:
	minecraft/pixelmon/client/ClientProxy.java
	minecraft/pixelmon/config/PixelmonItems.java
Update CommandSpawn.java
Double Faint message, nullpointer fix.
Removing a Faint message.. not needed
Heal Fix
Merge pull request #1 from Rhonim/Several-Fixes

Merging to master..
Merge pull request #1096 from Rhonim/Several-Fixes

Several fixes
tried to fix up movespeed.  Mojang have completely stuffed it up
CONFUSION FIX: Pokemon now attack on the turn they snap out of confusion