Char Edits Update 5

Combat tab macrolinks generated and implemented
Fixed various types and errors