From: Mario <mario.mario@y7mail.com>
Date: Mon, 10 Jan 2022 04:22:44 +0000 (+0000)
Subject: Merge branch 'drjaska/balance/vortex' into 'master'
X-Git-Tag: xonotic-v0.8.5~238
X-Git-Url: https://de.git.xonotic.org/?a=commitdiff_plain;h=d27ed9f826a5dd11d2fbada305cceec53629be12;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'drjaska/balance/vortex' into 'master'

https://forums.xonotic.org/showthread.php?tid=8520 related vortex changes

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

d27ed9f826a5dd11d2fbada305cceec53629be12