Merge branch 'egofix' into 'master'

Fix ego stacking on randarts on certain egos

It's a long standing bug now that, due to the way resolvers work, applying the same ego of a certain type (e.g. robe of fire) to an item would make the statistic (e.g. resistance) on that item to spiral out of control exponentially. This branch fixes that by making it possible to resolve truly all resolvers before merging an ego.