From: LegendaryGuard <rootuser999@gmail.com>
Date: Wed, 5 Jul 2023 23:04:55 +0000 (+0200)
Subject: Merge branch 'terencehill/new_powerups' into LegendaryGuard/new_powerups
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=786adb69ffef1ba7b22e21fa2d5c5b18ca6fa96c;p=xonotic%2Fmediasource.git

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

786adb69ffef1ba7b22e21fa2d5c5b18ca6fa96c