Merge pull request #534 from wyrmisis/fix/v12-initiative-woes

feat(combat): replace the combat tab with one made for v12

Author: Rughalt

.eslintrc

@@ -98,4 +98,4 @@
 		"fromUuidSync": "readonly",
 		"PoolTerm": "readonly"
 	}
-}
+}

src/lang/en.json

@@ -8,6 +8,7 @@
   "OSE.Reset": "Reset",
   "OSE.Cancel": "Cancel",
   "OSE.Roll": "Roll",
+  "OSE.Reroll": "Reroll",
   "OSE.Success": "Success",
   "OSE.Failure": "Failure",
 
@@ -304,13 +305,16 @@
   "OSE.colors.orange": "Orange",
   "OSE.colors.white": "White",
 
+  "OSE.colors.black": "Black",
   "OSE.reaction.check": "Reaction Check",
   "OSE.reaction.Hostile": "{name} is Hostile",
   "OSE.reaction.Unfriendly": "{name} is Unfriendly",
   "OSE.reaction.Neutral": "{name} is Neutral",
   "OSE.reaction.Indifferent": "{name} is Indifferent",
   "OSE.reaction.Friendly": "{name} is Friendly",
 
+  "OSE.combat.SetCombatantAsActive": "Set Active",
+  "OSE.combat.SetCombatantGroups": "Set Combatant Groups",
   "OSE.CombatFlag.SpellDeclared": "Spell Declared",
   "OSE.CombatFlag.RetreatFromMeleeDeclared": "Retreat From Melee Declared",