CAP6 Implementation
Fix tier mistake for CAP6
Update Sniper shortDesc
Update Bulldoze shortDesc
Inaccurate shortDesc for Bulldoze
Merge pull request #470 from jas61292/master

CAP6 Implementation
Properly implement Mat Block
Ghost type is immune to 'trapped' status
Sync learnsets
Blaziken and Deoxys-N have been quickbanned
Add fail message for trapping moves
Fix Trapping Implementation

Until the next overhaul
Merge pull request #471 from V4Victini/trapping

Some changes to trapping implementation
Update README: All gens at least nominally supported
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/E4Arsh/Pokemon-Showdown