Tomes recoded to use modifiers
Merge remote-tracking branch 'origin/master'

Conflicts:
	scripts/npc/npc_items_custom.txt