Merge branch 'release/2.6.0'

Author: Alar of Runetotem

OrderHallCommander.toc

@@ -1,6 +1,17 @@
-## Interface: 110105, 110107
+## Interface: 110200, 110205
 ## Title: OrderHallCommander
 ## IconTexture: 134414
+## Category-enUS: Expansion Features
+## Category-deDE: Erweiterungsfeatures
+## Category-esES: Características
+## Category-esMX: Características de expansiones
+## Category-frFR: Contenu d’extension
+## Category-itIT: Contenuti specifici
+## Category-koKR: 확장팩 특징
+## Category-ptBR: Características da Expansão
+## Category-ruRU: Особый контент
+## Category-zhCN: 特色更新
+## Category-zhTW: 資料片特色
 ## Notes: Sending all follower to missions with just one click and more
 ## Notes-itIT: Invia tutti i seguaci in missione con un click e molto altro
 ## Notes-frFR: Vous aide au moment de choisir le droit utilisateur pour la bonne mission

RelNotes.json

@@ -1,5 +1,28 @@
 {
     "NOTES": {
+        "k020600": {
+            "major": "2",
+            "minor": "6",
+            "patch": "0",
+            "description": [
+                {
+                    "tag": "Toc",
+                    "info": "11.2.0"
+                },
+                {
+                    "tag": "Fix",
+                    "info": "Removed a glitch when clicking on minimap button"
+                },
+                {
+                    "tag": "Feature",
+                    "info": "Added category"
+                },
+                {
+                    "tag": "Internale",
+                    "info": "removed unused parameters"
+                }
+            ]
+        },
         "k020502": {
             "major": "2",
             "minor": "5",

RelNotes.lua

@@ -16,6 +16,12 @@ self:Wiki([[
 typing /ohc silent in chat will eliminate every chat message from OrderHallCommander
 ]])
 self:HF_Paragraph('Release Notes')
+self:RelNotes(2,6,0,[[
+Toc: 11.2.0
+Fix: Removed a glitch when clicking on minimap button
+Feature: Added category
+Internale: removed unused parameters
+]])
 self:RelNotes(2,5,2,[[
 Toc: 11.1.5
 ]])

tutorials.lua

@@ -138,7 +138,7 @@ tutorials={
   },
   {
     text=function()
-        local c,n=C(X["Counter kill Troops"], fcolor),C(X["Never kill Troops"],fcolor),C(addon:GetNumber("MAXCHAMP"),ncolor)
+        local c=C(X["Counter kill Troops"], fcolor)
         return format(L["With %1$s you ask to always counter the Hazard kill troop.\nThis means that OHC will try to counter it OR use a troop with just one durability left.\nThe target for this switch is to avoid wasting durability point, NOT to avoid troops' death."],
         c)
     end,
@@ -406,6 +406,7 @@ end
 function module:Hide(this)
   HelpPlateTooltip.HookedByOHC=nil
   HelpPlateTooltip:SetFrameStrata(platestrata)
+  if (not HelpPlate_TooltipHide) then return end
   HelpPlate_TooltipHide()
   HelpPlateTooltip:SetParent(UIParent)
   Clicker:SetParent(nil)