Merge pull request #60 from Rutherther/feat/combat-v1

Make combat nonblocking, make multiple queues for distinct operations

fix(combat): prevent quitting before an operation is finished

feat(combat): update operations to be non-blocking, add support for handling waiting

Merge pull request #32 from Rutherther/combat

Add combat extension

fix(combat): remove trailing whitespace

feat(combat): add combat manager