Merge remote-tracking branch 'upstream/master' into main
More Gen 6 data
Fix some typos in data
Merge pull request #385 from Slayer95/master

Fix some typos in data
Fix some more typos
Merge pull request #386 from Slayer95/master

Fix some more typos
Merge remote-tracking branch 'upstream/master' into main
Update learnsets

Added 6L0 moves for Charizard, Lucario, and Blaziken
Update Blaziken's learnset

fire punch is 6L0 as well
Merge pull request #387 from V4Victini/learnsets

Update learnsets
Protean changes type before the move is used
Add Abomasite
Fix typo
Add all known Mega Stones
Added new aliases for megas
Mega Stones onTakeItem: false,

Mega Stones are confirmed to be unremovable, even by Knock Off. http://www.smogon.com/forums/threads/pok%C3%A9mon-battle-mechanics-research.3489239/page-3#post-4876344
Knock Off 65 BP

Knock Off 65 BP image: http://s14.photobucket.com/user/chicobo329/media/4a68a1b7-6de1-406c-af59-efc469505200_zps5a25aff3.jpg.html
Merge pull request #390 from ALAKTORN/patch-2

Mega Stones can't be removed
Merge pull request #388 from Sanel23/patch-1

Added new aliases for megas
Merge pull request #392 from ALAKTORN/patch-3

Knock Off 65 BP