Merge branch 'master' into divVerent/crypto2

Conflicts:
	qcsrc/server/ipban.qc

diff --cc defaultXonotic.cfg
index 555da4afad130949e43b810bf22a302fb6b93a76,e00da32085eb42889faf444dcdc9464384fc005e..7312a34e4aed51515b0c52ef1c62b623f97a0a58
--- 1/defaultXonotic.cfg
--- 2/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@@ -1255,9 -1260,8 +1260,9 @@@ set g_keyhunt_teams 
  set cl_gravity 800    "but ignored anyway"
  
  set g_ban_default_bantime 5400        "90 minutes"
- set g_ban_default_masksize 3  "whole 255.255.255.0 networks (set to 4 for single IPs); when UID support is compiled in, masksize 0 means banning by UID"
+ set g_ban_default_masksize 3  "masksize 0 means banning by UID only, 1 means banning by /8 (IPv6: /32) network, 2 means banning by /16 (IPv6: /48) network, 3 means banning by /24 (IPv6: /56) network, 4 means banning by single IP (IPv6: /64 network)"
  set g_banned_list ""  "format: IP remainingtime IP remainingtime ..."
 +set g_banned_list_idmode "1"  "when set, the IP banning system always uses the ID over the IP address (so a user in a banned IP range can connect if they have a valid signed ID)"
  alias bans "sv_cmd bans"
  alias ban "sv_cmd ban $*"         // usage: ban address(maybe incomplete, like 1.2.3) bantime(seconds)
  alias kickban "sv_cmd kickban $*" // usage: kickban # playerno bantime(seconds) masksize(bytes)

diff --cc qcsrc/client/Main.qc
Simple merge

diff --cc qcsrc/server/cl_client.qc
Simple merge

diff --cc qcsrc/server/ipban.qc
Simple merge