Merge remote-tracking branch 'origin/master' into tzork/gm_nexball

Conflicts:
	qcsrc/server/cl_weapons.qc

diff --cc defaultXonotic.cfg
Simple merge

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

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

diff --cc qcsrc/server/cl_weapons.qc
index dc827c9a21d019d833d97c2722d76fed77306b9a,fac0d73aa2cbf09b30f36ed949e7bb97a9d26085..4a12ce1850323e10f7b11282a76874cb0f426e66
--- 1/qcsrc/server/cl_weapons.qc
--- 2/qcsrc/server/cl_weapons.qc
+++ b/qcsrc/server/cl_weapons.qc
@@@ -282,6 -318,8 +318,8 @@@ float W_IsWeaponThrowable(float w
                return 0;
        if (g_cts)
                return 0;
 -      if (g_nexball && w == WEP_PORTO)
++      if (g_nexball && w == WEP_GRENADE_LAUNCHER)
+               return 0;
  
        wb = W_WeaponBit(w);
        if(!wb)

diff --cc qcsrc/server/defs.qh
Simple merge

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

diff --cc qcsrc/server/progs.src
Simple merge