Merge remote-tracking branch 'origin/main' into web-dashboard-simplier

# Conflicts:
#	dMasterServer/MasterServer.cpp
This commit is contained in:
Aaron Kimbrell
2026-06-28 01:57:53 -05:00
262 changed files with 3943 additions and 2641 deletions

View File

@@ -12,3 +12,5 @@ web_server_enabled=0
# Unused for now
# web_server_listen_ip=127.0.0.1
web_server_listen_port=2005
max_ignores=32