From: terencehill <piuntn@gmail.com>
Date: Tue, 18 Jan 2022 18:02:17 +0000 (+0000)
Subject: Merge branch 'Mario/resource_registry' into 'master'
X-Git-Tag: xonotic-v0.8.5~232
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6d997e7ed11d0f4a3449e8dcab751b06bb305743;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/resource_registry' into 'master'

Migrating resources (ammo, health etc) to a registry for ease of maintenance and a cleaner codebase.

Closes #2030

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

6d997e7ed11d0f4a3449e8dcab751b06bb305743