terrain types
Merge branch 'master' of https://github.com/TimFontaine/Rose.git
accelerator fix