Camouflage and terrain
Merge pull request #792 from CrystalMoogle/gen6data

Camouflage and terrain