From: terencehill <piuntn@gmail.com>
Date: Sat, 13 Mar 2021 00:32:12 +0000 (+0000)
Subject: Merge branch 'drjaska/balance/mortar' into 'master'
X-Git-Tag: xonotic-v0.8.5~511
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fmerge-requests%2F886%2Fhead;p=xonotic%2Fxonotic-data.pk3dir.git

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

Mortar longer lifetime so that it's usable as a mortar in large open maps

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

700083806f04f9697f02a720b1df17ff7536b979