Merge remote-tracking branch 'upstream/master' into main
Merge pull request #382 from TalkTakesTime/master

Add /ignore to help
Pumpkaboo and Gourgeist have multiple formes
Add Pixel Plate
Update Gen 6 learnsets
Pixie Plate is the correct name
add scizornite
add mega scizor and mega blaziken [server side]
fix dex number
update with scizor and blaze
Set Tier Shift to Gen 5
Update Gen 6 learnsets
Update Gen 6 base stats
Merge pull request #383 from Oiawesome/patch-6

Add some mega evos (not completely done yet)
Update Mega Lucario's stats
Add some basic clauses to Gen 5.5

Game play has demonstrated that gen 5.5 needs some basic clauses 
as of now. It also makes the gen more similar to gen 5 with 
gen 6 mechanics.
Add female Meowstic forme
NEXT is a 5th Gen OM
More Gen 6 data
Fix some typos in data