Updated the contents and fixed the bug
Merge branch 'medieval' of https://github.com/John-Candlebury/Cataclysm-DDA into John-Candlebury-medieval