commit before merge
bug fix: player_progress properly updated after cauldrons completed
Merge branch 'dev'