Merge branch 'master' into fruitiex/fruitbalance

Conflicts:
	balance.cfg

diff --cc balance.cfg
index 8c531589276b83be5d8ad9f72a5003264d90b418,156b69aed586e61776ebd45bc3dc5ee7035f6e99..e824e271ba095c3aa0063f6de66215e74e805bc0
--- 1/balance.cfg
--- 2/balance.cfg
+++ b/balance.cfg
@@@ -269,8 -269,7 +269,8 @@@ set g_balance_uzi_bulletconstant 115 /
  // }}}
  // {{{ mortar
  set g_balance_grenadelauncher_primary2secondary 0
- set g_balance_grenadelauncher_primary_damage 50
 +set g_balance_grenadelauncher_primary_sticky 0
+ set g_balance_grenadelauncher_primary_damage 70
  set g_balance_grenadelauncher_primary_edgedamage 38
  set g_balance_grenadelauncher_primary_force 400
  set g_balance_grenadelauncher_primary_radius 140
@@@ -283,8 -281,7 +283,8 @@@ set g_balance_grenadelauncher_primary_l
  set g_balance_grenadelauncher_primary_refire 0.8
  set g_balance_grenadelauncher_primary_animtime 0.3
  set g_balance_grenadelauncher_primary_ammo 2
- set g_balance_grenadelauncher_secondary_damage 60
 +set g_balance_grenadelauncher_primary_health 25
+ set g_balance_grenadelauncher_secondary_damage 70
  set g_balance_grenadelauncher_secondary_edgedamage 38
  set g_balance_grenadelauncher_secondary_force 400
  set g_balance_grenadelauncher_secondary_radius 140