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

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

bd4136e7f4786dd7bb6a051ec76b0e539218a063