Merge branch 'jgrpp' into save_ext_spp

Conflicts:
	src/saveload/order_sl.cpp

src/table/settings.ini

@@ -468,6 +468,15 @@ str      = STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL
 strhelp  = STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_HELPTEXT
 strval   = STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_NO_ACTIONS
 
+[SDT_BOOL]
+base     = GameSettings
+var      = construction.enable_build_river
+def      = false
+cat      = SC_BASIC
+str      = STR_CONFIG_SETTING_ENABLE_BUILD_RIVER
+strhelp  = STR_CONFIG_SETTING_ENABLE_BUILD_RIVER_HELPTEXT
+patxname = ""enable_build_river.construction.enable_build_river""
+
 [SDT_VAR]
 base     = GameSettings
 var      = construction.terraform_per_64k_frames
@@ -2704,6 +2713,28 @@ strhelp  = STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT
 strval   = STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE
 cat      = SC_BASIC
 
+[SDT_BOOL]
+base     = GameSettings
+var      = construction.trees_around_snow_line_enabled
+def      = true
+str      = STR_CONFIG_SETTING_TREES_AROUND_SNOWLINE
+strhelp  = STR_CONFIG_SETTING_TREES_AROUND_SNOWLINE_HELPTEXT
+cat      = SC_BASIC
+patxname = ""everest_treeline.construction.trees_around_snow_line_enabled""
+
+[SDT_VAR]
+base     = GameSettings
+var      = construction.trees_around_snow_line_range
+type     = SLE_UINT8
+def      = 8
+min      = 1
+max      = 20
+str      = STR_CONFIG_SETTING_TREES_AROUND_SNOWLINE_RANGE
+strhelp  = STR_CONFIG_SETTING_TREES_AROUND_SNOWLINE_RANGE_HELPTEXT
+strval   = STR_JUST_COMMA
+cat      = SC_BASIC
+patxname = ""everest_treeline.construction.trees_around_snow_line_range""
+
 [SDT_VAR]
 base     = GameSettings
 var      = game_creation.custom_sea_level