Correct game state order/false merge
Added new sea generator
Merge branch 'master' into auto-load-map