You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Jonathan G Rennison fd605e3cf3 Merge branch 'master' into jgrpp-beta ... # Conflicts: # .github/workflows/commit-checker.yml # src/company_cmd.cpp # src/console_cmds.cpp # src/crashlog.cpp # src/lang/english.txt # src/lang/german.txt # src/lang/indonesian.txt # src/lang/japanese.txt # src/lang/korean.txt # src/lang/swedish.txt # src/linkgraph/linkgraphjob.cpp # src/linkgraph/mcf.cpp # src/network/core/tcp.cpp # src/network/core/tcp.h # src/network/core/tcp_game.h # src/network/core/udp.h # src/network/network.cpp # src/network/network_admin.cpp # src/network/network_admin.h # src/network/network_chat_gui.cpp # src/network/network_client.cpp # src/network/network_client.h # src/network/network_func.h # src/network/network_internal.h # src/network/network_server.cpp # src/network/network_server.h # src/newgrf.cpp # src/newgrf_station.cpp # src/order_gui.cpp # src/rail_cmd.cpp # src/saveload/saveload.cpp # src/settings.cpp # src/settings_gui.cpp # src/settings_internal.h # src/settings_type.h # src/station_cmd.cpp # src/stdafx.h # src/table/currency_settings.ini # src/table/misc_settings.ini # src/table/settings.h.preamble # src/table/settings.ini # src/terraform_cmd.cpp # src/timetable_gui.cpp # src/train_cmd.cpp # src/tree_cmd.cpp # src/water_cmd.cpp		3 years ago
..
ISSUE_TEMPLATE	Change: [Actions] Reword bug/crash report instructions (#9104)	3 years ago
workflows	Merge branch 'master' into jgrpp-beta	3 years ago
FUNDING.yml	Add: [GitHub] sponsor button on github.com (#7700)	5 years ago
PULL_REQUEST_TEMPLATE.md	Fix: add missing variables to NewGRF inspect window.	4 years ago
changelog.sh	Add: [Actions] release workflow for both releases and nightlies	4 years ago
stale.yml	Add: [GitHub] enable probot/stale, to flush out stale issues/pull requests	6 years ago