Merge remote branch 'origin/master' into diabolik/newanims

diff --combined defaultXonotic.cfg
index a945830d8a1ae9191d4076b5fb7b397d8002e51c,255e980a68113acbd94c17863e38bac37d52dc6e..553b42f8ee693a72a2a5b3fb641ce7b420c6be02
--- 1/defaultXonotic.cfg
--- 2/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@@ -1185,16 -1185,16 +1185,16 @@@ alias cl_fbskin_green "playermodel mode
  alias cl_fbskin_red "playermodel models/player/erebus.iqm; playerskin 1; color 4 4"
  alias cl_fbskin_orange "playermodel models/player/erebus.iqm; playerskin 1; color 14 14"
  alias cl_fbskin_off "playermodel models/player/erebus.iqm; playerskin 0"
 -alias sv_fbskin_green "sv_defaultcharacter 1; sv_defaultplayermodel models/player/erebus.iqm; sv_defaultplayerskin 1; sv_defaultplayercolors 51"
 -alias sv_fbskin_red "sv_defaultcharacter 1; sv_defaultplayermodel models/player/erebus.iqm; sv_defaultplayerskin 1; sv_defaultplayercolors 68"
 -alias sv_fbskin_orange "sv_defaultcharacter 1; sv_defaultplayermodel models/player/erebus.iqm; sv_defaultplayerskin 1; sv_defaultplayercolors 238"
 +alias sv_fbskin_green "sv_defaultcharacter 1; sv_defaultplayermodel models/player/megaerebus.iqm; sv_defaultplayerskin 1; sv_defaultplayercolors 51"
 +alias sv_fbskin_red "sv_defaultcharacter 1; sv_defaultplayermodel models/player/megaerebus.iqm; sv_defaultplayerskin 1; sv_defaultplayercolors 68"
 +alias sv_fbskin_orange "sv_defaultcharacter 1; sv_defaultplayermodel models/player/megaerebus.iqm; sv_defaultplayerskin 1; sv_defaultplayercolors 238"
  alias sv_fbskin_off "sv_defaultcharacter 0; sv_defaultplayerskin 0; sv_defaultplayercolors \"\""
  
  seta sv_servermodelsonly 1
  
  cl_curl_enabled 1
- cl_curl_maxspeed 300
- sv_curl_defaulturl "http://www.xonotic.com/contentdownload/getmap.php?file="
+ cl_curl_maxspeed 400
+ sv_curl_defaulturl "http://www.xonotic.org/contentdownload/getmap.php?file="
  set sv_curl_serverpackages_auto 1 "automatically add packs with *.serverpackage files to sv_curl_serverpackages"
  
  set sv_motd ""
@@@ -1541,7 -1541,7 +1541,7 @@@ seta accuracy_color2 "0 1 0
  // for menu server list (eventually make them have engine support?)
  seta menu_slist_showfull 1 "show servers even if they are full and have no slots to join"
  seta menu_slist_showempty 1 "show servers even if they are no empty and have no opponents to play against"
- set menu_slist_modfilter "=" // set to either: !modname or modname. modname of = means "same as we are running now".
+ seta menu_slist_modfilter "" // set to either: !modname or modname. modname of = means "same as we are running now".
  
  // for menu weapon arena
  set menu_weaponarena_with_laser 0 "also enable the Laser in this weapon arena"