Changed recoil to occur after rough skin/rocky helmet/iron barbs.
Fixed Leech Seed in RBY
Merge pull request #1294 from VeteranPadgett/rbyleechseed

Fixed Leech Seed in RBY
Merge pull request #1293 from KalaShayminS/master

Add Chinese translations of new Mega and forms
Encore in Gens 5 & 6
Begone, Spiky Pichu

Can't be transferred to gen 6
Merge pull request #1296 from WriggleNightbug/patch-1

Begone, Spiky Pichu
Merge pull request #1295 from VeteranPadgett/encore

Encore in Gens 5 & 6
Kalos Legends have at least 3 flawless IVs
Mega Evolutions in Teambuilder
Merge pull request #1298 from VeteranPadgett/mega

Mega Evolutions in Teambuilder
Better usability
Merge pull request #1290 from VeteranPadgett/turn

Recoil/Rough Skin Turn Order
Merge pull request #1297 from VeteranPadgett/xylegend

Kalos Legends have at least 3 flawless IVs
Initialize ctype to stop being annoying when building

Also makes sure Curse isn't accidentally used as a type as that's not
allowed too.
Merge pull request #1299 from Fuzzysqurl/master

Initialize ctype to stop being annoying when building
Fix Move Machine + New icons
Merge pull request #1301 from Fuzzysqurl/master

Fix Move Machine + New icons
New Icons + Pichu Endeavor
Merge pull request #1302 from Fuzzysqurl/master

New Icons + Pichu Endeavor