Merge branch 'master' into jgrpp

# Conflicts: # src/lang/german.txt # src/lang/korean.txt # src/lang/spanish_MX.txt # src/lang/traditional_chinese.txt # src/script/api/script_airport.cpp # src/script/api/script_rail.cpp
2022-06-06 01:03:00 +01:00
parent b2d8f3ce43 0a3d5f5ff8
commit 3ea1e27fdd
15 changed files with 948 additions and 635 deletions
--- a/cmake/scripts/Regression.cmake
+++ b/cmake/scripts/Regression.cmake
@@ -35,6 +35,7 @@ execute_process(COMMAND ${OPENTTD_EXECUTABLE}
                        -vnull:ticks=30000
                        -d script=2
                        -d misc=9
+                        -Q
                OUTPUT_VARIABLE REGRESSION_OUTPUT
                ERROR_VARIABLE REGRESSION_RESULT
                OUTPUT_STRIP_TRAILING_WHITESPACE