Merge tag '14.0-beta1' into jgrpp

# Conflicts:
#	src/3rdparty/squirrel/squirrel/sqcompiler.cpp
#	src/aircraft.h
#	src/animated_tile.h
#	src/base_consist.h
#	src/cargotype.h
#	src/company_gui.cpp
#	src/console_cmds.cpp
#	src/core/overflowsafe_type.hpp
#	src/engine_gui.cpp
#	src/industry_gui.cpp
#	src/lang/english.txt
#	src/music/extmidi.cpp
#	src/network/core/network_game_info.cpp
#	src/network/network_server.cpp
#	src/newgrf.cpp
#	src/newgrf_industries.cpp
#	src/order_base.h
#	src/order_cmd.cpp
#	src/order_gui.cpp
#	src/order_type.h
#	src/os/macosx/misc_osx.cpp
#	src/os/windows/crashlog_win.cpp
#	src/rail_gui.cpp
#	src/rail_gui.h
#	src/roadveh.h
#	src/roadveh_cmd.cpp
#	src/saveload/afterload.cpp
#	src/saveload/company_sl.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/saveload/saveload_error.hpp
#	src/script/api/script_town.cpp
#	src/settingsgen/settingsgen.cpp
#	src/ship.h
#	src/ship_cmd.cpp
#	src/smallmap_gui.cpp
#	src/spritecache.cpp
#	src/stdafx.h
#	src/strgen/strgen.cpp
#	src/strgen/strgen.h
#	src/table/settings/script_settings.ini
#	src/timetable_cmd.cpp
#	src/timetable_gui.cpp
#	src/town.h
#	src/town_cmd.cpp
#	src/town_cmd.h
#	src/town_gui.cpp
#	src/train.h
#	src/train_cmd.cpp
#	src/tree_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_base.h
#	src/vehicle_cmd.cpp
#	src/vehicle_gui.cpp
#	src/vehiclelist.cpp
#	src/waypoint_base.h
#	src/widget.cpp

src/table/settings/gui_settings.ini

@@ -1054,9 +1054,9 @@ cat      = SC_EXPERT
 var      = gui.cycle_signal_types
 type     = SLE_UINT8
 flags    = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_GUI_DROPDOWN
-def      = 0
-min      = 0
-max      = 1
+def      = SIGNAL_CYCLE_GROUP
+min      = SIGNAL_CYCLE_GROUP
+max      = SIGNAL_CYCLE_ALL
 interval = 1
 str      = STR_CONFIG_SETTING_CYCLE_SIGNAL_TYPES
 strhelp  = STR_CONFIG_SETTING_CYCLE_SIGNAL_TYPES_HELPTEXT

src/table/settings/script_settings.ini

@@ -8,7 +8,6 @@
 ; and in the savegame PATS chunk.
 
 [pre-amble]
-static constexpr std::initializer_list<const char*> _settings_profiles{"easy", "medium", "hard"};
 
 static void ScriptMaxOpsChange(int32_t new_value);
 static bool CheckScriptMaxMemoryChange(int32_t &new_value);
@@ -48,17 +47,6 @@ patxname = nullptr
 enumlist = <this parameter must be set>
 
 
-[SDT_OMANY]
-var      = script.settings_profile
-type     = SLE_UINT8
-from     = SLV_178
-flags    = SF_GUI_DROPDOWN
-def      = SP_EASY
-min      = SP_EASY
-max      = SP_HARD
-full     = _settings_profiles
-cat      = SC_BASIC
-
 [SDT_VAR]
 var      = script.script_max_opcode_till_suspend
 type     = SLE_UINT32