From: Dr. Jaska <drjaska83@gmail.com>
Date: Thu, 2 Jan 2025 01:37:20 +0000 (+0000)
Subject: Merge branch 'Mario/monster_teamcolor_fix' into 'master'
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8d6592d8161b36911abbe5838f4cc66eac86fa79;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/monster_teamcolor_fix' into 'master'

Fix monsters preferring player colours over team colours

Closes #2953

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

8d6592d8161b36911abbe5838f4cc66eac86fa79