Merge remote branch 'origin/master' into tzork/balance-tzork

Conflicts:
	balancetZork.cfg

diff --cc balance25.cfg
Simple merge

diff --cc balanceLeeStricklin.cfg
Simple merge

diff --cc balanceNexSVN.cfg
Simple merge

diff --cc balanceSamual.cfg
Simple merge

diff --cc balanceTest.cfg
Simple merge

diff --cc balanceXonotic.cfg
Simple merge

diff --cc balancetZork.cfg
index 0386e1dd5bb6f3c3400908db00a0e7f5e3a245cb,56ea71c184e93a1630b750b60d2704b8ee817804..4de12ee5c52d5b34aaa141caa4144557c37f790f
--- 1/balancetZork.cfg
--- 2/balancetZork.cfg
+++ b/balancetZork.cfg
@@@ -428,10 -394,11 +428,11 @@@ set g_balance_crylink_primary_refire 
  set g_balance_crylink_primary_animtime 0.4
  set g_balance_crylink_primary_ammo 2
  set g_balance_crylink_primary_bouncedamagefactor 0.2
- set g_balance_crylink_primary_joinspeed 2000
- set g_balance_crylink_primary_joinboost 2
+ set g_balance_crylink_primary_joinspeed 0
+ set g_balance_crylink_primary_jointime 0
+ set g_balance_crylink_secondary_linkexplode 1
  
 -set g_balance_crylink_primary_middle_lifetime 5 // range: 10000 full, fades to 20000
 +set g_balance_crylink_primary_middle_lifetime 5 
  set g_balance_crylink_primary_middle_fadetime 5
  set g_balance_crylink_primary_other_lifetime 2 // range: 800 full, fades to 1300
  set g_balance_crylink_primary_other_fadetime 0.25