Merge branch 'master' into mirceakitsune/weapon_mine_layer

diff --cc balanceXonotic.cfg
index b0ac66e294227a5d6db15271b1912a1996d7e991,0f8abc017b88969030ce42efe6163c2f21afdd89..e8367149f75ca098fea72197d3f2c3ab5f2a2145
--- 1/balanceXonotic.cfg
--- 2/balanceXonotic.cfg
+++ b/balanceXonotic.cfg
@@@ -303,33 -303,11 +303,33 @@@ set g_balance_grenadelauncher_secondary
  set g_balance_grenadelauncher_secondary_bouncefactor 0.7
  set g_balance_grenadelauncher_secondary_bouncestop 0.12
  // }}}
 +// {{{ minelayer // TODO
 +set g_balance_minelayer_damage 35
 +set g_balance_minelayer_edgedamage 30
 +set g_balance_minelayer_force 250
 +set g_balance_minelayer_radius 175
 +set g_balance_minelayer_detectionradius 150
 +set g_balance_minelayer_speed 0
 +set g_balance_minelayer_speedstart 750
 +set g_balance_minelayer_lifetime 60
 +set g_balance_minelayer_refire 1.5
 +set g_balance_minelayer_animtime 0.4
 +set g_balance_minelayer_ammo 5
 +set g_balance_minelayer_health 10
 +set g_balance_minelayer_limit 4 // 0 disables the limit
 +set g_balance_minelayer_damageforcescale 0
 +set g_balance_minelayer_detonatedelay -1 // positive: timer till detonation is allowed, negative: "security device" that prevents ANY remote detonation if it could hurt its owner, zero: detonatable at any time
 +set g_balance_minelayer_time 0.25
 +set g_balance_minelayer_remote_damage 45
 +set g_balance_minelayer_remote_edgedamage 40
 +set g_balance_minelayer_remote_radius 200
 +set g_balance_minelayer_remote_force 300
 +// }}}
  // {{{ electro // TODO
  set g_balance_electro_lightning 1
- set g_balance_electro_primary_damage 90
+ set g_balance_electro_primary_damage 85
  set g_balance_electro_primary_edgedamage 0
- set g_balance_electro_primary_force 550
+ set g_balance_electro_primary_force 425
  set g_balance_electro_primary_force_up 125
  set g_balance_electro_primary_radius 850
  set g_balance_electro_primary_comboradius 75