From: LegendaryGuard <rootuser999@gmail.com>
Date: Wed, 17 Aug 2022 20:43:48 +0000 (+0200)
Subject: Merge branch 'master' into LegendaryGuard/armorizing_and_dark_nades
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b0bbe19a37ee50c9d2c754e8ba3ca96dceb938db;p=xonotic%2Fxonotic-data.pk3dir.git

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

b0bbe19a37ee50c9d2c754e8ba3ca96dceb938db