Use -ability for Cloud Nine and Air Lock messages
Update OMotM
Remove OM Mashup
Prevent Spacial Rend with Draco Meteor in Random Battle
Prevent Fake Out with setup in Random Battle
Entrainment now uses [from] in its messages

When a Pokemon uses Entrainment, the correct battle message should be
"POKEMON acquired ABILITY!", which only displays in the client if the
[from] tag is included in the message.
Documented -ability, -endability in protocol-doc.md
Merge pull request #1236 from ascriptmaster/master

Entrainment use proper tags in messages
Fix Sky Drop to miss against Phantom Force

Added Phantom Force to the list of moves that Sky Drop will miss against.
Merge pull request #1237 from ascriptmaster/master

Fix Sky Drop to miss against Phantom Force
Add Pumpkaboo-Super event
Add new OM Mashup
Give Belly Drum Pokemon Sitrus Berry in Random Battle
Implement /rangelock
Fix style errors in pull request #1221
changes to random doubles item generation

- added charti & occa for 4x weaknesses
- made yache only for 4x weaknesses
- made it so you cant have fake out & sheer force (9-21-14)
- changed it so shuca berry and chople berry won't be added to
immunities
- unburden mons only have normal gem if they have fake out as opposed to
any normal attacking move
- made life orb more common over expert belt

fixed error in shuca generation

typoed, but fixed it so now it should only give shuca berry to pokemon
without a ground immunity

fixed broken indentation

fixed issues pointed out by slayer95

should have fixed the indentation and edited the  immunity check
Fix typo in Berserk Gene´s implementation
Fix Throwback mod
Merge pull request #1223 from Audiosurfer/master

Conflicts:
	data/scripts.js
Fix Mega check in b078d698