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

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

a314015e9db37c612bd23d584ed336033c97c0a2