From: Mario <zacjardine@y7mail.com>
Date: Sat, 10 Dec 2016 06:24:31 +0000 (+0000)
Subject: Merge branch 'DefaultUser/armormega' into 'master'
X-Git-Tag: xonotic-v0.8.2~387
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b4fbbbce9f643f769b92c35bc3185f31f53d80bc;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'DefaultUser/armormega' into 'master'

Armor and Health name inconsistency

Fixes item name inconsistency (see Issue #1490) of Armor and Health by renaming HealthLarge to HealthBig and ArmorLarge to ArmorMega as well as all associated cvars

See https://gitlab.com/xonotic/xonotic-maps.pk3dir/tree/DefaultUser/entity_def for updated entity definitions for radiant

See merge request !387
---

b4fbbbce9f643f769b92c35bc3185f31f53d80bc