Merge remote-tracking branch 'origin/master' into feature/#1891-set-ping-packet-size

# Conflicts:
#	server/util-server.js
#	src/languages/en.js
This commit is contained in:
Louis Lam 2023-01-25 16:12:33 +08:00
commit 5050ebc249
146 changed files with 22276 additions and 17092 deletions

View file

@ -67,6 +67,7 @@ class Database {
"patch-monitor-add-resend-interval.sql": true,
"patch-ping-packet-size.sql": true,
"patch-maintenance-table2.sql": true,
"patch-add-gamedig-monitor.sql": true,
};
/**