From: terencehill <piuntn@gmail.com>
Date: Fri, 18 Mar 2022 22:30:13 +0000 (+0100)
Subject: Merge branch 'master' into terencehill/full_damage_fix
X-Git-Tag: xonotic-v0.8.5~145^2~2
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=88fc8aa5281319c6f22456708b39708e2e61381b;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into terencehill/full_damage_fix
---

88fc8aa5281319c6f22456708b39708e2e61381b