Merge pull request #909 from Kinematics/4.1-dev

GearSwap/Mote-Libs - fix ranged set selection again
GearSwap/Mote-Libs - Get rid of extra fallback code.
Add CombatForm and CombatWeapon to ranged set selection.