1.6.1
fixed up all the rendering compiling issues
heaps more fixes
Merge pull request #1086 from Hiroku/master

Large amount of battle fixes and improvements, best to look at commits to get an idea of how much
fixed all but one compile error
The Flee effect no longer works during Trainer battles.
Merge pull request #1087 from KaiBB/master

The Flee effect no longer works during Trainer battles.
Fixed poisonBadly, using latest move data (look it up Mr M, you old
school guy you)
heaps more stuff for 1.6.1
heaps of textures fixes
last texture fixes
Merge branch 'master' of https://github.com/MrMasochism/Pixelmon

Conflicts:
	minecraft/pixelmon/battles/attacks/EffectRegistry.java
	minecraft/pixelmon/battles/attacks/specialAttacks/basic/Endeavor.java
	minecraft/pixelmon/battles/attacks/specialAttacks/basic/JumpKick.java
Update README.md

Updated readme for 1.6.1 and new forge
Fixed Fearow so he's now flapping. Updated the serpentskeleton to contain the new serpent animations. Updated Onix to use the new animation system. Updated abra and cloyster due to changes in serpentskeleton.
Merge pull request #1088 from ZeeCount/master

9th July - Animation fixes (Wing and Serpent)
Merge remote-tracking branch 'origin/master'