From: SpiKe <leguen.yannick@gmail.com>
Date: Fri, 20 Jan 2023 13:16:09 +0000 (+0000)
Subject: Merge branch 'Spike29/atelier_teleporter_fix' into 'pending-release'
X-Git-Tag: xonotic-v0.8.6~22^2~11
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a5078120fb5848814b6bb7c7266c7307c76c3981;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'Spike29/atelier_teleporter_fix' into 'pending-release'

Atelier: place the teleporter exits slightly above the ground + use nodrawnonsolid instead of caulk for the decals

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

a5078120fb5848814b6bb7c7266c7307c76c3981