From: SpiKe <leguen.yannick@gmail.com>
Date: Fri, 17 Jun 2022 08:44:14 +0000 (+0000)
Subject: Merge branch 't0uYK8Ne/erbium' into 'master'
X-Git-Tag: xonotic-v0.8.5~10
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=acb43dde0a98cb0feff39b16c9da502577a52151;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 't0uYK8Ne/erbium' into 'master'

erbium: fix various issues

Closes #195, #144, and #135

See merge request xonotic/xonotic-maps.pk3dir!101
---

acb43dde0a98cb0feff39b16c9da502577a52151