Merge branch 'master' into fruitiex/fruitbalance

diff --cc balanceLeeStricklin.cfg
index 20c6153a1e8d72423442154c11d2575fc94cc047,8a0ae6c46224929acbb9574496eb204d40f22db6..1120cdbcf137b8c59eec6f484e18feb8f252f32d
--- 1/balanceLeeStricklin.cfg
--- 2/balanceLeeStricklin.cfg
+++ b/balanceLeeStricklin.cfg
@@@ -320,33 -319,11 +320,33 @@@ set g_balance_grenadelauncher_secondary
  set g_balance_grenadelauncher_secondary_bouncestop 0.12
  set g_balance_grenadelauncher_secondary_remote_detonateprimary 0
  // }}}
 +// {{{ 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_proximityradius 150
 +set g_balance_minelayer_speed 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 15
 +set g_balance_minelayer_limit 4 // 0 disables the limit
 +set g_balance_minelayer_protection 1 // don't explode if the mine would hurt the owner or a team mate
 +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.5
 +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
  set g_balance_electro_lightning 0
- set g_balance_electro_primary_damage 80
- set g_balance_electro_primary_edgedamage 0
- set g_balance_electro_primary_force 550
+ set g_balance_electro_primary_damage 55
+ set g_balance_electro_primary_edgedamage 5
+ set g_balance_electro_primary_force 267
  set g_balance_electro_primary_force_up 125
  set g_balance_electro_primary_radius 150
  set g_balance_electro_primary_comboradius 75

diff --cc defaultXonotic.cfg
Simple merge