Update formats-data.js
Merge pull request #1 from jas61292/patch-1

Update formats-data.js
Adding CAP18
Optimize f7ea60fe25
Remove Mafia plugin

Too many crashes :/
Merge pull request #949 from jas61292/master

CAP18 Implementation
Add CAP Volkraken Playtest
Merge branch 'master' of https://github.com/Zarel/Pokemon-Showdown
Fix error in 760151246c739d56e7af66e170a3aba4a230d32f
Fix race condition in team validator

Would lead to the wrong kinds of teams sometimes.
Edit /unmute not muted message

Nitpicky. Makes it consistent with the other /un mod command messages
Merge pull request #954 from Morfent/patch-2

Edit /unmute not muted message
Add moves uncallable by Assist

Geomancy, King's Shield, Mat Block, Spiky Shield, Sticky Web
Merge pull request #19 from Zarel/master

Patch 19