Merge pull request #552 from iks3/feature-elementalist

author iks <iks3@users.noreply.github.com>

Fri, 19 Mar 2021 09:53:27 +0000 (18:53 +0900)

committer GitHub <noreply@github.com>

Fri, 19 Mar 2021 09:53:27 +0000 (18:53 +0900)
author iks <iks3@users.noreply.github.com>
Fri, 19 Mar 2021 09:53:27 +0000 (18:53 +0900)
committer GitHub <noreply@github.com>
Fri, 19 Mar 2021 09:53:27 +0000 (18:53 +0900)
diff --cc src/player/player-status-flags.cpp
Simple merge
diff --cc src/player/player-status.cpp
Simple merge
author	iks <iks3@users.noreply.github.com>
	Fri, 19 Mar 2021 09:53:27 +0000 (18:53 +0900)
committer	GitHub <noreply@github.com>
	Fri, 19 Mar 2021 09:53:27 +0000 (18:53 +0900)
		1	2
src/player/player-status-flags.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/player/player-status.cpp	patch \|	diff1 \|	diff2 \|	blob \| history