use new combat
Merge branch 'master' of https://github.com/MINIONBOTS/FFXIVMinion
Merge branch 'master' of https://github.com/MINIONBOTS/FFXIVMinion
shifting code, not being read correctly outside of the CNE