From: LegendaryGuard <rootuser999@gmail.com>
Date: Wed, 7 Jun 2023 11:11:41 +0000 (+0200)
Subject: Merge branch 'master' into LegendaryGuard/new_powerups
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3ac06702e27f109ae5fc8cefef46355b20cef656;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into LegendaryGuard/new_powerups
---

3ac06702e27f109ae5fc8cefef46355b20cef656