Merge branch 'feature/DrinkingBiomeEffects' into develop

Conflicts:
	WaywardCharacters/src/main/java/net/wayward_realms/waywardcharacters/PlayerInteractListener.java
	WaywardCharacters/src/main/java/net/wayward_realms/waywardcharacters/PlayerItemConsumeListener.java