Merge branch 'master' into jgrpp

# Conflicts:
#	CMakeLists.txt
#	cmake/CompileFlags.cmake
#	src/bridge_gui.cpp
#	src/saveload/afterload.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/saveload/town_sl.cpp
#	src/screenshot.cpp
#	src/screenshot.h
#	src/toolbar_gui.cpp
#	src/town.h
#	src/town_cmd.cpp

src/table/newgrf_debug_data.h

@@ -670,18 +670,6 @@ class NIHTown : public NIHelper {
 		seprintf(buffer, lastof(buffer), "  Index: %u", index);
 		print(buffer);
 
-		char *b = buffer;
-		b += seprintf(b, lastof(buffer), "  cargo_produced: ");
-		SetDParam(0, t->cargo_produced);
-		b = GetString(b, STR_JUST_CARGO_LIST, lastof(buffer));
-		print(buffer);
-
-		b = buffer;
-		b += seprintf(b, lastof(buffer), "  cargo_accepted_total: ");
-		SetDParam(0, t->cargo_accepted_total);
-		b = GetString(b, STR_JUST_CARGO_LIST, lastof(buffer));
-		print(buffer);
-
 		seprintf(buffer, lastof(buffer), "  Nearby stations: %u", (uint) t->stations_near.size());
 		print(buffer);
 		for (const Station *st : t->stations_near) {

src/table/settings.ini

@@ -3343,7 +3343,7 @@ type     = SLE_UINT8
 from     = SLV_30
 def      = 32
 min      = 12
-max      = 48
+max      = 128
 str      = STR_CONFIG_SETTING_OIL_REF_EDGE_DISTANCE
 strval   = STR_CONFIG_SETTING_TILE_LENGTH
 strhelp  = STR_CONFIG_SETTING_OIL_REF_EDGE_DISTANCE_HELPTEXT