Separated phases of matter from materials
Merge remote-tracking branch 'upstream/master' into phases

Conflicts:
	player.cpp
Fixed typo
Fixed crafting of drinks
Fixed bracket issue caused by merge conflict
Merge remote-tracking branch 'upstream/master' into phases

Conflicts:
	player.cpp
Merge remote-tracking branch 'dda/pr/425' into dda-master

Conflicts:
	crafting.cpp
Whitespace cleanup.