From: Dr. Jaska <drjaska83@gmail.com>
Date: Thu, 28 Nov 2024 03:41:36 +0000 (+0000)
Subject: Merge branch 'z411/stalemate-fix' into 'master'
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=19b0fab4d2e682346e5cbd5abe7f5bc745d92034;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'z411/stalemate-fix' into 'master'

CA: Floor health and armor in PreventStalemate

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

19b0fab4d2e682346e5cbd5abe7f5bc745d92034