Merge branch 'master' into z411/bai-server

author z411 <z411@omaera.org>

Sun, 5 Dec 2021 02:10:16 +0000 (23:10 -0300)

committer z411 <z411@omaera.org>

Sun, 5 Dec 2021 02:10:16 +0000 (23:10 -0300)
author z411 <z411@omaera.org>
Sun, 5 Dec 2021 02:10:16 +0000 (23:10 -0300)
committer z411 <z411@omaera.org>
Sun, 5 Dec 2021 02:10:16 +0000 (23:10 -0300)
diff --cc qcsrc/server/items/items.qc
Simple merge
diff --cc qcsrc/server/world.qc
Simple merge
author	z411 <z411@omaera.org>
	Sun, 5 Dec 2021 02:10:16 +0000 (23:10 -0300)
committer	z411 <z411@omaera.org>
	Sun, 5 Dec 2021 02:10:16 +0000 (23:10 -0300)
		1	2
qcsrc/server/items/items.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/world.qc	patch \|	diff1 \|	diff2 \|	blob \| history