Soak/FC/ToT fix; Camouflage fix
Metronome fix, if statement
Simpler type check
Merge pull request #1089 from Fuzzysqurl/silcoon

Soak/FC/ToT fix; Camouflage fix
Merge pull request #1088 from CrystalMoogle/gen6data

Metronome fix, if statement
Allow '6g ou' to be an alias for '6G Overused' when starting a tourney
Allow Acrobatics in Fight Club tier
Merge remote-tracking branch 'upstream/master'