From: z411 <z411@omaera.org>
Date: Tue, 18 Jan 2022 21:00:22 +0000 (-0300)
Subject: Merge branch 'master' into z411/bai-server
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e0d80663c69f8d26c96742d7add9e17f7edeec48;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into z411/bai-server
---

e0d80663c69f8d26c96742d7add9e17f7edeec48
diff --cc qcsrc/server/items/items.qc
index 3e958ec2d,0ea10da5e..a59d465e8
--- a/qcsrc/server/items/items.qc
+++ b/qcsrc/server/items/items.qc
@@@ -11,8 -11,8 +11,9 @@@
  #include <common/mutators/mutator/buffs/sv_buffs.qh>
  #include <common/mutators/mutator/powerups/_mod.qh>
  #include <common/mutators/mutator/status_effects/_mod.qh>
 +#include <common/net_linked.qh>
  #include <common/notifications/all.qh>
+ #include <common/resources/resources.qh>
  #include <common/util.qh>
  #include <common/weapons/_all.qh>
  #include <common/wepent.qh>
diff --cc qcsrc/server/weapons/weaponsystem.qc
index ecdd0f9a1,fcce2a23d..11833e50b
--- a/qcsrc/server/weapons/weaponsystem.qc
+++ b/qcsrc/server/weapons/weaponsystem.qc
@@@ -6,9 -6,9 +6,10 @@@
  #include <common/mapobjects/platforms.qh>
  #include <common/monsters/_mod.qh>
  #include <common/mutators/mutator/status_effects/_mod.qh>
 +#include <common/ent_cs.qh>
  #include <common/net_linked.qh>
  #include <common/notifications/all.qh>
+ #include <common/resources/sv_resources.qh>
  #include <common/state.qh>
  #include <common/util.qh>
  #include <common/vehicles/all.qh>