From: LegendaryGuard <rootuser999@gmail.com>
Date: Mon, 10 Jan 2022 01:34:55 +0000 (+0100)
Subject: Merge branch 'master' into LegendaryGuard/armorizing_and_dark_nades
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2b41cfcfb402353e18b342d4d9358983f17270b4;p=xonotic%2Fxonotic-data.pk3dir.git

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

2b41cfcfb402353e18b342d4d9358983f17270b4