Added AquaRing and BatonPass
Merge branch 'master' of https://github.com/MrMasochism/Pixelmon
Fixed flinching
removed debug line, enabled structure spawning
updated to forge 738
implemented switch blocking in battle
added dig
updated readme for new forge
apricorn trees are now as hard as logs and drop a log on destruction
fixed double-kick and other similar attacks
small fix to false swipe
added teleport in battle (battle ends and pokemon teleports away)
fix to priority moves and a crash from flinching code
added a fix to acupressure causing a lock on the server thread
allowed ability to remove rare candy crafting
added attack Beat Up
Merge branch 'master' of https://github.com/MrMasochism/Pixelmon

Conflicts:
	minecraft/pixelmon/config/PixelmonRecipes.java
Recipes For Items