Merge remote-tracking branch 'upstream/release/14' into 14

2024-04-04 18:22:11 +01:00
parent 34ac0fd432 cd9c9afcb6
commit f312cf0f91
187 changed files with 11016 additions and 7374 deletions
--- a/src/settings_table.cpp
+++ b/src/settings_table.cpp
@@ -50,7 +50,6 @@
 #include "void_map.h"
 #include "station_func.h"
 #include "station_base.h"
-#include "language.h"

 #include "table/strings.h"
 #include "table/settings.h"