Pulled curse logic over from the Exile CR.
Pulled Granite/Jade flask support over from the Exile CR.
Merge branch 'dev' into release