From: LegendaryGuard <rootuser999@gmail.com>
Date: Sun, 11 Sep 2022 21:56:32 +0000 (+0200)
Subject: Merge branch 'master' into LegendaryGuard/armorizing_and_dark_nades
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a96b2f2d833ba9d5f2ddfb86b21aebc690c2b9f3;p=xonotic%2Fxonotic-data.pk3dir.git

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

a96b2f2d833ba9d5f2ddfb86b21aebc690c2b9f3