Merge branch 'master' into divVerent/csad

Conflicts:
	qcsrc/client/Main.qc
	qcsrc/client/autocvars.qh

diff --cc defaultXonotic.cfg
Simple merge

diff --cc qcsrc/client/autocvars.qh
index 3029dbe819a9b708f143379b78597f5c2e70bd4d,cb06932e45e00eefaa25e29dd3abf2e25df753c4..0c926d43c9af408177f91e587eb949666ca8af93
--- 1/qcsrc/client/autocvars.qh
--- 2/qcsrc/client/autocvars.qh
+++ b/qcsrc/client/autocvars.qh
@@@ -404,4 -407,4 +407,5 @@@ string autocvar__cl_playermodel
  float autocvar_cl_precacheplayermodels;
  float autocvar_cl_deathglow;
  float autocvar_developer_csqcentities;
 +float autocvar__animblend;
+ float autocvar_g_jetpack_attenuation;

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

diff --cc qcsrc/common/util.qc
Simple merge

diff --cc qcsrc/common/util.qh
Simple merge

diff --cc qcsrc/csqcmodellib/cl_model.qc
Simple merge

diff --cc qcsrc/csqcmodellib/interpolate.qc
Simple merge

diff --cc qcsrc/server/autocvars.qh
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_weaponsystem.qc
Simple merge

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

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

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

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