.
Merge branch 'dev' of https://github.com/ArnauPrat/triforce into dev

Conflicts:
	src/cover_utils.cpp