.
Merge remote-tracking branch 'main/master'

Conflicts:
	src/Server/battle.cpp