Merge translatable strings for !1017 (Mario/monsters) early

[xonotic/xonotic-data.pk3dir.git] / xonotic-common.cfg

diff --git a/xonotic-common.cfg b/xonotic-common.cfg
index ff5787269e4be9a7093a312bf18ce849e550a1be..05670d56ca19a54a18a3ad38e46664a1b9ca1d45 100644 (file)
--- a/xonotic-common.cfg
+++ b/xonotic-common.cfg
@@ -31,6 +31,16 @@ gameversion_max 65535 // git builds see all versions
 
 seta g_configversion 0 "Configuration file version (used to upgrade settings) 0: first run, or previous start was <2.4.1  Later, it's overridden by config.cfg, version ranges are defined in config_update.cfg"
 
+// Set the master servers to do DNS lookups we control.
+// This allows us to update the master server IPs without a release.
+set sv_masterextra1 "master1.xonotic.org:42863"
+set sv_masterextra2 "master2.xonotic.org:27950"
+set sv_masterextra3 ""  // Got removed from DP, so we can't use this one for master3.
+set sv_master1 "dpm4.xonotic.xyz:27777"  // gazby, soylent_cow
+set sv_master2 "dpm6.xonotic.xyz:27777"  // gazby, soylent_cow
+set sv_master3 "master3.xonotic.org:27950"
+set sv_master4 "master4.xonotic.org:42863"
+
 exec xonotic-client.cfg
 exec xonotic-server.cfg