From: terencehill <piuntn@gmail.com>
Date: Thu, 15 Jun 2023 21:56:43 +0000 (+0000)
Subject: Merge branch 'bones_was_here/itemsdesync' into 'master'
X-Git-Tag: xonotic-v0.8.6~7
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=57a79a3b86a66c5fdf92e14562f58e5274913a8b;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'bones_was_here/itemsdesync' into 'master'

Items overhaul

Closes #2824, #2059, and #1046

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

57a79a3b86a66c5fdf92e14562f58e5274913a8b