Updated constants
Merge branch 'develop' into ghostblocks.monstertest