gen 6 preparations

New gen added, types table changed, new fairy type added
Merge remote-tracking branch 'main/master'