From: bones_was_here <bones_was_here@xa.org.au>
Date: Fri, 17 Jun 2022 16:47:44 +0000 (+0000)
Subject: Merge breaking changes for 0.8.5 into 'master'
X-Git-Tag: xonotic-v0.8.5~7
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f59fcf7b046a2f744e056a1cac8faaf0ee77e124;p=xonotic%2Fxonotic-data.pk3dir.git

Merge breaking changes for 0.8.5 into 'master'

Closes #2434

See merge request xonotic/xonotic-data.pk3dir!1008
---

f59fcf7b046a2f744e056a1cac8faaf0ee77e124