moved can attack calculation to after picking moves
added a chat message if music could not be found detailing the path
removed pre-loading of pokeball textures
added sound on sending out
Fixed glitch in battle gui
moved to minecraft 1.5.1
Fixed magikarp (now swims upright always in water)
updated forge version number
Merge remote-tracking branch 'Masterbranch/master'