Partially redesigned terrain generation
Merge commit '9fd71346725b64c96f6d5bcb8f2adc23fb2a8242'