From: Thomas Debesse <dev@illwieckz.net>
Date: Mon, 20 Feb 2023 19:26:04 +0000 (+0000)
Subject: Merge branch 'master-merge' into 'master'
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a8c2d8c3c99b4fe795164a6d02c716638e14d05d;p=xonotic%2Fnetradiant.git

Merge branch 'master-merge' into 'master'

First bunch of merge from NetRadiantCustom

See merge request xonotic/netradiant!193
---

a8c2d8c3c99b4fe795164a6d02c716638e14d05d