Merge branch 'master' into mirceakitsune/damage_effects

diff --cc defaultXonotic.cfg
Simple merge

diff --cc effectinfo.txt
Simple merge

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

diff --cc qcsrc/client/autocvars.qh
Simple merge

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

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

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

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