]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'Mario/minor_fixes' into 'master'
authorterencehill <piuntn@gmail.com>
Sun, 25 Dec 2022 02:08:11 +0000 (02:08 +0000)
committerterencehill <piuntn@gmail.com>
Sun, 25 Dec 2022 02:08:11 +0000 (02:08 +0000)
Several fixes for minor issues

Closes #2135, #2360, #2704, #2734, #2749, and #2751

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

1  2 
gamemodes-server.cfg
qcsrc/common/monsters/sv_monsters.qc
qcsrc/server/items/items.qc

Simple merge
Simple merge
Simple merge