1.6.1
fixed up all the rendering compiling issues
heaps more fixes
fixed all but one compile error
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