Merge branch 'master' into mirceakitsune/universal_reload_system

diff --cc balanceXonotic.cfg
Simple merge

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

diff --cc qcsrc/server/autocvars.qh
index 57bed42e1777b663654ec0fd7620d7dae3a6a95a,0820ef713f2d261caf9414ee34a2ff8c86cf6fda..7c9a533572908add4ee7e5df0456a4904b2beec1
--- 1/qcsrc/server/autocvars.qh
--- 2/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@@ -443,15 -431,11 +444,16 @@@ float autocvar_g_balance_minelayer_remo
  float autocvar_g_balance_minelayer_remote_radius;
  float autocvar_g_balance_minelayer_speed;
  float autocvar_g_balance_minelayer_time;
 +float autocvar_g_balance_minelayer_reload_ammo;
 +float autocvar_g_balance_minelayer_reload_time;
  float autocvar_g_balance_minstanex_ammo;
 +float autocvar_g_balance_minstanex_laser_ammo;
  float autocvar_g_balance_minstanex_animtime;
  float autocvar_g_balance_minstanex_refire;
 +float autocvar_g_balance_minstanex_reload_ammo;
 +float autocvar_g_balance_minstanex_reload_time;
  float autocvar_g_balance_nex_charge;
+ float autocvar_g_balance_nex_charge_animlimit;
  float autocvar_g_balance_nex_charge_limit;
  float autocvar_g_balance_nex_charge_maxspeed;
  float autocvar_g_balance_nex_charge_mindmg;

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

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

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

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