Prevent cancellation of final decisions by directly overriding them
A player would bypass the final decision constraint by directly sending choice commands after verifying that they weren't really trapped.
Don't send trapped flag to client in pokemon requestData
It caused the "you might be trapped" message to effectively mean "you could have been trapped, but aren't".
Fix Illusion failing to fake trapping abilities
It wouldn't activate the "maybeTrapped" flag.
Merge pull request #1263 from Slayer95/ability-trap

Fixes for (absence of) trapping abilities
Change Lightningrod to Lightning Rod

It has been changed in ORAS.
Add ORAS Mega Evolutions

Some Mega Stone names are assumptions.
Mega Glalie and Mega Steelix are the only ones with missing height and
weight.
Add Primal Groudon and Primal Kyogre
Add new ORAS moves
Add Pikachu formes
Correct Dragon Ascent and Hyperspace Fury
Fix Primal Groudon's types
Add Mega Steelix/Glalie height and weight
Fix typo in Slowbro´s mega stone
Note: Not claiming that "Slowbronite" is its in-game name.
Add Red and Blue Orbs
Fix crash in /triviaplayers
Remove a trailing comma in move data
Merge pull request #1266 from Morfent/trivia

Fix crash in /triviaplayers
Add new moves to uncallable Metronome moves
Add Evasion Clauses to BH
Only ban Evasion Moves in BH