Merge branch 'master' into Mario/minigames_merge

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

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index c37e19fb3ab614e549fedc3c3940f63869e4f08a..dc241eced0f343393ccf0521790009b3ba370aac 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -1101,7 +1101,6 @@ seta cl_gentle_damage 0           "client side gentle mode (only replaces damage flash);
 set g_jetpack 0 "Jetpack mutator"
 
 set g_running_guns 0 "... or wonder, till it drives you mad, what would have followed if you had."
-set g_bastet 0 "don't try"
 
 set _urllib_nextslot 0 "temp variable"
 set cl_warpzone_usetrace 1 "do not touch"
@@ -1399,6 +1398,7 @@ exec gamemodes.cfg
 exec mutators.cfg
 exec notifications.cfg
 exec monsters.cfg
+exec minigames.cfg
 
 // load console command aliases and settings
 exec commands.cfg