Revert mooshrooms, pigmen and witches back to their previous forms.
Adds the 4 newer potions to the Potion Cleric's trade options (#1197)
