From: terencehill <piuntn@gmail.com>
Date: Wed, 5 Oct 2022 14:32:56 +0000 (+0000)
Subject: Merge branch 'bones_was_here/teameditems' into 'master'
X-Git-Tag: xonotic-v0.8.6~340
X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=de686ec15ae7d9641b2be2bf9b4d33c67328e3a2;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'bones_was_here/teameditems' into 'master'

Teamed items fixes and Q3 compatibility

Closes #2368

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

de686ec15ae7d9641b2be2bf9b4d33c67328e3a2