Merge pull request #3814 from Slimebreath6078/feature/Add_Laffey_II

author 火炎の飛竜 <87808091+Slimebreath6078@users.noreply.github.com>

Sun, 3 Mar 2024 13:40:54 +0000 (22:40 +0900)

committer GitHub <noreply@github.com>

Sun, 3 Mar 2024 13:40:54 +0000 (22:40 +0900)
author 火炎の飛竜 <87808091+Slimebreath6078@users.noreply.github.com>
Sun, 3 Mar 2024 13:40:54 +0000 (22:40 +0900)
committer GitHub <noreply@github.com>
Sun, 3 Mar 2024 13:40:54 +0000 (22:40 +0900)
diff --cc lib/edit/MonsterRaceDefinitions.txt
Simple merge
diff --cc src/mspell/mspell-summon.cpp
Simple merge
diff --cc src/system/monster-race-info.h
Simple merge
author	火炎の飛竜 <87808091+Slimebreath6078@users.noreply.github.com>
	Sun, 3 Mar 2024 13:40:54 +0000 (22:40 +0900)
committer	GitHub <noreply@github.com>
	Sun, 3 Mar 2024 13:40:54 +0000 (22:40 +0900)
		1	2
lib/edit/MonsterRaceDefinitions.txt	patch \|	diff1 \|	diff2 \|	blob \| history
src/mspell/mspell-summon.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/system/monster-race-info.h	patch \|	diff1 \|	diff2 \|	blob \| history