From: LegendaryGuard <rootuser999@gmail.com>
Date: Sun, 27 Nov 2022 20:27:14 +0000 (+0100)
Subject: Merge branch 'master' into LegendaryGuard/armorizing_and_dark_nades
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ca4daf21e5363b99d5cc39b39536b28e3e813984;p=xonotic%2Fxonotic-data.pk3dir.git

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

ca4daf21e5363b99d5cc39b39536b28e3e813984