Merge branch 'misc_idk' into 'master'

Miscs for next version

1. fix wintry ego on shield not crit (it does mindcrit, but then use the base damage instead)
2. fix Shattering Charge double crits (luckily only spire dragon knows this obslete talent, which is extremely rare except Gorbat Pride).

See merge request !747