Merge pull request #919 from Kinematics/4.1-dev

GearSwap - Rework handling of disabled equip slots.
GearSwap - Fix: combine with base set.