From: terencehill <piuntn@gmail.com>
Date: Wed, 10 Apr 2024 23:07:17 +0000 (+0000)
Subject: Merge branch 'master' into 'terencehill/nades_stuff'
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=aaf1761cd58aef0700bf02f094dfc11b68d0091e;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into 'terencehill/nades_stuff'

# Conflicts:
#   qcsrc/common/mutators/mutator/nades/nades.qc
---

aaf1761cd58aef0700bf02f094dfc11b68d0091e
diff --cc qcsrc/common/mutators/mutator/nades/nades.qc
index 3ca3eb69f,e32cd20d8..3d3849f62
--- a/qcsrc/common/mutators/mutator/nades/nades.qc
+++ b/qcsrc/common/mutators/mutator/nades/nades.qc
@@@ -37,6 -37,9 +37,7 @@@ entity Nade_TrailEffect(int proj, int n
  
      return EFFECT_Null;
  }
+ 
 -REGISTER_NET_TEMP(TE_CSQC_DARKBLINKING);
 -
  #endif
  
  #ifdef CSQC