Merge branch 'town_cargo_adj-sx' into jgrpp

Conflicts:
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h

src/table/settings.ini

@@ -755,6 +755,19 @@ str      = STR_CONFIG_SETTING_SHORT_PATH_SATURATION
 strval   = STR_CONFIG_SETTING_PERCENTAGE
 strhelp  = STR_CONFIG_SETTING_SHORT_PATH_SATURATION_HELPTEXT
 
+[SDT_VAR]
+base     = GameSettings
+var      = economy.town_cargo_factor
+type     = SLE_INT8
+from     = 160
+def      = 0
+min      = -16
+max      = +8
+interval = 1
+str      = STR_CONFIG_SETTING_TOWN_CARGO_FACTOR
+strval	 = STR_JUST_INT
+patxname = ""town_cargo_adj.economy.town_cargo_factor""
+
 ; Vehicles
 
 [SDT_VAR]