From 7b374294ab2713bfa54e301f57e19ebfb4ec6a14 Mon Sep 17 00:00:00 2001
From: Alar of Runetotem <alar@aspide.it>
Date: Sun, 22 Jan 2017 16:27:27 +0100
Subject: [PATCH] OrderHallCommander import

---
 OrderHallCommander/CHANGES.txt                     |   12 -
 OrderHallCommander/OrderHallCommander.lua          |   89 +-
 OrderHallCommander/OrderHallCommander.toc          |    9 +-
 OrderHallCommander/OrderHallCommander.xml          |   27 +-
 OrderHallCommander/autocomplete.lua                |   66 +-
 OrderHallCommander/autopilot.lua                   |   13 +-
 OrderHallCommander/cache.lua                       |  154 +-
 OrderHallCommander/core.lua                        |   27 +-
 OrderHallCommander/data.lua                        |  272 ++-
 OrderHallCommander/followerpage.lua                |   23 +-
 .../libs/Ace3/AceBucket-3.0/AceBucket-3.0.lua      |  293 ---
 .../libs/Ace3/AceBucket-3.0/AceBucket-3.0.xml      |    4 -
 .../Ace3/AceSerializer-3.0/AceSerializer-3.0.lua   |  287 ---
 .../Ace3/AceSerializer-3.0/AceSerializer-3.0.xml   |    4 -
 .../LibInit/Ace3/AceAddon-3.0/AceAddon-3.0.lua     |  674 ------
 .../LibInit/Ace3/AceAddon-3.0/AceAddon-3.0.xml     |    4 -
 .../LibInit/Ace3/AceConfig-3.0/AceConfig-3.0.lua   |   57 -
 .../LibInit/Ace3/AceConfig-3.0/AceConfig-3.0.xml   |    8 -
 .../AceConfigCmd-3.0/AceConfigCmd-3.0.lua          |  794 -------
 .../AceConfigCmd-3.0/AceConfigCmd-3.0.xml          |    4 -
 .../AceConfigDialog-3.0/AceConfigDialog-3.0.lua    | 1955 -----------------
 .../AceConfigDialog-3.0/AceConfigDialog-3.0.xml    |    4 -
 .../AceConfigRegistry-3.0.lua                      |  349 ---
 .../AceConfigRegistry-3.0.xml                      |    4 -
 .../LibInit/Ace3/AceConsole-3.0/AceConsole-3.0.lua |  250 ---
 .../LibInit/Ace3/AceConsole-3.0/AceConsole-3.0.xml |    4 -
 .../libs/LibInit/Ace3/AceDB-3.0/AceDB-3.0.lua      |  746 -------
 .../libs/LibInit/Ace3/AceDB-3.0/AceDB-3.0.xml      |    4 -
 .../Ace3/AceDBOptions-3.0/AceDBOptions-3.0.lua     |  460 ----
 .../Ace3/AceDBOptions-3.0/AceDBOptions-3.0.xml     |    4 -
 .../LibInit/Ace3/AceEvent-3.0/AceEvent-3.0.lua     |  126 --
 .../LibInit/Ace3/AceEvent-3.0/AceEvent-3.0.xml     |    4 -
 .../libs/LibInit/Ace3/AceGUI-3.0/AceGUI-3.0.lua    |  813 -------
 .../libs/LibInit/Ace3/AceGUI-3.0/AceGUI-3.0.xml    |   28 -
 .../widgets/AceGUIContainer-BlizOptionsGroup.lua   |  138 --
 .../widgets/AceGUIContainer-DropDownGroup.lua      |  157 --
 .../AceGUI-3.0/widgets/AceGUIContainer-Frame.lua   |  311 ---
 .../widgets/AceGUIContainer-InlineGroup.lua        |  103 -
 .../widgets/AceGUIContainer-ScrollFrame.lua        |  210 --
 .../widgets/AceGUIContainer-SimpleGroup.lua        |   69 -
 .../widgets/AceGUIContainer-TabGroup.lua           |  350 ---
 .../widgets/AceGUIContainer-TreeGroup.lua          |  717 ------
 .../AceGUI-3.0/widgets/AceGUIContainer-Window.lua  |  331 ---
 .../AceGUI-3.0/widgets/AceGUIWidget-Button.lua     |  103 -
 .../AceGUI-3.0/widgets/AceGUIWidget-CheckBox.lua   |  295 ---
 .../widgets/AceGUIWidget-ColorPicker.lua           |  194 --
 .../widgets/AceGUIWidget-DropDown-Items.lua        |  477 ----
 .../AceGUI-3.0/widgets/AceGUIWidget-DropDown.lua   |  737 -------
 .../AceGUI-3.0/widgets/AceGUIWidget-EditBox.lua    |  265 ---
 .../AceGUI-3.0/widgets/AceGUIWidget-Heading.lua    |   78 -
 .../Ace3/AceGUI-3.0/widgets/AceGUIWidget-Icon.lua  |  140 --
 .../widgets/AceGUIWidget-InteractiveLabel.lua      |  101 -
 .../AceGUI-3.0/widgets/AceGUIWidget-Keybinding.lua |  249 ---
 .../Ace3/AceGUI-3.0/widgets/AceGUIWidget-Label.lua |  166 --
 .../widgets/AceGUIWidget-MultiLineEditBox.lua      |  366 ----
 .../AceGUI-3.0/widgets/AceGUIWidget-Slider.lua     |  285 ---
 .../libs/LibInit/Ace3/AceHook-3.0/AceHook-3.0.lua  |  511 -----
 .../libs/LibInit/Ace3/AceHook-3.0/AceHook-3.0.xml  |    4 -
 .../LibInit/Ace3/AceLocale-3.0/AceLocale-3.0.lua   |  137 --
 .../LibInit/Ace3/AceLocale-3.0/AceLocale-3.0.xml   |    4 -
 .../LibInit/Ace3/AceTimer-3.0/AceTimer-3.0.lua     |  276 ---
 .../LibInit/Ace3/AceTimer-3.0/AceTimer-3.0.xml     |    4 -
 .../CallbackHandler-1.0/CallbackHandler-1.0.lua    |  238 --
 .../CallbackHandler-1.0/CallbackHandler-1.0.xml    |    4 -
 .../libs/LibInit/Ace3/LibStub/LibStub.lua          |   30 -
 .../libs/LibInit/LibDataBroker-1.1.lua             |   90 -
 OrderHallCommander/libs/LibInit/LibInit.lua        | 2302 --------------------
 OrderHallCommander/libs/LibInit/LibInit.xml        |    8 -
 OrderHallCommander/libs/LibInit/colorize.lua       |  209 --
 OrderHallCommander/libs/LibInit/libs.xml           |   15 -
 .../libs/LibItemUpgradeInfo-1.0/Core.lua           |  654 ------
 .../LibItemUpgradeInfo-1.0.toc                     |    9 -
 .../LibItemUpgradeInfo-1.0.xml                     |    4 -
 .../LibItemUpgradeInfo-1.0/LibStub/LibStub.lua     |   51 -
 .../LibItemUpgradeInfo-1.0/LibStub/LibStub.toc     |    9 -
 OrderHallCommander/localization.lua                |  507 +----
 OrderHallCommander/matchmaker.lua                  |  260 ++-
 OrderHallCommander/missionlist.lua                 |  154 +-
 OrderHallCommander/missionpage.lua                 |   15 +-
 OrderHallCommander/widgets.lua                     |   11 +-
 OrderHallCommander/widgets.xml                     |    2 +-
 OrderHallCommander/widgets/GUIContainer.lua        |   53 -
 OrderHallCommander/widgets/MissionButton.lua       |  129 --
 OrderHallCommander/widgets/MissionsList.lua        |  180 --
 84 files changed, 840 insertions(+), 18444 deletions(-)
 delete mode 100644 OrderHallCommander/CHANGES.txt
 delete mode 100644 OrderHallCommander/libs/Ace3/AceBucket-3.0/AceBucket-3.0.lua
 delete mode 100644 OrderHallCommander/libs/Ace3/AceBucket-3.0/AceBucket-3.0.xml
 delete mode 100644 OrderHallCommander/libs/Ace3/AceSerializer-3.0/AceSerializer-3.0.lua
 delete mode 100644 OrderHallCommander/libs/Ace3/AceSerializer-3.0/AceSerializer-3.0.xml
 delete mode 100644 OrderHallCommander/libs/LibInit/Ace3/AceAddon-3.0/AceAddon-3.0.lua
 delete mode 100644 OrderHallCommander/libs/LibInit/Ace3/AceAddon-3.0/AceAddon-3.0.xml
 delete mode 100644 OrderHallCommander/libs/LibInit/Ace3/AceConfig-3.0/AceConfig-3.0.lua
 delete mode 100644 OrderHallCommander/libs/LibInit/Ace3/AceConfig-3.0/AceConfig-3.0.xml
 delete mode 100644 OrderHallCommander/libs/LibInit/Ace3/AceConfig-3.0/AceConfigCmd-3.0/AceConfigCmd-3.0.lua
 delete mode 100644 OrderHallCommander/libs/LibInit/Ace3/AceConfig-3.0/AceConfigCmd-3.0/AceConfigCmd-3.0.xml
 delete mode 100644 OrderHallCommander/libs/LibInit/Ace3/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua
 delete mode 100644 OrderHallCommander/libs/LibInit/Ace3/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.xml
 delete mode 100644 OrderHallCommander/libs/LibInit/Ace3/AceConfig-3.0/AceConfigRegistry-3.0/AceConfigRegistry-3.0.lua
 delete mode 100644 OrderHallCommander/libs/LibInit/Ace3/AceConfig-3.0/AceConfigRegistry-3.0/AceConfigRegistry-3.0.xml
 delete mode 100644 OrderHallCommander/libs/LibInit/Ace3/AceConsole-3.0/AceConsole-3.0.lua
 delete mode 100644 OrderHallCommander/libs/LibInit/Ace3/AceConsole-3.0/AceConsole-3.0.xml
 delete mode 100644 OrderHallCommander/libs/LibInit/Ace3/AceDB-3.0/AceDB-3.0.lua
 delete mode 100644 OrderHallCommander/libs/LibInit/Ace3/AceDB-3.0/AceDB-3.0.xml
 delete mode 100644 OrderHallCommander/libs/LibInit/Ace3/AceDBOptions-3.0/AceDBOptions-3.0.lua
 delete mode 100644 OrderHallCommander/libs/LibInit/Ace3/AceDBOptions-3.0/AceDBOptions-3.0.xml
 delete mode 100644 OrderHallCommander/libs/LibInit/Ace3/AceEvent-3.0/AceEvent-3.0.lua
 delete mode 100644 OrderHallCommander/libs/LibInit/Ace3/AceEvent-3.0/AceEvent-3.0.xml
 delete mode 100644 OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/AceGUI-3.0.lua
 delete mode 100644 OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/AceGUI-3.0.xml
 delete mode 100644 OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIContainer-BlizOptionsGroup.lua
 delete mode 100644 OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIContainer-DropDownGroup.lua
 delete mode 100644 OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIContainer-Frame.lua
 delete mode 100644 OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIContainer-InlineGroup.lua
 delete mode 100644 OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIContainer-ScrollFrame.lua
 delete mode 100644 OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIContainer-SimpleGroup.lua
 delete mode 100644 OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIContainer-TabGroup.lua
 delete mode 100644 OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIContainer-TreeGroup.lua
 delete mode 100644 OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIContainer-Window.lua
 delete mode 100644 OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIWidget-Button.lua
 delete mode 100644 OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIWidget-CheckBox.lua
 delete mode 100644 OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIWidget-ColorPicker.lua
 delete mode 100644 OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIWidget-DropDown-Items.lua
 delete mode 100644 OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIWidget-DropDown.lua
 delete mode 100644 OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIWidget-EditBox.lua
 delete mode 100644 OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIWidget-Heading.lua
 delete mode 100644 OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIWidget-Icon.lua
 delete mode 100644 OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIWidget-InteractiveLabel.lua
 delete mode 100644 OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIWidget-Keybinding.lua
 delete mode 100644 OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIWidget-Label.lua
 delete mode 100644 OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIWidget-MultiLineEditBox.lua
 delete mode 100644 OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIWidget-Slider.lua
 delete mode 100644 OrderHallCommander/libs/LibInit/Ace3/AceHook-3.0/AceHook-3.0.lua
 delete mode 100644 OrderHallCommander/libs/LibInit/Ace3/AceHook-3.0/AceHook-3.0.xml
 delete mode 100644 OrderHallCommander/libs/LibInit/Ace3/AceLocale-3.0/AceLocale-3.0.lua
 delete mode 100644 OrderHallCommander/libs/LibInit/Ace3/AceLocale-3.0/AceLocale-3.0.xml
 delete mode 100644 OrderHallCommander/libs/LibInit/Ace3/AceTimer-3.0/AceTimer-3.0.lua
 delete mode 100644 OrderHallCommander/libs/LibInit/Ace3/AceTimer-3.0/AceTimer-3.0.xml
 delete mode 100644 OrderHallCommander/libs/LibInit/Ace3/CallbackHandler-1.0/CallbackHandler-1.0.lua
 delete mode 100644 OrderHallCommander/libs/LibInit/Ace3/CallbackHandler-1.0/CallbackHandler-1.0.xml
 delete mode 100644 OrderHallCommander/libs/LibInit/Ace3/LibStub/LibStub.lua
 delete mode 100644 OrderHallCommander/libs/LibInit/LibDataBroker-1.1.lua
 delete mode 100644 OrderHallCommander/libs/LibInit/LibInit.lua
 delete mode 100644 OrderHallCommander/libs/LibInit/LibInit.xml
 delete mode 100644 OrderHallCommander/libs/LibInit/colorize.lua
 delete mode 100644 OrderHallCommander/libs/LibInit/libs.xml
 delete mode 100644 OrderHallCommander/libs/LibItemUpgradeInfo-1.0/Core.lua
 delete mode 100644 OrderHallCommander/libs/LibItemUpgradeInfo-1.0/LibItemUpgradeInfo-1.0.toc
 delete mode 100644 OrderHallCommander/libs/LibItemUpgradeInfo-1.0/LibItemUpgradeInfo-1.0.xml
 delete mode 100644 OrderHallCommander/libs/LibItemUpgradeInfo-1.0/LibStub/LibStub.lua
 delete mode 100644 OrderHallCommander/libs/LibItemUpgradeInfo-1.0/LibStub/LibStub.toc
 delete mode 100644 OrderHallCommander/widgets/Follower.lua
 delete mode 100644 OrderHallCommander/widgets/GUIContainer.lua
 delete mode 100644 OrderHallCommander/widgets/MissionButton.lua
 delete mode 100644 OrderHallCommander/widgets/MissionsList.lua
 delete mode 100644 OrderHallCommander/widgets/Reward.lua

diff --git a/OrderHallCommander/CHANGES.txt b/OrderHallCommander/CHANGES.txt
deleted file mode 100644
index 54e9cfd..0000000
--- a/OrderHallCommander/CHANGES.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-tag f427ed9f65556847fd2a9781443fb52ffa6e6eab 0.2.4
-Author:	Alar of Runetotem <alar@aspide.it>
-Date:	Tue Jan 10 23:22:16 2017 +0100
-
-Fixed various lua error and cache issues
-
-commit 8556b794a81a3e02cc916ec4116a91ace33dc63c
-Author: Alar of Runetotem <alar@aspide.it>
-Date:   Tue Jan 10 23:17:36 2017 +0100
-
-    Notes updated
-
diff --git a/OrderHallCommander/OrderHallCommander.lua b/OrderHallCommander/OrderHallCommander.lua
index 182a9ab..eca96e8 100644
--- a/OrderHallCommander/OrderHallCommander.lua
+++ b/OrderHallCommander/OrderHallCommander.lua
@@ -4,7 +4,7 @@ local function pp(...) print(GetTime(),"|cff009900",__FILE__:sub(-15),strjoin(",
 --*CONFIG noswitch=false,profile=true,enhancedProfile=true
 --*MIXINS "AceHook-3.0","AceEvent-3.0","AceTimer-3.0"
 --*MINOR 35
--- Generated on 11/12/2016 23:26:42
+-- Generated on 20/01/2017 08:15:04
 local me,ns=...
 local LibInit,minor=LibStub("LibInit",true)
 assert(LibInit,me .. ": Missing LibInit, please reinstall")
@@ -19,6 +19,7 @@ local L=addon:GetLocale()
 local new=addon.NewTable
 local del=addon.DelTable
 local kpairs=addon:GetKpairs()
+--local empty=addon:GetEmpty()
 local OHF=OrderHallMissionFrame
 local OHFMissionTab=OrderHallMissionFrame.MissionTab --Container for mission list and single mission
 local OHFMissions=OrderHallMissionFrame.MissionTab.MissionList -- same as OrderHallMissionFrameMissions Call Update on this to refresh Mission Listing
@@ -33,7 +34,7 @@ local FAKE_FOLLOWERID="0x0000000000000000"
 local MAXLEVEL=110
 local dprint=print
 local ddump
---[===[@debug@
+--@debug@
 LoadAddOn("Blizzard_DebugTools")
 ddump=DevTools_Dump
 LoadAddOn("LibDebug")
@@ -57,17 +58,21 @@ addon.safeG=setmetatable({},{
 	end
 })
 
---@end-debug@]===]
---@non-debug@
+--@end-debug@
+--[===[@non-debug@
 dprint=function() end
 ddump=function() end
 local print=function() end
---@end-non-debug@
+--@end-non-debug@]===]
 
 -- End Template - DO NOT MODIFY ANYTHING BEFORE THIS LINE
 --*BEGIN
 local MISSING=ITEM_MISSING:format('|cff'..C.Red.c)..'|r'
 local ctr=0
+-- Sometimes matchmakimng starts before these are defined, so I put here a sensible default (actually, this values are constans)
+addon.MAXLEVEL=110
+addon.MAXQUALITY=4
+addon.MAXQLEVEL=addon.MAXLEVEL+addon.MAXQUALITY
 function addon.resolve(frame) 
 	local name
 	if type(frame)=="table" and frame.GetName then
@@ -187,9 +192,9 @@ end
 function MixinThreats:AddIconsAndCost(mechanics,biases,cost,color,notEnoughResources)
 	local icons=OHF.abilityCountersForMechanicTypes
 	if not icons then
-		--[===[@debug@
+		--@debug@
 		print("Empty icons")
-		--@end-debug@ ]===]
+		--@end-debug@ 
 		return false 
 	end
 	for i=1,#self.usedPool do
@@ -239,7 +244,7 @@ function MixinThreats:AddIconsAndCost(mechanics,biases,cost,color,notEnoughResou
 	return true
 end
 
-function MixinFollowerIcon:SetFollower(followerID)
+function MixinFollowerIcon:SetFollower(followerID,checkStatus)
 	local info=addon:GetFollowerData(followerID)
 	if not info or not info.followerID then
 		local rc
@@ -250,11 +255,20 @@ function MixinFollowerIcon:SetFollower(followerID)
 	end
 	self.followerID=followerID
 	self:SetupPortrait(info)
-	local status=(followerID and not OHFMissions.showInProgress) and G.GetFollowerStatus(followerID) or nil
-	if not status and info.isMaxLevel then
-		self:SetILevel(info.iLevel)
+	local status=(followerID and checkStatus) and G.GetFollowerStatus(followerID) or nil
+	if status then 
+		self:SetILevel(0) --CHAT_FLAG_DND
+		self.Level:SetText(status);		
+		self.Portrait:SetDesaturated(true)
+		self:SetQuality(1)
+		self:GetParent():SetNotReady(true)
 	else
-		self:SetLevel(status and CHAT_FLAG_DND or info.level)
+		self.Portrait:SetDesaturated(false)
+		if info.isMaxLevel then
+			self:SetILevel(info.iLevel)
+		else
+			self:SetLevel(info.level)
+		end
 	end
 end
 function MixinFollowerIcon:SetEmpty(message)
@@ -262,15 +276,16 @@ function MixinFollowerIcon:SetEmpty(message)
 	self:SetLevel(message or MISSING)
 	self:SetPortraitIcon()
 	self:SetQuality(1)
+	self:GetParent():SetNotReady(true)
 end
 function MixinFollowerIcon:ShowTooltip()
 	if not self.followerID then
---[===[@debug@
+--@debug@
 		return self:Dump()
---@end-debug@]===]
---@non-debug@
+--@end-debug@
+--[===[@non-debug@
 		return
---@end-non-debug@	
+--@end-non-debug@]===]	
 	end
 	local link = C_Garrison.GetFollowerLink(self.followerID);
 	if link then
@@ -304,13 +319,25 @@ function Mixin:MembersOnLoad()
 			self.Champions[1]:SetPoint("RIGHT")
 		else
 			self.Champions[i]=CreateFrame("Frame",nil,self,"OHCFollowerIcon")
-			self.Champions[i]:SetPoint("RIGHT",self.Champions[i-1],"LEFT",-5,0)
+			self.Champions[i]:SetPoint("RIGHT",self.Champions[i-1],"LEFT",-15,0)
 		end
-		self.Champions[i]:SetFrameLevel(self:GetFrameLevel()+10)
+		self.Champions[i]:SetFrameLevel(self:GetFrameLevel()+1)
 		self.Champions[i]:Show()
 		self.Champions[i]:SetEmpty()
 	end
-	self:SetWidth(self.Champions[1]:GetWidth()*3+10)
+	self:SetWidth(self.Champions[1]:GetWidth()*3+30)
+	self.NotReady.Text:SetFormattedText(RAID_MEMBER_NOT_READY,STATUS_TEXT_PARTY)
+	self.NotReady.Text:SetTextColor(C.Orange())
+end
+function Mixin:MembersOnShow()
+	self:SetNotReady()
+end
+function Mixin:SetNotReady(show)
+	if show then
+		self.NotReady:Show()
+	else
+		self.NotReady:Hide()
+	end
 end
 function MixinMenu:OnLoad()
 	self.Top:SetAtlas("_StoneFrameTile-Top", true);
@@ -323,5 +350,27 @@ function MixinMenu:OnLoad()
 	self.GarrCorners.BottomRightGarrCorner:SetAtlas("StoneFrameCorner-TopLeft", true);
 	self.CloseButton:SetScript("OnClick",function() MixinMenu.OnClick(self) end)
 end	
-
+if not addon.GetEmpty then -- Will be moved into LibInit
+--@debug@
+	print("Used internal GetEmpty")
+--@end-debug@
+	local type=type
+	local function empty(obj)
+		if not obj then return true end -- Simplest case, obj evaluates to false in boolean context
+		local t=type(obj)
+		if t=="number" then
+			return obj==0
+		elseif t=="bool" then
+			return true
+		elseif t=="string" then
+			return obj=='' or obj==tostring(nil)
+		elseif t=="table" then
+			return not next(obj)
+		end
+		return false -- Userdata and threads can never be empty
+	end
+	function addon:GetEmpty()
+		return empty
+	end
+end
 
diff --git a/OrderHallCommander/OrderHallCommander.toc b/OrderHallCommander/OrderHallCommander.toc
index cfe7587..a866ddd 100644
--- a/OrderHallCommander/OrderHallCommander.toc
+++ b/OrderHallCommander/OrderHallCommander.toc
@@ -12,8 +12,8 @@
 ## Notes-zhTW: 发送所有的追随者与点击多任务
 ## Notes-zhCN: 發送所有的追隨者與點擊多任務
 ## Author: Alar of Runetotem
-## Version: 0.2.4 7.1.0
-## X-Revision: 8556b79
+## Version: 0.9.9 7.1.0
+## X-Revision: @project-abbreviated-hash@
 ## eMail: alar@aspide.it
 ## URL: http://wow.aspide.it
 ## OptionalDeps: Ace3,LibInit
@@ -28,7 +28,7 @@
 ## X-Category: Garrison
 ## X-License: GPL v3
 ## X-eMail: alar@aspide.it
-## X-Date: 2017-01-11T4:17:36Z
+## X-Date: @project-date-iso@
 ## X-Embeds: LibInit
 embeds.xml
 localization.lua
@@ -45,3 +45,6 @@ widgets.xml
 RelNotes.lua
 data.lua
 wowhead.lua
+#@do-not-package@
+Debug.lua
+#@end-do-not-package@
diff --git a/OrderHallCommander/OrderHallCommander.xml b/OrderHallCommander/OrderHallCommander.xml
index d9a29d3..2bbaa08 100644
--- a/OrderHallCommander/OrderHallCommander.xml
+++ b/OrderHallCommander/OrderHallCommander.xml
@@ -31,7 +31,9 @@
 			</Layer>
 		</Layers>	
 		<Scripts>
+<!--@debug@-->				
 			<OnEnter method="Dump"/>
+<!--@end-debug@-->				
 			<OnLeave method="HideTT"/>
 		</Scripts>
 	</Frame>
@@ -55,22 +57,39 @@
 		</Layers> 		
 		<Scripts>
 			<OnLoad method="ThreatsOnLoad"/>
-<!--@debug@				
+<!--@debug@-->				
 			<OnEnter>
 				self:Dump(self:GetParent())
 			</OnEnter>
-@end-debug@-->				
+<!--@end-debug@-->				
 			<OnLeave method="HideTT"/>
 		</Scripts>
 	</Frame>
 	<Frame name="OHCMembers" mixin="OrderHallCommanderMixin" virtual="true" enableMouse="false">
 		<Size x="1" y="70"/>
 		<Frames>
+			<Frame parentKey="NotReady" strata="HIGH">
+				<Anchors>
+					<Anchor point="TOPLEFT" x="-5" y="0"/>
+					<Anchor point="BOTTOMRIGHT" x="5" y="0"/>
+				</Anchors>					
+				<Layers>
+					<Layer level="OVERLAY">
+						<FontString parentKey="Text" justifyV="TOP" justifyH="CENTER" inherits="GameFontNormalOutline" text="GARRISON_PARTY_NOT_ENOUGH_CHAMPIONS">
+							<Anchors>
+								<Anchor point="TOPLEFT" x="5" y="0"/>
+								<Anchor point="BOTTOMRIGHT" x="-5" y="0"/>
+							</Anchors>					
+						</FontString>
+					</Layer>
+				</Layers> 		
+			</Frame>				
 			<Frame parentArray="Champions" inherits="OHCFollowerIcon" />
 		</Frames>
 		<Scripts>
 			<OnLoad method="MembersOnLoad"/>
 			<OnLeave method="HideTT"/>
+			<OnShow methot="MembersOnShow"/>
 		</Scripts>
 	</Frame>
 	<Frame name="OHCFollowerIcon" mixin="OrderHallCommanderMixin,OrderHallCommanderMixinFollowerIcon" enableMouse="true" inherits="GarrisonFollowerPortraitTemplate" virtual="true" >
@@ -175,7 +194,7 @@
 		</Scripts>
 	</Frame>
 	<Frame name="OHCAlertFrameTemplate" inherits="GarrisonStandardFollowerAlertFrameTemplate" virtual="true"/>
-<!--@debug@	
+<!--@debug@-->	
 	<Frame name="OHCDebug" mixin="OrderHallCommanderMixin" visible="true" enableMouse="true" movable="true">
 		<Size x="240" y="160"/>
 		<KeyValues>
@@ -264,7 +283,7 @@
 			<OnDragStop method="DragStop"/>
 		</Scripts>
 	</Frame>
-@end-debug@-->	
+<!--@end-debug@-->	
 	<!--
 	GarrisonFollowerXPGainTemplate
 	GarrisonFollowerXPBarTemplate
diff --git a/OrderHallCommander/autocomplete.lua b/OrderHallCommander/autocomplete.lua
index ec46e32..2b778f5 100644
--- a/OrderHallCommander/autocomplete.lua
+++ b/OrderHallCommander/autocomplete.lua
@@ -4,7 +4,7 @@ local function pp(...) print(GetTime(),"|cff009900",__FILE__:sub(-15),strjoin(",
 --*CONFIG noswitch=false,profile=true,enhancedProfile=true
 --*MIXINS "AceHook-3.0","AceEvent-3.0","AceTimer-3.0"
 --*MINOR 35
--- Generated on 11/12/2016 23:26:42
+-- Generated on 20/01/2017 08:15:04
 local me,ns=...
 local addon=ns --#Addon (to keep eclipse happy)
 ns=nil
@@ -19,6 +19,7 @@ local L=addon:GetLocale()
 local new=addon.NewTable
 local del=addon.DelTable
 local kpairs=addon:GetKpairs()
+local empty=addon:GetEmpty()
 local OHF=OrderHallMissionFrame
 local OHFMissionTab=OrderHallMissionFrame.MissionTab --Container for mission list and single mission
 local OHFMissions=OrderHallMissionFrame.MissionTab.MissionList -- same as OrderHallMissionFrameMissions Call Update on this to refresh Mission Listing
@@ -37,7 +38,7 @@ local HideTT=OrderHallCommanderMixin.HideTT
 
 local dprint=print
 local ddump
---[===[@debug@
+--@debug@
 LoadAddOn("Blizzard_DebugTools")
 ddump=DevTools_Dump
 LoadAddOn("LibDebug")
@@ -45,12 +46,12 @@ LoadAddOn("LibDebug")
 if LibDebug then LibDebug() dprint=print end
 local safeG=addon.safeG
 
---@end-debug@]===]
---@non-debug@
+--@end-debug@
+--[===[@non-debug@
 dprint=function() end
 ddump=function() end
 local print=function() end
---@end-non-debug@
+--@end-non-debug@]===]
 
 -- End Template - DO NOT MODIFY ANYTHING BEFORE THIS LINE
 --*BEGIN 
@@ -73,9 +74,9 @@ end
 
 function module:GenerateMissionCompleteList(title,anchor)
 	local w=AceGUI:Create("OHCMissionsList")
---[===[@debug@
+--@debug@
 	title=format("%s %s %s",title,w.frame:GetName(),GetTime()*1000)
---@end-debug@]===]
+--@end-debug@
 	w:SetTitle(title)
 	w:SetCallback("OnClose",function(widget) return module:MissionsCleanup() end)
 	--report:SetPoint("TOPLEFT",GMFMissions.CompleteDialog.BorderFrame)
@@ -88,11 +89,11 @@ function module:GenerateMissionCompleteList(title,anchor)
 	w.frame:SetFrameStrata("HIGH")
 	return w
 end
---[===[@debug@
+--@debug@
 function addon:ShowRewards()
 	return module:GenerateMissionCompleteList("Test",UIParent)
 end
---@end-debug@]===]
+--@end-debug@
 local cappedCurrencies={
 	GARRISON_CURRENCY,
 	GARRISON_SHIP_OIL_CURRENCY
@@ -123,9 +124,9 @@ local function startTimer(delay,event,...)
 	event=event or "LOOP"
 	stopTimer()
 	timer=module:ScheduleRepeatingTimer("MissionAutoComplete",delay,event,...)
-	--[===[@debug@
+	--@debug@
 	print("Timer rearmed for",event,delay)
-	--@end-debug@]===]
+	--@end-debug@
 end
 function module:MissionsCleanup()
 	local f=OHF
@@ -176,9 +177,9 @@ end
 function module:MissionComplete(this,button,skiprescheck)
 	missions=G.GetCompleteMissions(followerType)
 	fillMyStatus(mebefore)	
---[===[@debug@
+--@debug@
 	addon:PushEvent("Starting autocomplete")
---@end-debug@]===]
+--@end-debug@
 
 	if (missions and #missions > 0) then
 		this:SetEnabled(false)
@@ -211,13 +212,14 @@ function module:MissionComplete(this,button,skiprescheck)
 			local m=missions[i]
 --totalTimeString, totalTimeSeconds, isMissionTimeImproved, successChance, partyBuffs, isEnvMechanicCountered, xpBonus, materialMultiplier, goldMultiplier = C_Garrison.GetPartyMissionInfo(MISSION_PAGE_FRAME.missionInfo.missionID);
 			_,_,m.isMissionTimeImproved,m.successChance,_,_,m.xpBonus,m.resourceMultiplier,m.goldMultiplier=G.GetPartyMissionInfo(m.missionID)
+			addon:GetCacheModule():SetMissionStatus(m.missionID,'completed')			
 		end
 		local stop
 		for id,qt in pairs(wasted) do
 			local name,current,_,_,_,cap=GetCurrencyInfo(id)
-			--[===[@debug@
+			--@debug@
 			print(name,current,qt,cap)
-			--@end-debug@]===]
+			--@end-debug@
 			current=current+qt
 			if current+qt > cap then
 				message=message.."\n"..format(L["Capped %1$s. Spend at least %2$d of them"],name,current+qt-cap)
@@ -284,9 +286,9 @@ function module:MissionAutoComplete(event,...)
 	local current=report:GetUserData('current')
 	local currentMission=report:GetUserData('missions')[current]
 	local missionID=currentMission and currentMission.missionID or 0
---[===[@debug@
+--@debug@
 	print("evt",missionID,event,...)
---@end-debug@]===]
+--@end-debug@
 	-- GARRISON_FOLLOWER_XP_CHANGED: followerType,followerID, xpGained, oldXp, oldLevel, oldQuality
 	if (event=="GARRISON_FOLLOWER_XP_CHANGED") then
 		local followerType,followerID, xpGained, oldXp, oldLevel, oldQuality=...
@@ -350,26 +352,26 @@ function module:MissionAutoComplete(event,...)
 				report:AddMissionButton(currentMission,currentMission.followers,currentMission.successChance,"report")
 			end
 			if (step==0) then
---[===[@debug@
+--@debug@
 				print("Fired MarkMissionCompleter",currentMission.missionID)
 				addon:PushEvent("MarkMissionComplete",currentMission.missionID)
---@end-debug@]===]
+--@end-debug@
 
 				G.MarkMissionComplete(currentMission.missionID)
 				startTimer(2)
 			elseif (step==1) then
---[===[@debug@
+--@debug@
 				print("Fired MissionBonusRoll",currentMission.missionID)
 				addon:PushEvent("MissionBonusRoll",currentMission.missionID)
---@end-debug@]===]
+--@end-debug@
 
 				G.MissionBonusRoll(currentMission.missionID)
 				startTimer(2)
 			elseif (step>=2) then
---[===[@debug@
+--@debug@
 				print("Advanced to next mission  last:",currentMission.missionID,step)
 				addon:PushEvent("Next mission last:",currentMission.missionID)
---@end-debug@]===]
+--@end-debug@
 
 				self:GetMissionResults(step,currentMission)
 				--addon:RefreshFollowerStatus()
@@ -381,9 +383,9 @@ function module:MissionAutoComplete(event,...)
 			end
 			currentMission.state=step
 		else
---[===[@debug@
+--@debug@
 			addon:PushEvent("Building final report")
---@end-debug@]===]
+--@end-debug@
 
 			report:AddButton(L["Building Final report"])
 			startTimer(1,"LOOT")
@@ -444,9 +446,9 @@ function module:MissionsPrintResults(success)
 	stopTimer()
 	local reported
 	local followers
-	--[===[@debug@
+	--@debug@
 	_G["testrewards"]=rewards
-	--@end-debug@]===]
+	--@end-debug@
 	for k,v in pairs(rewards.currencies) do
 		reported=true
 		if k == 0 then
@@ -505,10 +507,10 @@ function module:MissionsPrintResults(success)
 	end
 	if mebefore.level < 110 then
 		fillMyStatus(meafter)
-		--[===[@debug@
-		printMyStatus(mebefore)
-		printMyStatus(meafter)
-		--@end-debug@]===]
+		--@debug@
+		--printMyStatus(mebefore)
+		--printMyStatus(meafter)
+		--@end-debug@
 		local xpgain=0
 		if meafter.level>mebefore.level then
 			xpgain=mebefore.xpMax-mebefore.xp + meafter.xp
@@ -531,4 +533,4 @@ function addon:MissionComplete(...)
 end
 function addon:CloseMissionComplete()
 	return module:CloseReport()
-end
+end
\ No newline at end of file
diff --git a/OrderHallCommander/autopilot.lua b/OrderHallCommander/autopilot.lua
index c87a176..e345ce6 100644
--- a/OrderHallCommander/autopilot.lua
+++ b/OrderHallCommander/autopilot.lua
@@ -4,7 +4,7 @@ local function pp(...) print(GetTime(),"|cff009900",__FILE__:sub(-15),strjoin(",
 --*CONFIG noswitch=false,profile=true,enhancedProfile=true
 --*MIXINS "AceHook-3.0","AceEvent-3.0","AceTimer-3.0"
 --*MINOR 35
--- Generated on 11/12/2016 23:26:42
+-- Generated on 20/01/2017 08:15:04
 local me,ns=...
 local addon=ns --#Addon (to keep eclipse happy)
 ns=nil
@@ -19,6 +19,7 @@ local L=addon:GetLocale()
 local new=addon.NewTable
 local del=addon.DelTable
 local kpairs=addon:GetKpairs()
+local empty=addon:GetEmpty()
 local OHF=OrderHallMissionFrame
 local OHFMissionTab=OrderHallMissionFrame.MissionTab --Container for mission list and single mission
 local OHFMissions=OrderHallMissionFrame.MissionTab.MissionList -- same as OrderHallMissionFrameMissions Call Update on this to refresh Mission Listing
@@ -37,7 +38,7 @@ local HideTT=OrderHallCommanderMixin.HideTT
 
 local dprint=print
 local ddump
---[===[@debug@
+--@debug@
 LoadAddOn("Blizzard_DebugTools")
 ddump=DevTools_Dump
 LoadAddOn("LibDebug")
@@ -45,12 +46,12 @@ LoadAddOn("LibDebug")
 if LibDebug then LibDebug() dprint=print end
 local safeG=addon.safeG
 
---@end-debug@]===]
---@non-debug@
+--@end-debug@
+--[===[@non-debug@
 dprint=function() end
 ddump=function() end
 local print=function() end
---@end-non-debug@
+--@end-non-debug@]===]
 
 -- End Template - DO NOT MODIFY ANYTHING BEFORE THIS LINE
---*BEGIN 
+--*BEGIN 
\ No newline at end of file
diff --git a/OrderHallCommander/cache.lua b/OrderHallCommander/cache.lua
index d745a0e..37e2cf7 100644
--- a/OrderHallCommander/cache.lua
+++ b/OrderHallCommander/cache.lua
@@ -4,7 +4,7 @@ local function pp(...) print(GetTime(),"|cff009900",__FILE__:sub(-15),strjoin(",
 --*CONFIG noswitch=false,profile=true,enhancedProfile=true
 --*MIXINS "AceHook-3.0","AceEvent-3.0","AceTimer-3.0"
 --*MINOR 35
--- Generated on 11/12/2016 23:26:42
+-- Generated on 20/01/2017 08:15:04
 local me,ns=...
 local addon=ns --#Addon (to keep eclipse happy)
 ns=nil
@@ -19,6 +19,7 @@ local L=addon:GetLocale()
 local new=addon.NewTable
 local del=addon.DelTable
 local kpairs=addon:GetKpairs()
+local empty=addon:GetEmpty()
 local OHF=OrderHallMissionFrame
 local OHFMissionTab=OrderHallMissionFrame.MissionTab --Container for mission list and single mission
 local OHFMissions=OrderHallMissionFrame.MissionTab.MissionList -- same as OrderHallMissionFrameMissions Call Update on this to refresh Mission Listing
@@ -34,10 +35,10 @@ local MAXLEVEL=110
 
 local ShowTT=OrderHallCommanderMixin.ShowTT
 local HideTT=OrderHallCommanderMixin.HideTT
-local unpack=unpack
+
 local dprint=print
 local ddump
---[===[@debug@
+--@debug@
 LoadAddOn("Blizzard_DebugTools")
 ddump=DevTools_Dump
 LoadAddOn("LibDebug")
@@ -45,12 +46,12 @@ LoadAddOn("LibDebug")
 if LibDebug then LibDebug() dprint=print end
 local safeG=addon.safeG
 
---@end-debug@]===]
---@non-debug@
+--@end-debug@
+--[===[@non-debug@
 dprint=function() end
 ddump=function() end
 local print=function() end
---@end-non-debug@
+--@end-non-debug@]===]
 
 -- End Template - DO NOT MODIFY ANYTHING BEFORE THIS LINE
 --*BEGIN 
@@ -87,6 +88,11 @@ local cachedMissions={}
 local categoryInfo
 local shipmentInfo={}
 local emptyTable={}
+local permutations={
+	{},
+	{},
+	{}
+}
 local methods={available='GetAvailableMissions',inProgress='GetInProgressMissions',completed='GetCompleteMissions'}
 local catPool={}
 local troopTypes={}
@@ -102,9 +108,9 @@ local function fillCachedMission(mission,time)
 end
 local function getCachedMissions()
 	if not next(cachedMissions) then
---[===[@debug@
+--@debug@
 		OHCDebug:Bump("Missions")
---@end-debug@	]===]
+--@end-debug@	
 		local time=GetTime()
 		for property,method in pairs(methods) do
 			local missions=G[method](followerType)
@@ -119,10 +125,10 @@ local function getCachedMissions()
 end	
 local function getCachedFollowers()
 	
-	if not next(cachedFollowers) then
---[===[@debug@
+	if empty(cachedFollowers) then
+--@debug@
 		OHCDebug:Bump("Followers")
---@end-debug@	]===]
+--@end-debug@	
 		local followers=G.GetFollowers(followerType)
 		if type(followers)=="table" then
 			local time=GetTime()
@@ -136,7 +142,7 @@ local function getCachedFollowers()
 		end
 	end
 	return cachedFollowers 
-end 
+end
 function module:GetAverageLevels(cached)
 	if avgLevel==0 or not cached then
 		local level,ilevel,tot=0,0,0
@@ -152,6 +158,31 @@ function module:GetAverageLevels(cached)
 	end
 	return avgLevel,avgIlevel
 end
+function addon:GetPermutations()
+	local champs=new()
+	addon:GetAllChampions(champs)
+	local k=#champs
+	local refresh=false
+	for i=1,k do
+		if permutations[1][i]~=champs[i] then refresh=true end
+	end
+	if refresh then
+		wipe(permutations[1])
+		wipe(permutations[2])
+		wipe(permutations[3])
+		for i=1,k do
+			tinsert(permutations[1],champs[i].followerID)
+			for j=i+1,k do
+				tinsert(permutations[2],strjoin(',',tostringall(champs[i].followerID,champs[j].followerID)))
+				for z=j+1,k do
+					tinsert(permutations[3],strjoin(',',tostringall(champs[i].followerID,champs[j].followerID,champs[z].followerID)))
+				end
+			end
+		end
+	end
+	del(champs)
+	return permutations
+end
 function module:DeleteFollower(followerID)
 	if followerID and cachedFollowers[followerID] then
 		del(cachedFollowers[followerID])
@@ -187,10 +218,10 @@ function module:BuildMission(missionIDfollowerID)
 	end
 end
 function module:refreshMission(data)
-	local runtime,runtimesec,inProgress,duration,durationsec,bool1,string1=G.GetMissionTimes(data.missionID)
+	--local runtime,runtimesec,inProgress,duration,durationsec,bool1,string1=G.GetMissionTimes(data.missionID)
 end
 function module:refreshFollower(data)
-	if data.lastUpdate < followersRefresh then
+	if (data.lastUpdate or 0) < followersRefresh then
 		-- stale data, refresh volatile fields
 		local id=data.followerID
 		local rc,name=pcall(G.GetFollowerName,id)
@@ -205,7 +236,7 @@ function module:refreshFollower(data)
 		end
 	end	
 end
---[===[@debug@
+--@debug@
 function module:GetFollower(key)
 	if (key:sub(1,2)=='0x') then
 		key="0x" .. ("0000000000000000" ..key:sub(3)):sub(-16)
@@ -217,7 +248,7 @@ function module:GetFollower(key)
 		end
 	end
 end
---@end-debug@]===]
+--@end-debug@
 function module:GetFollowerData(...)
 	local id,key,defaultvalue=...
 	local f=getCachedFollowers()
@@ -245,6 +276,15 @@ function module:GetFollowerData(...)
 		end
 	end
 end
+function module:SetMissionStatus(missionID,status)
+	local mission=getCachedMissions()[missionID]
+	if mission then
+		mission.inProgress=nil
+		mission.available=nil
+		mission.completed=nil
+	end
+	mission[status]=true
+end
 function module:GetMissionData(...)
 	local id,key,defaultvalue=...
 	local f=getCachedMissions()
@@ -306,26 +346,56 @@ local function alertSetup(frame,name,...)
 	frame.Title:SetText(name)
 	return frame
 end
-function module:RefreshTroopTypes(categoryInfo)
+function module:RefreshTroopTypes()
 	wipe(troopTypes)
-	for i, category in ipairs(categoryInfo) do
-		local index=category.classSpec
-		tinsert(troopTypes,index)
+	local t=new()
+	for i,v in pairs(getCachedFollowers()) do
+		if v.isTroop then
+			t[v.classSpec]=true
+		end
+	end
+	for i,_ in pairs(t) do
+		tinsert(troopTypes,i)
 	end
 end
+local TroopsHeader
+function module:GetTroopsFrame()
+	if not TroopsHeader then
+		local frame=CreateFrame("Frame",nil,OrderHallMissionFrame,"TooltipBorderedFrameTemplate")
+		frame.Background:Hide()
+		frame.Top=frame:CreateTexture(nil,"BACKGROUND",nil,-1)
+		frame.Top:SetPoint("TOPLEFT")
+		frame.Top:SetPoint("BOTTOMRIGHT")
+		frame.Top:SetAtlas("_StoneFrameTile-Top")
+		frame:SetHeight(35)
+		frame:ClearAllPoints()
+		frame:SetPoint("BOTTOMLEFT",OrderHallMissionFrame,"TOPLEFT",0,-2)
+		frame:SetPoint("BOTTOMRIGHT",OrderHallMissionFrame,"TOPRIGHT",2,-2)
+		frame:SetFrameLevel(OrderHallMissionFrame:GetFrameLevel()-1)
+		frame:Show()
+		TroopsHeader=frame
+	end
+	return TroopsHeader
+end
+
 function module:ParseFollowers()
-	if (not G.IsPlayerInGarrison(garrisonType)) then return end
-	categoryInfo = C_Garrison.GetClassSpecCategoryInfo(followerType)
-	self:RefreshTroopTypes(categoryInfo)
+	self:RefreshTroopTypes()
+	categoryInfo = G.GetClassSpecCategoryInfo(followerType)
+	if empty(categoryInfo) then
+		G.RequestClassSpecCategoryInfo(followerType)
+		self:ScheduleTimer("ParseFollowers",1)
+		return
+	end
 	G.RequestLandingPageShipmentInfo();
 	if not OHF:IsVisible() then return end
+	local main=self:GetTroopsFrame()
 	local numCategories = #categoryInfo;
 	local prevCategory, firstCategory;
 	local xSpacing = 20;	-- space between categories
 	for i, category in ipairs(categoryInfo) do
 		local index=category.classSpec
 		if not catPool[index] then
-			catPool[index]=CreateFrame("Frame","FollowerIcon",OHF,"OrderHallClassSpecCategoryTemplate")
+			catPool[index]=CreateFrame("Frame","FollowerIcon",main,"OrderHallClassSpecCategoryTemplate")
 		end
 		local categoryInfoFrame = catPool[index];
 		if not shipmentInfo[category.icon] then
@@ -343,19 +413,20 @@ function module:ParseFollowers()
 			category.count, category.limit,unpack(shipmentInfo[category.icon]));
 		categoryInfoFrame.Count:SetWidth(categoryInfoFrame.Count:GetStringWidth()+10)			
 		categoryInfoFrame:ClearAllPoints();
-		categoryInfoFrame:SetWidth(35 + categoryInfoFrame.Count:GetWidth())
-		if i==1 then
-			categoryInfoFrame:SetPoint("TOPLEFT",75, 2);
-		else
-			categoryInfoFrame:SetPoint("TOPRIGHT",-40, 2);
-		end
+		local w=35 + categoryInfoFrame.Count:GetWidth()
+		categoryInfoFrame:SetWidth(w)
+		categoryInfoFrame:SetPoint("TOPLEFT",60 +(w+10) *(i-1), 0);
 		categoryInfoFrame:Show();
 	end
 end
+function addon:ParseFollowers()
+	return module:ParseFollowers()
+end
 local OrderHallCommanderAlertSystem=AlertFrame:AddSimpleAlertFrameSubSystem("OHCAlertFrameTemplate", alertSetup)
 local shownAlerts={}
 function module:GARRISON_LANDINGPAGE_SHIPMENTS(...)
 	if not addon:GetBoolean('TROOPALERT') then return end
+	if (not G.IsPlayerInGarrison(garrisonType)) then return end
 	local followerShipments = C_Garrison.GetFollowerShipments(garrisonType);
 	for _,t in pairs(shipmentInfo) do
 		t[1]=0
@@ -383,9 +454,10 @@ function module:GARRISON_LANDINGPAGE_SHIPMENTS(...)
 end
 
 function module:Refresh(event,...)
---[===[@debug@
+--@debug@
 	OHCDebug.CacheRefresh:SetText(event:sub(10))
---@end-debug@]===]
+--@end-debug@
+	addon:RefreshFollowerStatus()
 	if (event == "CURRENCY_DISPLAY_UPDATE") then
 		resources = select(2,GetCurrencyInfo(currency))		
 		return
@@ -411,9 +483,9 @@ function module:Refresh(event,...)
 			if data then 
 				data.lastUpdate=0
 				self:refreshFollower(data)
---[===[@debug@
+--@debug@
 				addon:PushEvent("CURRENT_FOLLOWER_XP",4,followerID,0,data.xp,data.level,data.quality)
---@end-debug@]===]
+--@end-debug@
 
 			end
 		end
@@ -466,7 +538,7 @@ function module:OnInitialized()
 	currencyName, resources, currencyTexture = GetCurrencyInfo(currency);
 	addon.resourceFormat=COSTS_LABEL .." %d " .. currencyName
 	self:ParseFollowers()
-	self:ScheduleRepeatingTimer("ParseFollowers",5)
+	
 end
 ---- Public Interface
 -- 
@@ -528,7 +600,6 @@ function addon:GetTroop(troopType,qt,skipBusy)
 		end
 	end
 	return unpack(troops)
-	
 end
 function addon:GetTroopTypes()
 	return troopTypes
@@ -538,7 +609,16 @@ function addon:RebuildMissionCache()
 	wipe(cachedMissions)
 	getCachedMissions()
 end
+function addon:RebuildFollowerCache()
+	wipe(cachedFollowers)
+	getCachedFollowers()
+	module:RefreshTroopTypes()
+end
+function addon:RebuildAllCaches()
+	self:RebuildFollowerCache()
+	self:RebuildMissionCache()
+end
 
 function addon:GetAverageLevels(...)
 	return module:GetAverageLevels(...)
-end
+end
\ No newline at end of file
diff --git a/OrderHallCommander/core.lua b/OrderHallCommander/core.lua
index 3b48c95..22f7b21 100644
--- a/OrderHallCommander/core.lua
+++ b/OrderHallCommander/core.lua
@@ -4,7 +4,7 @@ local function pp(...) print(GetTime(),"|cff009900",__FILE__:sub(-15),strjoin(",
 --*CONFIG noswitch=false,profile=true,enhancedProfile=true
 --*MIXINS "AceHook-3.0","AceEvent-3.0","AceTimer-3.0"
 --*MINOR 35
--- Generated on 11/12/2016 23:26:42
+-- Generated on 20/01/2017 08:15:04
 local me,ns=...
 local addon=ns --#Addon (to keep eclipse happy)
 ns=nil
@@ -19,6 +19,7 @@ local L=addon:GetLocale()
 local new=addon.NewTable
 local del=addon.DelTable
 local kpairs=addon:GetKpairs()
+local empty=addon:GetEmpty()
 local OHF=OrderHallMissionFrame
 local OHFMissionTab=OrderHallMissionFrame.MissionTab --Container for mission list and single mission
 local OHFMissions=OrderHallMissionFrame.MissionTab.MissionList -- same as OrderHallMissionFrameMissions Call Update on this to refresh Mission Listing
@@ -37,7 +38,7 @@ local HideTT=OrderHallCommanderMixin.HideTT
 
 local dprint=print
 local ddump
---[===[@debug@
+--@debug@
 LoadAddOn("Blizzard_DebugTools")
 ddump=DevTools_Dump
 LoadAddOn("LibDebug")
@@ -45,12 +46,12 @@ LoadAddOn("LibDebug")
 if LibDebug then LibDebug() dprint=print end
 local safeG=addon.safeG
 
---@end-debug@]===]
---@non-debug@
+--@end-debug@
+--[===[@non-debug@
 dprint=function() end
 ddump=function() end
 local print=function() end
---@end-non-debug@
+--@end-non-debug@]===]
 
 -- End Template - DO NOT MODIFY ANYTHING BEFORE THIS LINE
 --*BEGIN 
@@ -90,11 +91,11 @@ end
 function addon:OnInitialized()
   _G.dbOHCperChar=_G.dbOHCperChar or {}
 	menu=CreateFrame("Frame")
---[===[@debug@
+--@debug@
 	local f=menu
 	f:RegisterAllEvents()
 	self:RawHookScript(f,"OnEvent","ShowGarrisonEvents")
---@end-debug@]===]
+--@end-debug@
 	self:AddLabel(L["General"])
 	self:AddBoolean("MOVEPANEL",true,L["Make Order Hall Mission Panel movable"],L["Position is not saved on logout"])
 	self:AddBoolean("TROOPALERT",true,L["Troop ready alert"],L["Notifies you when you have troops ready to be collected"])
@@ -152,18 +153,19 @@ function addon:ActivateButton(button,OnClick,Tooltiptext,persistent)
 end
 --- Helpers
 -- 
-function addon:SetBackdrop(frame,r,g,b)
+function addon:SetBackdrop(frame,r,g,b,a)
 	r=r or 1
 	g=g or 0
 	b=b or 0
+	a=a or 1
    frame:SetBackdrop({
          bgFile = "Interface/Tooltips/UI-Tooltip-Background", 
-         edgeFile = "Interface/Tooltips/UI-Tooltip-Border", 
+         xedgeFile = "Interface/Tooltips/UI-Tooltip-Border", 
          tile = true, tileSize = 16, edgeSize = 16, 
          insets = { left = 4, right = 4, top = 4, bottom =   4}
       }
    )	
-   frame:SetBackdropColor(r,g,b,1)
+   frame:SetBackdropColor(r,g,b,a)
 end
 function addon:GetDifficultyColors(...)
 	local q=self:GetDifficultyColor(...)
@@ -262,7 +264,7 @@ function addon:Reward2Class(mission)
 	end
 	return mission.missionSort
 end
---[===[@debug@
+--@debug@
 local events={}
 function addon:Trace(frame, method)
 	if true then return end
@@ -288,7 +290,6 @@ function addon:ShowGarrisonEvents(this,event,...)
 			local _,_,_,followers=...
 			if type(followers)=="table" then
 				tinsert(dbOHCperChar,followers)			
-				DevTools_Dump(followers)
 			end
 		end
 		lastevent=event
@@ -306,4 +307,4 @@ function addon:DumpEvents()
 end
 addon:PushEvent("ADDON_LOADED")
 _G.OHC=addon
---@end-debug@]===]
+--@end-debug@
diff --git a/OrderHallCommander/data.lua b/OrderHallCommander/data.lua
index 6f59f0d..b64ba5b 100644
--- a/OrderHallCommander/data.lua
+++ b/OrderHallCommander/data.lua
@@ -2,7 +2,7 @@ local __FILE__=tostring(debugstack(1,2,0):match("(.*):1:")) -- Always check line
 local function pp(...) print(GetTime(),"|cff009900",__FILE__:sub(-15),strjoin(",",tostringall(...)),"|r") end
 --*TYPE module
 --*CONFIG profile=true,enhancedProfile=true
--- Generated on 11/12/2016 23:26:42
+-- Generated on 20/01/2017 08:15:04
 local me,ns=...
 local addon=ns --#Addon (to keep eclipse happy)
 ns=nil
@@ -17,6 +17,7 @@ local L=addon:GetLocale()
 local new=addon.NewTable
 local del=addon.DelTable
 local kpairs=addon:GetKpairs()
+local empty=addon:GetEmpty()
 local OHF=OrderHallMissionFrame
 local OHFMissionTab=OrderHallMissionFrame.MissionTab --Container for mission list and single mission
 local OHFMissions=OrderHallMissionFrame.MissionTab.MissionList -- same as OrderHallMissionFrameMissions Call Update on this to refresh Mission Listing
@@ -35,7 +36,7 @@ local HideTT=OrderHallCommanderMixin.HideTT
 
 local dprint=print
 local ddump
---[===[@debug@
+--@debug@
 LoadAddOn("Blizzard_DebugTools")
 ddump=DevTools_Dump
 LoadAddOn("LibDebug")
@@ -43,12 +44,12 @@ LoadAddOn("LibDebug")
 if LibDebug then LibDebug() dprint=print end
 local safeG=addon.safeG
 
---@end-debug@]===]
---@non-debug@
+--@end-debug@
+--[===[@non-debug@
 dprint=function() end
 ddump=function() end
 local print=function() end
---@end-non-debug@
+--@end-non-debug@]===]
 
 -- End Template - DO NOT MODIFY ANYTHING BEFORE THIS LINE
 --*BEGIN
@@ -187,3 +188,264 @@ function module:TickleServer()
 	end
 	addon:Print("Precached ",i," items")
 end
+--@do-not-package@
+--[[
+
+dbOHCperChar = {
+	"GameTooltip/GarrisonMissionListTooltipThreatsFrame", -- [299]
+	"GameTooltip/GarrisonMissionListTooltipThreatsFrame", -- [301]
+	"GameTooltip/GarrisonMissionListTooltipThreatsFrame", -- [303]
+	"GameTooltip/GarrisonMissionListTooltipThreatsFrame", -- [367]
+	"GameTooltip/GarrisonMissionListTooltipThreatsFrame", -- [369]
+	"GameTooltip/GarrisonMissionListTooltipThreatsFrame", -- [371]
+	"GarrisonFollowerTooltip/GarrisonFollowerTooltip.PortraitFrame", -- [421]
+	"GarrisonFollowerTooltip/GarrisonFollowerTooltip.PortraitFrame", -- [425]
+	"GarrisonFollowerTooltip/UNK_0", -- [422]
+	"GarrisonFollowerTooltip/UNK_0", -- [426]
+	"GarrisonFollowerTooltip/UNK_0", -- [427]
+	"GarrisonMissionListTooltipThreatsFrame/UNK_0", -- [298]
+	"GarrisonMissionListTooltipThreatsFrame/UNK_0", -- [300]
+	"GarrisonMissionListTooltipThreatsFrame/UNK_0", -- [302]
+	"GarrisonMissionListTooltipThreatsFrame/UNK_0", -- [366]
+	"GarrisonMissionListTooltipThreatsFrame/UNK_0", -- [368]
+	"GarrisonMissionListTooltipThreatsFrame/UNK_0", -- [370]
+	"OrderHallCommandBar/OrderHallCommandBar.CurrencyHitTest", -- [173]
+	"OrderHallCommandBar/OrderHallCommandBar.CurrencyHitTest", -- [1]
+	"OrderHallCommandBar/OrderHallCommandBar.CurrencyHitTest", -- [87]
+	"OrderHallCommandBar/OrderHallCommandBar.WorldMapButton", -- [13]
+	"OrderHallCommandBar/OrderHallCommandBar.WorldMapButton", -- [174]
+	"OrderHallCommandBar/OrderHallCommandBar.WorldMapButton", -- [88]
+	"OrderHallFollowerOptionDropDown/OrderHallFollowerOptionDropDownButton", -- [324]
+	"OrderHallFollowerOptionDropDown/OrderHallFollowerOptionDropDownButton", -- [411]
+	"OrderHallMissionFrame.FollowerTab.AbilitiesFrame/OrderHallMissionFrame.FollowerTab.AbilitiesFrame.CombatAllySpell1", -- [311]
+	"OrderHallMissionFrame.FollowerTab.AbilitiesFrame/OrderHallMissionFrame.FollowerTab.AbilitiesFrame.CombatAllySpell2", -- [312]
+	"OrderHallMissionFrame.FollowerTab.ModelCluster.Child/OrderHallMissionFrame.FollowerTab.ModelCluster.Child.Model1", -- [327]
+	"OrderHallMissionFrame.FollowerTab.ModelCluster.Child/OrderHallMissionFrame.FollowerTab.ModelCluster.Child.Shadows", -- [307]
+	"OrderHallMissionFrame.FollowerTab.ModelCluster/OrderHallMissionFrame.FollowerTab.ModelCluster.Child", -- [308]
+	"OrderHallMissionFrame.FollowerTab/OrderHallMissionFrame.FollowerTab.AbilitiesFrame", -- [313]
+	"OrderHallMissionFrame.FollowerTab/OrderHallMissionFrame.FollowerTab.DurabilityFrame", -- [304]
+	"OrderHallMissionFrame.FollowerTab/OrderHallMissionFrame.FollowerTab.ItemAverageLevel", -- [315]
+	"OrderHallMissionFrame.FollowerTab/OrderHallMissionFrame.FollowerTab.ModelCluster", -- [309]
+	"OrderHallMissionFrame.FollowerTab/OrderHallMissionFrame.FollowerTab.PortraitFrame", -- [306]
+	"OrderHallMissionFrame.FollowerTab/OrderHallMissionFrame.FollowerTab.QualityFrame", -- [305]
+	"OrderHallMissionFrame.FollowerTab/OrderHallMissionFrame.FollowerTab.Source", -- [314]
+	"OrderHallMissionFrame.FollowerTab/OrderHallMissionFrame.FollowerTab.XPBar", -- [310]
+	"OrderHallMissionFrame.MissionTab.MissionPage.BuffsFrame/UNK_0", -- [418]
+	"OrderHallMissionFrame.MissionTab.MissionPage.Enemy1/OrderHallMissionFrame.MissionTab.MissionPage.Enemy1.MechanicEffect", -- [386]
+	"OrderHallMissionFrame.MissionTab.MissionPage.Enemy1/OrderHallMissionFrame.MissionTab.MissionPage.Enemy1.PortraitFrame", -- [384]
+	"OrderHallMissionFrame.MissionTab.MissionPage.Enemy1/UNK_0", -- [385]
+	"OrderHallMissionFrame.MissionTab.MissionPage.Enemy2/OrderHallMissionFrame.MissionTab.MissionPage.Enemy2.MechanicEffect", -- [390]
+	"OrderHallMissionFrame.MissionTab.MissionPage.Enemy2/OrderHallMissionFrame.MissionTab.MissionPage.Enemy2.PortraitFrame", -- [388]
+	"OrderHallMissionFrame.MissionTab.MissionPage.Enemy2/UNK_0", -- [389]
+	"OrderHallMissionFrame.MissionTab.MissionPage.Enemy3/OrderHallMissionFrame.MissionTab.MissionPage.Enemy3.MechanicEffect", -- [394]
+	"OrderHallMissionFrame.MissionTab.MissionPage.Enemy3/OrderHallMissionFrame.MissionTab.MissionPage.Enemy3.PortraitFrame", -- [392]
+	"OrderHallMissionFrame.MissionTab.MissionPage.Enemy3/UNK_0", -- [393]
+	"OrderHallMissionFrame.MissionTab.MissionPage.Follower1/OrderHallMissionFrame.MissionTab.MissionPage.Follower1.PortraitFrame", -- [396]
+	"OrderHallMissionFrame.MissionTab.MissionPage.Follower2/OrderHallMissionFrame.MissionTab.MissionPage.Follower2.Durability", -- [416]
+	"OrderHallMissionFrame.MissionTab.MissionPage.Follower2/OrderHallMissionFrame.MissionTab.MissionPage.Follower2.PortraitFrame", -- [398]
+	"OrderHallMissionFrame.MissionTab.MissionPage.Follower3/OrderHallMissionFrame.MissionTab.MissionPage.Follower3.Durability", -- [417]
+	"OrderHallMissionFrame.MissionTab.MissionPage.Follower3/OrderHallMissionFrame.MissionTab.MissionPage.Follower3.PortraitFrame", -- [400]
+	"OrderHallMissionFrame.MissionTab.MissionPage.RewardsFrame/OrderHallMissionFrame.MissionTab.MissionPage.RewardsFrame.MissionXPTooltipHitBox", -- [381]
+	"OrderHallMissionFrame.MissionTab.MissionPage.RewardsFrame/OrderHallMissionFrame.MissionTab.MissionPage.RewardsFrame.OvermaxItem", -- [378]
+	"OrderHallMissionFrame.MissionTab.MissionPage.RewardsFrame/OrderHallMissionFrame.MissionTab.MissionPage.RewardsFrame.OvermaxItem", -- [415]
+	"OrderHallMissionFrame.MissionTab.MissionPage.RewardsFrame/OrderHallMissionFrame.MissionTab.MissionPage.RewardsFrame.OvermaxItem", -- [420]
+	"OrderHallMissionFrame.MissionTab.MissionPage.RewardsFrame/OrderHallMissionFrame.MissionTab.MissionPage.RewardsFrame.Reward1", -- [379]
+	"OrderHallMissionFrame.MissionTab.MissionPage.RewardsFrame/OrderHallMissionFrame.MissionTab.MissionPage.RewardsFrame.Reward2", -- [380]
+	"OrderHallMissionFrame.MissionTab.MissionPage.RewardsFrame/OrderHallMissionFrame.MissionTab.MissionPage.RewardsFrame.TooltipHitBox", -- [382]
+	"OrderHallMissionFrame.MissionTab.MissionPage.Stage/OrderHallMissionFrame.MissionTab.MissionPage.Stage.MissionEnvIcon", -- [374]
+	"OrderHallMissionFrame.MissionTab.MissionPage.Stage/OrderHallMissionFrame.MissionTab.MissionPage.Stage.MissionInfo", -- [373]
+	"OrderHallMissionFrame.MissionTab.MissionPage/OrderHallMissionFrame.MissionTab.MissionPage.BuffsFrame", -- [419]
+	"OrderHallMissionFrame.MissionTab.MissionPage/OrderHallMissionFrame.MissionTab.MissionPage.CloseButton", -- [372]
+	"OrderHallMissionFrame.MissionTab.MissionPage/OrderHallMissionFrame.MissionTab.MissionPage.CostFrame", -- [377]
+	"OrderHallMissionFrame.MissionTab.MissionPage/OrderHallMissionFrame.MissionTab.MissionPage.EmptyFollowerModel", -- [402]
+	"OrderHallMissionFrame.MissionTab.MissionPage/OrderHallMissionFrame.MissionTab.MissionPage.Enemy1", -- [387]
+	"OrderHallMissionFrame.MissionTab.MissionPage/OrderHallMissionFrame.MissionTab.MissionPage.Enemy2", -- [391]
+	"OrderHallMissionFrame.MissionTab.MissionPage/OrderHallMissionFrame.MissionTab.MissionPage.Enemy3", -- [395]
+	"OrderHallMissionFrame.MissionTab.MissionPage/OrderHallMissionFrame.MissionTab.MissionPage.Follower1", -- [397]
+	"OrderHallMissionFrame.MissionTab.MissionPage/OrderHallMissionFrame.MissionTab.MissionPage.Follower2", -- [399]
+	"OrderHallMissionFrame.MissionTab.MissionPage/OrderHallMissionFrame.MissionTab.MissionPage.Follower3", -- [401]
+	"OrderHallMissionFrame.MissionTab.MissionPage/OrderHallMissionFrame.MissionTab.MissionPage.ItemLevelHitboxFrame", -- [414]
+	"OrderHallMissionFrame.MissionTab.MissionPage/OrderHallMissionFrame.MissionTab.MissionPage.RewardsFrame", -- [383]
+	"OrderHallMissionFrame.MissionTab.MissionPage/OrderHallMissionFrame.MissionTab.MissionPage.Stage", -- [375]
+	"OrderHallMissionFrame.MissionTab.MissionPage/OrderHallMissionFrame.MissionTab.MissionPage.StartMissionButton", -- [376]
+	"OrderHallMissionFrame.MissionTab/OrderHallMissionFrame.MissionTab.MissionPage", -- [403]
+	"OrderHallMissionFrame.MissionTab/OrderHallMissionFrameMissions", -- [280]
+	"OrderHallMissionFrame.MissionTab/OrderHallMissionFrameMissions", -- [351]
+	"OrderHallMissionFrame.MissionTab/UNK_0", -- [281]
+	"OrderHallMissionFrame.MissionTab/UNK_0", -- [282]
+	"OrderHallMissionFrame.MissionTab/UNK_0", -- [283]
+	"OrderHallMissionFrame.MissionTab/UNK_0", -- [284]
+	"OrderHallMissionFrame.MissionTab/UNK_0", -- [285]
+	"OrderHallMissionFrame.MissionTab/UNK_0", -- [286]
+	"OrderHallMissionFrame.MissionTab/UNK_0", -- [287]
+	"OrderHallMissionFrame.MissionTab/UNK_0", -- [288]
+	"OrderHallMissionFrame.MissionTab/UNK_0", -- [289]
+	"OrderHallMissionFrame.MissionTab/UNK_0", -- [290]
+	"OrderHallMissionFrame.MissionTab/UNK_0", -- [291]
+	"OrderHallMissionFrame.MissionTab/UNK_0", -- [292]
+	"OrderHallMissionFrame.MissionTab/UNK_0", -- [293]
+	"OrderHallMissionFrame.MissionTab/UNK_0", -- [352]
+	"OrderHallMissionFrame.MissionTab/UNK_0", -- [353]
+	"OrderHallMissionFrame.MissionTab/UNK_0", -- [354]
+	"OrderHallMissionFrame.MissionTab/UNK_0", -- [355]
+	"OrderHallMissionFrame.MissionTab/UNK_0", -- [356]
+	"OrderHallMissionFrame.MissionTab/UNK_0", -- [357]
+	"OrderHallMissionFrame.MissionTab/UNK_0", -- [358]
+	"OrderHallMissionFrame.MissionTab/UNK_0", -- [359]
+	"OrderHallMissionFrame.MissionTab/UNK_0", -- [360]
+	"OrderHallMissionFrame.MissionTab/UNK_0", -- [361]
+	"OrderHallMissionFrame.MissionTab/UNK_0", -- [362]
+	"OrderHallMissionFrame.MissionTab/UNK_0", -- [363]
+	"OrderHallMissionFrame.MissionTab/UNK_0", -- [364]
+	"OrderHallMissionFrame/OrderHallMissionFrame.ClassHallIcon", -- [253]
+	"OrderHallMissionFrame/OrderHallMissionFrame.CloseButton", -- [251]
+	"OrderHallMissionFrame/OrderHallMissionFrame.FollowerTab", -- [316]
+	"OrderHallMissionFrame/OrderHallMissionFrame.GarrCorners", -- [252]
+	"OrderHallMissionFrame/OrderHallMissionFrame.MissionTab", -- [294]
+	"OrderHallMissionFrame/OrderHallMissionFrame.MissionTab", -- [365]
+	"OrderHallMissionFrame/OrderHallMissionFrameFollowers", -- [326]
+	"OrderHallMissionFrame/OrderHallMissionFrameFollowers", -- [413]
+	"OrderHallMissionFrame/OrderHallMissionFrameTab1", -- [254]
+	"OrderHallMissionFrame/OrderHallMissionFrameTab1", -- [296]
+	"OrderHallMissionFrame/OrderHallMissionFrameTab2", -- [255]
+	"OrderHallMissionFrame/OrderHallMissionFrameTab2", -- [297]
+	"OrderHallMissionFrame/OrderHallMissionFrameTab3", -- [256]
+	"OrderHallMissionFrameFollowers/OrderHallFollowerOptionDropDown", -- [325]
+	"OrderHallMissionFrameFollowers/OrderHallFollowerOptionDropDown", -- [412]
+	"OrderHallMissionFrameFollowers/OrderHallMissionFrameFollowers.MaterialFrame", -- [322]
+	"OrderHallMissionFrameFollowers/OrderHallMissionFrameFollowers.MaterialFrame", -- [409]
+	"OrderHallMissionFrameFollowers/OrderHallMissionFrameFollowers.SearchBox", -- [323]
+	"OrderHallMissionFrameFollowers/OrderHallMissionFrameFollowers.SearchBox", -- [410]
+	"OrderHallMissionFrameFollowers/OrderHallMissionFrameFollowersListScrollFrame", -- [321]
+	"OrderHallMissionFrameFollowers/OrderHallMissionFrameFollowersListScrollFrame", -- [408]
+	"OrderHallMissionFrameFollowersListScrollFrame/OrderHallMissionFrameFollowersListScrollFrameScrollBar", -- [320]
+	"OrderHallMissionFrameFollowersListScrollFrame/OrderHallMissionFrameFollowersListScrollFrameScrollBar", -- [407]
+	"OrderHallMissionFrameFollowersListScrollFrame/OrderHallMissionFrameFollowersListScrollFrameScrollChild", -- [317]
+	"OrderHallMissionFrameFollowersListScrollFrame/OrderHallMissionFrameFollowersListScrollFrameScrollChild", -- [404]
+	"OrderHallMissionFrameFollowersListScrollFrameScrollBar/OrderHallMissionFrameFollowersListScrollFrameScrollBarScrollDownButton", -- [319]
+	"OrderHallMissionFrameFollowersListScrollFrameScrollBar/OrderHallMissionFrameFollowersListScrollFrameScrollBarScrollDownButton", -- [406]
+	"OrderHallMissionFrameFollowersListScrollFrameScrollBar/OrderHallMissionFrameFollowersListScrollFrameScrollBarScrollUpButton", -- [318]
+	"OrderHallMissionFrameFollowersListScrollFrameScrollBar/OrderHallMissionFrameFollowersListScrollFrameScrollBarScrollUpButton", -- [405]
+	"OrderHallMissionFrameMissions.CombatAllyUI.Available/OrderHallMissionFrameMissions.CombatAllyUI.Available.AddFollowerButton", -- [277]
+	"OrderHallMissionFrameMissions.CombatAllyUI.Available/OrderHallMissionFrameMissions.CombatAllyUI.Available.AddFollowerButton", -- [348]
+	"OrderHallMissionFrameMissions.CombatAllyUI/OrderHallMissionFrameMissions.CombatAllyUI.Available", -- [278]
+	"OrderHallMissionFrameMissions.CombatAllyUI/OrderHallMissionFrameMissions.CombatAllyUI.Available", -- [349]
+	"OrderHallMissionFrameMissions/OrderHallMissionFrameMissions.CombatAllyUI", -- [279]
+	"OrderHallMissionFrameMissions/OrderHallMissionFrameMissions.CombatAllyUI", -- [350]
+	"OrderHallMissionFrameMissions/OrderHallMissionFrameMissions.MaterialFrame", -- [276]
+	"OrderHallMissionFrameMissions/OrderHallMissionFrameMissions.MaterialFrame", -- [347]
+	"OrderHallMissionFrameMissions/OrderHallMissionFrameMissionsListScrollFrame", -- [273]
+	"OrderHallMissionFrameMissions/OrderHallMissionFrameMissionsListScrollFrame", -- [344]
+	"OrderHallMissionFrameMissions/OrderHallMissionFrameMissionsTab1", -- [274]
+	"OrderHallMissionFrameMissions/OrderHallMissionFrameMissionsTab1", -- [345]
+	"OrderHallMissionFrameMissions/OrderHallMissionFrameMissionsTab2", -- [275]
+	"OrderHallMissionFrameMissions/OrderHallMissionFrameMissionsTab2", -- [346]
+	"OrderHallMissionFrameMissionsListScrollFrame/OrderHallMissionFrameMissionsListScrollFrameScrollBar", -- [272]
+	"OrderHallMissionFrameMissionsListScrollFrame/OrderHallMissionFrameMissionsListScrollFrameScrollBar", -- [343]
+	"OrderHallMissionFrameMissionsListScrollFrame/OrderHallMissionFrameMissionsListScrollFrameScrollChild", -- [269]
+	"OrderHallMissionFrameMissionsListScrollFrame/OrderHallMissionFrameMissionsListScrollFrameScrollChild", -- [340]
+	"OrderHallMissionFrameMissionsListScrollFrameButton1/UNK_0", -- [257]
+	"OrderHallMissionFrameMissionsListScrollFrameButton1/UNK_0", -- [328]
+	"OrderHallMissionFrameMissionsListScrollFrameButton2/UNK_0", -- [259]
+	"OrderHallMissionFrameMissionsListScrollFrameButton2/UNK_0", -- [330]
+	"OrderHallMissionFrameMissionsListScrollFrameButton3/UNK_0", -- [261]
+	"OrderHallMissionFrameMissionsListScrollFrameButton3/UNK_0", -- [332]
+	"OrderHallMissionFrameMissionsListScrollFrameButton4/UNK_0", -- [263]
+	"OrderHallMissionFrameMissionsListScrollFrameButton4/UNK_0", -- [334]
+	"OrderHallMissionFrameMissionsListScrollFrameButton5/UNK_0", -- [265]
+	"OrderHallMissionFrameMissionsListScrollFrameButton5/UNK_0", -- [336]
+	"OrderHallMissionFrameMissionsListScrollFrameButton6/UNK_0", -- [267]
+	"OrderHallMissionFrameMissionsListScrollFrameButton6/UNK_0", -- [338]
+	"OrderHallMissionFrameMissionsListScrollFrameScrollBar/OrderHallMissionFrameMissionsListScrollFrameScrollBarScrollDownButton", -- [271]
+	"OrderHallMissionFrameMissionsListScrollFrameScrollBar/OrderHallMissionFrameMissionsListScrollFrameScrollBarScrollDownButton", -- [342]
+	"OrderHallMissionFrameMissionsListScrollFrameScrollBar/OrderHallMissionFrameMissionsListScrollFrameScrollBarScrollUpButton", -- [270]
+	"OrderHallMissionFrameMissionsListScrollFrameScrollBar/OrderHallMissionFrameMissionsListScrollFrameScrollBarScrollUpButton", -- [341]
+	"OrderHallMissionFrameMissionsListScrollFrameScrollChild/OrderHallMissionFrameMissionsListScrollFrameButton1", -- [258]
+	"OrderHallMissionFrameMissionsListScrollFrameScrollChild/OrderHallMissionFrameMissionsListScrollFrameButton1", -- [329]
+	"OrderHallMissionFrameMissionsListScrollFrameScrollChild/OrderHallMissionFrameMissionsListScrollFrameButton2", -- [260]
+	"OrderHallMissionFrameMissionsListScrollFrameScrollChild/OrderHallMissionFrameMissionsListScrollFrameButton2", -- [331]
+	"OrderHallMissionFrameMissionsListScrollFrameScrollChild/OrderHallMissionFrameMissionsListScrollFrameButton3", -- [262]
+	"OrderHallMissionFrameMissionsListScrollFrameScrollChild/OrderHallMissionFrameMissionsListScrollFrameButton3", -- [333]
+	"OrderHallMissionFrameMissionsListScrollFrameScrollChild/OrderHallMissionFrameMissionsListScrollFrameButton4", -- [264]
+	"OrderHallMissionFrameMissionsListScrollFrameScrollChild/OrderHallMissionFrameMissionsListScrollFrameButton4", -- [335]
+	"OrderHallMissionFrameMissionsListScrollFrameScrollChild/OrderHallMissionFrameMissionsListScrollFrameButton5", -- [266]
+	"OrderHallMissionFrameMissionsListScrollFrameScrollChild/OrderHallMissionFrameMissionsListScrollFrameButton5", -- [337]
+	"OrderHallMissionFrameMissionsListScrollFrameScrollChild/OrderHallMissionFrameMissionsListScrollFrameButton6", -- [268]
+	"OrderHallMissionFrameMissionsListScrollFrameScrollChild/OrderHallMissionFrameMissionsListScrollFrameButton6", -- [339]
+	"UIParent/GameMenuFrame", -- [440]
+	"UIParent/GarrisonFollowerMissionAbilityWithoutCountersTooltip", -- [424]
+	"UIParent/GarrisonFollowerTooltip", -- [423]
+	"UIParent/GarrisonFollowerTooltip", -- [428]
+	"UIParent/OrderHallCommandBar", -- [14]
+	"UIParent/OrderHallCommandBar", -- [175]
+	"UIParent/OrderHallCommandBar", -- [89]
+	"UIParent/OrderHallMissionFrame", -- [295]
+}
+GarrisonFollowerOptions[followerid].strings=
+RETURN_TO_START = "Return to your Class Hall to start this mission"
+FOLLOWER_ADDED_TOAST = "Follower Gained"
+TROOP_ADDED_UPGRADED_TOAST = "Upgraded Troop Gained"
+TRAITS_LABEL = "Equipment Slots"
+FOLLOWER_COUNT_LABEL = "Champions"
+FOLLOWER_ADDED_UPGRADED_TOAST = "Upgraded Follower Gained"
+FOLLOWER_COUNT_STRING = "Champions: %s%d/%d%s"
+CONFIRM_EQUIPMENT = "Are you sure you want to equip your follower with %s?"
+TROOP_ADDED_TOAST = "Troop Gained"
+LANDING_COMPLETE = "Complete - Return to your Class Hall"
+
+followerListCounterInnerSpacing = 4
+minQualityLevelToShowLevel = 0
+showSpikyBordersOnSpecializationAbilities = true
+hideMissionTypeInLandingPage = true
+missionCompleteUseNeutralChest = true
+followerPageShowGear = false
+followerListCounterScale = 1.15
+isPrimaryFollowerType = true
+garrisonType = 3
+missionPageMaxCountersInFollowerFrame = 3
+missionPageMaxCountersInFollowerFrameBeforeScaling = 2
+hideCountersInAbilityFrame = true
+usesOvermaxMechanic = true
+showCategoriesInFollowerList = true
+missionFrame = "OrderHallMissionFrame"
+missionTooltipShowPartialCountersAsFull = true
+showCautionSignOnMissionFollowersSmallBias = false
+displayCounterAbilityInPlaceOfMechanic = true
+showSingleMissionCompleteAnimation = true
+followerPageShowSourceText = false
+missionPageAssignTroopSound = "UI_Mission_SlotTroop"
+minFollowersForThreatCountersFrame = 1.#INF
+partyNotFullText = "You do not have enough Champions to start this mission."
+followerListCounterOuterSpacingX = 8
+missionAbilityTooltipFrame = "GarrisonFollowerMissionAbilityWithoutCountersTooltip"
+abilityTooltipFrame = "GarrisonFollowerAbilityWithoutCountersTooltip"
+missionPageMechanicYOffset = -32
+followerListCounterNumPerRow = 2
+traitAbilitiesAreEquipment = true
+missionFollowerSortFunc = function: 000000003F78CD70
+followerListCounterOuterSpacingY = 4
+useAbilityTooltipStyleWithoutCounters = true
+missionFollowerInitSortFunc = function: 00007FF788B90998
+missionPageAssignFollowerSound = "UI_Mission_SlotChampion"
+showSingleMissionCompleteFollower = false
+showILevelOnFollower = false
+showILevelInFollowerList = true
+missionPageShowXPInMissionInfo = true
+}
+
+GARRISON_MISSION_NPC_OPEN,followerType
+GARRISON_MISSION_COMPLETE_RESPONSE,missionID,canComplete,success,bool(?),table(?)
+GARRISON_FOLLOWER_DURABILITY_CHANGED,followerType,followerID,number(Durability left?)
+GARRISON_FOLLOWER_XP_CHANGED,followerType,followerID,gainedxp,oldxp,oldlevel,oldquality (gained is 0 for maxed)
+GARRISON_MISSION_BONUS_ROLL_COMPLETE,missionID,bool(Success?)
+If succeeded then
+GARRISON_MISSION_BONUS_ROLL_LOOT,itemId
+GARRISON_MISSION_LIST_UPDATE,missionType
+GARRISON_FOLLOWER_XP_CHANGED,followerType,followerID,gainedxp,oldxp,oldlevel,oldquality (gained is 0 for maxed)
+If troops lost:
+GARRISON_FOLLOWER_REMOVED,followerType
+GARRISON_FOLLOWER_LIST_UPDATE,followerType
+
+
+--]]
+--@end-do-not-package@
diff --git a/OrderHallCommander/followerpage.lua b/OrderHallCommander/followerpage.lua
index 6e5630e..82c5470 100644
--- a/OrderHallCommander/followerpage.lua
+++ b/OrderHallCommander/followerpage.lua
@@ -4,7 +4,7 @@ local function pp(...) print(GetTime(),"|cff009900",__FILE__:sub(-15),strjoin(",
 --*CONFIG noswitch=false,profile=true,enhancedProfile=true
 --*MIXINS "AceHook-3.0","AceEvent-3.0","AceTimer-3.0"
 --*MINOR 35
--- Generated on 11/12/2016 23:26:42
+-- Generated on 20/01/2017 08:15:04
 local me,ns=...
 local addon=ns --#Addon (to keep eclipse happy)
 ns=nil
@@ -19,6 +19,7 @@ local L=addon:GetLocale()
 local new=addon.NewTable
 local del=addon.DelTable
 local kpairs=addon:GetKpairs()
+local empty=addon:GetEmpty()
 local OHF=OrderHallMissionFrame
 local OHFMissionTab=OrderHallMissionFrame.MissionTab --Container for mission list and single mission
 local OHFMissions=OrderHallMissionFrame.MissionTab.MissionList -- same as OrderHallMissionFrameMissions Call Update on this to refresh Mission Listing
@@ -37,7 +38,7 @@ local HideTT=OrderHallCommanderMixin.HideTT
 
 local dprint=print
 local ddump
---[===[@debug@
+--@debug@
 LoadAddOn("Blizzard_DebugTools")
 ddump=DevTools_Dump
 LoadAddOn("LibDebug")
@@ -45,21 +46,21 @@ LoadAddOn("LibDebug")
 if LibDebug then LibDebug() dprint=print end
 local safeG=addon.safeG
 
---@end-debug@]===]
---@non-debug@
+--@end-debug@
+--[===[@non-debug@
 dprint=function() end
 ddump=function() end
 local print=function() end
---@end-non-debug@
+--@end-non-debug@]===]
 
 -- End Template - DO NOT MODIFY ANYTHING BEFORE THIS LINE
 --*BEGIN
 local UpgradeFrame
 local UpgradeButtons={}
 local pool={}
---[===[@debug@
+--@debug@
 local debugInfo
---@end-debug@]===]
+--@end-debug@
 function module:CheckSpell()
 end
 function module:OnInitialized()
@@ -75,12 +76,12 @@ function module:OnInitialized()
 	self:RegisterEvent("GARRISON_FOLLOWER_LIST_UPDATE","GARRISON_FOLLOWER_UPGRADED")
 	self:RegisterEvent("GARRISON_FOLLOWER_XP_CHANGED","GARRISON_FOLLOWER_UPGRADED")
 	UpgradeFrame:EnableMouse(true)
-	--[===[@debug@
+	--@debug@
 	self:RawHookScript(UpgradeFrame,"OnEnter","ShowFollowerData")
 	self:RawHookScript(UpgradeFrame,"OnLeave",function() GameTooltip:Hide() end)
 	debugInfo=u:CreateFontString(nil, "OVERLAY", "GameFontNormal")
 	debugInfo:SetPoint("TOPLEFT",70,20)
---@end-debug@	]===]
+--@end-debug@	
 end
 function module:ShowFollowerData(this)
 	local tip=GameTooltip
@@ -116,9 +117,9 @@ function module:RenderUpgradeButton(id,previous)
 		return b
 end 
 function module:RefreshUpgrades(model,followerID,displayID,showWeapon)
---[===[@debug@
+--@debug@
 	debugInfo:SetText(followerID)
---@end-debug@]===]
+--@end-debug@
 	if not OHFFollowerTab:IsVisible() then return end
 	if model then
 		UpgradeFrame:SetFrameStrata(model:GetFrameStrata())
diff --git a/OrderHallCommander/libs/Ace3/AceBucket-3.0/AceBucket-3.0.lua b/OrderHallCommander/libs/Ace3/AceBucket-3.0/AceBucket-3.0.lua
deleted file mode 100644
index d5e1065..0000000
--- a/OrderHallCommander/libs/Ace3/AceBucket-3.0/AceBucket-3.0.lua
+++ /dev/null
@@ -1,293 +0,0 @@
---- A bucket to catch events in. **AceBucket-3.0** provides throttling of events that fire in bursts and
--- your addon only needs to know about the full burst.
--- 
--- This Bucket implementation works as follows:\\
---   Initially, no schedule is running, and its waiting for the first event to happen.\\
---   The first event will start the bucket, and get the scheduler running, which will collect all
---   events in the given interval. When that interval is reached, the bucket is pushed to the 
---   callback and a new schedule is started. When a bucket is empty after its interval, the scheduler is 
---   stopped, and the bucket is only listening for the next event to happen, basically back in its initial state.
--- 
--- In addition, the buckets collect information about the "arg1" argument of the events that fire, and pass those as a 
--- table to your callback. This functionality was mostly designed for the UNIT_* events.\\
--- The table will have the different values of "arg1" as keys, and the number of occurances as their value, e.g.\\
---   { ["player"] = 2, ["target"] = 1, ["party1"] = 1 }
---
--- **AceBucket-3.0** can be embeded into your addon, either explicitly by calling AceBucket:Embed(MyAddon) or by 
--- specifying it as an embeded library in your AceAddon. All functions will be available on your addon object
--- and can be accessed directly, without having to explicitly call AceBucket itself.\\
--- It is recommended to embed AceBucket, otherwise you'll have to specify a custom `self` on all calls you
--- make into AceBucket.
--- @usage
--- MyAddon = LibStub("AceAddon-3.0"):NewAddon("BucketExample", "AceBucket-3.0")
--- 
--- function MyAddon:OnEnable()
---   -- Register a bucket that listens to all the HP related events, 
---   -- and fires once per second
---   self:RegisterBucketEvent({"UNIT_HEALTH", "UNIT_MAXHEALTH"}, 1, "UpdateHealth")
--- end
---
--- function MyAddon:UpdateHealth(units)
---   if units.player then
---     print("Your HP changed!")
---   end
--- end
--- @class file
--- @name AceBucket-3.0.lua
--- @release $Id: AceBucket-3.0.lua 895 2009-12-06 16:28:55Z nevcairiel $
-
-local MAJOR, MINOR = "AceBucket-3.0", 3
-local AceBucket, oldminor = LibStub:NewLibrary(MAJOR, MINOR)
-
-if not AceBucket then return end -- No Upgrade needed
-
-AceBucket.buckets = AceBucket.buckets or {}
-AceBucket.embeds = AceBucket.embeds or {}
-
--- the libraries will be lazyly bound later, to avoid errors due to loading order issues
-local AceEvent, AceTimer
-
--- Lua APIs
-local tconcat = table.concat
-local type, next, pairs, select = type, next, pairs, select
-local tonumber, tostring, rawset = tonumber, tostring, rawset
-local assert, loadstring, error = assert, loadstring, error
-
--- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
--- List them here for Mikk's FindGlobals script
--- GLOBALS: LibStub, geterrorhandler
-
-local bucketCache = setmetatable({}, {__mode='k'})
-
---[[
-	 xpcall safecall implementation
-]]
-local xpcall = xpcall
-
-local function errorhandler(err)
-	return geterrorhandler()(err)
-end
-
-local function CreateDispatcher(argCount)
-	local code = [[
-		local xpcall, eh = ...
-		local method, ARGS
-		local function call() return method(ARGS) end
-	
-		local function dispatch(func, ...)
-			 method = func
-			 if not method then return end
-			 ARGS = ...
-			 return xpcall(call, eh)
-		end
-	
-		return dispatch
-	]]
-	
-	local ARGS = {}
-	for i = 1, argCount do ARGS[i] = "arg"..i end
-	code = code:gsub("ARGS", tconcat(ARGS, ", "))
-	return assert(loadstring(code, "safecall Dispatcher["..argCount.."]"))(xpcall, errorhandler)
-end
-
-local Dispatchers = setmetatable({}, {__index=function(self, argCount)
-	local dispatcher = CreateDispatcher(argCount)
-	rawset(self, argCount, dispatcher)
-	return dispatcher
-end})
-Dispatchers[0] = function(func)
-	return xpcall(func, errorhandler)
-end
- 
-local function safecall(func, ...)
-	return Dispatchers[select('#', ...)](func, ...)
-end
-
--- FireBucket ( bucket )
---
--- send the bucket to the callback function and schedule the next FireBucket in interval seconds
-local function FireBucket(bucket)
-	local received = bucket.received
-	
-	-- we dont want to fire empty buckets
-	if next(received) then
-		local callback = bucket.callback
-		if type(callback) == "string" then
-			safecall(bucket.object[callback], bucket.object, received)
-		else
-			safecall(callback, received)
-		end
-		
-		for k in pairs(received) do
-			received[k] = nil
-		end
-		
-		-- if the bucket was not empty, schedule another FireBucket in interval seconds
-		bucket.timer = AceTimer.ScheduleTimer(bucket, FireBucket, bucket.interval, bucket)
-	else -- if it was empty, clear the timer and wait for the next event
-		bucket.timer = nil
-	end
-end
-
--- BucketHandler ( event, arg1 )
--- 
--- callback func for AceEvent
--- stores arg1 in the received table, and schedules the bucket if necessary
-local function BucketHandler(self, event, arg1)
-	if arg1 == nil then
-		arg1 = "nil"
-	end
-	
-	self.received[arg1] = (self.received[arg1] or 0) + 1
-	
-	-- if we are not scheduled yet, start a timer on the interval for our bucket to be cleared
-	if not self.timer then
-		self.timer = AceTimer.ScheduleTimer(self, FireBucket, self.interval, self)
-	end
-end
-
--- RegisterBucket( event, interval, callback, isMessage )
---
--- event(string or table) - the event, or a table with the events, that this bucket listens to
--- interval(int) - time between bucket fireings
--- callback(func or string) - function pointer, or method name of the object, that gets called when the bucket is cleared
--- isMessage(boolean) - register AceEvent Messages instead of game events
-local function RegisterBucket(self, event, interval, callback, isMessage)
-	-- try to fetch the librarys
-	if not AceEvent or not AceTimer then 
-		AceEvent = LibStub:GetLibrary("AceEvent-3.0", true)
-		AceTimer = LibStub:GetLibrary("AceTimer-3.0", true)
-		if not AceEvent or not AceTimer then
-			error(MAJOR .. " requires AceEvent-3.0 and AceTimer-3.0", 3)
-		end
-	end
-	
-	if type(event) ~= "string" and type(event) ~= "table" then error("Usage: RegisterBucket(event, interval, callback): 'event' - string or table expected.", 3) end
-	if not callback then
-		if type(event) == "string" then
-			callback = event
-		else
-			error("Usage: RegisterBucket(event, interval, callback): cannot omit callback when event is not a string.", 3)
-		end
-	end
-	if not tonumber(interval) then error("Usage: RegisterBucket(event, interval, callback): 'interval' - number expected.", 3) end
-	if type(callback) ~= "string" and type(callback) ~= "function" then error("Usage: RegisterBucket(event, interval, callback): 'callback' - string or function or nil expected.", 3) end
-	if type(callback) == "string" and type(self[callback]) ~= "function" then error("Usage: RegisterBucket(event, interval, callback): 'callback' - method not found on target object.", 3) end
-	
-	local bucket = next(bucketCache)
-	if bucket then
-		bucketCache[bucket] = nil
-	else
-		bucket = { handler = BucketHandler, received = {} }
-	end
-	bucket.object, bucket.callback, bucket.interval = self, callback, tonumber(interval)
-	
-	local regFunc = isMessage and AceEvent.RegisterMessage or AceEvent.RegisterEvent
-	
-	if type(event) == "table" then
-		for _,e in pairs(event) do
-			regFunc(bucket, e, "handler")
-		end
-	else
-		regFunc(bucket, event, "handler")
-	end
-	
-	local handle = tostring(bucket)
-	AceBucket.buckets[handle] = bucket
-	
-	return handle
-end
-
---- Register a Bucket for an event (or a set of events)
--- @param event The event to listen for, or a table of events.
--- @param interval The Bucket interval (burst interval)
--- @param callback The callback function, either as a function reference, or a string pointing to a method of the addon object.
--- @return The handle of the bucket (for unregistering)
--- @usage
--- MyAddon = LibStub("AceAddon-3.0"):NewAddon("MyAddon", "AceBucket-3.0")
--- MyAddon:RegisterBucketEvent("BAG_UPDATE", 0.2, "UpdateBags")
--- 
--- function MyAddon:UpdateBags()
---   -- do stuff
--- end
-function AceBucket:RegisterBucketEvent(event, interval, callback)
-	return RegisterBucket(self, event, interval, callback, false)
-end
-
---- Register a Bucket for an AceEvent-3.0 addon message (or a set of messages)
--- @param message The message to listen for, or a table of messages.
--- @param interval The Bucket interval (burst interval)
--- @param callback The callback function, either as a function reference, or a string pointing to a method of the addon object.
--- @return The handle of the bucket (for unregistering)
--- @usage
--- MyAddon = LibStub("AceAddon-3.0"):NewAddon("MyAddon", "AceBucket-3.0")
--- MyAddon:RegisterBucketEvent("SomeAddon_InformationMessage", 0.2, "ProcessData")
--- 
--- function MyAddon:ProcessData()
---   -- do stuff
--- end
-function AceBucket:RegisterBucketMessage(message, interval, callback)
-	return RegisterBucket(self, message, interval, callback, true)
-end
-
---- Unregister any events and messages from the bucket and clear any remaining data.
--- @param handle The handle of the bucket as returned by RegisterBucket*
-function AceBucket:UnregisterBucket(handle)
-	local bucket = AceBucket.buckets[handle]
-	if bucket then
-		AceEvent.UnregisterAllEvents(bucket)
-		AceEvent.UnregisterAllMessages(bucket)
-		
-		-- clear any remaining data in the bucket
-		for k in pairs(bucket.received) do
-			bucket.received[k] = nil
-		end
-		
-		if bucket.timer then
-			AceTimer.CancelTimer(bucket, bucket.timer)
-			bucket.timer = nil
-		end
-		
-		AceBucket.buckets[handle] = nil
-		-- store our bucket in the cache
-		bucketCache[bucket] = true
-	end
-end
-
---- Unregister all buckets of the current addon object (or custom "self").
-function AceBucket:UnregisterAllBuckets()
-	-- hmm can we do this more efficient? (it is not done often so shouldn't matter much)
-	for handle, bucket in pairs(AceBucket.buckets) do
-		if bucket.object == self then
-			AceBucket.UnregisterBucket(self, handle)
-		end
-	end
-end
-
-
-
--- embedding and embed handling
-local mixins = {
-	"RegisterBucketEvent",
-	"RegisterBucketMessage", 
-	"UnregisterBucket",
-	"UnregisterAllBuckets",
-} 
-
--- Embeds AceBucket into the target object making the functions from the mixins list available on target:..
--- @param target target object to embed AceBucket in
-function AceBucket:Embed( target )
-	for _, v in pairs( mixins ) do
-		target[v] = self[v]
-	end
-	self.embeds[target] = true
-	return target
-end
-
-function AceBucket:OnEmbedDisable( target )
-	target:UnregisterAllBuckets()
-end
-
-for addon in pairs(AceBucket.embeds) do
-	AceBucket:Embed(addon)
-end
diff --git a/OrderHallCommander/libs/Ace3/AceBucket-3.0/AceBucket-3.0.xml b/OrderHallCommander/libs/Ace3/AceBucket-3.0/AceBucket-3.0.xml
deleted file mode 100644
index 43c6bee..0000000
--- a/OrderHallCommander/libs/Ace3/AceBucket-3.0/AceBucket-3.0.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
-..\FrameXML\UI.xsd">
-	<Script file="AceBucket-3.0.lua"/>
-</Ui>
\ No newline at end of file
diff --git a/OrderHallCommander/libs/Ace3/AceSerializer-3.0/AceSerializer-3.0.lua b/OrderHallCommander/libs/Ace3/AceSerializer-3.0/AceSerializer-3.0.lua
deleted file mode 100644
index b163d7e..0000000
--- a/OrderHallCommander/libs/Ace3/AceSerializer-3.0/AceSerializer-3.0.lua
+++ /dev/null
@@ -1,287 +0,0 @@
---- **AceSerializer-3.0** can serialize any variable (except functions or userdata) into a string format,
--- that can be send over the addon comm channel. AceSerializer was designed to keep all data intact, especially 
--- very large numbers or floating point numbers, and table structures. The only caveat currently is, that multiple
--- references to the same table will be send individually.
---
--- **AceSerializer-3.0** can be embeded into your addon, either explicitly by calling AceSerializer:Embed(MyAddon) or by 
--- specifying it as an embeded library in your AceAddon. All functions will be available on your addon object
--- and can be accessed directly, without having to explicitly call AceSerializer itself.\\
--- It is recommended to embed AceSerializer, otherwise you'll have to specify a custom `self` on all calls you
--- make into AceSerializer.
--- @class file
--- @name AceSerializer-3.0
--- @release $Id: AceSerializer-3.0.lua 1135 2015-09-19 20:39:16Z nevcairiel $
-local MAJOR,MINOR = "AceSerializer-3.0", 5
-local AceSerializer, oldminor = LibStub:NewLibrary(MAJOR, MINOR)
-
-if not AceSerializer then return end
-
--- Lua APIs
-local strbyte, strchar, gsub, gmatch, format = string.byte, string.char, string.gsub, string.gmatch, string.format
-local assert, error, pcall = assert, error, pcall
-local type, tostring, tonumber = type, tostring, tonumber
-local pairs, select, frexp = pairs, select, math.frexp
-local tconcat = table.concat
-
--- quick copies of string representations of wonky numbers
-local inf = math.huge
-
-local serNaN  -- can't do this in 4.3, see ace3 ticket 268
-local serInf, serInfMac = "1.#INF", "inf"
-local serNegInf, serNegInfMac = "-1.#INF", "-inf"
-
-
--- Serialization functions
-
-local function SerializeStringHelper(ch)	-- Used by SerializeValue for strings
-	-- We use \126 ("~") as an escape character for all nonprints plus a few more
-	local n = strbyte(ch)
-	if n==30 then           -- v3 / ticket 115: catch a nonprint that ends up being "~^" when encoded... DOH
-		return "\126\122"
-	elseif n<=32 then 			-- nonprint + space
-		return "\126"..strchar(n+64)
-	elseif n==94 then		-- value separator 
-		return "\126\125"
-	elseif n==126 then		-- our own escape character
-		return "\126\124"
-	elseif n==127 then		-- nonprint (DEL)
-		return "\126\123"
-	else
-		assert(false)	-- can't be reached if caller uses a sane regex
-	end
-end
-
-local function SerializeValue(v, res, nres)
-	-- We use "^" as a value separator, followed by one byte for type indicator
-	local t=type(v)
-	
-	if t=="string" then		-- ^S = string (escaped to remove nonprints, "^"s, etc)
-		res[nres+1] = "^S"
-		res[nres+2] = gsub(v,"[%c \94\126\127]", SerializeStringHelper)
-		nres=nres+2
-	
-	elseif t=="number" then	-- ^N = number (just tostring()ed) or ^F (float components)
-		local str = tostring(v)
-		if tonumber(str)==v  --[[not in 4.3 or str==serNaN]] then
-			-- translates just fine, transmit as-is
-			res[nres+1] = "^N"
-			res[nres+2] = str
-			nres=nres+2
-		elseif v == inf or v == -inf then
-			res[nres+1] = "^N"
-			res[nres+2] = v == inf and serInf or serNegInf
-			nres=nres+2
-		else
-			local m,e = frexp(v)
-			res[nres+1] = "^F"
-			res[nres+2] = format("%.0f",m*2^53)	-- force mantissa to become integer (it's originally 0.5--0.9999)
-			res[nres+3] = "^f"
-			res[nres+4] = tostring(e-53)	-- adjust exponent to counteract mantissa manipulation
-			nres=nres+4
-		end
-	
-	elseif t=="table" then	-- ^T...^t = table (list of key,value pairs)
-		nres=nres+1
-		res[nres] = "^T"
-		for k,v in pairs(v) do
-			nres = SerializeValue(k, res, nres)
-			nres = SerializeValue(v, res, nres)
-		end
-		nres=nres+1
-		res[nres] = "^t"
-	
-	elseif t=="boolean" then	-- ^B = true, ^b = false
-		nres=nres+1
-		if v then
-			res[nres] = "^B"	-- true
-		else
-			res[nres] = "^b"	-- false
-		end
-	
-	elseif t=="nil" then		-- ^Z = nil (zero, "N" was taken :P)
-		nres=nres+1
-		res[nres] = "^Z"
-	
-	else
-		error(MAJOR..": Cannot serialize a value of type '"..t.."'")	-- can't produce error on right level, this is wildly recursive
-	end
-	
-	return nres
-end
-
-
-
-local serializeTbl = { "^1" }	-- "^1" = Hi, I'm data serialized by AceSerializer protocol rev 1
-
---- Serialize the data passed into the function.
--- Takes a list of values (strings, numbers, booleans, nils, tables)
--- and returns it in serialized form (a string).\\
--- May throw errors on invalid data types.
--- @param ... List of values to serialize
--- @return The data in its serialized form (string)
-function AceSerializer:Serialize(...)
-	local nres = 1
-	
-	for i=1,select("#", ...) do
-		local v = select(i, ...)
-		nres = SerializeValue(v, serializeTbl, nres)
-	end
-	
-	serializeTbl[nres+1] = "^^"	-- "^^" = End of serialized data
-	
-	return tconcat(serializeTbl, "", 1, nres+1)
-end
-
--- Deserialization functions
-local function DeserializeStringHelper(escape)
-	if escape<"~\122" then
-		return strchar(strbyte(escape,2,2)-64)
-	elseif escape=="~\122" then	-- v3 / ticket 115: special case encode since 30+64=94 ("^") - OOPS.
-		return "\030"
-	elseif escape=="~\123" then
-		return "\127"
-	elseif escape=="~\124" then
-		return "\126"
-	elseif escape=="~\125" then
-		return "\94"
-	end
-	error("DeserializeStringHelper got called for '"..escape.."'?!?")  -- can't be reached unless regex is screwed up
-end
-
-local function DeserializeNumberHelper(number)
-	--[[ not in 4.3 if number == serNaN then
-		return 0/0
-	else]]if number == serNegInf or number == serNegInfMac then
-		return -inf
-	elseif number == serInf or number == serInfMac then
-		return inf
-	else
-		return tonumber(number)
-	end
-end
-
--- DeserializeValue: worker function for :Deserialize()
--- It works in two modes:
---   Main (top-level) mode: Deserialize a list of values and return them all
---   Recursive (table) mode: Deserialize only a single value (_may_ of course be another table with lots of subvalues in it)
---
--- The function _always_ works recursively due to having to build a list of values to return
---
--- Callers are expected to pcall(DeserializeValue) to trap errors
-
-local function DeserializeValue(iter,single,ctl,data)
-
-	if not single then
-		ctl,data = iter()
-	end
-
-	if not ctl then 
-		error("Supplied data misses AceSerializer terminator ('^^')")
-	end	
-
-	if ctl=="^^" then
-		-- ignore extraneous data
-		return
-	end
-
-	local res
-	
-	if ctl=="^S" then
-		res = gsub(data, "~.", DeserializeStringHelper)
-	elseif ctl=="^N" then
-		res = DeserializeNumberHelper(data)
-		if not res then
-			error("Invalid serialized number: '"..tostring(data).."'")
-		end
-	elseif ctl=="^F" then     -- ^F<mantissa>^f<exponent>
-		local ctl2,e = iter()
-		if ctl2~="^f" then
-			error("Invalid serialized floating-point number, expected '^f', not '"..tostring(ctl2).."'")
-		end
-		local m=tonumber(data)
-		e=tonumber(e)
-		if not (m and e) then
-			error("Invalid serialized floating-point number, expected mantissa and exponent, got '"..tostring(m).."' and '"..tostring(e).."'")
-		end
-		res = m*(2^e)
-	elseif ctl=="^B" then	-- yeah yeah ignore data portion
-		res = true
-	elseif ctl=="^b" then   -- yeah yeah ignore data portion
-		res = false
-	elseif ctl=="^Z" then	-- yeah yeah ignore data portion
-		res = nil
-	elseif ctl=="^T" then
-		-- ignore ^T's data, future extensibility?
-		res = {}
-		local k,v
-		while true do
-			ctl,data = iter()
-			if ctl=="^t" then break end	-- ignore ^t's data
-			k = DeserializeValue(iter,true,ctl,data)
-			if k==nil then 
-				error("Invalid AceSerializer table format (no table end marker)")
-			end
-			ctl,data = iter()
-			v = DeserializeValue(iter,true,ctl,data)
-			if v==nil then
-				error("Invalid AceSerializer table format (no table end marker)")
-			end
-			res[k]=v
-		end
-	else
-		error("Invalid AceSerializer control code '"..ctl.."'")
-	end
-	
-	if not single then
-		return res,DeserializeValue(iter)
-	else
-		return res
-	end
-end
-
---- Deserializes the data into its original values.
--- Accepts serialized data, ignoring all control characters and whitespace.
--- @param str The serialized data (from :Serialize)
--- @return true followed by a list of values, OR false followed by an error message
-function AceSerializer:Deserialize(str)
-	str = gsub(str, "[%c ]", "")	-- ignore all control characters; nice for embedding in email and stuff
-
-	local iter = gmatch(str, "(^.)([^^]*)")	-- Any ^x followed by string of non-^
-	local ctl,data = iter()
-	if not ctl or ctl~="^1" then
-		-- we purposefully ignore the data portion of the start code, it can be used as an extension mechanism
-		return false, "Supplied data is not AceSerializer data (rev 1)"
-	end
-
-	return pcall(DeserializeValue, iter)
-end
-
-
-----------------------------------------
--- Base library stuff
-----------------------------------------
-
-AceSerializer.internals = {	-- for test scripts
-	SerializeValue = SerializeValue,
-	SerializeStringHelper = SerializeStringHelper,
-}
-
-local mixins = {
-	"Serialize",
-	"Deserialize",
-}
-
-AceSerializer.embeds = AceSerializer.embeds or {}
-
-function AceSerializer:Embed(target)
-	for k, v in pairs(mixins) do
-		target[v] = self[v]
-	end
-	self.embeds[target] = true
-	return target
-end
-
--- Update embeds
-for target, v in pairs(AceSerializer.embeds) do
-	AceSerializer:Embed(target)
-end
\ No newline at end of file
diff --git a/OrderHallCommander/libs/Ace3/AceSerializer-3.0/AceSerializer-3.0.xml b/OrderHallCommander/libs/Ace3/AceSerializer-3.0/AceSerializer-3.0.xml
deleted file mode 100644
index 94924af..0000000
--- a/OrderHallCommander/libs/Ace3/AceSerializer-3.0/AceSerializer-3.0.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
-..\FrameXML\UI.xsd">
-	<Script file="AceSerializer-3.0.lua"/>
-</Ui>
\ No newline at end of file
diff --git a/OrderHallCommander/libs/LibInit/Ace3/AceAddon-3.0/AceAddon-3.0.lua b/OrderHallCommander/libs/LibInit/Ace3/AceAddon-3.0/AceAddon-3.0.lua
deleted file mode 100644
index a7f7279..0000000
--- a/OrderHallCommander/libs/LibInit/Ace3/AceAddon-3.0/AceAddon-3.0.lua
+++ /dev/null
@@ -1,674 +0,0 @@
---- **AceAddon-3.0** provides a template for creating addon objects.
--- It'll provide you with a set of callback functions that allow you to simplify the loading
--- process of your addon.\\
--- Callbacks provided are:\\
--- * **OnInitialize**, which is called directly after the addon is fully loaded.
--- * **OnEnable** which gets called during the PLAYER_LOGIN event, when most of the data provided by the game is already present.
--- * **OnDisable**, which is only called when your addon is manually being disabled.
--- @usage
--- -- A small (but complete) addon, that doesn't do anything, 
--- -- but shows usage of the callbacks.
--- local MyAddon = LibStub("AceAddon-3.0"):NewAddon("MyAddon")
--- 
--- function MyAddon:OnInitialize()
---   -- do init tasks here, like loading the Saved Variables, 
---   -- or setting up slash commands.
--- end
--- 
--- function MyAddon:OnEnable()
---   -- Do more initialization here, that really enables the use of your addon.
---   -- Register Events, Hook functions, Create Frames, Get information from 
---   -- the game that wasn't available in OnInitialize
--- end
---
--- function MyAddon:OnDisable()
---   -- Unhook, Unregister Events, Hide frames that you created.
---   -- You would probably only use an OnDisable if you want to 
---   -- build a "standby" mode, or be able to toggle modules on/off.
--- end
--- @class file
--- @name AceAddon-3.0.lua
--- @release $Id: AceAddon-3.0.lua 1084 2013-04-27 20:14:11Z nevcairiel $
-
-local MAJOR, MINOR = "AceAddon-3.0", 12
-local AceAddon, oldminor = LibStub:NewLibrary(MAJOR, MINOR)
-
-if not AceAddon then return end -- No Upgrade needed.
-
-AceAddon.frame = AceAddon.frame or CreateFrame("Frame", "AceAddon30Frame") -- Our very own frame
-AceAddon.addons = AceAddon.addons or {} -- addons in general
-AceAddon.statuses = AceAddon.statuses or {} -- statuses of addon.
-AceAddon.initializequeue = AceAddon.initializequeue or {} -- addons that are new and not initialized
-AceAddon.enablequeue = AceAddon.enablequeue or {} -- addons that are initialized and waiting to be enabled
-AceAddon.embeds = AceAddon.embeds or setmetatable({}, {__index = function(tbl, key) tbl[key] = {} return tbl[key] end }) -- contains a list of libraries embedded in an addon
-
--- Lua APIs
-local tinsert, tconcat, tremove = table.insert, table.concat, table.remove
-local fmt, tostring = string.format, tostring
-local select, pairs, next, type, unpack = select, pairs, next, type, unpack
-local loadstring, assert, error = loadstring, assert, error
-local setmetatable, getmetatable, rawset, rawget = setmetatable, getmetatable, rawset, rawget
-
--- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
--- List them here for Mikk's FindGlobals script
--- GLOBALS: LibStub, IsLoggedIn, geterrorhandler
-
---[[
-	 xpcall safecall implementation
-]]
-local xpcall = xpcall
-
-local function errorhandler(err)
-	return geterrorhandler()(err)
-end
-
-local function CreateDispatcher(argCount)
-	local code = [[
-		local xpcall, eh = ...
-		local method, ARGS
-		local function call() return method(ARGS) end
-	
-		local function dispatch(func, ...)
-			 method = func
-			 if not method then return end
-			 ARGS = ...
-			 return xpcall(call, eh)
-		end
-	
-		return dispatch
-	]]
-	
-	local ARGS = {}
-	for i = 1, argCount do ARGS[i] = "arg"..i end
-	code = code:gsub("ARGS", tconcat(ARGS, ", "))
-	return assert(loadstring(code, "safecall Dispatcher["..argCount.."]"))(xpcall, errorhandler)
-end
-
-local Dispatchers = setmetatable({}, {__index=function(self, argCount)
-	local dispatcher = CreateDispatcher(argCount)
-	rawset(self, argCount, dispatcher)
-	return dispatcher
-end})
-Dispatchers[0] = function(func)
-	return xpcall(func, errorhandler)
-end
-
-local function safecall(func, ...)
-	-- we check to see if the func is passed is actually a function here and don't error when it isn't
-	-- this safecall is used for optional functions like OnInitialize OnEnable etc. When they are not
-	-- present execution should continue without hinderance
-	if type(func) == "function" then
-		return Dispatchers[select('#', ...)](func, ...)
-	end
-end
-
--- local functions that will be implemented further down
-local Enable, Disable, EnableModule, DisableModule, Embed, NewModule, GetModule, GetName, SetDefaultModuleState, SetDefaultModuleLibraries, SetEnabledState, SetDefaultModulePrototype
-
--- used in the addon metatable
-local function addontostring( self ) return self.name end 
-
--- Check if the addon is queued for initialization
-local function queuedForInitialization(addon)
-	for i = 1, #AceAddon.initializequeue do
-		if AceAddon.initializequeue[i] == addon then
-			return true
-		end
-	end
-	return false
-end
-
---- Create a new AceAddon-3.0 addon.
--- Any libraries you specified will be embeded, and the addon will be scheduled for 
--- its OnInitialize and OnEnable callbacks.
--- The final addon object, with all libraries embeded, will be returned.
--- @paramsig [object ,]name[, lib, ...]
--- @param object Table to use as a base for the addon (optional)
--- @param name Name of the addon object to create
--- @param lib List of libraries to embed into the addon
--- @usage 
--- -- Create a simple addon object
--- MyAddon = LibStub("AceAddon-3.0"):NewAddon("MyAddon", "AceEvent-3.0")
---
--- -- Create a Addon object based on the table of a frame
--- local MyFrame = CreateFrame("Frame")
--- MyAddon = LibStub("AceAddon-3.0"):NewAddon(MyFrame, "MyAddon", "AceEvent-3.0")
-function AceAddon:NewAddon(objectorname, ...)
-	local object,name
-	local i=1
-	if type(objectorname)=="table" then
-		object=objectorname
-		name=...
-		i=2
-	else
-		name=objectorname
-	end
-	if type(name)~="string" then
-		error(("Usage: NewAddon([object,] name, [lib, lib, lib, ...]): 'name' - string expected got '%s'."):format(type(name)), 2)
-	end
-	if self.addons[name] then 
-		error(("Usage: NewAddon([object,] name, [lib, lib, lib, ...]): 'name' - Addon '%s' already exists."):format(name), 2)
-	end
-	
-	object = object or {}
-	object.name = name
-
-	local addonmeta = {}
-	local oldmeta = getmetatable(object)
-	if oldmeta then
-		for k, v in pairs(oldmeta) do addonmeta[k] = v end
-	end
-	addonmeta.__tostring = addontostring
-	
-	setmetatable( object, addonmeta )
-	self.addons[name] = object
-	object.modules = {}
-	object.orderedModules = {}
-	object.defaultModuleLibraries = {}
-	Embed( object ) -- embed NewModule, GetModule methods
-	self:EmbedLibraries(object, select(i,...))
-	
-	-- add to queue of addons to be initialized upon ADDON_LOADED
-	tinsert(self.initializequeue, object)
-	return object
-end
-
-
---- Get the addon object by its name from the internal AceAddon registry.
--- Throws an error if the addon object cannot be found (except if silent is set).
--- @param name unique name of the addon object
--- @param silent if true, the addon is optional, silently return nil if its not found
--- @usage 
--- -- Get the Addon
--- MyAddon = LibStub("AceAddon-3.0"):GetAddon("MyAddon")
-function AceAddon:GetAddon(name, silent)
-	if not silent and not self.addons[name] then
-		error(("Usage: GetAddon(name): 'name' - Cannot find an AceAddon '%s'."):format(tostring(name)), 2)
-	end
-	return self.addons[name]
-end
-
--- - Embed a list of libraries into the specified addon.
--- This function will try to embed all of the listed libraries into the addon
--- and error if a single one fails.
---
--- **Note:** This function is for internal use by :NewAddon/:NewModule
--- @paramsig addon, [lib, ...]
--- @param addon addon object to embed the libs in
--- @param lib List of libraries to embed into the addon
-function AceAddon:EmbedLibraries(addon, ...)
-	for i=1,select("#", ... ) do
-		local libname = select(i, ...)
-		self:EmbedLibrary(addon, libname, false, 4)
-	end
-end
-
--- - Embed a library into the addon object.
--- This function will check if the specified library is registered with LibStub
--- and if it has a :Embed function to call. It'll error if any of those conditions
--- fails.
---
--- **Note:** This function is for internal use by :EmbedLibraries
--- @paramsig addon, libname[, silent[, offset]]
--- @param addon addon object to embed the library in
--- @param libname name of the library to embed
--- @param silent marks an embed to fail silently if the library doesn't exist (optional)
--- @param offset will push the error messages back to said offset, defaults to 2 (optional)
-function AceAddon:EmbedLibrary(addon, libname, silent, offset)
-	local lib = LibStub:GetLibrary(libname, true)
-	if not lib and not silent then
-		error(("Usage: EmbedLibrary(addon, libname, silent, offset): 'libname' - Cannot find a library instance of %q."):format(tostring(libname)), offset or 2)
-	elseif lib and type(lib.Embed) == "function" then
-		lib:Embed(addon)
-		tinsert(self.embeds[addon], libname)
-		return true
-	elseif lib then
-		error(("Usage: EmbedLibrary(addon, libname, silent, offset): 'libname' - Library '%s' is not Embed capable"):format(libname), offset or 2)
-	end
-end
-
---- Return the specified module from an addon object.
--- Throws an error if the addon object cannot be found (except if silent is set)
--- @name //addon//:GetModule
--- @paramsig name[, silent]
--- @param name unique name of the module
--- @param silent if true, the module is optional, silently return nil if its not found (optional)
--- @usage 
--- -- Get the Addon
--- MyAddon = LibStub("AceAddon-3.0"):GetAddon("MyAddon")
--- -- Get the Module
--- MyModule = MyAddon:GetModule("MyModule")
-function GetModule(self, name, silent)
-	if not self.modules[name] and not silent then
-		error(("Usage: GetModule(name, silent): 'name' - Cannot find module '%s'."):format(tostring(name)), 2)
-	end
-	return self.modules[name]
-end
-
-local function IsModuleTrue(self) return true end
-
---- Create a new module for the addon.
--- The new module can have its own embeded libraries and/or use a module prototype to be mixed into the module.\\
--- A module has the same functionality as a real addon, it can have modules of its own, and has the same API as
--- an addon object.
--- @name //addon//:NewModule
--- @paramsig name[, prototype|lib[, lib, ...]]
--- @param name unique name of the module
--- @param prototype object to derive this module from, methods and values from this table will be mixed into the module (optional)
--- @param lib List of libraries to embed into the addon
--- @usage 
--- -- Create a module with some embeded libraries
--- MyModule = MyAddon:NewModule("MyModule", "AceEvent-3.0", "AceHook-3.0")
--- 
--- -- Create a module with a prototype
--- local prototype = { OnEnable = function(self) print("OnEnable called!") end }
--- MyModule = MyAddon:NewModule("MyModule", prototype, "AceEvent-3.0", "AceHook-3.0")
-function NewModule(self, name, prototype, ...)
-	if type(name) ~= "string" then error(("Usage: NewModule(name, [prototype, [lib, lib, lib, ...]): 'name' - string expected got '%s'."):format(type(name)), 2) end
-	if type(prototype) ~= "string" and type(prototype) ~= "table" and type(prototype) ~= "nil" then error(("Usage: NewModule(name, [prototype, [lib, lib, lib, ...]): 'prototype' - table (prototype), string (lib) or nil expected got '%s'."):format(type(prototype)), 2) end
-	
-	if self.modules[name] then error(("Usage: NewModule(name, [prototype, [lib, lib, lib, ...]): 'name' - Module '%s' already exists."):format(name), 2) end
-	
-	-- modules are basically addons. We treat them as such. They will be added to the initializequeue properly as well.
-	-- NewModule can only be called after the parent addon is present thus the modules will be initialized after their parent is.
-	local module = AceAddon:NewAddon(fmt("%s_%s", self.name or tostring(self), name))
-	
-	module.IsModule = IsModuleTrue
-	module:SetEnabledState(self.defaultModuleState)
-	module.moduleName = name
-
-	if type(prototype) == "string" then
-		AceAddon:EmbedLibraries(module, prototype, ...)
-	else
-		AceAddon:EmbedLibraries(module, ...)
-	end
-	AceAddon:EmbedLibraries(module, unpack(self.defaultModuleLibraries))
-
-	if not prototype or type(prototype) == "string" then
-		prototype = self.defaultModulePrototype or nil
-	end
-	
-	if type(prototype) == "table" then
-		local mt = getmetatable(module)
-		mt.__index = prototype
-		setmetatable(module, mt)  -- More of a Base class type feel.
-	end
-	
-	safecall(self.OnModuleCreated, self, module) -- Was in Ace2 and I think it could be a cool thing to have handy.
-	self.modules[name] = module
-	tinsert(self.orderedModules, module)
-	
-	return module
-end
-
---- Returns the real name of the addon or module, without any prefix.
--- @name //addon//:GetName
--- @paramsig 
--- @usage 
--- print(MyAddon:GetName())
--- -- prints "MyAddon"
-function GetName(self)
-	return self.moduleName or self.name
-end
-
---- Enables the Addon, if possible, return true or false depending on success.
--- This internally calls AceAddon:EnableAddon(), thus dispatching a OnEnable callback
--- and enabling all modules of the addon (unless explicitly disabled).\\
--- :Enable() also sets the internal `enableState` variable to true
--- @name //addon//:Enable
--- @paramsig 
--- @usage 
--- -- Enable MyModule
--- MyAddon = LibStub("AceAddon-3.0"):GetAddon("MyAddon")
--- MyModule = MyAddon:GetModule("MyModule")
--- MyModule:Enable()
-function Enable(self)
-	self:SetEnabledState(true)
-
-	-- nevcairiel 2013-04-27: don't enable an addon/module if its queued for init still
-	-- it'll be enabled after the init process
-	if not queuedForInitialization(self) then
-		return AceAddon:EnableAddon(self)
-	end
-end
-
---- Disables the Addon, if possible, return true or false depending on success.
--- This internally calls AceAddon:DisableAddon(), thus dispatching a OnDisable callback
--- and disabling all modules of the addon.\\
--- :Disable() also sets the internal `enableState` variable to false
--- @name //addon//:Disable
--- @paramsig 
--- @usage 
--- -- Disable MyAddon
--- MyAddon = LibStub("AceAddon-3.0"):GetAddon("MyAddon")
--- MyAddon:Disable()
-function Disable(self)
-	self:SetEnabledState(false)
-	return AceAddon:DisableAddon(self)
-end
-
---- Enables the Module, if possible, return true or false depending on success.
--- Short-hand function that retrieves the module via `:GetModule` and calls `:Enable` on the module object.
--- @name //addon//:EnableModule
--- @paramsig name
--- @usage 
--- -- Enable MyModule using :GetModule
--- MyAddon = LibStub("AceAddon-3.0"):GetAddon("MyAddon")
--- MyModule = MyAddon:GetModule("MyModule")
--- MyModule:Enable()
---
--- -- Enable MyModule using the short-hand
--- MyAddon = LibStub("AceAddon-3.0"):GetAddon("MyAddon")
--- MyAddon:EnableModule("MyModule")
-function EnableModule(self, name)
-	local module = self:GetModule( name )
-	return module:Enable()
-end
-
---- Disables the Module, if possible, return true or false depending on success.
--- Short-hand function that retrieves the module via `:GetModule` and calls `:Disable` on the module object.
--- @name //addon//:DisableModule
--- @paramsig name
--- @usage 
--- -- Disable MyModule using :GetModule
--- MyAddon = LibStub("AceAddon-3.0"):GetAddon("MyAddon")
--- MyModule = MyAddon:GetModule("MyModule")
--- MyModule:Disable()
---
--- -- Disable MyModule using the short-hand
--- MyAddon = LibStub("AceAddon-3.0"):GetAddon("MyAddon")
--- MyAddon:DisableModule("MyModule")
-function DisableModule(self, name)
-	local module = self:GetModule( name )
-	return module:Disable()
-end
-
---- Set the default libraries to be mixed into all modules created by this object.
--- Note that you can only change the default module libraries before any module is created.
--- @name //addon//:SetDefaultModuleLibraries
--- @paramsig lib[, lib, ...]
--- @param lib List of libraries to embed into the addon
--- @usage 
--- -- Create the addon object
--- MyAddon = LibStub("AceAddon-3.0"):NewAddon("MyAddon")
--- -- Configure default libraries for modules (all modules need AceEvent-3.0)
--- MyAddon:SetDefaultModuleLibraries("AceEvent-3.0")
--- -- Create a module
--- MyModule = MyAddon:NewModule("MyModule")
-function SetDefaultModuleLibraries(self, ...)
-	if next(self.modules) then
-		error("Usage: SetDefaultModuleLibraries(...): cannot change the module defaults after a module has been registered.", 2)
-	end
-	self.defaultModuleLibraries = {...}
-end
-
---- Set the default state in which new modules are being created.
--- Note that you can only change the default state before any module is created.
--- @name //addon//:SetDefaultModuleState
--- @paramsig state
--- @param state Default state for new modules, true for enabled, false for disabled
--- @usage 
--- -- Create the addon object
--- MyAddon = LibStub("AceAddon-3.0"):NewAddon("MyAddon")
--- -- Set the default state to "disabled"
--- MyAddon:SetDefaultModuleState(false)
--- -- Create a module and explicilty enable it
--- MyModule = MyAddon:NewModule("MyModule")
--- MyModule:Enable()
-function SetDefaultModuleState(self, state)
-	if next(self.modules) then
-		error("Usage: SetDefaultModuleState(state): cannot change the module defaults after a module has been registered.", 2)
-	end
-	self.defaultModuleState = state
-end
-
---- Set the default prototype to use for new modules on creation.
--- Note that you can only change the default prototype before any module is created.
--- @name //addon//:SetDefaultModulePrototype
--- @paramsig prototype
--- @param prototype Default prototype for the new modules (table)
--- @usage 
--- -- Define a prototype
--- local prototype = { OnEnable = function(self) print("OnEnable called!") end }
--- -- Set the default prototype
--- MyAddon:SetDefaultModulePrototype(prototype)
--- -- Create a module and explicitly Enable it
--- MyModule = MyAddon:NewModule("MyModule")
--- MyModule:Enable()
--- -- should print "OnEnable called!" now
--- @see NewModule
-function SetDefaultModulePrototype(self, prototype)
-	if next(self.modules) then
-		error("Usage: SetDefaultModulePrototype(prototype): cannot change the module defaults after a module has been registered.", 2)
-	end
-	if type(prototype) ~= "table" then
-		error(("Usage: SetDefaultModulePrototype(prototype): 'prototype' - table expected got '%s'."):format(type(prototype)), 2)
-	end
-	self.defaultModulePrototype = prototype
-end
-
---- Set the state of an addon or module
--- This should only be called before any enabling actually happend, e.g. in/before OnInitialize.
--- @name //addon//:SetEnabledState
--- @paramsig state
--- @param state the state of an addon or module  (enabled=true, disabled=false)
-function SetEnabledState(self, state)
-	self.enabledState = state
-end
-
-
---- Return an iterator of all modules associated to the addon.
--- @name //addon//:IterateModules
--- @paramsig 
--- @usage 
--- -- Enable all modules
--- for name, module in MyAddon:IterateModules() do
---    module:Enable()
--- end
-local function IterateModules(self) return pairs(self.modules) end
-
--- Returns an iterator of all embeds in the addon
--- @name //addon//:IterateEmbeds
--- @paramsig 
-local function IterateEmbeds(self) return pairs(AceAddon.embeds[self]) end
-
---- Query the enabledState of an addon.
--- @name //addon//:IsEnabled
--- @paramsig 
--- @usage 
--- if MyAddon:IsEnabled() then
---     MyAddon:Disable()
--- end
-local function IsEnabled(self) return self.enabledState end
-local mixins = {
-	NewModule = NewModule,
-	GetModule = GetModule,
-	Enable = Enable,
-	Disable = Disable,
-	EnableModule = EnableModule,
-	DisableModule = DisableModule,
-	IsEnabled = IsEnabled,
-	SetDefaultModuleLibraries = SetDefaultModuleLibraries,
-	SetDefaultModuleState = SetDefaultModuleState,
-	SetDefaultModulePrototype = SetDefaultModulePrototype,
-	SetEnabledState = SetEnabledState,
-	IterateModules = IterateModules,
-	IterateEmbeds = IterateEmbeds,
-	GetName = GetName,
-}
-local function IsModule(self) return false end
-local pmixins = {
-	defaultModuleState = true,
-	enabledState = true,
-	IsModule = IsModule,
-}
--- Embed( target )
--- target (object) - target object to embed aceaddon in
---
--- this is a local function specifically since it's meant to be only called internally
-function Embed(target, skipPMixins)
-	for k, v in pairs(mixins) do
-		target[k] = v
-	end
-	if not skipPMixins then
-		for k, v in pairs(pmixins) do
-			target[k] = target[k] or v
-		end
-	end
-end
-
-
--- - Initialize the addon after creation.
--- This function is only used internally during the ADDON_LOADED event
--- It will call the **OnInitialize** function on the addon object (if present), 
--- and the **OnEmbedInitialize** function on all embeded libraries.
--- 
--- **Note:** Do not call this function manually, unless you're absolutely sure that you know what you are doing.
--- @param addon addon object to intialize
-function AceAddon:InitializeAddon(addon)
-	safecall(addon.OnInitialize, addon)
-	
-	local embeds = self.embeds[addon]
-	for i = 1, #embeds do
-		local lib = LibStub:GetLibrary(embeds[i], true)
-		if lib then safecall(lib.OnEmbedInitialize, lib, addon) end
-	end
-	
-	-- we don't call InitializeAddon on modules specifically, this is handled
-	-- from the event handler and only done _once_
-end
-
--- - Enable the addon after creation.
--- Note: This function is only used internally during the PLAYER_LOGIN event, or during ADDON_LOADED,
--- if IsLoggedIn() already returns true at that point, e.g. for LoD Addons.
--- It will call the **OnEnable** function on the addon object (if present), 
--- and the **OnEmbedEnable** function on all embeded libraries.\\
--- This function does not toggle the enable state of the addon itself, and will return early if the addon is disabled.
---
--- **Note:** Do not call this function manually, unless you're absolutely sure that you know what you are doing.
--- Use :Enable on the addon itself instead.
--- @param addon addon object to enable
-function AceAddon:EnableAddon(addon)
-	if type(addon) == "string" then addon = AceAddon:GetAddon(addon) end
-	if self.statuses[addon.name] or not addon.enabledState then return false end
-	
-	-- set the statuses first, before calling the OnEnable. this allows for Disabling of the addon in OnEnable.
-	self.statuses[addon.name] = true
-	
-	safecall(addon.OnEnable, addon)
-	
-	-- make sure we're still enabled before continueing
-	if self.statuses[addon.name] then
-		local embeds = self.embeds[addon]
-		for i = 1, #embeds do
-			local lib = LibStub:GetLibrary(embeds[i], true)
-			if lib then safecall(lib.OnEmbedEnable, lib, addon) end
-		end
-	
-		-- enable possible modules.
-		local modules = addon.orderedModules
-		for i = 1, #modules do
-			self:EnableAddon(modules[i])
-		end
-	end
-	return self.statuses[addon.name] -- return true if we're disabled
-end
-
--- - Disable the addon
--- Note: This function is only used internally.
--- It will call the **OnDisable** function on the addon object (if present), 
--- and the **OnEmbedDisable** function on all embeded libraries.\\
--- This function does not toggle the enable state of the addon itself, and will return early if the addon is still enabled.
---
--- **Note:** Do not call this function manually, unless you're absolutely sure that you know what you are doing. 
--- Use :Disable on the addon itself instead.
--- @param addon addon object to enable
-function AceAddon:DisableAddon(addon)
-	if type(addon) == "string" then addon = AceAddon:GetAddon(addon) end
-	if not self.statuses[addon.name] then return false end
-	
-	-- set statuses first before calling OnDisable, this allows for aborting the disable in OnDisable.
-	self.statuses[addon.name] = false
-	
-	safecall( addon.OnDisable, addon )
-	
-	-- make sure we're still disabling...
-	if not self.statuses[addon.name] then 
-		local embeds = self.embeds[addon]
-		for i = 1, #embeds do
-			local lib = LibStub:GetLibrary(embeds[i], true)
-			if lib then safecall(lib.OnEmbedDisable, lib, addon) end
-		end
-		-- disable possible modules.
-		local modules = addon.orderedModules
-		for i = 1, #modules do
-			self:DisableAddon(modules[i])
-		end
-	end
-	
-	return not self.statuses[addon.name] -- return true if we're disabled
-end
-
---- Get an iterator over all registered addons.
--- @usage 
--- -- Print a list of all installed AceAddon's
--- for name, addon in AceAddon:IterateAddons() do
---   print("Addon: " .. name)
--- end
-function AceAddon:IterateAddons() return pairs(self.addons) end
-
---- Get an iterator over the internal status registry.
--- @usage 
--- -- Print a list of all enabled addons
--- for name, status in AceAddon:IterateAddonStatus() do
---   if status then
---     print("EnabledAddon: " .. name)
---   end
--- end
-function AceAddon:IterateAddonStatus() return pairs(self.statuses) end
-
--- Following Iterators are deprecated, and their addon specific versions should be used
--- e.g. addon:IterateEmbeds() instead of :IterateEmbedsOnAddon(addon)
-function AceAddon:IterateEmbedsOnAddon(addon) return pairs(self.embeds[addon]) end
-function AceAddon:IterateModulesOfAddon(addon) return pairs(addon.modules) end
-
--- Event Handling
-local function onEvent(this, event, arg1)
-	-- 2011-08-17 nevcairiel - ignore the load event of Blizzard_DebugTools, so a potential startup error isn't swallowed up
-	if (event == "ADDON_LOADED"  and arg1 ~= "Blizzard_DebugTools") or event == "PLAYER_LOGIN" then
-		-- if a addon loads another addon, recursion could happen here, so we need to validate the table on every iteration
-		while(#AceAddon.initializequeue > 0) do
-			local addon = tremove(AceAddon.initializequeue, 1)
-			-- this might be an issue with recursion - TODO: validate
-			if event == "ADDON_LOADED" then addon.baseName = arg1 end
-			AceAddon:InitializeAddon(addon)
-			tinsert(AceAddon.enablequeue, addon)
-		end
-		
-		if IsLoggedIn() then
-			while(#AceAddon.enablequeue > 0) do
-				local addon = tremove(AceAddon.enablequeue, 1)
-				AceAddon:EnableAddon(addon)
-			end
-		end
-	end
-end
-
-AceAddon.frame:RegisterEvent("ADDON_LOADED")
-AceAddon.frame:RegisterEvent("PLAYER_LOGIN")
-AceAddon.frame:SetScript("OnEvent", onEvent)
-
--- upgrade embeded
-for name, addon in pairs(AceAddon.addons) do
-	Embed(addon, true)
-end
-
--- 2010-10-27 nevcairiel - add new "orderedModules" table
-if oldminor and oldminor < 10 then
-	for name, addon in pairs(AceAddon.addons) do
-		addon.orderedModules = {}
-		for module_name, module in pairs(addon.modules) do
-			tinsert(addon.orderedModules, module)
-		end
-	end
-end
diff --git a/OrderHallCommander/libs/LibInit/Ace3/AceAddon-3.0/AceAddon-3.0.xml b/OrderHallCommander/libs/LibInit/Ace3/AceAddon-3.0/AceAddon-3.0.xml
deleted file mode 100644
index e6ad639..0000000
--- a/OrderHallCommander/libs/LibInit/Ace3/AceAddon-3.0/AceAddon-3.0.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
-..\FrameXML\UI.xsd">
-	<Script file="AceAddon-3.0.lua"/>
-</Ui>
\ No newline at end of file
diff --git a/OrderHallCommander/libs/LibInit/Ace3/AceConfig-3.0/AceConfig-3.0.lua b/OrderHallCommander/libs/LibInit/Ace3/AceConfig-3.0/AceConfig-3.0.lua
deleted file mode 100644
index 3bedf8c..0000000
--- a/OrderHallCommander/libs/LibInit/Ace3/AceConfig-3.0/AceConfig-3.0.lua
+++ /dev/null
@@ -1,57 +0,0 @@
---- AceConfig-3.0 wrapper library.
--- Provides an API to register an options table with the config registry,
--- as well as associate it with a slash command.
--- @class file
--- @name AceConfig-3.0
--- @release $Id: AceConfig-3.0.lua 969 2010-10-07 02:11:48Z shefki $
-
---[[
-AceConfig-3.0
-
-Very light wrapper library that combines all the AceConfig subcomponents into one more easily used whole.
-
-]]
-
-local MAJOR, MINOR = "AceConfig-3.0", 2
-local AceConfig = LibStub:NewLibrary(MAJOR, MINOR)
-
-if not AceConfig then return end
-
-local cfgreg = LibStub("AceConfigRegistry-3.0")
-local cfgcmd = LibStub("AceConfigCmd-3.0")
---TODO: local cfgdlg = LibStub("AceConfigDialog-3.0", true)
---TODO: local cfgdrp = LibStub("AceConfigDropdown-3.0", true)
-
--- Lua APIs
-local pcall, error, type, pairs = pcall, error, type, pairs
-
--- -------------------------------------------------------------------
--- :RegisterOptionsTable(appName, options, slashcmd, persist)
---
--- - appName - (string) application name
--- - options - table or function ref, see AceConfigRegistry
--- - slashcmd - slash command (string) or table with commands, or nil to NOT create a slash command
-
---- Register a option table with the AceConfig registry.
--- You can supply a slash command (or a table of slash commands) to register with AceConfigCmd directly.
--- @paramsig appName, options [, slashcmd]
--- @param appName The application name for the config table.
--- @param options The option table (or a function to generate one on demand).  http://www.wowace.com/addons/ace3/pages/ace-config-3-0-options-tables/
--- @param slashcmd A slash command to register for the option table, or a table of slash commands.
--- @usage
--- local AceConfig = LibStub("AceConfig-3.0")
--- AceConfig:RegisterOptionsTable("MyAddon", myOptions, {"/myslash", "/my"})
-function AceConfig:RegisterOptionsTable(appName, options, slashcmd)
-	local ok,msg = pcall(cfgreg.RegisterOptionsTable, self, appName, options)
-	if not ok then error(msg, 2) end
-	
-	if slashcmd then
-		if type(slashcmd) == "table" then
-			for _,cmd in pairs(slashcmd) do
-				cfgcmd:CreateChatCommand(cmd, appName)
-			end
-		else
-			cfgcmd:CreateChatCommand(slashcmd, appName)
-		end
-	end
-end
diff --git a/OrderHallCommander/libs/LibInit/Ace3/AceConfig-3.0/AceConfig-3.0.xml b/OrderHallCommander/libs/LibInit/Ace3/AceConfig-3.0/AceConfig-3.0.xml
deleted file mode 100644
index 87972ad..0000000
--- a/OrderHallCommander/libs/LibInit/Ace3/AceConfig-3.0/AceConfig-3.0.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
-..\FrameXML\UI.xsd">
-	<Include file="AceConfigRegistry-3.0\AceConfigRegistry-3.0.xml"/>
-	<Include file="AceConfigCmd-3.0\AceConfigCmd-3.0.xml"/>
-	<Include file="AceConfigDialog-3.0\AceConfigDialog-3.0.xml"/>
-	<!--<Include file="AceConfigDropdown-3.0\AceConfigDropdown-3.0.xml"/>-->
-	<Script file="AceConfig-3.0.lua"/>
-</Ui>
\ No newline at end of file
diff --git a/OrderHallCommander/libs/LibInit/Ace3/AceConfig-3.0/AceConfigCmd-3.0/AceConfigCmd-3.0.lua b/OrderHallCommander/libs/LibInit/Ace3/AceConfig-3.0/AceConfigCmd-3.0/AceConfigCmd-3.0.lua
deleted file mode 100644
index 2023981..0000000
--- a/OrderHallCommander/libs/LibInit/Ace3/AceConfig-3.0/AceConfigCmd-3.0/AceConfigCmd-3.0.lua
+++ /dev/null
@@ -1,794 +0,0 @@
---- AceConfigCmd-3.0 handles access to an options table through the "command line" interface via the ChatFrames.
--- @class file
--- @name AceConfigCmd-3.0
--- @release $Id: AceConfigCmd-3.0.lua 1045 2011-12-09 17:58:40Z nevcairiel $
-
---[[
-AceConfigCmd-3.0
-
-Handles commandline optionstable access
-
-REQUIRES: AceConsole-3.0 for command registration (loaded on demand)
-
-]]
-
--- TODO: plugin args
-
-
-local MAJOR, MINOR = "AceConfigCmd-3.0", 13
-local AceConfigCmd = LibStub:NewLibrary(MAJOR, MINOR)
-
-if not AceConfigCmd then return end
-
-AceConfigCmd.commands = AceConfigCmd.commands or {}
-local commands = AceConfigCmd.commands
-
-local cfgreg = LibStub("AceConfigRegistry-3.0")
-local AceConsole -- LoD
-local AceConsoleName = "AceConsole-3.0"
-
--- Lua APIs
-local strsub, strsplit, strlower, strmatch, strtrim = string.sub, string.split, string.lower, string.match, string.trim
-local format, tonumber, tostring = string.format, tonumber, tostring
-local tsort, tinsert = table.sort, table.insert
-local select, pairs, next, type = select, pairs, next, type
-local error, assert = error, assert
-
--- WoW APIs
-local _G = _G
-
--- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
--- List them here for Mikk's FindGlobals script
--- GLOBALS: LibStub, SELECTED_CHAT_FRAME, DEFAULT_CHAT_FRAME
-
-
-local L = setmetatable({}, {	-- TODO: replace with proper locale
-	__index = function(self,k) return k end
-})
-
-
-
-local function print(msg)
-	(SELECTED_CHAT_FRAME or DEFAULT_CHAT_FRAME):AddMessage(msg)
-end
-
--- constants used by getparam() calls below
-
-local handlertypes = {["table"]=true}
-local handlermsg = "expected a table"
-
-local functypes = {["function"]=true, ["string"]=true}
-local funcmsg = "expected function or member name"
-
-
--- pickfirstset() - picks the first non-nil value and returns it
-
-local function pickfirstset(...)	
-	for i=1,select("#",...) do
-		if select(i,...)~=nil then
-			return select(i,...)
-		end
-	end
-end
-
-
--- err() - produce real error() regarding malformed options tables etc
-
-local function err(info,inputpos,msg )
-	local cmdstr=" "..strsub(info.input, 1, inputpos-1)
-	error(MAJOR..": /" ..info[0] ..cmdstr ..": "..(msg or "malformed options table"), 2)
-end
-
-
--- usererr() - produce chatframe message regarding bad slash syntax etc
-
-local function usererr(info,inputpos,msg )
-	local cmdstr=strsub(info.input, 1, inputpos-1);
-	print("/" ..info[0] .. " "..cmdstr ..": "..(msg or "malformed options table"))
-end
-
-
--- callmethod() - call a given named method (e.g. "get", "set") with given arguments
-
-local function callmethod(info, inputpos, tab, methodtype, ...)
-	local method = info[methodtype]
-	if not method then
-		err(info, inputpos, "'"..methodtype.."': not set")
-	end
-
-	info.arg = tab.arg
-	info.option = tab
-	info.type = tab.type
-
-	if type(method)=="function" then
-		return method(info, ...)
-	elseif type(method)=="string" then
-		if type(info.handler[method])~="function" then
-			err(info, inputpos, "'"..methodtype.."': '"..method.."' is not a member function of "..tostring(info.handler))
-		end
-		return info.handler[method](info.handler, info, ...)
-	else
-		assert(false)	-- type should have already been checked on read
-	end
-end
-
--- callfunction() - call a given named function (e.g. "name", "desc") with given arguments
-
-local function callfunction(info, tab, methodtype, ...)
-	local method = tab[methodtype]
-
-	info.arg = tab.arg
-	info.option = tab
-	info.type = tab.type
-	
-	if type(method)=="function" then
-		return method(info, ...)
-	else
-		assert(false) -- type should have already been checked on read
-	end
-end
-
--- do_final() - do the final step (set/execute) along with validation and confirmation
-
-local function do_final(info, inputpos, tab, methodtype, ...)
-	if info.validate then 
-		local res = callmethod(info,inputpos,tab,"validate",...)
-		if type(res)=="string" then
-			usererr(info, inputpos, "'"..strsub(info.input, inputpos).."' - "..res)
-			return
-		end
-	end
-	-- console ignores .confirm
-	
-	callmethod(info,inputpos,tab,methodtype, ...)
-end
-
-
--- getparam() - used by handle() to retreive and store "handler", "get", "set", etc
-
-local function getparam(info, inputpos, tab, depth, paramname, types, errormsg)
-	local old,oldat = info[paramname], info[paramname.."_at"]
-	local val=tab[paramname]
-	if val~=nil then
-		if val==false then
-			val=nil
-		elseif not types[type(val)] then 
-			err(info, inputpos, "'" .. paramname.. "' - "..errormsg) 
-		end
-		info[paramname] = val
-		info[paramname.."_at"] = depth
-	end
-	return old,oldat
-end
-
-
--- iterateargs(tab) - custom iterator that iterates both t.args and t.plugins.*
-local dummytable={}
-
-local function iterateargs(tab)
-	if not tab.plugins then 
-		return pairs(tab.args) 
-	end
-	
-	local argtabkey,argtab=next(tab.plugins)
-	local v
-	
-	return function(_, k)
-		while argtab do
-			k,v = next(argtab, k)
-			if k then return k,v end
-			if argtab==tab.args then
-				argtab=nil
-			else
-				argtabkey,argtab = next(tab.plugins, argtabkey)
-				if not argtabkey then
-					argtab=tab.args
-				end
-			end
-		end
-	end
-end
-
-local function checkhidden(info, inputpos, tab)
-	if tab.cmdHidden~=nil then
-		return tab.cmdHidden
-	end
-	local hidden = tab.hidden
-	if type(hidden) == "function" or type(hidden) == "string" then
-		info.hidden = hidden
-		hidden = callmethod(info, inputpos, tab, 'hidden')
-		info.hidden = nil
-	end
-	return hidden
-end
-
-local function showhelp(info, inputpos, tab, depth, noHead)
-	if not noHead then
-		print("|cff33ff99"..info.appName.."|r: Arguments to |cffffff78/"..info[0].."|r "..strsub(info.input,1,inputpos-1)..":")
-	end
-	
-	local sortTbl = {}	-- [1..n]=name
-	local refTbl = {}   -- [name]=tableref
-	
-	for k,v in iterateargs(tab) do
-		if not refTbl[k] then	-- a plugin overriding something in .args
-			tinsert(sortTbl, k)
-			refTbl[k] = v
-		end
-	end
-	
-	tsort(sortTbl, function(one, two) 
-		local o1 = refTbl[one].order or 100
-		local o2 = refTbl[two].order or 100
-		if type(o1) == "function" or type(o1) == "string" then
-			info.order = o1
-			info[#info+1] = one
-			o1 = callmethod(info, inputpos, refTbl[one], "order")
-			info[#info] = nil
-			info.order = nil
-		end
-		if type(o2) == "function" or type(o1) == "string" then
-			info.order = o2
-			info[#info+1] = two
-			o2 = callmethod(info, inputpos, refTbl[two], "order")
-			info[#info] = nil
-			info.order = nil
-		end
-		if o1<0 and o2<0 then return o1<o2 end
-		if o2<0 then return true end
-		if o1<0 then return false end
-		if o1==o2 then return tostring(one)<tostring(two) end   -- compare names
-		return o1<o2
-	end)
-	
-	for i = 1, #sortTbl do
-		local k = sortTbl[i]
-		local v = refTbl[k]
-		if not checkhidden(info, inputpos, v) then
-			if v.type ~= "description" and v.type ~= "header" then
-				-- recursively show all inline groups
-				local name, desc = v.name, v.desc
-				if type(name) == "function" then
-					name = callfunction(info, v, 'name')
-				end
-				if type(desc) == "function" then
-					desc = callfunction(info, v, 'desc')
-				end
-				if v.type == "group" and pickfirstset(v.cmdInline, v.inline, false) then
-					print("  "..(desc or name)..":")
-					local oldhandler,oldhandler_at = getparam(info, inputpos, v, depth, "handler", handlertypes, handlermsg)
-					showhelp(info, inputpos, v, depth, true)
-					info.handler,info.handler_at = oldhandler,oldhandler_at
-				else
-					local key = k:gsub(" ", "_")
-					print("  |cffffff78"..key.."|r - "..(desc or name or ""))
-				end
-			end
-		end
-	end
-end
-
-
-local function keybindingValidateFunc(text)
-	if text == nil or text == "NONE" then
-		return nil
-	end
-	text = text:upper()
-	local shift, ctrl, alt
-	local modifier
-	while true do
-		if text == "-" then
-			break
-		end
-		modifier, text = strsplit('-', text, 2)
-		if text then
-			if modifier ~= "SHIFT" and modifier ~= "CTRL" and modifier ~= "ALT" then
-				return false
-			end
-			if modifier == "SHIFT" then
-				if shift then
-					return false
-				end
-				shift = true
-			end
-			if modifier == "CTRL" then
-				if ctrl then
-					return false
-				end
-				ctrl = true
-			end
-			if modifier == "ALT" then
-				if alt then
-					return false
-				end
-				alt = true
-			end
-		else
-			text = modifier
-			break
-		end
-	end
-	if text == "" then
-		return false
-	end
-	if not text:find("^F%d+$") and text ~= "CAPSLOCK" and text:len() ~= 1 and (text:byte() < 128 or text:len() > 4) and not _G["KEY_" .. text] then
-		return false
-	end
-	local s = text
-	if shift then
-		s = "SHIFT-" .. s
-	end
-	if ctrl then
-		s = "CTRL-" .. s
-	end
-	if alt then
-		s = "ALT-" .. s
-	end
-	return s
-end
-
--- handle() - selfrecursing function that processes input->optiontable 
--- - depth - starts at 0
--- - retfalse - return false rather than produce error if a match is not found (used by inlined groups)
-
-local function handle(info, inputpos, tab, depth, retfalse)
-
-	if not(type(tab)=="table" and type(tab.type)=="string") then err(info,inputpos) end
-
-	-------------------------------------------------------------------
-	-- Grab hold of handler,set,get,func,etc if set (and remember old ones)
-	-- Note that we do NOT validate if method names are correct at this stage,
-	-- the handler may change before they're actually used!
-
-	local oldhandler,oldhandler_at = getparam(info,inputpos,tab,depth,"handler",handlertypes,handlermsg)
-	local oldset,oldset_at = getparam(info,inputpos,tab,depth,"set",functypes,funcmsg)
-	local oldget,oldget_at = getparam(info,inputpos,tab,depth,"get",functypes,funcmsg)
-	local oldfunc,oldfunc_at = getparam(info,inputpos,tab,depth,"func",functypes,funcmsg)
-	local oldvalidate,oldvalidate_at = getparam(info,inputpos,tab,depth,"validate",functypes,funcmsg)
-	--local oldconfirm,oldconfirm_at = getparam(info,inputpos,tab,depth,"confirm",functypes,funcmsg)
-	
-	-------------------------------------------------------------------
-	-- Act according to .type of this table
-		
-	if tab.type=="group" then
-		------------ group --------------------------------------------
-		
-		if type(tab.args)~="table" then err(info, inputpos) end
-		if tab.plugins and type(tab.plugins)~="table" then err(info,inputpos) end
-		
-		-- grab next arg from input
-		local _,nextpos,arg = (info.input):find(" *([^ ]+) *", inputpos)
-		if not arg then
-			showhelp(info, inputpos, tab, depth)
-			return
-		end
-		nextpos=nextpos+1
-		
-		-- loop .args and try to find a key with a matching name
-		for k,v in iterateargs(tab) do
-			if not(type(k)=="string" and type(v)=="table" and type(v.type)=="string") then err(info,inputpos, "options table child '"..tostring(k).."' is malformed") end
-			
-			-- is this child an inline group? if so, traverse into it
-			if v.type=="group" and pickfirstset(v.cmdInline, v.inline, false) then
-				info[depth+1] = k
-				if handle(info, inputpos, v, depth+1, true)==false then
-					info[depth+1] = nil
-					-- wasn't found in there, but that's ok, we just keep looking down here
-				else
-					return	-- done, name was found in inline group
-				end
-			-- matching name and not a inline group
-			elseif strlower(arg)==strlower(k:gsub(" ", "_")) then
-				info[depth+1] = k
-				return handle(info,nextpos,v,depth+1)
-			end
-		end
-			
-		-- no match 
-		if retfalse then
-			-- restore old infotable members and return false to indicate failure
-			info.handler,info.handler_at = oldhandler,oldhandler_at
-			info.set,info.set_at = oldset,oldset_at
-			info.get,info.get_at = oldget,oldget_at
-			info.func,info.func_at = oldfunc,oldfunc_at
-			info.validate,info.validate_at = oldvalidate,oldvalidate_at
-			--info.confirm,info.confirm_at = oldconfirm,oldconfirm_at
-			return false
-		end
-		
-		-- couldn't find the command, display error
-		usererr(info, inputpos, "'"..arg.."' - " .. L["unknown argument"])
-		return
-	end
-	
-	local str = strsub(info.input,inputpos);
-	
-	if tab.type=="execute" then
-		------------ execute --------------------------------------------
-		do_final(info, inputpos, tab, "func")
-		
-
-	
-	elseif tab.type=="input" then
-		------------ input --------------------------------------------
-		
-		local res = true
-		if tab.pattern then
-			if not(type(tab.pattern)=="string") then err(info, inputpos, "'pattern' - expected a string") end
-			if not strmatch(str, tab.pattern) then
-				usererr(info, inputpos, "'"..str.."' - " .. L["invalid input"])
-				return
-			end
-		end
-		
-		do_final(info, inputpos, tab, "set", str)
-		
-
-	
-	elseif tab.type=="toggle" then
-		------------ toggle --------------------------------------------
-		local b
-		local str = strtrim(strlower(str))
-		if str=="" then
-			b = callmethod(info, inputpos, tab, "get")
-
-			if tab.tristate then
-				--cycle in true, nil, false order
-				if b then
-					b = nil
-				elseif b == nil then
-					b = false
-				else
-					b = true
-				end
-			else
-				b = not b
-			end
-			
-		elseif str==L["on"] then
-			b = true
-		elseif str==L["off"] then
-			b = false
-		elseif tab.tristate and str==L["default"] then
-			b = nil
-		else
-			if tab.tristate then
-				usererr(info, inputpos, format(L["'%s' - expected 'on', 'off' or 'default', or no argument to toggle."], str))
-			else
-				usererr(info, inputpos, format(L["'%s' - expected 'on' or 'off', or no argument to toggle."], str))
-			end
-			return
-		end
-		
-		do_final(info, inputpos, tab, "set", b)
-		
-
-	elseif tab.type=="range" then
-		------------ range --------------------------------------------
-		local val = tonumber(str)
-		if not val then
-			usererr(info, inputpos, "'"..str.."' - "..L["expected number"])
-			return
-		end
-		if type(info.step)=="number" then
-			val = val- (val % info.step)
-		end
-		if type(info.min)=="number" and val<info.min then
-			usererr(info, inputpos, val.." - "..format(L["must be equal to or higher than %s"], tostring(info.min)) )
-			return
-		end
-		if type(info.max)=="number" and val>info.max then
-			usererr(info, inputpos, val.." - "..format(L["must be equal to or lower than %s"], tostring(info.max)) )
-			return
-		end
-		
-		do_final(info, inputpos, tab, "set", val)
-
-	
-	elseif tab.type=="select" then
-		------------ select ------------------------------------
-		local str = strtrim(strlower(str))
-		
-		local values = tab.values
-		if type(values) == "function" or type(values) == "string" then
-			info.values = values
-			values = callmethod(info, inputpos, tab, "values")
-			info.values = nil
-		end
-		
-		if str == "" then
-			local b = callmethod(info, inputpos, tab, "get")
-			local fmt = "|cffffff78- [%s]|r %s"
-			local fmt_sel = "|cffffff78- [%s]|r %s |cffff0000*|r"
-			print(L["Options for |cffffff78"..info[#info].."|r:"])
-			for k, v in pairs(values) do
-				if b == k then
-					print(fmt_sel:format(k, v))
-				else
-					print(fmt:format(k, v))
-				end
-			end
-			return
-		end
-
-		local ok
-		for k,v in pairs(values) do 
-			if strlower(k)==str then
-				str = k	-- overwrite with key (in case of case mismatches)
-				ok = true
-				break
-			end
-		end
-		if not ok then
-			usererr(info, inputpos, "'"..str.."' - "..L["unknown selection"])
-			return
-		end
-		
-		do_final(info, inputpos, tab, "set", str)
-		
-	elseif tab.type=="multiselect" then
-		------------ multiselect -------------------------------------------
-		local str = strtrim(strlower(str))
-		
-		local values = tab.values
-		if type(values) == "function" or type(values) == "string" then
-			info.values = values
-			values = callmethod(info, inputpos, tab, "values")
-			info.values = nil
-		end
-		
-		if str == "" then
-			local fmt = "|cffffff78- [%s]|r %s"
-			local fmt_sel = "|cffffff78- [%s]|r %s |cffff0000*|r"
-			print(L["Options for |cffffff78"..info[#info].."|r (multiple possible):"])
-			for k, v in pairs(values) do
-				if callmethod(info, inputpos, tab, "get", k) then
-					print(fmt_sel:format(k, v))
-				else
-					print(fmt:format(k, v))
-				end
-			end
-			return
-		end
-		
-		--build a table of the selections, checking that they exist
-		--parse for =on =off =default in the process
-		--table will be key = true for options that should toggle, key = [on|off|default] for options to be set
-		local sels = {}
-		for v in str:gmatch("[^ ]+") do
-			--parse option=on etc
-			local opt, val = v:match('(.+)=(.+)')
-			--get option if toggling
-			if not opt then 
-				opt = v 
-			end
-			
-			--check that the opt is valid
-			local ok
-			for k,v in pairs(values) do 
-				if strlower(k)==opt then
-					opt = k	-- overwrite with key (in case of case mismatches)
-					ok = true
-					break
-				end
-			end
-			
-			if not ok then
-				usererr(info, inputpos, "'"..opt.."' - "..L["unknown selection"])
-				return
-			end
-			
-			--check that if val was supplied it is valid
-			if val then
-				if val == L["on"] or val == L["off"] or (tab.tristate and val == L["default"]) then
-					--val is valid insert it
-					sels[opt] = val
-				else
-					if tab.tristate then
-						usererr(info, inputpos, format(L["'%s' '%s' - expected 'on', 'off' or 'default', or no argument to toggle."], v, val))
-					else
-						usererr(info, inputpos, format(L["'%s' '%s' - expected 'on' or 'off', or no argument to toggle."], v, val))
-					end
-					return
-				end
-			else
-				-- no val supplied, toggle
-				sels[opt] = true
-			end
-		end
-		
-		for opt, val in pairs(sels) do
-			local newval
-			
-			if (val == true) then
-				--toggle the option
-				local b = callmethod(info, inputpos, tab, "get", opt)
-				
-				if tab.tristate then
-					--cycle in true, nil, false order
-					if b then
-						b = nil
-					elseif b == nil then
-						b = false
-					else
-						b = true
-					end
-				else
-					b = not b
-				end
-				newval = b
-			else
-				--set the option as specified
-				if val==L["on"] then
-					newval = true
-				elseif val==L["off"] then
-					newval = false
-				elseif val==L["default"] then
-					newval = nil
-				end
-			end
-			
-			do_final(info, inputpos, tab, "set", opt, newval)
-		end
-					
-		
-	elseif tab.type=="color" then
-		------------ color --------------------------------------------
-		local str = strtrim(strlower(str))
-		if str == "" then
-			--TODO: Show current value
-			return
-		end
-		
-		local r, g, b, a
-		
-		local hasAlpha = tab.hasAlpha
-		if type(hasAlpha) == "function" or type(hasAlpha) == "string" then
-			info.hasAlpha = hasAlpha
-			hasAlpha = callmethod(info, inputpos, tab, 'hasAlpha')
-			info.hasAlpha = nil
-		end
-		
-		if hasAlpha then
-			if str:len() == 8 and str:find("^%x*$")  then
-				--parse a hex string
-				r,g,b,a = tonumber(str:sub(1, 2), 16) / 255, tonumber(str:sub(3, 4), 16) / 255, tonumber(str:sub(5, 6), 16) / 255, tonumber(str:sub(7, 8), 16) / 255
-			else
-				--parse seperate values
-				r,g,b,a = str:match("^([%d%.]+) ([%d%.]+) ([%d%.]+) ([%d%.]+)$")
-				r,g,b,a = tonumber(r), tonumber(g), tonumber(b), tonumber(a)
-			end
-			if not (r and g and b and a) then
-				usererr(info, inputpos, format(L["'%s' - expected 'RRGGBBAA' or 'r g b a'."], str))
-				return
-			end
-			
-			if r >= 0.0 and r <= 1.0 and g >= 0.0 and g <= 1.0 and b >= 0.0 and b <= 1.0 and a >= 0.0 and a <= 1.0 then
-				--values are valid
-			elseif r >= 0 and r <= 255 and g >= 0 and g <= 255 and b >= 0 and b <= 255 and a >= 0 and a <= 255 then
-				--values are valid 0..255, convert to 0..1
-				r = r / 255
-				g = g / 255
-				b = b / 255
-				a = a / 255
-			else
-				--values are invalid
-				usererr(info, inputpos, format(L["'%s' - values must all be either in the range 0..1 or 0..255."], str))
-			end
-		else
-			a = 1.0
-			if str:len() == 6 and str:find("^%x*$") then
-				--parse a hex string
-				r,g,b = tonumber(str:sub(1, 2), 16) / 255, tonumber(str:sub(3, 4), 16) / 255, tonumber(str:sub(5, 6), 16) / 255
-			else
-				--parse seperate values
-				r,g,b = str:match("^([%d%.]+) ([%d%.]+) ([%d%.]+)$")
-				r,g,b = tonumber(r), tonumber(g), tonumber(b)
-			end
-			if not (r and g and b) then
-				usererr(info, inputpos, format(L["'%s' - expected 'RRGGBB' or 'r g b'."], str))
-				return
-			end
-			if r >= 0.0 and r <= 1.0 and g >= 0.0 and g <= 1.0 and b >= 0.0 and b <= 1.0 then
-				--values are valid
-			elseif r >= 0 and r <= 255 and g >= 0 and g <= 255 and b >= 0 and b <= 255 then
-				--values are valid 0..255, convert to 0..1
-				r = r / 255
-				g = g / 255
-				b = b / 255
-			else
-				--values are invalid
-				usererr(info, inputpos, format(L["'%s' - values must all be either in the range 0-1 or 0-255."], str))
-			end
-		end
-		
-		do_final(info, inputpos, tab, "set", r,g,b,a)
-
-	elseif tab.type=="keybinding" then
-		------------ keybinding --------------------------------------------
-		local str = strtrim(strlower(str))
-		if str == "" then
-			--TODO: Show current value
-			return
-		end
-		local value = keybindingValidateFunc(str:upper())
-		if value == false then
-			usererr(info, inputpos, format(L["'%s' - Invalid Keybinding."], str))
-			return
-		end
-
-		do_final(info, inputpos, tab, "set", value)
-
-	elseif tab.type=="description" then
-		------------ description --------------------
-		-- ignore description, GUI config only
-	else
-		err(info, inputpos, "unknown options table item type '"..tostring(tab.type).."'")
-	end
-end
-
---- Handle the chat command.
--- This is usually called from a chat command handler to parse the command input as operations on an aceoptions table.\\
--- AceConfigCmd uses this function internally when a slash command is registered with `:CreateChatCommand`
--- @param slashcmd The slash command WITHOUT leading slash (only used for error output)
--- @param appName The application name as given to `:RegisterOptionsTable()`
--- @param input The commandline input (as given by the WoW handler, i.e. without the command itself)
--- @usage
--- MyAddon = LibStub("AceAddon-3.0"):NewAddon("MyAddon", "AceConsole-3.0")
--- -- Use AceConsole-3.0 to register a Chat Command
--- MyAddon:RegisterChatCommand("mychat", "ChatCommand")
--- 
--- -- Show the GUI if no input is supplied, otherwise handle the chat input.
--- function MyAddon:ChatCommand(input)
---   -- Assuming "MyOptions" is the appName of a valid options table
---   if not input or input:trim() == "" then
---     LibStub("AceConfigDialog-3.0"):Open("MyOptions")
---   else
---     LibStub("AceConfigCmd-3.0").HandleCommand(MyAddon, "mychat", "MyOptions", input)
---   end
--- end
-function AceConfigCmd:HandleCommand(slashcmd, appName, input)
-
-	local optgetter = cfgreg:GetOptionsTable(appName)
-	if not optgetter then
-		error([[Usage: HandleCommand("slashcmd", "appName", "input"): 'appName' - no options table "]]..tostring(appName)..[[" has been registered]], 2)
-	end
-	local options = assert( optgetter("cmd", MAJOR) )
-	
-	local info = {   -- Don't try to recycle this, it gets handed off to callbacks and whatnot
-		[0] = slashcmd,
-		appName = appName,
-		options = options,
-		input = input,
-		self = self,
-		handler = self,
-		uiType = "cmd",
-		uiName = MAJOR,
-	}
-	
-	handle(info, 1, options, 0)  -- (info, inputpos, table, depth)
-end
-
---- Utility function to create a slash command handler.
--- Also registers tab completion with AceTab
--- @param slashcmd The slash command WITHOUT leading slash (only used for error output)
--- @param appName The application name as given to `:RegisterOptionsTable()`
-function AceConfigCmd:CreateChatCommand(slashcmd, appName)
-	if not AceConsole then
-		AceConsole = LibStub(AceConsoleName)
-	end
-	if AceConsole.RegisterChatCommand(self, slashcmd, function(input)
-				AceConfigCmd.HandleCommand(self, slashcmd, appName, input)	-- upgradable
-		end,
-	true) then -- succesfully registered so lets get the command -> app table in
-		commands[slashcmd] = appName
-	end
-end
-
---- Utility function that returns the options table that belongs to a slashcommand.
--- Designed to be used for the AceTab interface.
--- @param slashcmd The slash command WITHOUT leading slash (only used for error output)
--- @return The options table associated with the slash command (or nil if the slash command was not registered)
-function AceConfigCmd:GetChatCommandOptions(slashcmd)
-	return commands[slashcmd]
-end
diff --git a/OrderHallCommander/libs/LibInit/Ace3/AceConfig-3.0/AceConfigCmd-3.0/AceConfigCmd-3.0.xml b/OrderHallCommander/libs/LibInit/Ace3/AceConfig-3.0/AceConfigCmd-3.0/AceConfigCmd-3.0.xml
deleted file mode 100644
index 188d354..0000000
--- a/OrderHallCommander/libs/LibInit/Ace3/AceConfig-3.0/AceConfigCmd-3.0/AceConfigCmd-3.0.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
-..\FrameXML\UI.xsd">
-	<Script file="AceConfigCmd-3.0.lua"/>
-</Ui>
\ No newline at end of file
diff --git a/OrderHallCommander/libs/LibInit/Ace3/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua b/OrderHallCommander/libs/LibInit/Ace3/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua
deleted file mode 100644
index 3612fe8..0000000
--- a/OrderHallCommander/libs/LibInit/Ace3/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua
+++ /dev/null
@@ -1,1955 +0,0 @@
---- AceConfigDialog-3.0 generates AceGUI-3.0 based windows based on option tables.
--- @class file
--- @name AceConfigDialog-3.0
--- @release $Id: AceConfigDialog-3.0.lua 1139 2016-07-03 07:43:51Z nevcairiel $
-
-local LibStub = LibStub
-local MAJOR, MINOR = "AceConfigDialog-3.0", 61
-local AceConfigDialog, oldminor = LibStub:NewLibrary(MAJOR, MINOR)
-
-if not AceConfigDialog then return end
-
-AceConfigDialog.OpenFrames = AceConfigDialog.OpenFrames or {}
-AceConfigDialog.Status = AceConfigDialog.Status or {}
-AceConfigDialog.frame = AceConfigDialog.frame or CreateFrame("Frame")
-
-AceConfigDialog.frame.apps = AceConfigDialog.frame.apps or {}
-AceConfigDialog.frame.closing = AceConfigDialog.frame.closing or {}
-AceConfigDialog.frame.closeAllOverride = AceConfigDialog.frame.closeAllOverride or {}
-
-local gui = LibStub("AceGUI-3.0")
-local reg = LibStub("AceConfigRegistry-3.0")
-
--- Lua APIs
-local tconcat, tinsert, tsort, tremove, tsort = table.concat, table.insert, table.sort, table.remove, table.sort
-local strmatch, format = string.match, string.format
-local assert, loadstring, error = assert, loadstring, error
-local pairs, next, select, type, unpack, wipe, ipairs = pairs, next, select, type, unpack, wipe, ipairs
-local rawset, tostring, tonumber = rawset, tostring, tonumber
-local math_min, math_max, math_floor = math.min, math.max, math.floor
-
--- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
--- List them here for Mikk's FindGlobals script
--- GLOBALS: NORMAL_FONT_COLOR, GameTooltip, StaticPopupDialogs, ACCEPT, CANCEL, StaticPopup_Show
--- GLOBALS: PlaySound, GameFontHighlight, GameFontHighlightSmall, GameFontHighlightLarge
--- GLOBALS: CloseSpecialWindows, InterfaceOptions_AddCategory, geterrorhandler
-
-local emptyTbl = {}
-
---[[
-	 xpcall safecall implementation
-]]
-local xpcall = xpcall
-
-local function errorhandler(err)
-	return geterrorhandler()(err)
-end
-
-local function CreateDispatcher(argCount)
-	local code = [[
-		local xpcall, eh = ...
-		local method, ARGS
-		local function call() return method(ARGS) end
-	
-		local function dispatch(func, ...)
-			 method = func
-			 if not method then return end
-			 ARGS = ...
-			 return xpcall(call, eh)
-		end
-	
-		return dispatch
-	]]
-	
-	local ARGS = {}
-	for i = 1, argCount do ARGS[i] = "arg"..i end
-	code = code:gsub("ARGS", tconcat(ARGS, ", "))
-	return assert(loadstring(code, "safecall Dispatcher["..argCount.."]"))(xpcall, errorhandler)
-end
-
-local Dispatchers = setmetatable({}, {__index=function(self, argCount)
-	local dispatcher = CreateDispatcher(argCount)
-	rawset(self, argCount, dispatcher)
-	return dispatcher
-end})
-Dispatchers[0] = function(func)
-	return xpcall(func, errorhandler)
-end
- 
-local function safecall(func, ...)
-	return Dispatchers[select("#", ...)](func, ...)
-end
-
-local width_multiplier = 170
-
---[[
-Group Types
-  Tree 	- All Descendant Groups will all become nodes on the tree, direct child options will appear above the tree
-  		- Descendant Groups with inline=true and thier children will not become nodes
-
-  Tab	- Direct Child Groups will become tabs, direct child options will appear above the tab control
-  		- Grandchild groups will default to inline unless specified otherwise
-
-  Select- Same as Tab but with entries in a dropdown rather than tabs
-
-
-  Inline Groups
-  	- Will not become nodes of a select group, they will be effectivly part of thier parent group seperated by a border
-  	- If declared on a direct child of a root node of a select group, they will appear above the group container control
-  	- When a group is displayed inline, all descendants will also be inline members of the group
-
-]]
-
--- Recycling functions
-local new, del, copy
---newcount, delcount,createdcount,cached = 0,0,0
-do
-	local pool = setmetatable({},{__mode="k"})
-	function new()
-		--newcount = newcount + 1
-		local t = next(pool)
-		if t then
-			pool[t] = nil
-			return t
-		else
-			--createdcount = createdcount + 1
-			return {}
-		end
-	end
-	function copy(t)
-		local c = new()
-		for k, v in pairs(t) do
-			c[k] = v
-		end
-		return c
-	end
-	function del(t)
-		--delcount = delcount + 1
-		wipe(t)
-		pool[t] = true
-	end
---	function cached()
---		local n = 0
---		for k in pairs(pool) do
---			n = n + 1
---		end
---		return n
---	end
-end
-
--- picks the first non-nil value and returns it
-local function pickfirstset(...)
-  for i=1,select("#",...) do
-    if select(i,...)~=nil then
-      return select(i,...)
-    end
-  end
-end
-
---gets an option from a given group, checking plugins
-local function GetSubOption(group, key)
-	if group.plugins then
-		for plugin, t in pairs(group.plugins) do
-			if t[key] then
-				return t[key]
-			end
-		end
-	end
-
-	return group.args[key]
-end
-
---Option member type definitions, used to decide how to access it
-
---Is the member Inherited from parent options
-local isInherited = {
-	set = true,
-	get = true,
-	func = true,
-	confirm = true,
-	validate = true,
-	disabled = true,
-	hidden = true
-}
-
---Does a string type mean a literal value, instead of the default of a method of the handler
-local stringIsLiteral = {
-	name = true,
-	desc = true,
-	icon = true,
-	usage = true,
-	width = true,
-	image = true,
-	fontSize = true,
-}
-
---Is Never a function or method
-local allIsLiteral = {
-	type = true,
-	descStyle = true,
-	imageWidth = true,
-	imageHeight = true,
-}
-
---gets the value for a member that could be a function
---function refs are called with an info arg
---every other type is returned
-local function GetOptionsMemberValue(membername, option, options, path, appName, ...)
-	--get definition for the member
-	local inherits = isInherited[membername]
-	
-
-	--get the member of the option, traversing the tree if it can be inherited
-	local member
-	
-	if inherits then
-		local group = options
-		if group[membername] ~= nil then
-			member = group[membername]
-		end
-		for i = 1, #path do
-			group = GetSubOption(group, path[i])
-			if group[membername] ~= nil then
-				member = group[membername]
-			end
-		end
-	else
-		member = option[membername]
-	end
-	
-	--check if we need to call a functon, or if we have a literal value
-	if ( not allIsLiteral[membername] ) and ( type(member) == "function" or ((not stringIsLiteral[membername]) and type(member) == "string") ) then
-		--We have a function to call
-		local info = new()
-		--traverse the options table, picking up the handler and filling the info with the path
-		local handler
-		local group = options
-		handler = group.handler or handler
-		
-		for i = 1, #path do
-			group = GetSubOption(group, path[i])
-			info[i] = path[i]
-			handler = group.handler or handler
-		end
-		
-		info.options = options
-		info.appName = appName
-		info[0] = appName
-		info.arg = option.arg
-		info.handler = handler
-		info.option = option
-		info.type = option.type
-		info.uiType = "dialog"
-		info.uiName = MAJOR
-	
-		local a, b, c ,d 
-		--using 4 returns for the get of a color type, increase if a type needs more
-		if type(member) == "function" then
-			--Call the function
-			a,b,c,d = member(info, ...)
-		else
-			--Call the method
-			if handler and handler[member] then
-				a,b,c,d = handler[member](handler, info, ...)
-			else
-				error(format("Method %s doesn't exist in handler for type %s", member, membername))
-			end
-		end
-		del(info)
-		return a,b,c,d
-	else
-		--The value isnt a function to call, return it
-		return member	
-	end	
-end
-
---[[calls an options function that could be inherited, method name or function ref
-local function CallOptionsFunction(funcname ,option, options, path, appName, ...)
-	local info = new()
-
-	local func
-	local group = options
-	local handler
-
-	--build the info table containing the path
-	-- pick up functions while traversing the tree
-	if group[funcname] ~= nil then
-		func = group[funcname]
-	end
-	handler = group.handler or handler
-
-	for i, v in ipairs(path) do
-		group = GetSubOption(group, v)
-		info[i] = v
-		if group[funcname] ~= nil then
-			func =  group[funcname]
-		end
-		handler = group.handler or handler
-	end
-
-	info.options = options
-	info[0] = appName
-	info.arg = option.arg
-
-	local a, b, c ,d
-	if type(func) == "string" then
-		if handler and handler[func] then
-			a,b,c,d = handler[func](handler, info, ...)
-		else
-			error(string.format("Method %s doesn't exist in handler for type func", func))
-		end
-	elseif type(func) == "function" then
-		a,b,c,d = func(info, ...)
-	end
-	del(info)
-	return a,b,c,d
-end
---]]
-
---tables to hold orders and names for options being sorted, will be created with new()
---prevents needing to call functions repeatedly while sorting
-local tempOrders
-local tempNames
-
-local function compareOptions(a,b)
-	if not a then
-		return true
-	end
-	if not b then
-		return false
-	end
-	local OrderA, OrderB = tempOrders[a] or 100, tempOrders[b] or 100
-	if OrderA == OrderB then
-		local NameA = (type(tempNames[a]) == "string") and tempNames[a] or ""
-		local NameB = (type(tempNames[b]) == "string") and tempNames[b] or ""
-		return NameA:upper() < NameB:upper()
-	end
-	if OrderA < 0 then
-		if OrderB > 0 then
-			return false
-		end
-	else
-		if OrderB < 0 then
-			return true
-		end
-	end
-	return OrderA < OrderB
-end
-
-
-
---builds 2 tables out of an options group
--- keySort, sorted keys
--- opts, combined options from .plugins and args
-local function BuildSortedOptionsTable(group, keySort, opts, options, path, appName)
-	tempOrders = new()
-	tempNames = new()
-	
-	if group.plugins then
-		for plugin, t in pairs(group.plugins) do
-			for k, v in pairs(t) do
-				if not opts[k] then
-					tinsert(keySort, k)
-					opts[k] = v
-
-					path[#path+1] = k
-					tempOrders[k] = GetOptionsMemberValue("order", v, options, path, appName)
-					tempNames[k] = GetOptionsMemberValue("name", v, options, path, appName)
-					path[#path] = nil
-				end
-			end
-		end
-	end
-	
-	for k, v in pairs(group.args) do
-		if not opts[k] then
-			tinsert(keySort, k)
-			opts[k] = v
-
-			path[#path+1] = k
-			tempOrders[k] = GetOptionsMemberValue("order", v, options, path, appName)
-			tempNames[k] = GetOptionsMemberValue("name", v, options, path, appName)
-			path[#path] = nil
-		end
-	end
-
-	tsort(keySort, compareOptions)
-
-	del(tempOrders)
-	del(tempNames)
-end
-
-local function DelTree(tree)
-	if tree.children then
-		local childs = tree.children
-		for i = 1, #childs do
-			DelTree(childs[i])
-			del(childs[i])
-		end
-		del(childs)
-	end
-end
-
-local function CleanUserData(widget, event)
-	
-	local user = widget:GetUserDataTable()
-
-	if user.path then
-		del(user.path)
-	end
-
-	if widget.type == "TreeGroup" then
-		local tree = user.tree
-		widget:SetTree(nil)
-		if tree then
-			for i = 1, #tree do
-				DelTree(tree[i])
-				del(tree[i])
-			end
-			del(tree)
-		end
-	end
-
-	if widget.type == "TabGroup" then
-		widget:SetTabs(nil)
-		if user.tablist then
-			del(user.tablist)
-		end
-	end
-
-	if widget.type == "DropdownGroup" then
-		widget:SetGroupList(nil)
-		if user.grouplist then
-			del(user.grouplist)
-		end
-		if user.orderlist then
-			del(user.orderlist)
-		end
-	end
-end
-
--- - Gets a status table for the given appname and options path.
--- @param appName The application name as given to `:RegisterOptionsTable()`
--- @param path The path to the options (a table with all group keys)
--- @return 
-function AceConfigDialog:GetStatusTable(appName, path)
-	local status = self.Status
-
-	if not status[appName] then
-		status[appName] = {}
-		status[appName].status = {}
-		status[appName].children = {}
-	end
-
-	status = status[appName]
-
-	if path then
-		for i = 1, #path do
-			local v = path[i]
-			if not status.children[v] then
-				status.children[v] = {}
-				status.children[v].status = {}
-				status.children[v].children = {}
-			end
-			status = status.children[v]
-		end
-	end
-
-	return status.status
-end
-
---- Selects the specified path in the options window.
--- The path specified has to match the keys of the groups in the table.
--- @param appName The application name as given to `:RegisterOptionsTable()`
--- @param ... The path to the key that should be selected
-function AceConfigDialog:SelectGroup(appName, ...)
-	local path = new()
-
-	
-	local app = reg:GetOptionsTable(appName)
-	if not app then
-		error(("%s isn't registed with AceConfigRegistry, unable to open config"):format(appName), 2)
-	end
-	local options = app("dialog", MAJOR)
-	local group = options
-	local status = self:GetStatusTable(appName, path)
-	if not status.groups then
-		status.groups = {}
-	end
-	status = status.groups
-	local treevalue 
-	local treestatus 
-	
-	for n = 1, select("#",...) do
-		local key = select(n, ...)
-
-		if group.childGroups == "tab" or group.childGroups == "select" then
-			--if this is a tab or select group, select the group
-			status.selected = key
-			--children of this group are no longer extra levels of a tree
-			treevalue = nil
-		else
-			--tree group by default
-			if treevalue then
-				--this is an extra level of a tree group, build a uniquevalue for it
-				treevalue = treevalue.."\001"..key
-			else
-				--this is the top level of a tree group, the uniquevalue is the same as the key
-				treevalue = key
-				if not status.groups then
-					status.groups = {}
-				end
-				--save this trees status table for any extra levels or groups
-				treestatus = status
-			end
-			--make sure that the tree entry is open, and select it.
-			--the selected group will be overwritten if a child is the final target but still needs to be open
-			treestatus.selected = treevalue
-			treestatus.groups[treevalue] = true
-			
-		end
-		
-		--move to the next group in the path
-		group = GetSubOption(group, key)
-		if not group then 
-			break
-		end
-		tinsert(path, key)
-		status = self:GetStatusTable(appName, path)
-		if not status.groups then
-			status.groups = {}
-		end
-		status = status.groups
-	end
-	
-	del(path)
-	reg:NotifyChange(appName)
-end	
-
-local function OptionOnMouseOver(widget, event)
-	--show a tooltip/set the status bar to the desc text
-	local user = widget:GetUserDataTable()
-	local opt = user.option
-	local options = user.options
-	local path = user.path
-	local appName = user.appName
-
-	GameTooltip:SetOwner(widget.frame, "ANCHOR_TOPRIGHT")
-	local name = GetOptionsMemberValue("name", opt, options, path, appName)
-	local desc = GetOptionsMemberValue("desc", opt, options, path, appName)
-	local usage = GetOptionsMemberValue("usage", opt, options, path, appName)
-	local descStyle = opt.descStyle
-	
-	if descStyle and descStyle ~= "tooltip" then return end
-	
-	GameTooltip:SetText(name, 1, .82, 0, true)
-	
-	if opt.type == "multiselect" then
-		GameTooltip:AddLine(user.text, 0.5, 0.5, 0.8, true)
-	end	
-	if type(desc) == "string" then
-		GameTooltip:AddLine(desc, 1, 1, 1, true)
-	end
-	if type(usage) == "string" then
-		GameTooltip:AddLine("Usage: "..usage, NORMAL_FONT_COLOR.r, NORMAL_FONT_COLOR.g, NORMAL_FONT_COLOR.b, true)
-	end
-
-	GameTooltip:Show()
-end
-
-local function OptionOnMouseLeave(widget, event)
-	GameTooltip:Hide()
-end
-
-local function GetFuncName(option)
-	local type = option.type
-	if type == "execute" then
-		return "func"
-	else
-		return "set"
-	end
-end
-local function confirmPopup(appName, rootframe, basepath, info, message, func, ...)
-	if not StaticPopupDialogs["ACECONFIGDIALOG30_CONFIRM_DIALOG"] then
-		StaticPopupDialogs["ACECONFIGDIALOG30_CONFIRM_DIALOG"] = {}
-	end
-	local t = StaticPopupDialogs["ACECONFIGDIALOG30_CONFIRM_DIALOG"]
-	for k in pairs(t) do
-		t[k] = nil
-	end
-	t.text = message
-	t.button1 = ACCEPT
-	t.button2 = CANCEL
-	t.preferredIndex = STATICPOPUP_NUMDIALOGS
-	local dialog, oldstrata
-	t.OnAccept = function()
-		safecall(func, unpack(t))
-		if dialog and oldstrata then
-			dialog:SetFrameStrata(oldstrata)
-		end
-		AceConfigDialog:Open(appName, rootframe, unpack(basepath or emptyTbl))
-		del(info)
-	end
-	t.OnCancel = function()
-		if dialog and oldstrata then
-			dialog:SetFrameStrata(oldstrata)
-		end
-		AceConfigDialog:Open(appName, rootframe, unpack(basepath or emptyTbl))
-		del(info)
-	end
-	for i = 1, select("#", ...) do
-		t[i] = select(i, ...) or false
-	end
-	t.timeout = 0
-	t.whileDead = 1
-	t.hideOnEscape = 1
-
-	dialog = StaticPopup_Show("ACECONFIGDIALOG30_CONFIRM_DIALOG")
-	if dialog then
-		oldstrata = dialog:GetFrameStrata()
-		dialog:SetFrameStrata("TOOLTIP")
-	end
-end
-
-local function ActivateControl(widget, event, ...)
-	--This function will call the set / execute handler for the widget
-	--widget:GetUserDataTable() contains the needed info
-	local user = widget:GetUserDataTable()
-	local option = user.option
-	local options = user.options
-	local path = user.path
-	local info = new()
-
-	local func
-	local group = options
-	local funcname = GetFuncName(option)
-	local handler
-	local confirm
-	local validate
-	--build the info table containing the path
-	-- pick up functions while traversing the tree
-	if group[funcname] ~= nil then
-		func =  group[funcname]
-	end
-	handler = group.handler or handler
-	confirm = group.confirm
-	validate = group.validate
-	for i = 1, #path do
-		local v = path[i]
-		group = GetSubOption(group, v)
-		info[i] = v
-		if group[funcname] ~= nil then
-			func =  group[funcname]
-		end
-		handler = group.handler or handler
-		if group.confirm ~= nil then
-			confirm = group.confirm
-		end
-		if group.validate ~= nil then
-			validate = group.validate
-		end
-	end
-
-	info.options = options
-	info.appName = user.appName
-	info.arg = option.arg
-	info.handler = handler
-	info.option = option
-	info.type = option.type
-	info.uiType = "dialog"
-	info.uiName = MAJOR
-
-	local name
-	if type(option.name) == "function" then
-		name = option.name(info)
-	elseif type(option.name) == "string" then
-		name = option.name
-	else
-		name = ""
-	end
-	local usage = option.usage
-	local pattern = option.pattern
-
-	local validated = true
-
-	if option.type == "input" then
-		if type(pattern)=="string" then
-			if not strmatch(..., pattern) then
-				validated = false
-			end
-		end
-	end
-	
-	local success
-	if validated and option.type ~= "execute" then
-		if type(validate) == "string" then
-			if handler and handler[validate] then
-				success, validated = safecall(handler[validate], handler, info, ...)
-				if not success then validated = false end
-			else
-				error(format("Method %s doesn't exist in handler for type execute", validate))
-			end
-		elseif type(validate) == "function" then
-			success, validated = safecall(validate, info, ...)
-			if not success then validated = false end
-		end
-	end
-	
-	local rootframe = user.rootframe
-	if type(validated) == "string" then
-		--validate function returned a message to display
-		if rootframe.SetStatusText then
-			rootframe:SetStatusText(validated)
-		else
-			-- TODO: do something else.
-		end
-		PlaySound("igPlayerInviteDecline")
-		del(info)
-		return true
-	elseif not validated then
-		--validate returned false	
-		if rootframe.SetStatusText then
-			if usage then
-				rootframe:SetStatusText(name..": "..usage)
-			else
-				if pattern then
-					rootframe:SetStatusText(name..": Expected "..pattern)
-				else
-					rootframe:SetStatusText(name..": Invalid Value")
-				end
-			end
-		else
-			-- TODO: do something else
-		end
-		PlaySound("igPlayerInviteDecline")
-		del(info)
-		return true
-	else
-		
-		local confirmText = option.confirmText
-		--call confirm func/method
-		if type(confirm) == "string" then
-			if handler and handler[confirm] then
-				success, confirm = safecall(handler[confirm], handler, info, ...)
-				if success and type(confirm) == "string" then
-					confirmText = confirm
-					confirm = true
-				elseif not success then
-					confirm = false
-				end
-			else
-				error(format("Method %s doesn't exist in handler for type confirm", confirm))
-			end
-		elseif type(confirm) == "function" then
-			success, confirm = safecall(confirm, info, ...)
-			if success and type(confirm) == "string" then
-				confirmText = confirm
-				confirm = true
-			elseif not success then
-				confirm = false
-			end
-		end
-
-		--confirm if needed
-		if type(confirm) == "boolean" then
-			if confirm then
-				if not confirmText then
-					local name, desc = option.name, option.desc
-					if type(name) == "function" then
-						name = name(info)
-					end
-					if type(desc) == "function" then
-						desc = desc(info)
-					end
-					confirmText = name
-					if desc then
-						confirmText = confirmText.." - "..desc
-					end
-				end
-				
-				local iscustom = user.rootframe:GetUserData("iscustom")
-				local rootframe
-				
-				if iscustom then
-					rootframe = user.rootframe
-				end
-				local basepath = user.rootframe:GetUserData("basepath")
-				if type(func) == "string" then
-					if handler and handler[func] then
-						confirmPopup(user.appName, rootframe, basepath, info, confirmText, handler[func], handler, info, ...)
-					else
-						error(format("Method %s doesn't exist in handler for type func", func))
-					end
-				elseif type(func) == "function" then
-					confirmPopup(user.appName, rootframe, basepath, info, confirmText, func, info, ...)
-				end
-				--func will be called and info deleted when the confirm dialog is responded to
-				return
-			end
-		end
-
-		--call the function
-		if type(func) == "string" then
-			if handler and handler[func] then
-				safecall(handler[func],handler, info, ...)
-			else
-				error(format("Method %s doesn't exist in handler for type func", func))
-			end
-		elseif type(func) == "function" then
-			safecall(func,info, ...)
-		end
-
-
-
-		local iscustom = user.rootframe:GetUserData("iscustom")
-		local basepath = user.rootframe:GetUserData("basepath") or emptyTbl
-		--full refresh of the frame, some controls dont cause this on all events
-		if option.type == "color" then
-			if event == "OnValueConfirmed" then
-				
-				if iscustom then
-					AceConfigDialog:Open(user.appName, user.rootframe, unpack(basepath))
-				else
-					AceConfigDialog:Open(user.appName, unpack(basepath))
-				end
-			end
-		elseif option.type == "range" then
-			if event == "OnMouseUp" then
-				if iscustom then
-					AceConfigDialog:Open(user.appName, user.rootframe, unpack(basepath))
-				else
-					AceConfigDialog:Open(user.appName, unpack(basepath))
-				end
-			end
-		--multiselects don't cause a refresh on 'OnValueChanged' only 'OnClosed'
-		elseif option.type == "multiselect" then
-			user.valuechanged = true
-		else
-			if iscustom then
-				AceConfigDialog:Open(user.appName, user.rootframe, unpack(basepath))
-			else
-				AceConfigDialog:Open(user.appName, unpack(basepath))
-			end
-		end
-
-	end
-	del(info)
-end
-
-local function ActivateSlider(widget, event, value)
-	local option = widget:GetUserData("option")
-	local min, max, step = option.min or (not option.softMin and 0 or nil), option.max or (not option.softMax and 100 or nil), option.step
-	if min then
-		if step then
-			value = math_floor((value - min) / step + 0.5) * step + min
-		end
-		value = math_max(value, min)
-	end
-	if max then
-		value = math_min(value, max)
-	end
-	ActivateControl(widget,event,value)
-end
-
---called from a checkbox that is part of an internally created multiselect group
---this type is safe to refresh on activation of one control
-local function ActivateMultiControl(widget, event, ...)
-	ActivateControl(widget, event, widget:GetUserData("value"), ...)
-	local user = widget:GetUserDataTable()
-	local iscustom = user.rootframe:GetUserData("iscustom")
-	local basepath = user.rootframe:GetUserData("basepath") or emptyTbl
-	if iscustom then
-		AceConfigDialog:Open(user.appName, user.rootframe, unpack(basepath))
-	else
-		AceConfigDialog:Open(user.appName, unpack(basepath))
-	end
-end
-
-local function MultiControlOnClosed(widget, event, ...)
-	local user = widget:GetUserDataTable()
-	if user.valuechanged then
-		local iscustom = user.rootframe:GetUserData("iscustom")
-		local basepath = user.rootframe:GetUserData("basepath") or emptyTbl
-		if iscustom then
-			AceConfigDialog:Open(user.appName, user.rootframe, unpack(basepath))
-		else
-			AceConfigDialog:Open(user.appName, unpack(basepath))
-		end
-	end
-end
-
-local function FrameOnClose(widget, event)
-	local appName = widget:GetUserData("appName")
-	AceConfigDialog.OpenFrames[appName] = nil
-	gui:Release(widget)
-end
-
-local function CheckOptionHidden(option, options, path, appName)
-	--check for a specific boolean option
-	local hidden = pickfirstset(option.dialogHidden,option.guiHidden)
-	if hidden ~= nil then
-		return hidden
-	end
-
-	return GetOptionsMemberValue("hidden", option, options, path, appName)
-end
-
-local function CheckOptionDisabled(option, options, path, appName)
-	--check for a specific boolean option
-	local disabled = pickfirstset(option.dialogDisabled,option.guiDisabled)
-	if disabled ~= nil then
-		return disabled
-	end
-
-	return GetOptionsMemberValue("disabled", option, options, path, appName)
-end
---[[
-local function BuildTabs(group, options, path, appName)
-	local tabs = new()
-	local text = new()
-	local keySort = new()
-	local opts = new()
-
-	BuildSortedOptionsTable(group, keySort, opts, options, path, appName)
-
-	for i = 1, #keySort do
-		local k = keySort[i]
-		local v = opts[k]
-		if v.type == "group" then
-			path[#path+1] = k
-			local inline = pickfirstset(v.dialogInline,v.guiInline,v.inline, false)
-			local hidden = CheckOptionHidden(v, options, path, appName)
-			if not inline and not hidden then
-				tinsert(tabs, k)
-				text[k] = GetOptionsMemberValue("name", v, options, path, appName)
-			end
-			path[#path] = nil
-		end
-	end
-
-	del(keySort)
-	del(opts)
-
-	return tabs, text
-end
-]]
-local function BuildSelect(group, options, path, appName)
-	local groups = new()
-	local order = new()
-	local keySort = new()
-	local opts = new()
-
-	BuildSortedOptionsTable(group, keySort, opts, options, path, appName)
-
-	for i = 1, #keySort do
-		local k = keySort[i]
-		local v = opts[k]
-		if v.type == "group" then
-			path[#path+1] = k
-			local inline = pickfirstset(v.dialogInline,v.guiInline,v.inline, false)
-			local hidden = CheckOptionHidden(v, options, path, appName)
-			if not inline and not hidden then
-				groups[k] = GetOptionsMemberValue("name", v, options, path, appName)
-				tinsert(order, k)
-			end
-			path[#path] = nil
-		end
-	end
-
-	del(opts)
-	del(keySort)
-
-	return groups, order
-end
-
-local function BuildSubGroups(group, tree, options, path, appName)
-	local keySort = new()
-	local opts = new()
-
-	BuildSortedOptionsTable(group, keySort, opts, options, path, appName)
-
-	for i = 1, #keySort do
-		local k = keySort[i]
-		local v = opts[k]
-		if v.type == "group" then
-			path[#path+1] = k
-			local inline = pickfirstset(v.dialogInline,v.guiInline,v.inline, false)
-			local hidden = CheckOptionHidden(v, options, path, appName)
-			if not inline and not hidden then
-				local entry = new()
-				entry.value = k
-				entry.text = GetOptionsMemberValue("name", v, options, path, appName)
-				entry.icon = GetOptionsMemberValue("icon", v, options, path, appName)
-				entry.iconCoords = GetOptionsMemberValue("iconCoords", v, options, path, appName)
-				entry.disabled = CheckOptionDisabled(v, options, path, appName)
-				if not tree.children then tree.children = new() end
-				tinsert(tree.children,entry)
-				if (v.childGroups or "tree") == "tree" then
-					BuildSubGroups(v,entry, options, path, appName)
-				end
-			end
-			path[#path] = nil
-		end
-	end
-
-	del(keySort)
-	del(opts)
-end
-
-local function BuildGroups(group, options, path, appName, recurse)
-	local tree = new()
-	local keySort = new()
-	local opts = new()
-
-	BuildSortedOptionsTable(group, keySort, opts, options, path, appName)
-
-	for i = 1, #keySort do
-		local k = keySort[i]
-		local v = opts[k]
-		if v.type == "group" then
-			path[#path+1] = k
-			local inline = pickfirstset(v.dialogInline,v.guiInline,v.inline, false)
-			local hidden = CheckOptionHidden(v, options, path, appName)
-			if not inline and not hidden then
-				local entry = new()
-				entry.value = k
-				entry.text = GetOptionsMemberValue("name", v, options, path, appName)
-				entry.icon = GetOptionsMemberValue("icon", v, options, path, appName)
-				entry.disabled = CheckOptionDisabled(v, options, path, appName)
-				tinsert(tree,entry)
-				if recurse and (v.childGroups or "tree") == "tree" then
-					BuildSubGroups(v,entry, options, path, appName)
-				end
-			end
-			path[#path] = nil
-		end
-	end
-	del(keySort)
-	del(opts)
-	return tree
-end
-
-local function InjectInfo(control, options, option, path, rootframe, appName)
-	local user = control:GetUserDataTable()
-	for i = 1, #path do
-		user[i] = path[i]
-	end
-	user.rootframe = rootframe
-	user.option = option
-	user.options = options
-	user.path = copy(path)
-	user.appName = appName
-	control:SetCallback("OnRelease", CleanUserData)
-	control:SetCallback("OnLeave", OptionOnMouseLeave)
-	control:SetCallback("OnEnter", OptionOnMouseOver)
-end
-
-
---[[
-	options - root of the options table being fed
-	container - widget that controls will be placed in
-	rootframe - Frame object the options are in
-	path - table with the keys to get to the group being fed
---]]
-
-local function FeedOptions(appName, options,container,rootframe,path,group,inline)
-	local keySort = new()
-	local opts = new()
-
-	BuildSortedOptionsTable(group, keySort, opts, options, path, appName)
-
-	for i = 1, #keySort do
-		local k = keySort[i]
-		local v = opts[k]
-		tinsert(path, k)
-		local hidden = CheckOptionHidden(v, options, path, appName)
-		local name = GetOptionsMemberValue("name", v, options, path, appName)
-		if not hidden then
-			if v.type == "group" then
-				if inline or pickfirstset(v.dialogInline,v.guiInline,v.inline, false) then
-					--Inline group
-					local GroupContainer
-					if name and name ~= "" then
-						GroupContainer = gui:Create("InlineGroup")
-						GroupContainer:SetTitle(name or "")
-					else
-						GroupContainer = gui:Create("SimpleGroup")
-					end
-					
-					GroupContainer.width = "fill"
-					GroupContainer:SetLayout("flow")
-					container:AddChild(GroupContainer)
-					FeedOptions(appName,options,GroupContainer,rootframe,path,v,true)
-				end
-			else
-				--Control to feed
-				local control
-				
-				local name = GetOptionsMemberValue("name", v, options, path, appName)
-				
-				if v.type == "execute" then
-					
-					local imageCoords = GetOptionsMemberValue("imageCoords",v, options, path, appName)
-					local image, width, height = GetOptionsMemberValue("image",v, options, path, appName)
-					
-					if type(image) == "string" or type(image) == "number" then
-						control = gui:Create("Icon")
-						if not width then
-							width = GetOptionsMemberValue("imageWidth",v, options, path, appName)
-						end
-						if not height then
-							height = GetOptionsMemberValue("imageHeight",v, options, path, appName)
-						end
-						if type(imageCoords) == "table" then
-							control:SetImage(image, unpack(imageCoords))
-						else
-							control:SetImage(image)
-						end
-						if type(width) ~= "number" then
-							width = 32
-						end
-						if type(height) ~= "number" then
-							height = 32
-						end
-						control:SetImageSize(width, height)
-						control:SetLabel(name)
-					else
-						control = gui:Create("Button")
-						control:SetText(name)
-					end
-					control:SetCallback("OnClick",ActivateControl)
-
-				elseif v.type == "input" then
-					local controlType = v.dialogControl or v.control or (v.multiline and "MultiLineEditBox") or "EditBox"
-					control = gui:Create(controlType)
-					if not control then
-						geterrorhandler()(("Invalid Custom Control Type - %s"):format(tostring(controlType)))
-						control = gui:Create(v.multiline and "MultiLineEditBox" or "EditBox")
-					end
-					
-					if v.multiline and control.SetNumLines then
-						control:SetNumLines(tonumber(v.multiline) or 4)
-					end
-					control:SetLabel(name)
-					control:SetCallback("OnEnterPressed",ActivateControl)
-					local text = GetOptionsMemberValue("get",v, options, path, appName)
-					if type(text) ~= "string" then
-						text = ""
-					end
-					control:SetText(text)
-
-				elseif v.type == "toggle" then
-					control = gui:Create("CheckBox")
-					control:SetLabel(name)
-					control:SetTriState(v.tristate)
-					local value = GetOptionsMemberValue("get",v, options, path, appName)
-					control:SetValue(value)
-					control:SetCallback("OnValueChanged",ActivateControl)
-					
-					if v.descStyle == "inline" then
-						local desc = GetOptionsMemberValue("desc", v, options, path, appName)
-						control:SetDescription(desc)
-					end
-					
-					local image = GetOptionsMemberValue("image", v, options, path, appName)
-					local imageCoords = GetOptionsMemberValue("imageCoords", v, options, path, appName)
-					
-					if type(image) == "string" or type(image) == "number" then
-						if type(imageCoords) == "table" then
-							control:SetImage(image, unpack(imageCoords))
-						else
-							control:SetImage(image)
-						end
-					end
-				elseif v.type == "range" then
-					control = gui:Create("Slider")
-					control:SetLabel(name)
-					control:SetSliderValues(v.softMin or v.min or 0, v.softMax or v.max or 100, v.bigStep or v.step or 0)
-					control:SetIsPercent(v.isPercent)
-					local value = GetOptionsMemberValue("get",v, options, path, appName)
-					if type(value) ~= "number" then
-						value = 0
-					end
-					control:SetValue(value)
-					control:SetCallback("OnValueChanged",ActivateSlider)
-					control:SetCallback("OnMouseUp",ActivateSlider)
-
-				elseif v.type == "select" then
-					local values = GetOptionsMemberValue("values", v, options, path, appName)
-					if v.style == "radio" then
-						local disabled = CheckOptionDisabled(v, options, path, appName)
-						local width = GetOptionsMemberValue("width",v,options,path,appName)
-						control = gui:Create("InlineGroup")
-						control:SetLayout("Flow")
-						control:SetTitle(name)
-						control.width = "fill"
-
-						control:PauseLayout()
-						local optionValue = GetOptionsMemberValue("get",v, options, path, appName)
-						local t = {}
-						for value, text in pairs(values) do
-							t[#t+1]=value
-						end
-						tsort(t)
-						for k, value in ipairs(t) do
-							local text = values[value]
-							local radio = gui:Create("CheckBox")
-							radio:SetLabel(text)
-							radio:SetUserData("value", value)
-							radio:SetUserData("text", text)
-							radio:SetDisabled(disabled)
-							radio:SetType("radio")
-							radio:SetValue(optionValue == value)
-							radio:SetCallback("OnValueChanged", ActivateMultiControl)
-							InjectInfo(radio, options, v, path, rootframe, appName)
-							control:AddChild(radio)
-							if width == "double" then
-								radio:SetWidth(width_multiplier * 2)
-							elseif width == "half" then
-								radio:SetWidth(width_multiplier / 2)
-							elseif width == "full" then
-								radio.width = "fill"
-							else
-								radio:SetWidth(width_multiplier)
-							end
-						end
-						control:ResumeLayout()
-						control:DoLayout()
-					else
-						local controlType = v.dialogControl or v.control or "Dropdown"
-						control = gui:Create(controlType)
-						if not control then
-							geterrorhandler()(("Invalid Custom Control Type - %s"):format(tostring(controlType)))
-							control = gui:Create("Dropdown")
-						end
-						local itemType = v.itemControl
-						if itemType and not gui:GetWidgetVersion(itemType) then
-							geterrorhandler()(("Invalid Custom Item Type - %s"):format(tostring(itemType)))
-							itemType = nil
-						end
-						control:SetLabel(name)
-						control:SetList(values, nil, itemType)
-						local value = GetOptionsMemberValue("get",v, options, path, appName)
-						if not values[value] then
-							value = nil
-						end
-						control:SetValue(value)
-						control:SetCallback("OnValueChanged", ActivateControl)
-					end
-
-				elseif v.type == "multiselect" then
-					local values = GetOptionsMemberValue("values", v, options, path, appName)
-					local disabled = CheckOptionDisabled(v, options, path, appName)
-					
-					local controlType = v.dialogControl or v.control
-					
-					local valuesort = new()
-					if values then
-						for value, text in pairs(values) do
-							tinsert(valuesort, value)
-						end
-					end
-					tsort(valuesort)
-					
-					if controlType then
-						control = gui:Create(controlType)
-						if not control then
-							geterrorhandler()(("Invalid Custom Control Type - %s"):format(tostring(controlType)))
-						end
-					end
-					if control then
-						control:SetMultiselect(true)
-						control:SetLabel(name)
-						control:SetList(values)
-						control:SetDisabled(disabled)
-						control:SetCallback("OnValueChanged",ActivateControl)
-						control:SetCallback("OnClosed", MultiControlOnClosed)
-						local width = GetOptionsMemberValue("width",v,options,path,appName)
-						if width == "double" then
-							control:SetWidth(width_multiplier * 2)
-						elseif width == "half" then
-							control:SetWidth(width_multiplier / 2)
-						elseif width == "full" then
-							control.width = "fill"
-						else
-							control:SetWidth(width_multiplier)
-						end
-						--check:SetTriState(v.tristate)
-						for i = 1, #valuesort do
-							local key = valuesort[i]
-							local value = GetOptionsMemberValue("get",v, options, path, appName, key)
-							control:SetItemValue(key,value)
-						end
-					else
-						control = gui:Create("InlineGroup")
-						control:SetLayout("Flow")
-						control:SetTitle(name)
-						control.width = "fill"
-
-						control:PauseLayout()
-						local width = GetOptionsMemberValue("width",v,options,path,appName)
-						for i = 1, #valuesort do
-							local value = valuesort[i]
-							local text = values[value]
-							local check = gui:Create("CheckBox")
-							check:SetLabel(text)
-							check:SetUserData("value", value)
-							check:SetUserData("text", text)
-							check:SetDisabled(disabled)
-							check:SetTriState(v.tristate)
-							check:SetValue(GetOptionsMemberValue("get",v, options, path, appName, value))
-							check:SetCallback("OnValueChanged",ActivateMultiControl)
-							InjectInfo(check, options, v, path, rootframe, appName)
-							control:AddChild(check)
-							if width == "double" then
-								check:SetWidth(width_multiplier * 2)
-							elseif width == "half" then
-								check:SetWidth(width_multiplier / 2)
-							elseif width == "full" then
-								check.width = "fill"
-							else
-								check:SetWidth(width_multiplier)
-							end
-						end
-						control:ResumeLayout()
-						control:DoLayout()
-
-						
-					end
-					
-					del(valuesort)
-
-				elseif v.type == "color" then
-					control = gui:Create("ColorPicker")
-					control:SetLabel(name)
-					control:SetHasAlpha(GetOptionsMemberValue("hasAlpha",v, options, path, appName))
-					control:SetColor(GetOptionsMemberValue("get",v, options, path, appName))
-					control:SetCallback("OnValueChanged",ActivateControl)
-					control:SetCallback("OnValueConfirmed",ActivateControl)
-
-				elseif v.type == "keybinding" then
-					control = gui:Create("Keybinding")
-					control:SetLabel(name)
-					control:SetKey(GetOptionsMemberValue("get",v, options, path, appName))
-					control:SetCallback("OnKeyChanged",ActivateControl)
-
-				elseif v.type == "header" then
-					control = gui:Create("Heading")
-					control:SetText(name)
-					control.width = "fill"
-
-				elseif v.type == "description" then
-					control = gui:Create("Label")
-					control:SetText(name)
-					
-					local fontSize = GetOptionsMemberValue("fontSize",v, options, path, appName)
-					if fontSize == "medium" then
-						control:SetFontObject(GameFontHighlight)
-					elseif fontSize == "large" then
-						control:SetFontObject(GameFontHighlightLarge)
-					else -- small or invalid
-						control:SetFontObject(GameFontHighlightSmall)
-					end
-					
-					local imageCoords = GetOptionsMemberValue("imageCoords",v, options, path, appName)
-					local image, width, height = GetOptionsMemberValue("image",v, options, path, appName)
-					
-					if type(image) == "string" or type(image) == "number" then
-						if not width then
-							width = GetOptionsMemberValue("imageWidth",v, options, path, appName)
-						end
-						if not height then
-							height = GetOptionsMemberValue("imageHeight",v, options, path, appName)
-						end
-						if type(imageCoords) == "table" then
-							control:SetImage(image, unpack(imageCoords))
-						else
-							control:SetImage(image)
-						end
-						if type(width) ~= "number" then
-							width = 32
-						end
-						if type(height) ~= "number" then
-							height = 32
-						end
-						control:SetImageSize(width, height)
-					end
-					local width = GetOptionsMemberValue("width",v,options,path,appName)
-					control.width = not width and "fill"
-				end
-
-				--Common Init
-				if control then
-					if control.width ~= "fill" then
-						local width = GetOptionsMemberValue("width",v,options,path,appName)
-						if width == "double" then
-							control:SetWidth(width_multiplier * 2)
-						elseif width == "half" then
-							control:SetWidth(width_multiplier / 2)
-						elseif width == "full" then
-							control.width = "fill"
-						else
-							control:SetWidth(width_multiplier)
-						end
-					end
-					if control.SetDisabled then
-						local disabled = CheckOptionDisabled(v, options, path, appName)
-						control:SetDisabled(disabled)
-					end
-
-					InjectInfo(control, options, v, path, rootframe, appName)
-					container:AddChild(control)
-				end
-				
-			end
-		end
-		tremove(path)
-	end
-	container:ResumeLayout()
-	container:DoLayout()
-	del(keySort)
-	del(opts)
-end
-
-local function BuildPath(path, ...)
-	for i = 1, select("#",...)  do
-		tinsert(path, (select(i,...)))
-	end
-end
-
-
-local function TreeOnButtonEnter(widget, event, uniquevalue, button)
-	local user = widget:GetUserDataTable()
-	if not user then return end
-	local options = user.options
-	local option = user.option
-	local path = user.path
-	local appName = user.appName
-	
-	local feedpath = new()
-	for i = 1, #path do
-		feedpath[i] = path[i]
-	end
-
-	BuildPath(feedpath, ("\001"):split(uniquevalue))
-	local group = options
-	for i = 1, #feedpath do
-		if not group then return end
-		group = GetSubOption(group, feedpath[i])
-	end
-
-	local name = GetOptionsMemberValue("name", group, options, feedpath, appName)
-	local desc = GetOptionsMemberValue("desc", group, options, feedpath, appName)
-	
-	GameTooltip:SetOwner(button, "ANCHOR_NONE")
-	if widget.type == "TabGroup" then
-		GameTooltip:SetPoint("BOTTOM",button,"TOP")
-	else
-		GameTooltip:SetPoint("LEFT",button,"RIGHT")
-	end
-
-	GameTooltip:SetText(name, 1, .82, 0, true)
-	
-	if type(desc) == "string" then
-		GameTooltip:AddLine(desc, 1, 1, 1, true)
-	end
-	
-	GameTooltip:Show()
-end
-
-local function TreeOnButtonLeave(widget, event, value, button)
-	GameTooltip:Hide()
-end
-
-
-local function GroupExists(appName, options, path, uniquevalue)
-	if not uniquevalue then return false end
-	
-	local feedpath = new()
-	local temppath = new()
-	for i = 1, #path do
-		feedpath[i] = path[i]
-	end
-	
-	BuildPath(feedpath, ("\001"):split(uniquevalue))
-	
-	local group = options
-	for i = 1, #feedpath do
-		local v = feedpath[i]
-		temppath[i] = v
-		group = GetSubOption(group, v)
-		
-		if not group or group.type ~= "group" or CheckOptionHidden(group, options, temppath, appName) then 
-			del(feedpath)
-			del(temppath)
-			return false 
-		end
-	end
-	del(feedpath)
-	del(temppath)
-	return true
-end
-
-local function GroupSelected(widget, event, uniquevalue)
-
-	local user = widget:GetUserDataTable()
-
-	local options = user.options
-	local option = user.option
-	local path = user.path
-	local rootframe = user.rootframe
-
-	local feedpath = new()
-	for i = 1, #path do
-		feedpath[i] = path[i]
-	end
-
-	BuildPath(feedpath, ("\001"):split(uniquevalue))
-	local group = options
-	for i = 1, #feedpath do
-		group = GetSubOption(group, feedpath[i])
-	end
-	widget:ReleaseChildren()
-	AceConfigDialog:FeedGroup(user.appName,options,widget,rootframe,feedpath)
-
-	del(feedpath)
-end
-
-
-
---[[
--- INTERNAL --
-This function will feed one group, and any inline child groups into the given container
-Select Groups will only have the selection control (tree, tabs, dropdown) fed in
-and have a group selected, this event will trigger the feeding of child groups
-
-Rules:
-	If the group is Inline, FeedOptions
-	If the group has no child groups, FeedOptions
-
-	If the group is a tab or select group, FeedOptions then add the Group Control
-	If the group is a tree group FeedOptions then
-		its parent isnt a tree group:  then add the tree control containing this and all child tree groups
-		if its parent is a tree group, its already a node on a tree
---]]
-
-function AceConfigDialog:FeedGroup(appName,options,container,rootframe,path, isRoot)
-	local group = options
-	--follow the path to get to the curent group
-	local inline
-	local grouptype, parenttype = options.childGroups, "none"
-
-
-	for i = 1, #path do
-		local v = path[i]
-		group = GetSubOption(group, v)
-		inline = inline or pickfirstset(v.dialogInline,v.guiInline,v.inline, false)
-		parenttype = grouptype
-		grouptype = group.childGroups
-	end
-
-	if not parenttype then
-		parenttype = "tree"
-	end
-
-	--check if the group has child groups
-	local hasChildGroups
-	for k, v in pairs(group.args) do
-		if v.type == "group" and not pickfirstset(v.dialogInline,v.guiInline,v.inline, false) and not CheckOptionHidden(v, options, path, appName) then
-			hasChildGroups = true
-		end
-	end
-	if group.plugins then
-		for plugin, t in pairs(group.plugins) do
-			for k, v in pairs(t) do
-				if v.type == "group" and not pickfirstset(v.dialogInline,v.guiInline,v.inline, false) and not CheckOptionHidden(v, options, path, appName) then
-					hasChildGroups = true
-				end
-			end
-		end
-	end
-
-	container:SetLayout("flow")
-	local scroll
-
-	--Add a scrollframe if we are not going to add a group control, this is the inverse of the conditions for that later on
-	if (not (hasChildGroups and not inline)) or (grouptype ~= "tab" and grouptype ~= "select" and (parenttype == "tree" and not isRoot)) then
-		if container.type ~= "InlineGroup" and container.type ~= "SimpleGroup" then
-			scroll = gui:Create("ScrollFrame")
-			scroll:SetLayout("flow")
-			scroll.width = "fill"
-			scroll.height = "fill"
-			container:SetLayout("fill")
-			container:AddChild(scroll)
-			container = scroll
-		end
-	end
-
-	FeedOptions(appName,options,container,rootframe,path,group,nil)
-
-	if scroll then
-		container:PerformLayout()
-		local status = self:GetStatusTable(appName, path)
-		if not status.scroll then
-			status.scroll = {}
-		end
-		scroll:SetStatusTable(status.scroll)
-	end
-
-	if hasChildGroups and not inline then
-		local name = GetOptionsMemberValue("name", group, options, path, appName)
-		if grouptype == "tab" then
-
-			local tab = gui:Create("TabGroup")
-			InjectInfo(tab, options, group, path, rootframe, appName)
-			tab:SetCallback("OnGroupSelected", GroupSelected)
-			tab:SetCallback("OnTabEnter", TreeOnButtonEnter)
-			tab:SetCallback("OnTabLeave", TreeOnButtonLeave)
-			
-			local status = AceConfigDialog:GetStatusTable(appName, path)
-			if not status.groups then
-				status.groups = {}
-			end
-			tab:SetStatusTable(status.groups)
-			tab.width = "fill"
-			tab.height = "fill"
-
-			local tabs = BuildGroups(group, options, path, appName)
-			tab:SetTabs(tabs)
-			tab:SetUserData("tablist", tabs)
-
-			for i = 1, #tabs do
-				local entry = tabs[i]
-				if not entry.disabled then
-					tab:SelectTab((GroupExists(appName, options, path,status.groups.selected) and status.groups.selected) or entry.value)
-					break
-				end
-			end
-			
-			container:AddChild(tab)
-
-		elseif grouptype == "select" then
-
-			local select = gui:Create("DropdownGroup")
-			select:SetTitle(name)
-			InjectInfo(select, options, group, path, rootframe, appName)
-			select:SetCallback("OnGroupSelected", GroupSelected)
-			local status = AceConfigDialog:GetStatusTable(appName, path)
-			if not status.groups then
-				status.groups = {}
-			end
-			select:SetStatusTable(status.groups)
-			local grouplist, orderlist = BuildSelect(group, options, path, appName)
-			select:SetGroupList(grouplist, orderlist)
-			select:SetUserData("grouplist", grouplist)
-			select:SetUserData("orderlist", orderlist)
-
-			local firstgroup = orderlist[1]
-			if firstgroup then
-				select:SetGroup((GroupExists(appName, options, path,status.groups.selected) and status.groups.selected) or firstgroup)
-			end
-			
-			select.width = "fill"
-			select.height = "fill"
-
-			container:AddChild(select)
-
-		--assume tree group by default
-		--if parenttype is tree then this group is already a node on that tree
-		elseif (parenttype ~= "tree") or isRoot then
-			local tree = gui:Create("TreeGroup")
-			InjectInfo(tree, options, group, path, rootframe, appName)
-			tree:EnableButtonTooltips(false)
-			
-			tree.width = "fill"
-			tree.height = "fill"
-
-			tree:SetCallback("OnGroupSelected", GroupSelected)
-			tree:SetCallback("OnButtonEnter", TreeOnButtonEnter)
-			tree:SetCallback("OnButtonLeave", TreeOnButtonLeave)
-			
-			local status = AceConfigDialog:GetStatusTable(appName, path)
-			if not status.groups then
-				status.groups = {}
-			end
-			local treedefinition = BuildGroups(group, options, path, appName, true)
-			tree:SetStatusTable(status.groups)
-
-			tree:SetTree(treedefinition)
-			tree:SetUserData("tree",treedefinition)
-
-			for i = 1, #treedefinition do
-				local entry = treedefinition[i]
-				if not entry.disabled then
-					tree:SelectByValue((GroupExists(appName, options, path,status.groups.selected) and status.groups.selected) or entry.value)
-					break
-				end
-			end
-
-			container:AddChild(tree)
-		end
-	end
-end
-
-local old_CloseSpecialWindows
-
-
-local function RefreshOnUpdate(this)
-	for appName in pairs(this.closing) do
-		if AceConfigDialog.OpenFrames[appName] then
-			AceConfigDialog.OpenFrames[appName]:Hide()
-		end
-		if AceConfigDialog.BlizOptions and AceConfigDialog.BlizOptions[appName] then
-			for key, widget in pairs(AceConfigDialog.BlizOptions[appName]) do
-				if not widget:IsVisible() then
-					widget:ReleaseChildren()
-				end
-			end
-		end
-		this.closing[appName] = nil
-	end
-	
-	if this.closeAll then
-		for k, v in pairs(AceConfigDialog.OpenFrames) do
-			if not this.closeAllOverride[k] then
-				v:Hide()
-			end
-		end
-		this.closeAll = nil
-		wipe(this.closeAllOverride)
-	end
-	
-	for appName in pairs(this.apps) do
-		if AceConfigDialog.OpenFrames[appName] then
-			local user = AceConfigDialog.OpenFrames[appName]:GetUserDataTable()
-			AceConfigDialog:Open(appName, unpack(user.basepath or emptyTbl))
-		end
-		if AceConfigDialog.BlizOptions and AceConfigDialog.BlizOptions[appName] then
-			for key, widget in pairs(AceConfigDialog.BlizOptions[appName]) do
-				local user = widget:GetUserDataTable()
-				if widget:IsVisible() then
-					AceConfigDialog:Open(widget:GetUserData("appName"), widget, unpack(user.basepath or emptyTbl))
-				end
-			end
-		end
-		this.apps[appName] = nil
-	end
-	this:SetScript("OnUpdate", nil)
-end
-
--- Upgrade the OnUpdate script as well, if needed.
-if AceConfigDialog.frame:GetScript("OnUpdate") then
-	AceConfigDialog.frame:SetScript("OnUpdate", RefreshOnUpdate)
-end
-
---- Close all open options windows
-function AceConfigDialog:CloseAll()
-	AceConfigDialog.frame.closeAll = true
-	AceConfigDialog.frame:SetScript("OnUpdate", RefreshOnUpdate)
-	if next(self.OpenFrames) then
-		return true
-	end
-end
-
---- Close a specific options window.
--- @param appName The application name as given to `:RegisterOptionsTable()`
-function AceConfigDialog:Close(appName)
-	if self.OpenFrames[appName] then
-		AceConfigDialog.frame.closing[appName] = true
-		AceConfigDialog.frame:SetScript("OnUpdate", RefreshOnUpdate)
-		return true
-	end
-end
-
--- Internal -- Called by AceConfigRegistry
-function AceConfigDialog:ConfigTableChanged(event, appName)
-	AceConfigDialog.frame.apps[appName] = true
-	AceConfigDialog.frame:SetScript("OnUpdate", RefreshOnUpdate)
-end
-
-reg.RegisterCallback(AceConfigDialog, "ConfigTableChange", "ConfigTableChanged")
-
---- Sets the default size of the options window for a specific application.
--- @param appName The application name as given to `:RegisterOptionsTable()`
--- @param width The default width
--- @param height The default height
-function AceConfigDialog:SetDefaultSize(appName, width, height)
-	local status = AceConfigDialog:GetStatusTable(appName)
-	if type(width) == "number" and type(height) == "number" then
-		status.width = width
-		status.height = height
-	end
-end
-
---- Open an option window at the specified path (if any).
--- This function can optionally feed the group into a pre-created container
--- instead of creating a new container frame.
--- @paramsig appName [, container][, ...]
--- @param appName The application name as given to `:RegisterOptionsTable()`
--- @param container An optional container frame to feed the options into
--- @param ... The path to open after creating the options window (see `:SelectGroup` for details)
-function AceConfigDialog:Open(appName, container, ...)
-	if not old_CloseSpecialWindows then
-		old_CloseSpecialWindows = CloseSpecialWindows
-		CloseSpecialWindows = function()
-			local found = old_CloseSpecialWindows()
-			return self:CloseAll() or found
-		end
-	end
-	local app = reg:GetOptionsTable(appName)
-	if not app then
-		error(("%s isn't registed with AceConfigRegistry, unable to open config"):format(appName), 2)
-	end
-	local options = app("dialog", MAJOR)
-
-	local f
-	
-	local path = new()
-	local name = GetOptionsMemberValue("name", options, options, path, appName)
-	
-	--If an optional path is specified add it to the path table before feeding the options
-	--as container is optional as well it may contain the first element of the path
-	if type(container) == "string" then
-		tinsert(path, container)
-		container = nil
-	end
-	for n = 1, select("#",...) do
-		tinsert(path, (select(n, ...)))
-	end
-	
-	local option = options
-	if type(container) == "table" and container.type == "BlizOptionsGroup" and #path > 0 then
-		for i = 1, #path do
-			option = options.args[path[i]]
-		end
-		name = format("%s - %s", name, GetOptionsMemberValue("name", option, options, path, appName))
-	end
-	
-	--if a container is given feed into that
-	if container then
-		f = container
-		f:ReleaseChildren()
-		f:SetUserData("appName", appName)
-		f:SetUserData("iscustom", true)
-		if #path > 0 then
-			f:SetUserData("basepath", copy(path))
-		end
-		local status = AceConfigDialog:GetStatusTable(appName)
-		if not status.width then
-			status.width =  700
-		end
-		if not status.height then
-			status.height = 500
-		end
-		if f.SetStatusTable then
-			f:SetStatusTable(status)
-		end
-		if f.SetTitle then
-			f:SetTitle(name or "")
-		end
-	else
-		if not self.OpenFrames[appName] then
-			f = gui:Create("Frame")
-			self.OpenFrames[appName] = f
-		else
-			f = self.OpenFrames[appName]
-		end
-		f:ReleaseChildren()
-		f:SetCallback("OnClose", FrameOnClose)
-		f:SetUserData("appName", appName)
-		if #path > 0 then
-			f:SetUserData("basepath", copy(path))
-		end
-		f:SetTitle(name or "")
-		local status = AceConfigDialog:GetStatusTable(appName)
-		f:SetStatusTable(status)
-	end
-
-	self:FeedGroup(appName,options,f,f,path,true)
-	if f.Show then
-		f:Show()
-	end
-	del(path)
-
-	if AceConfigDialog.frame.closeAll then
-		-- close all is set, but thats not good, since we're just opening here, so force it
-		AceConfigDialog.frame.closeAllOverride[appName] = true
-	end
-end
-
--- convert pre-39 BlizOptions structure to the new format
-if oldminor and oldminor < 39 and AceConfigDialog.BlizOptions then
-	local old = AceConfigDialog.BlizOptions
-	local new = {}
-	for key, widget in pairs(old) do
-		local appName = widget:GetUserData("appName")
-		if not new[appName] then new[appName] = {} end
-		new[appName][key] = widget
-	end
-	AceConfigDialog.BlizOptions = new
-else
-	AceConfigDialog.BlizOptions = AceConfigDialog.BlizOptions or {}
-end
-
-local function FeedToBlizPanel(widget, event)
-	local path = widget:GetUserData("path")
-	AceConfigDialog:Open(widget:GetUserData("appName"), widget, unpack(path or emptyTbl))
-end
-
-local function ClearBlizPanel(widget, event)
-	local appName = widget:GetUserData("appName")
-	AceConfigDialog.frame.closing[appName] = true
-	AceConfigDialog.frame:SetScript("OnUpdate", RefreshOnUpdate)
-end
-
---- Add an option table into the Blizzard Interface Options panel.
--- You can optionally supply a descriptive name to use and a parent frame to use,
--- as well as a path in the options table.\\
--- If no name is specified, the appName will be used instead.
---
--- If you specify a proper `parent` (by name), the interface options will generate a
--- tree layout. Note that only one level of children is supported, so the parent always
--- has to be a head-level note.
---
--- This function returns a reference to the container frame registered with the Interface
--- Options. You can use this reference to open the options with the API function
--- `InterfaceOptionsFrame_OpenToCategory`.
--- @param appName The application name as given to `:RegisterOptionsTable()`
--- @param name A descriptive name to display in the options tree (defaults to appName)
--- @param parent The parent to use in the interface options tree.
--- @param ... The path in the options table to feed into the interface options panel.
--- @return The reference to the frame registered into the Interface Options. 
-function AceConfigDialog:AddToBlizOptions(appName, name, parent, ...)
-	local BlizOptions = AceConfigDialog.BlizOptions
-	
-	local key = appName
-	for n = 1, select("#", ...) do
-		key = key.."\001"..select(n, ...)
-	end
-	
-	if not BlizOptions[appName] then
-		BlizOptions[appName] = {}
-	end
-	
-	if not BlizOptions[appName][key] then
-		local group = gui:Create("BlizOptionsGroup")
-		BlizOptions[appName][key] = group
-		group:SetName(name or appName, parent)
-
-		group:SetTitle(name or appName)
-		group:SetUserData("appName", appName)
-		if select("#", ...) > 0 then
-			local path = {}
-			for n = 1, select("#",...) do
-				tinsert(path, (select(n, ...)))
-			end
-			group:SetUserData("path", path)
-		end
-		group:SetCallback("OnShow", FeedToBlizPanel)
-		group:SetCallback("OnHide", ClearBlizPanel)
-		InterfaceOptions_AddCategory(group.frame)
-		return group.frame
-	else
-		error(("%s has already been added to the Blizzard Options Window with the given path"):format(appName), 2)
-	end
-end
diff --git a/OrderHallCommander/libs/LibInit/Ace3/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.xml b/OrderHallCommander/libs/LibInit/Ace3/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.xml
deleted file mode 100644
index 86ce057..0000000
--- a/OrderHallCommander/libs/LibInit/Ace3/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
-..\FrameXML\UI.xsd">
-	<Script file="AceConfigDialog-3.0.lua"/>
-</Ui>
\ No newline at end of file
diff --git a/OrderHallCommander/libs/LibInit/Ace3/AceConfig-3.0/AceConfigRegistry-3.0/AceConfigRegistry-3.0.lua b/OrderHallCommander/libs/LibInit/Ace3/AceConfig-3.0/AceConfigRegistry-3.0/AceConfigRegistry-3.0.lua
deleted file mode 100644
index cf81973..0000000
--- a/OrderHallCommander/libs/LibInit/Ace3/AceConfig-3.0/AceConfigRegistry-3.0/AceConfigRegistry-3.0.lua
+++ /dev/null
@@ -1,349 +0,0 @@
---- AceConfigRegistry-3.0 handles central registration of options tables in use by addons and modules.\\
--- Options tables can be registered as raw tables, OR as function refs that return a table.\\
--- Such functions receive three arguments: "uiType", "uiName", "appName". \\
--- * Valid **uiTypes**: "cmd", "dropdown", "dialog". This is verified by the library at call time. \\
--- * The **uiName** field is expected to contain the full name of the calling addon, including version, e.g. "FooBar-1.0". This is verified by the library at call time.\\
--- * The **appName** field is the options table name as given at registration time \\
--- 
--- :IterateOptionsTables() (and :GetOptionsTable() if only given one argument) return a function reference that the requesting config handling addon must call with valid "uiType", "uiName".
--- @class file
--- @name AceConfigRegistry-3.0
--- @release $Id: AceConfigRegistry-3.0.lua 1139 2016-07-03 07:43:51Z nevcairiel $
-local MAJOR, MINOR = "AceConfigRegistry-3.0", 16
-local AceConfigRegistry = LibStub:NewLibrary(MAJOR, MINOR)
-
-if not AceConfigRegistry then return end
-
-AceConfigRegistry.tables = AceConfigRegistry.tables or {}
-
-local CallbackHandler = LibStub:GetLibrary("CallbackHandler-1.0")
-
-if not AceConfigRegistry.callbacks then
-	AceConfigRegistry.callbacks = CallbackHandler:New(AceConfigRegistry)
-end
-
--- Lua APIs
-local tinsert, tconcat = table.insert, table.concat
-local strfind, strmatch = string.find, string.match
-local type, tostring, select, pairs = type, tostring, select, pairs
-local error, assert = error, assert
-
------------------------------------------------------------------------
--- Validating options table consistency:
-
-
-AceConfigRegistry.validated = {
-	-- list of options table names ran through :ValidateOptionsTable automatically. 
-	-- CLEARED ON PURPOSE, since newer versions may have newer validators
-	cmd = {},
-	dropdown = {},
-	dialog = {},
-}
-
-
-
-local function err(msg, errlvl, ...)
-	local t = {}
-	for i=select("#",...),1,-1 do
-		tinsert(t, (select(i, ...)))
-	end
-	error(MAJOR..":ValidateOptionsTable(): "..tconcat(t,".")..msg, errlvl+2)
-end
-
-
-local isstring={["string"]=true, _="string"}
-local isstringfunc={["string"]=true,["function"]=true, _="string or funcref"}
-local istable={["table"]=true,   _="table"}
-local ismethodtable={["table"]=true,["string"]=true,["function"]=true,   _="methodname, funcref or table"}
-local optstring={["nil"]=true,["string"]=true, _="string"}
-local optstringfunc={["nil"]=true,["string"]=true,["function"]=true, _="string or funcref"}
-local optstringnumberfunc={["nil"]=true,["string"]=true,["number"]=true,["function"]=true, _="string, number or funcref"}
-local optnumber={["nil"]=true,["number"]=true, _="number"}
-local optmethod={["nil"]=true,["string"]=true,["function"]=true, _="methodname or funcref"}
-local optmethodfalse={["nil"]=true,["string"]=true,["function"]=true,["boolean"]={[false]=true},  _="methodname, funcref or false"}
-local optmethodnumber={["nil"]=true,["string"]=true,["function"]=true,["number"]=true,  _="methodname, funcref or number"}
-local optmethodtable={["nil"]=true,["string"]=true,["function"]=true,["table"]=true,  _="methodname, funcref or table"}
-local optmethodbool={["nil"]=true,["string"]=true,["function"]=true,["boolean"]=true,  _="methodname, funcref or boolean"}
-local opttable={["nil"]=true,["table"]=true,  _="table"}
-local optbool={["nil"]=true,["boolean"]=true,  _="boolean"}
-local optboolnumber={["nil"]=true,["boolean"]=true,["number"]=true,  _="boolean or number"}
-
-local basekeys={
-	type=isstring,
-	name=isstringfunc,
-	desc=optstringfunc,
-	descStyle=optstring,
-	order=optmethodnumber,
-	validate=optmethodfalse,
-	confirm=optmethodbool,
-	confirmText=optstring,
-	disabled=optmethodbool,
-	hidden=optmethodbool,
-		guiHidden=optmethodbool,
-		dialogHidden=optmethodbool,
-		dropdownHidden=optmethodbool,
-	cmdHidden=optmethodbool,
-	icon=optstringnumberfunc,
-	iconCoords=optmethodtable,
-	handler=opttable,
-	get=optmethodfalse,
-	set=optmethodfalse,
-	func=optmethodfalse,
-	arg={["*"]=true},
-	width=optstring,
-}
-
-local typedkeys={
-	header={},
-	description={
-		image=optstringnumberfunc,
-		imageCoords=optmethodtable,
-		imageHeight=optnumber,
-		imageWidth=optnumber,
-		fontSize=optstringfunc,
-	},
-	group={
-		args=istable,
-		plugins=opttable,
-		inline=optbool,
-			cmdInline=optbool,
-			guiInline=optbool,
-			dropdownInline=optbool,
-			dialogInline=optbool,
-		childGroups=optstring,
-	},
-	execute={
-		image=optstringnumberfunc,
-		imageCoords=optmethodtable,
-		imageHeight=optnumber,
-		imageWidth=optnumber,
-	},
-	input={
-		pattern=optstring,
-		usage=optstring,
-		control=optstring,
-		dialogControl=optstring,
-		dropdownControl=optstring,
-		multiline=optboolnumber,
-	},
-	toggle={
-		tristate=optbool,
-		image=optstringnumberfunc,
-		imageCoords=optmethodtable,
-	},
-	tristate={
-	},
-	range={
-		min=optnumber,
-		softMin=optnumber,
-		max=optnumber,
-		softMax=optnumber,
-		step=optnumber,
-		bigStep=optnumber,
-		isPercent=optbool,
-	},
-	select={
-		values=ismethodtable,
-		style={
-			["nil"]=true, 
-			["string"]={dropdown=true,radio=true}, 
-			_="string: 'dropdown' or 'radio'"
-		},
-		control=optstring,
-		dialogControl=optstring,
-		dropdownControl=optstring,
-		itemControl=optstring,
-	},
-	multiselect={
-		values=ismethodtable,
-		style=optstring,
-		tristate=optbool,
-		control=optstring,
-		dialogControl=optstring,
-		dropdownControl=optstring,
-	},
-	color={
-		hasAlpha=optmethodbool,
-	},
-	keybinding={
-		-- TODO
-	},
-}
-
-local function validateKey(k,errlvl,...)
-	errlvl=(errlvl or 0)+1
-	if type(k)~="string" then
-		err("["..tostring(k).."] - key is not a string", errlvl,...)
-	end
-	if strfind(k, "[%c\127]") then
-		err("["..tostring(k).."] - key name contained control characters", errlvl,...)
-	end
-end
-
-local function validateVal(v, oktypes, errlvl,...)
-	errlvl=(errlvl or 0)+1
-	local isok=oktypes[type(v)] or oktypes["*"]
-
-	if not isok then
-		err(": expected a "..oktypes._..", got '"..tostring(v).."'", errlvl,...)
-	end
-	if type(isok)=="table" then		-- isok was a table containing specific values to be tested for!
-		if not isok[v] then
-			err(": did not expect "..type(v).." value '"..tostring(v).."'", errlvl,...)
-		end
-	end
-end
-
-local function validate(options,errlvl,...)
-	errlvl=(errlvl or 0)+1
-	-- basic consistency
-	if type(options)~="table" then
-		err(": expected a table, got a "..type(options), errlvl,...)
-	end
-	if type(options.type)~="string" then
-		err(".type: expected a string, got a "..type(options.type), errlvl,...)
-	end
-	
-	-- get type and 'typedkeys' member
-	local tk = typedkeys[options.type]
-	if not tk then
-		err(".type: unknown type '"..options.type.."'", errlvl,...)
-	end
-	
-	-- make sure that all options[] are known parameters
-	for k,v in pairs(options) do
-		if not (tk[k] or basekeys[k]) then
-			err(": unknown parameter", errlvl,tostring(k),...)
-		end
-	end
-
-	-- verify that required params are there, and that everything is the right type
-	for k,oktypes in pairs(basekeys) do
-		validateVal(options[k], oktypes, errlvl,k,...)
-	end
-	for k,oktypes in pairs(tk) do
-		validateVal(options[k], oktypes, errlvl,k,...)
-	end
-
-	-- extra logic for groups
-	if options.type=="group" then
-		for k,v in pairs(options.args) do
-			validateKey(k,errlvl,"args",...)
-			validate(v, errlvl,k,"args",...)
-		end
-		if options.plugins then
-			for plugname,plugin in pairs(options.plugins) do
-				if type(plugin)~="table" then
-					err(": expected a table, got '"..tostring(plugin).."'", errlvl,tostring(plugname),"plugins",...)
-				end
-				for k,v in pairs(plugin) do
-					validateKey(k,errlvl,tostring(plugname),"plugins",...)
-					validate(v, errlvl,k,tostring(plugname),"plugins",...)
-				end
-			end
-		end
-	end
-end
-
-
---- Validates basic structure and integrity of an options table \\
--- Does NOT verify that get/set etc actually exist, since they can be defined at any depth
--- @param options The table to be validated
--- @param name The name of the table to be validated (shown in any error message)
--- @param errlvl (optional number) error level offset, default 0 (=errors point to the function calling :ValidateOptionsTable)
-function AceConfigRegistry:ValidateOptionsTable(options,name,errlvl)
-	errlvl=(errlvl or 0)+1
-	name = name or "Optionstable"
-	if not options.name then
-		options.name=name	-- bit of a hack, the root level doesn't really need a .name :-/
-	end
-	validate(options,errlvl,name)
-end
-
---- Fires a "ConfigTableChange" callback for those listening in on it, allowing config GUIs to refresh.
--- You should call this function if your options table changed from any outside event, like a game event
--- or a timer.
--- @param appName The application name as given to `:RegisterOptionsTable()`
-function AceConfigRegistry:NotifyChange(appName)
-	if not AceConfigRegistry.tables[appName] then return end
-	AceConfigRegistry.callbacks:Fire("ConfigTableChange", appName)
-end
-
--- -------------------------------------------------------------------
--- Registering and retreiving options tables:
-
-
--- validateGetterArgs: helper function for :GetOptionsTable (or, rather, the getter functions returned by it)
-
-local function validateGetterArgs(uiType, uiName, errlvl)
-	errlvl=(errlvl or 0)+2
-	if uiType~="cmd" and uiType~="dropdown" and uiType~="dialog" then
-		error(MAJOR..": Requesting options table: 'uiType' - invalid configuration UI type, expected 'cmd', 'dropdown' or 'dialog'", errlvl)
-	end
-	if not strmatch(uiName, "[A-Za-z]%-[0-9]") then	-- Expecting e.g. "MyLib-1.2"
-		error(MAJOR..": Requesting options table: 'uiName' - badly formatted or missing version number. Expected e.g. 'MyLib-1.2'", errlvl)
-	end
-end
-
---- Register an options table with the config registry.
--- @param appName The application name as given to `:RegisterOptionsTable()`
--- @param options The options table, OR a function reference that generates it on demand. \\
--- See the top of the page for info on arguments passed to such functions.
--- @param skipValidation Skip options table validation (primarily useful for extremely huge options, with a noticeable slowdown)
-function AceConfigRegistry:RegisterOptionsTable(appName, options, skipValidation)
-	if type(options)=="table" then
-		if options.type~="group" then	-- quick sanity checker
-			error(MAJOR..": RegisterOptionsTable(appName, options): 'options' - missing type='group' member in root group", 2)
-		end
-		AceConfigRegistry.tables[appName] = function(uiType, uiName, errlvl)
-			errlvl=(errlvl or 0)+1
-			validateGetterArgs(uiType, uiName, errlvl)
-			if not AceConfigRegistry.validated[uiType][appName] and not skipValidation then
-				AceConfigRegistry:ValidateOptionsTable(options, appName, errlvl)	-- upgradable
-				AceConfigRegistry.validated[uiType][appName] = true
-			end
-			return options 
-		end
-	elseif type(options)=="function" then
-		AceConfigRegistry.tables[appName] = function(uiType, uiName, errlvl)
-			errlvl=(errlvl or 0)+1
-			validateGetterArgs(uiType, uiName, errlvl)
-			local tab = assert(options(uiType, uiName, appName))
-			if not AceConfigRegistry.validated[uiType][appName] and not skipValidation then
-				AceConfigRegistry:ValidateOptionsTable(tab, appName, errlvl)	-- upgradable
-				AceConfigRegistry.validated[uiType][appName] = true
-			end
-			return tab
-		end
-	else
-		error(MAJOR..": RegisterOptionsTable(appName, options): 'options' - expected table or function reference", 2)
-	end
-end
-
---- Returns an iterator of ["appName"]=funcref pairs
-function AceConfigRegistry:IterateOptionsTables()
-	return pairs(AceConfigRegistry.tables)
-end
-
-
-
-
---- Query the registry for a specific options table.
--- If only appName is given, a function is returned which you
--- can call with (uiType,uiName) to get the table.\\
--- If uiType&uiName are given, the table is returned.
--- @param appName The application name as given to `:RegisterOptionsTable()`
--- @param uiType The type of UI to get the table for, one of "cmd", "dropdown", "dialog"
--- @param uiName The name of the library/addon querying for the table, e.g. "MyLib-1.0"
-function AceConfigRegistry:GetOptionsTable(appName, uiType, uiName)
-	local f = AceConfigRegistry.tables[appName]
-	if not f then
-		return nil
-	end
-	
-	if uiType then
-		return f(uiType,uiName,1)	-- get the table for us
-	else
-		return f	-- return the function
-	end
-end
diff --git a/OrderHallCommander/libs/LibInit/Ace3/AceConfig-3.0/AceConfigRegistry-3.0/AceConfigRegistry-3.0.xml b/OrderHallCommander/libs/LibInit/Ace3/AceConfig-3.0/AceConfigRegistry-3.0/AceConfigRegistry-3.0.xml
deleted file mode 100644
index 101bfda..0000000
--- a/OrderHallCommander/libs/LibInit/Ace3/AceConfig-3.0/AceConfigRegistry-3.0/AceConfigRegistry-3.0.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
-..\FrameXML\UI.xsd">
-	<Script file="AceConfigRegistry-3.0.lua"/>
-</Ui>
\ No newline at end of file
diff --git a/OrderHallCommander/libs/LibInit/Ace3/AceConsole-3.0/AceConsole-3.0.lua b/OrderHallCommander/libs/LibInit/Ace3/AceConsole-3.0/AceConsole-3.0.lua
deleted file mode 100644
index 0567a65..0000000
--- a/OrderHallCommander/libs/LibInit/Ace3/AceConsole-3.0/AceConsole-3.0.lua
+++ /dev/null
@@ -1,250 +0,0 @@
---- **AceConsole-3.0** provides registration facilities for slash commands.
--- You can register slash commands to your custom functions and use the `GetArgs` function to parse them
--- to your addons individual needs.
---
--- **AceConsole-3.0** can be embeded into your addon, either explicitly by calling AceConsole:Embed(MyAddon) or by 
--- specifying it as an embeded library in your AceAddon. All functions will be available on your addon object
--- and can be accessed directly, without having to explicitly call AceConsole itself.\\
--- It is recommended to embed AceConsole, otherwise you'll have to specify a custom `self` on all calls you
--- make into AceConsole.
--- @class file
--- @name AceConsole-3.0
--- @release $Id: AceConsole-3.0.lua 1143 2016-07-11 08:52:03Z nevcairiel $
-local MAJOR,MINOR = "AceConsole-3.0", 7
-
-local AceConsole, oldminor = LibStub:NewLibrary(MAJOR, MINOR)
-
-if not AceConsole then return end -- No upgrade needed
-
-AceConsole.embeds = AceConsole.embeds or {} -- table containing objects AceConsole is embedded in.
-AceConsole.commands = AceConsole.commands or {} -- table containing commands registered
-AceConsole.weakcommands = AceConsole.weakcommands or {} -- table containing self, command => func references for weak commands that don't persist through enable/disable
-
--- Lua APIs
-local tconcat, tostring, select = table.concat, tostring, select
-local type, pairs, error = type, pairs, error
-local format, strfind, strsub = string.format, string.find, string.sub
-local max = math.max
-
--- WoW APIs
-local _G = _G
-
--- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
--- List them here for Mikk's FindGlobals script
--- GLOBALS: DEFAULT_CHAT_FRAME, SlashCmdList, hash_SlashCmdList
-
-local tmp={}
-local function Print(self,frame,...)
-	local n=0
-	if self ~= AceConsole then
-		n=n+1
-		tmp[n] = "|cff33ff99"..tostring( self ).."|r:"
-	end
-	for i=1, select("#", ...) do
-		n=n+1
-		tmp[n] = tostring(select(i, ...))
-	end
-	frame:AddMessage( tconcat(tmp," ",1,n) )
-end
-
---- Print to DEFAULT_CHAT_FRAME or given ChatFrame (anything with an .AddMessage function)
--- @paramsig [chatframe ,] ...
--- @param chatframe Custom ChatFrame to print to (or any frame with an .AddMessage function)
--- @param ... List of any values to be printed
-function AceConsole:Print(...)
-	local frame = ...
-	if type(frame) == "table" and frame.AddMessage then	-- Is first argument something with an .AddMessage member?
-		return Print(self, frame, select(2,...))
-	else
-		return Print(self, DEFAULT_CHAT_FRAME, ...)
-	end
-end
-
-
---- Formatted (using format()) print to DEFAULT_CHAT_FRAME or given ChatFrame (anything with an .AddMessage function)
--- @paramsig [chatframe ,] "format"[, ...]
--- @param chatframe Custom ChatFrame to print to (or any frame with an .AddMessage function)
--- @param format Format string - same syntax as standard Lua format()
--- @param ... Arguments to the format string
-function AceConsole:Printf(...)
-	local frame = ...
-	if type(frame) == "table" and frame.AddMessage then	-- Is first argument something with an .AddMessage member?
-		return Print(self, frame, format(select(2,...)))
-	else
-		return Print(self, DEFAULT_CHAT_FRAME, format(...))
-	end
-end
-
-
-
-
---- Register a simple chat command
--- @param command Chat command to be registered WITHOUT leading "/"
--- @param func Function to call when the slash command is being used (funcref or methodname)
--- @param persist if false, the command will be soft disabled/enabled when aceconsole is used as a mixin (default: true)
-function AceConsole:RegisterChatCommand( command, func, persist )
-	if type(command)~="string" then error([[Usage: AceConsole:RegisterChatCommand( "command", func[, persist ]): 'command' - expected a string]], 2) end
-	
-	if persist==nil then persist=true end	-- I'd rather have my addon's "/addon enable" around if the author screws up. Having some extra slash regged when it shouldnt be isn't as destructive. True is a better default. /Mikk
-	
-	local name = "ACECONSOLE_"..command:upper()
-	
-	if type( func ) == "string" then
-		SlashCmdList[name] = function(input, editBox)
-			self[func](self, input, editBox)
-		end
-	else
-		SlashCmdList[name] = func
-	end
-	_G["SLASH_"..name.."1"] = "/"..command:lower()
-	AceConsole.commands[command] = name
-	-- non-persisting commands are registered for enabling disabling
-	if not persist then
-		if not AceConsole.weakcommands[self] then AceConsole.weakcommands[self] = {} end
-		AceConsole.weakcommands[self][command] = func
-	end
-	return true
-end
-
---- Unregister a chatcommand
--- @param command Chat command to be unregistered WITHOUT leading "/"
-function AceConsole:UnregisterChatCommand( command )
-	local name = AceConsole.commands[command]
-	if name then
-		SlashCmdList[name] = nil
-		_G["SLASH_" .. name .. "1"] = nil
-		hash_SlashCmdList["/" .. command:upper()] = nil
-		AceConsole.commands[command] = nil
-	end
-end
-
---- Get an iterator over all Chat Commands registered with AceConsole
--- @return Iterator (pairs) over all commands
-function AceConsole:IterateChatCommands() return pairs(AceConsole.commands) end
-
-
-local function nils(n, ...)
-	if n>1 then
-		return nil, nils(n-1, ...)
-	elseif n==1 then
-		return nil, ...
-	else
-		return ...
-	end
-end
-	
-
---- Retreive one or more space-separated arguments from a string. 
--- Treats quoted strings and itemlinks as non-spaced.
--- @param str The raw argument string
--- @param numargs How many arguments to get (default 1)
--- @param startpos Where in the string to start scanning (default  1)
--- @return Returns arg1, arg2, ..., nextposition\\
--- Missing arguments will be returned as nils. 'nextposition' is returned as 1e9 at the end of the string.
-function AceConsole:GetArgs(str, numargs, startpos)
-	numargs = numargs or 1
-	startpos = max(startpos or 1, 1)
-	
-	local pos=startpos
-
-	-- find start of new arg
-	pos = strfind(str, "[^ ]", pos)
-	if not pos then	-- whoops, end of string
-		return nils(numargs, 1e9)
-	end
-
-	if numargs<1 then
-		return pos
-	end
-
-	-- quoted or space separated? find out which pattern to use
-	local delim_or_pipe
-	local ch = strsub(str, pos, pos)
-	if ch=='"' then
-		pos = pos + 1
-		delim_or_pipe='([|"])'
-	elseif ch=="'" then
-		pos = pos + 1
-		delim_or_pipe="([|'])"
-	else
-		delim_or_pipe="([| ])"
-	end
-	
-	startpos = pos
-	
-	while true do
-		-- find delimiter or hyperlink
-		local ch,_
-		pos,_,ch = strfind(str, delim_or_pipe, pos)
-		
-		if not pos then break end
-		
-		if ch=="|" then
-			-- some kind of escape
-			
-			if strsub(str,pos,pos+1)=="|H" then
-				-- It's a |H....|hhyper link!|h
-				pos=strfind(str, "|h", pos+2)	-- first |h
-				if not pos then break end
-				
-				pos=strfind(str, "|h", pos+2)	-- second |h
-				if not pos then break end
-			elseif strsub(str,pos, pos+1) == "|T" then
-				-- It's a |T....|t  texture
-				pos=strfind(str, "|t", pos+2)
-				if not pos then break end
-			end
-			
-			pos=pos+2 -- skip past this escape (last |h if it was a hyperlink)
-		
-		else
-			-- found delimiter, done with this arg
-			return strsub(str, startpos, pos-1), AceConsole:GetArgs(str, numargs-1, pos+1)
-		end
-		
-	end
-	
-	-- search aborted, we hit end of string. return it all as one argument. (yes, even if it's an unterminated quote or hyperlink)
-	return strsub(str, startpos), nils(numargs-1, 1e9)
-end
-
-
---- embedding and embed handling
-
-local mixins = {
-	"Print",
-	"Printf",
-	"RegisterChatCommand", 
-	"UnregisterChatCommand",
-	"GetArgs",
-} 
-
--- Embeds AceConsole into the target object making the functions from the mixins list available on target:..
--- @param target target object to embed AceBucket in
-function AceConsole:Embed( target )
-	for k, v in pairs( mixins ) do
-		target[v] = self[v]
-	end
-	self.embeds[target] = true
-	return target
-end
-
-function AceConsole:OnEmbedEnable( target )
-	if AceConsole.weakcommands[target] then
-		for command, func in pairs( AceConsole.weakcommands[target] ) do
-			target:RegisterChatCommand( command, func, false, true ) -- nonpersisting and silent registry
-		end
-	end
-end
-
-function AceConsole:OnEmbedDisable( target )
-	if AceConsole.weakcommands[target] then
-		for command, func in pairs( AceConsole.weakcommands[target] ) do
-			target:UnregisterChatCommand( command ) -- TODO: this could potentially unregister a command from another application in case of command conflicts. Do we care?
-		end
-	end
-end
-
-for addon in pairs(AceConsole.embeds) do
-	AceConsole:Embed(addon)
-end
diff --git a/OrderHallCommander/libs/LibInit/Ace3/AceConsole-3.0/AceConsole-3.0.xml b/OrderHallCommander/libs/LibInit/Ace3/AceConsole-3.0/AceConsole-3.0.xml
deleted file mode 100644
index be9f47c..0000000
--- a/OrderHallCommander/libs/LibInit/Ace3/AceConsole-3.0/AceConsole-3.0.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
-..\FrameXML\UI.xsd">
-	<Script file="AceConsole-3.0.lua"/>
-</Ui>
\ No newline at end of file
diff --git a/OrderHallCommander/libs/LibInit/Ace3/AceDB-3.0/AceDB-3.0.lua b/OrderHallCommander/libs/LibInit/Ace3/AceDB-3.0/AceDB-3.0.lua
deleted file mode 100644
index b42b442..0000000
--- a/OrderHallCommander/libs/LibInit/Ace3/AceDB-3.0/AceDB-3.0.lua
+++ /dev/null
@@ -1,746 +0,0 @@
---- **AceDB-3.0** manages the SavedVariables of your addon.
--- It offers profile management, smart defaults and namespaces for modules.\\
--- Data can be saved in different data-types, depending on its intended usage.
--- The most common data-type is the `profile` type, which allows the user to choose
--- the active profile, and manage the profiles of all of his characters.\\
--- The following data types are available:
--- * **char** Character-specific data. Every character has its own database.
--- * **realm** Realm-specific data. All of the players characters on the same realm share this database.
--- * **class** Class-specific data. All of the players characters of the same class share this database.
--- * **race** Race-specific data. All of the players characters of the same race share this database.
--- * **faction** Faction-specific data. All of the players characters of the same faction share this database.
--- * **factionrealm** Faction and realm specific data. All of the players characters on the same realm and of the same faction share this database.
--- * **locale** Locale specific data, based on the locale of the players game client.
--- * **global** Global Data. All characters on the same account share this database.
--- * **profile** Profile-specific data. All characters using the same profile share this database. The user can control which profile should be used.
---
--- Creating a new Database using the `:New` function will return a new DBObject. A database will inherit all functions
--- of the DBObjectLib listed here. \\
--- If you create a new namespaced child-database (`:RegisterNamespace`), you'll get a DBObject as well, but note
--- that the child-databases cannot individually change their profile, and are linked to their parents profile - and because of that,
--- the profile related APIs are not available. Only `:RegisterDefaults` and `:ResetProfile` are available on child-databases.
---
--- For more details on how to use AceDB-3.0, see the [[AceDB-3.0 Tutorial]].
---
--- You may also be interested in [[libdualspec-1-0|LibDualSpec-1.0]] to do profile switching automatically when switching specs.
---
--- @usage
--- MyAddon = LibStub("AceAddon-3.0"):NewAddon("DBExample")
---
--- -- declare defaults to be used in the DB
--- local defaults = {
---   profile = {
---     setting = true,
---   }
--- }
---
--- function MyAddon:OnInitialize()
---   -- Assuming the .toc says ## SavedVariables: MyAddonDB
---   self.db = LibStub("AceDB-3.0"):New("MyAddonDB", defaults, true)
--- end
--- @class file
--- @name AceDB-3.0.lua
--- @release $Id: AceDB-3.0.lua 1142 2016-07-11 08:36:19Z nevcairiel $
-local ACEDB_MAJOR, ACEDB_MINOR = "AceDB-3.0", 26
-local AceDB, oldminor = LibStub:NewLibrary(ACEDB_MAJOR, ACEDB_MINOR)
-
-if not AceDB then return end -- No upgrade needed
-
--- Lua APIs
-local type, pairs, next, error = type, pairs, next, error
-local setmetatable, getmetatable, rawset, rawget = setmetatable, getmetatable, rawset, rawget
-
--- WoW APIs
-local _G = _G
-
--- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
--- List them here for Mikk's FindGlobals script
--- GLOBALS: LibStub
-
-AceDB.db_registry = AceDB.db_registry or {}
-AceDB.frame = AceDB.frame or CreateFrame("Frame")
-
-local CallbackHandler
-local CallbackDummy = { Fire = function() end }
-
-local DBObjectLib = {}
-
---[[-------------------------------------------------------------------------
-	AceDB Utility Functions
----------------------------------------------------------------------------]]
-
--- Simple shallow copy for copying defaults
-local function copyTable(src, dest)
-	if type(dest) ~= "table" then dest = {} end
-	if type(src) == "table" then
-		for k,v in pairs(src) do
-			if type(v) == "table" then
-				-- try to index the key first so that the metatable creates the defaults, if set, and use that table
-				v = copyTable(v, dest[k])
-			end
-			dest[k] = v
-		end
-	end
-	return dest
-end
-
--- Called to add defaults to a section of the database
---
--- When a ["*"] default section is indexed with a new key, a table is returned
--- and set in the host table.  These tables must be cleaned up by removeDefaults
--- in order to ensure we don't write empty default tables.
-local function copyDefaults(dest, src)
-	-- this happens if some value in the SV overwrites our default value with a non-table
-	--if type(dest) ~= "table" then return end
-	for k, v in pairs(src) do
-		if k == "*" or k == "**" then
-			if type(v) == "table" then
-				-- This is a metatable used for table defaults
-				local mt = {
-					-- This handles the lookup and creation of new subtables
-					__index = function(t,k)
-							if k == nil then return nil end
-							local tbl = {}
-							copyDefaults(tbl, v)
-							rawset(t, k, tbl)
-							return tbl
-						end,
-				}
-				setmetatable(dest, mt)
-				-- handle already existing tables in the SV
-				for dk, dv in pairs(dest) do
-					if not rawget(src, dk) and type(dv) == "table" then
-						copyDefaults(dv, v)
-					end
-				end
-			else
-				-- Values are not tables, so this is just a simple return
-				local mt = {__index = function(t,k) return k~=nil and v or nil end}
-				setmetatable(dest, mt)
-			end
-		elseif type(v) == "table" then
-			if not rawget(dest, k) then rawset(dest, k, {}) end
-			if type(dest[k]) == "table" then
-				copyDefaults(dest[k], v)
-				if src['**'] then
-					copyDefaults(dest[k], src['**'])
-				end
-			end
-		else
-			if rawget(dest, k) == nil then
-				rawset(dest, k, v)
-			end
-		end
-	end
-end
-
--- Called to remove all defaults in the default table from the database
-local function removeDefaults(db, defaults, blocker)
-	-- remove all metatables from the db, so we don't accidentally create new sub-tables through them
-	setmetatable(db, nil)
-	-- loop through the defaults and remove their content
-	for k,v in pairs(defaults) do
-		if k == "*" or k == "**" then
-			if type(v) == "table" then
-				-- Loop through all the actual k,v pairs and remove
-				for key, value in pairs(db) do
-					if type(value) == "table" then
-						-- if the key was not explicitly specified in the defaults table, just strip everything from * and ** tables
-						if defaults[key] == nil and (not blocker or blocker[key] == nil) then
-							removeDefaults(value, v)
-							-- if the table is empty afterwards, remove it
-							if next(value) == nil then
-								db[key] = nil
-							end
-						-- if it was specified, only strip ** content, but block values which were set in the key table
-						elseif k == "**" then
-							removeDefaults(value, v, defaults[key])
-						end
-					end
-				end
-			elseif k == "*" then
-				-- check for non-table default
-				for key, value in pairs(db) do
-					if defaults[key] == nil and v == value then
-						db[key] = nil
-					end
-				end
-			end
-		elseif type(v) == "table" and type(db[k]) == "table" then
-			-- if a blocker was set, dive into it, to allow multi-level defaults
-			removeDefaults(db[k], v, blocker and blocker[k])
-			if next(db[k]) == nil then
-				db[k] = nil
-			end
-		else
-			-- check if the current value matches the default, and that its not blocked by another defaults table
-			if db[k] == defaults[k] and (not blocker or blocker[k] == nil) then
-				db[k] = nil
-			end
-		end
-	end
-end
-
--- This is called when a table section is first accessed, to set up the defaults
-local function initSection(db, section, svstore, key, defaults)
-	local sv = rawget(db, "sv")
-
-	local tableCreated
-	if not sv[svstore] then sv[svstore] = {} end
-	if not sv[svstore][key] then
-		sv[svstore][key] = {}
-		tableCreated = true
-	end
-
-	local tbl = sv[svstore][key]
-
-	if defaults then
-		copyDefaults(tbl, defaults)
-	end
-	rawset(db, section, tbl)
-
-	return tableCreated, tbl
-end
-
--- Metatable to handle the dynamic creation of sections and copying of sections.
-local dbmt = {
-	__index = function(t, section)
-			local keys = rawget(t, "keys")
-			local key = keys[section]
-			if key then
-				local defaultTbl = rawget(t, "defaults")
-				local defaults = defaultTbl and defaultTbl[section]
-
-				if section == "profile" then
-					local new = initSection(t, section, "profiles", key, defaults)
-					if new then
-						-- Callback: OnNewProfile, database, newProfileKey
-						t.callbacks:Fire("OnNewProfile", t, key)
-					end
-				elseif section == "profiles" then
-					local sv = rawget(t, "sv")
-					if not sv.profiles then sv.profiles = {} end
-					rawset(t, "profiles", sv.profiles)
-				elseif section == "global" then
-					local sv = rawget(t, "sv")
-					if not sv.global then sv.global = {} end
-					if defaults then
-						copyDefaults(sv.global, defaults)
-					end
-					rawset(t, section, sv.global)
-				else
-					initSection(t, section, section, key, defaults)
-				end
-			end
-
-			return rawget(t, section)
-		end
-}
-
-local function validateDefaults(defaults, keyTbl, offset)
-	if not defaults then return end
-	offset = offset or 0
-	for k in pairs(defaults) do
-		if not keyTbl[k] or k == "profiles" then
-			error(("Usage: AceDBObject:RegisterDefaults(defaults): '%s' is not a valid datatype."):format(k), 3 + offset)
-		end
-	end
-end
-
-local preserve_keys = {
-	["callbacks"] = true,
-	["RegisterCallback"] = true,
-	["UnregisterCallback"] = true,
-	["UnregisterAllCallbacks"] = true,
-	["children"] = true,
-}
-
-local realmKey = GetRealmName()
-local charKey = UnitName("player") .. " - " .. realmKey
-local _, classKey = UnitClass("player")
-local _, raceKey = UnitRace("player")
-local factionKey = UnitFactionGroup("player")
-local factionrealmKey = factionKey .. " - " .. realmKey
-local localeKey = GetLocale():lower()
-
-local regionTable = { "US", "KR", "EU", "TW", "CN" }
-local regionKey = regionTable[GetCurrentRegion()]
-local factionrealmregionKey = factionrealmKey .. " - " .. regionKey
-
--- Actual database initialization function
-local function initdb(sv, defaults, defaultProfile, olddb, parent)
-	-- Generate the database keys for each section
-
-	-- map "true" to our "Default" profile
-	if defaultProfile == true then defaultProfile = "Default" end
-
-	local profileKey
-	if not parent then
-		-- Make a container for profile keys
-		if not sv.profileKeys then sv.profileKeys = {} end
-
-		-- Try to get the profile selected from the char db
-		profileKey = sv.profileKeys[charKey] or defaultProfile or charKey
-
-		-- save the selected profile for later
-		sv.profileKeys[charKey] = profileKey
-	else
-		-- Use the profile of the parents DB
-		profileKey = parent.keys.profile or defaultProfile or charKey
-
-		-- clear the profileKeys in the DB, namespaces don't need to store them
-		sv.profileKeys = nil
-	end
-
-	-- This table contains keys that enable the dynamic creation
-	-- of each section of the table.  The 'global' and 'profiles'
-	-- have a key of true, since they are handled in a special case
-	local keyTbl= {
-		["char"] = charKey,
-		["realm"] = realmKey,
-		["class"] = classKey,
-		["race"] = raceKey,
-		["faction"] = factionKey,
-		["factionrealm"] = factionrealmKey,
-		["factionrealmregion"] = factionrealmregionKey,
-		["profile"] = profileKey,
-		["locale"] = localeKey,
-		["global"] = true,
-		["profiles"] = true,
-	}
-
-	validateDefaults(defaults, keyTbl, 1)
-
-	-- This allows us to use this function to reset an entire database
-	-- Clear out the old database
-	if olddb then
-		for k,v in pairs(olddb) do if not preserve_keys[k] then olddb[k] = nil end end
-	end
-
-	-- Give this database the metatable so it initializes dynamically
-	local db = setmetatable(olddb or {}, dbmt)
-
-	if not rawget(db, "callbacks") then
-		-- try to load CallbackHandler-1.0 if it loaded after our library
-		if not CallbackHandler then CallbackHandler = LibStub:GetLibrary("CallbackHandler-1.0", true) end
-		db.callbacks = CallbackHandler and CallbackHandler:New(db) or CallbackDummy
-	end
-
-	-- Copy methods locally into the database object, to avoid hitting
-	-- the metatable when calling methods
-
-	if not parent then
-		for name, func in pairs(DBObjectLib) do
-			db[name] = func
-		end
-	else
-		-- hack this one in
-		db.RegisterDefaults = DBObjectLib.RegisterDefaults
-		db.ResetProfile = DBObjectLib.ResetProfile
-	end
-
-	-- Set some properties in the database object
-	db.profiles = sv.profiles
-	db.keys = keyTbl
-	db.sv = sv
-	--db.sv_name = name
-	db.defaults = defaults
-	db.parent = parent
-
-	-- store the DB in the registry
-	AceDB.db_registry[db] = true
-
-	return db
-end
-
--- handle PLAYER_LOGOUT
--- strip all defaults from all databases
--- and cleans up empty sections
-local function logoutHandler(frame, event)
-	if event == "PLAYER_LOGOUT" then
-		for db in pairs(AceDB.db_registry) do
-			db.callbacks:Fire("OnDatabaseShutdown", db)
-			db:RegisterDefaults(nil)
-
-			-- cleanup sections that are empty without defaults
-			local sv = rawget(db, "sv")
-			for section in pairs(db.keys) do
-				if rawget(sv, section) then
-					-- global is special, all other sections have sub-entrys
-					-- also don't delete empty profiles on main dbs, only on namespaces
-					if section ~= "global" and (section ~= "profiles" or rawget(db, "parent")) then
-						for key in pairs(sv[section]) do
-							if not next(sv[section][key]) then
-								sv[section][key] = nil
-							end
-						end
-					end
-					if not next(sv[section]) then
-						sv[section] = nil
-					end
-				end
-			end
-		end
-	end
-end
-
-AceDB.frame:RegisterEvent("PLAYER_LOGOUT")
-AceDB.frame:SetScript("OnEvent", logoutHandler)
-
-
---[[-------------------------------------------------------------------------
-	AceDB Object Method Definitions
----------------------------------------------------------------------------]]
-
---- Sets the defaults table for the given database object by clearing any
--- that are currently set, and then setting the new defaults.
--- @param defaults A table of defaults for this database
-function DBObjectLib:RegisterDefaults(defaults)
-	if defaults and type(defaults) ~= "table" then
-		error("Usage: AceDBObject:RegisterDefaults(defaults): 'defaults' - table or nil expected.", 2)
-	end
-
-	validateDefaults(defaults, self.keys)
-
-	-- Remove any currently set defaults
-	if self.defaults then
-		for section,key in pairs(self.keys) do
-			if self.defaults[section] and rawget(self, section) then
-				removeDefaults(self[section], self.defaults[section])
-			end
-		end
-	end
-
-	-- Set the DBObject.defaults table
-	self.defaults = defaults
-
-	-- Copy in any defaults, only touching those sections already created
-	if defaults then
-		for section,key in pairs(self.keys) do
-			if defaults[section] and rawget(self, section) then
-				copyDefaults(self[section], defaults[section])
-			end
-		end
-	end
-end
-
---- Changes the profile of the database and all of it's namespaces to the
--- supplied named profile
--- @param name The name of the profile to set as the current profile
-function DBObjectLib:SetProfile(name)
-	if type(name) ~= "string" then
-		error("Usage: AceDBObject:SetProfile(name): 'name' - string expected.", 2)
-	end
-
-	-- changing to the same profile, dont do anything
-	if name == self.keys.profile then return end
-
-	local oldProfile = self.profile
-	local defaults = self.defaults and self.defaults.profile
-
-	-- Callback: OnProfileShutdown, database
-	self.callbacks:Fire("OnProfileShutdown", self)
-
-	if oldProfile and defaults then
-		-- Remove the defaults from the old profile
-		removeDefaults(oldProfile, defaults)
-	end
-
-	self.profile = nil
-	self.keys["profile"] = name
-
-	-- if the storage exists, save the new profile
-	-- this won't exist on namespaces.
-	if self.sv.profileKeys then
-		self.sv.profileKeys[charKey] = name
-	end
-
-	-- populate to child namespaces
-	if self.children then
-		for _, db in pairs(self.children) do
-			DBObjectLib.SetProfile(db, name)
-		end
-	end
-
-	-- Callback: OnProfileChanged, database, newProfileKey
-	self.callbacks:Fire("OnProfileChanged", self, name)
-end
-
---- Returns a table with the names of the existing profiles in the database.
--- You can optionally supply a table to re-use for this purpose.
--- @param tbl A table to store the profile names in (optional)
-function DBObjectLib:GetProfiles(tbl)
-	if tbl and type(tbl) ~= "table" then
-		error("Usage: AceDBObject:GetProfiles(tbl): 'tbl' - table or nil expected.", 2)
-	end
-
-	-- Clear the container table
-	if tbl then
-		for k,v in pairs(tbl) do tbl[k] = nil end
-	else
-		tbl = {}
-	end
-
-	local curProfile = self.keys.profile
-
-	local i = 0
-	for profileKey in pairs(self.profiles) do
-		i = i + 1
-		tbl[i] = profileKey
-		if curProfile and profileKey == curProfile then curProfile = nil end
-	end
-
-	-- Add the current profile, if it hasn't been created yet
-	if curProfile then
-		i = i + 1
-		tbl[i] = curProfile
-	end
-
-	return tbl, i
-end
-
---- Returns the current profile name used by the database
-function DBObjectLib:GetCurrentProfile()
-	return self.keys.profile
-end
-
---- Deletes a named profile.  This profile must not be the active profile.
--- @param name The name of the profile to be deleted
--- @param silent If true, do not raise an error when the profile does not exist
-function DBObjectLib:DeleteProfile(name, silent)
-	if type(name) ~= "string" then
-		error("Usage: AceDBObject:DeleteProfile(name): 'name' - string expected.", 2)
-	end
-
-	if self.keys.profile == name then
-		error("Cannot delete the active profile in an AceDBObject.", 2)
-	end
-
-	if not rawget(self.profiles, name) and not silent then
-		error("Cannot delete profile '" .. name .. "'. It does not exist.", 2)
-	end
-
-	self.profiles[name] = nil
-
-	-- populate to child namespaces
-	if self.children then
-		for _, db in pairs(self.children) do
-			DBObjectLib.DeleteProfile(db, name, true)
-		end
-	end
-
-	-- switch all characters that use this profile back to the default
-	if self.sv.profileKeys then
-		for key, profile in pairs(self.sv.profileKeys) do
-			if profile == name then
-				self.sv.profileKeys[key] = nil
-			end
-		end
-	end
-
-	-- Callback: OnProfileDeleted, database, profileKey
-	self.callbacks:Fire("OnProfileDeleted", self, name)
-end
-
---- Copies a named profile into the current profile, overwriting any conflicting
--- settings.
--- @param name The name of the profile to be copied into the current profile
--- @param silent If true, do not raise an error when the profile does not exist
-function DBObjectLib:CopyProfile(name, silent)
-	if type(name) ~= "string" then
-		error("Usage: AceDBObject:CopyProfile(name): 'name' - string expected.", 2)
-	end
-
-	if name == self.keys.profile then
-		error("Cannot have the same source and destination profiles.", 2)
-	end
-
-	if not rawget(self.profiles, name) and not silent then
-		error("Cannot copy profile '" .. name .. "'. It does not exist.", 2)
-	end
-
-	-- Reset the profile before copying
-	DBObjectLib.ResetProfile(self, nil, true)
-
-	local profile = self.profile
-	local source = self.profiles[name]
-
-	copyTable(source, profile)
-
-	-- populate to child namespaces
-	if self.children then
-		for _, db in pairs(self.children) do
-			DBObjectLib.CopyProfile(db, name, true)
-		end
-	end
-
-	-- Callback: OnProfileCopied, database, sourceProfileKey
-	self.callbacks:Fire("OnProfileCopied", self, name)
-end
-
---- Resets the current profile to the default values (if specified).
--- @param noChildren if set to true, the reset will not be populated to the child namespaces of this DB object
--- @param noCallbacks if set to true, won't fire the OnProfileReset callback
-function DBObjectLib:ResetProfile(noChildren, noCallbacks)
-	local profile = self.profile
-
-	for k,v in pairs(profile) do
-		profile[k] = nil
-	end
-
-	local defaults = self.defaults and self.defaults.profile
-	if defaults then
-		copyDefaults(profile, defaults)
-	end
-
-	-- populate to child namespaces
-	if self.children and not noChildren then
-		for _, db in pairs(self.children) do
-			DBObjectLib.ResetProfile(db, nil, noCallbacks)
-		end
-	end
-
-	-- Callback: OnProfileReset, database
-	if not noCallbacks then
-		self.callbacks:Fire("OnProfileReset", self)
-	end
-end
-
---- Resets the entire database, using the string defaultProfile as the new default
--- profile.
--- @param defaultProfile The profile name to use as the default
-function DBObjectLib:ResetDB(defaultProfile)
-	if defaultProfile and type(defaultProfile) ~= "string" then
-		error("Usage: AceDBObject:ResetDB(defaultProfile): 'defaultProfile' - string or nil expected.", 2)
-	end
-
-	local sv = self.sv
-	for k,v in pairs(sv) do
-		sv[k] = nil
-	end
-
-	local parent = self.parent
-
-	initdb(sv, self.defaults, defaultProfile, self)
-
-	-- fix the child namespaces
-	if self.children then
-		if not sv.namespaces then sv.namespaces = {} end
-		for name, db in pairs(self.children) do
-			if not sv.namespaces[name] then sv.namespaces[name] = {} end
-			initdb(sv.namespaces[name], db.defaults, self.keys.profile, db, self)
-		end
-	end
-
-	-- Callback: OnDatabaseReset, database
-	self.callbacks:Fire("OnDatabaseReset", self)
-	-- Callback: OnProfileChanged, database, profileKey
-	self.callbacks:Fire("OnProfileChanged", self, self.keys["profile"])
-
-	return self
-end
-
---- Creates a new database namespace, directly tied to the database.  This
--- is a full scale database in it's own rights other than the fact that
--- it cannot control its profile individually
--- @param name The name of the new namespace
--- @param defaults A table of values to use as defaults
-function DBObjectLib:RegisterNamespace(name, defaults)
-	if type(name) ~= "string" then
-		error("Usage: AceDBObject:RegisterNamespace(name, defaults): 'name' - string expected.", 2)
-	end
-	if defaults and type(defaults) ~= "table" then
-		error("Usage: AceDBObject:RegisterNamespace(name, defaults): 'defaults' - table or nil expected.", 2)
-	end
-	if self.children and self.children[name] then
-		error ("Usage: AceDBObject:RegisterNamespace(name, defaults): 'name' - a namespace with that name already exists.", 2)
-	end
-
-	local sv = self.sv
-	if not sv.namespaces then sv.namespaces = {} end
-	if not sv.namespaces[name] then
-		sv.namespaces[name] = {}
-	end
-
-	local newDB = initdb(sv.namespaces[name], defaults, self.keys.profile, nil, self)
-
-	if not self.children then self.children = {} end
-	self.children[name] = newDB
-	return newDB
-end
-
---- Returns an already existing namespace from the database object.
--- @param name The name of the new namespace
--- @param silent if true, the addon is optional, silently return nil if its not found
--- @usage
--- local namespace = self.db:GetNamespace('namespace')
--- @return the namespace object if found
-function DBObjectLib:GetNamespace(name, silent)
-	if type(name) ~= "string" then
-		error("Usage: AceDBObject:GetNamespace(name): 'name' - string expected.", 2)
-	end
-	if not silent and not (self.children and self.children[name]) then
-		error ("Usage: AceDBObject:GetNamespace(name): 'name' - namespace does not exist.", 2)
-	end
-	if not self.children then self.children = {} end
-	return self.children[name]
-end
-
---[[-------------------------------------------------------------------------
-	AceDB Exposed Methods
----------------------------------------------------------------------------]]
-
---- Creates a new database object that can be used to handle database settings and profiles.
--- By default, an empty DB is created, using a character specific profile.
---
--- You can override the default profile used by passing any profile name as the third argument,
--- or by passing //true// as the third argument to use a globally shared profile called "Default".
---
--- Note that there is no token replacement in the default profile name, passing a defaultProfile as "char"
--- will use a profile named "char", and not a character-specific profile.
--- @param tbl The name of variable, or table to use for the database
--- @param defaults A table of database defaults
--- @param defaultProfile The name of the default profile. If not set, a character specific profile will be used as the default.
--- You can also pass //true// to use a shared global profile called "Default".
--- @usage
--- -- Create an empty DB using a character-specific default profile.
--- self.db = LibStub("AceDB-3.0"):New("MyAddonDB")
--- @usage
--- -- Create a DB using defaults and using a shared default profile
--- self.db = LibStub("AceDB-3.0"):New("MyAddonDB", defaults, true)
-function AceDB:New(tbl, defaults, defaultProfile)
-	if type(tbl) == "string" then
-		local name = tbl
-		tbl = _G[name]
-		if not tbl then
-			tbl = {}
-			_G[name] = tbl
-		end
-	end
-
-	if type(tbl) ~= "table" then
-		error("Usage: AceDB:New(tbl, defaults, defaultProfile): 'tbl' - table expected.", 2)
-	end
-
-	if defaults and type(defaults) ~= "table" then
-		error("Usage: AceDB:New(tbl, defaults, defaultProfile): 'defaults' - table expected.", 2)
-	end
-
-	if defaultProfile and type(defaultProfile) ~= "string" and defaultProfile ~= true then
-		error("Usage: AceDB:New(tbl, defaults, defaultProfile): 'defaultProfile' - string or true expected.", 2)
-	end
-
-	return initdb(tbl, defaults, defaultProfile)
-end
-
--- upgrade existing databases
-for db in pairs(AceDB.db_registry) do
-	if not db.parent then
-		for name,func in pairs(DBObjectLib) do
-			db[name] = func
-		end
-	else
-		db.RegisterDefaults = DBObjectLib.RegisterDefaults
-		db.ResetProfile = DBObjectLib.ResetProfile
-	end
-end
diff --git a/OrderHallCommander/libs/LibInit/Ace3/AceDB-3.0/AceDB-3.0.xml b/OrderHallCommander/libs/LibInit/Ace3/AceDB-3.0/AceDB-3.0.xml
deleted file mode 100644
index 46b20ba..0000000
--- a/OrderHallCommander/libs/LibInit/Ace3/AceDB-3.0/AceDB-3.0.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
-..\FrameXML\UI.xsd">
-	<Script file="AceDB-3.0.lua"/>
-</Ui>
\ No newline at end of file
diff --git a/OrderHallCommander/libs/LibInit/Ace3/AceDBOptions-3.0/AceDBOptions-3.0.lua b/OrderHallCommander/libs/LibInit/Ace3/AceDBOptions-3.0/AceDBOptions-3.0.lua
deleted file mode 100644
index 5028fef..0000000
--- a/OrderHallCommander/libs/LibInit/Ace3/AceDBOptions-3.0/AceDBOptions-3.0.lua
+++ /dev/null
@@ -1,460 +0,0 @@
---- AceDBOptions-3.0 provides a universal AceConfig options screen for managing AceDB-3.0 profiles.
--- @class file
--- @name AceDBOptions-3.0
--- @release $Id: AceDBOptions-3.0.lua 1140 2016-07-03 07:53:29Z nevcairiel $
-local ACEDBO_MAJOR, ACEDBO_MINOR = "AceDBOptions-3.0", 15
-local AceDBOptions, oldminor = LibStub:NewLibrary(ACEDBO_MAJOR, ACEDBO_MINOR)
-
-if not AceDBOptions then return end -- No upgrade needed
-
--- Lua APIs
-local pairs, next = pairs, next
-
--- WoW APIs
-local UnitClass = UnitClass
-
--- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
--- List them here for Mikk's FindGlobals script
--- GLOBALS: NORMAL_FONT_COLOR_CODE, FONT_COLOR_CODE_CLOSE
-
-AceDBOptions.optionTables = AceDBOptions.optionTables or {}
-AceDBOptions.handlers = AceDBOptions.handlers or {}
-
---[[
-	Localization of AceDBOptions-3.0
-]]
-
-local L = {
-	choose = "Existing Profiles",
-	choose_desc = "You can either create a new profile by entering a name in the editbox, or choose one of the already existing profiles.",
-	choose_sub = "Select one of your currently available profiles.",
-	copy = "Copy From",
-	copy_desc = "Copy the settings from one existing profile into the currently active profile.",
-	current = "Current Profile:",
-	default = "Default",
-	delete = "Delete a Profile",
-	delete_confirm = "Are you sure you want to delete the selected profile?",
-	delete_desc = "Delete existing and unused profiles from the database to save space, and cleanup the SavedVariables file.",
-	delete_sub = "Deletes a profile from the database.",
-	intro = "You can change the active database profile, so you can have different settings for every character.",
-	new = "New",
-	new_sub = "Create a new empty profile.",
-	profiles = "Profiles",
-	profiles_sub = "Manage Profiles",
-	reset = "Reset Profile",
-	reset_desc = "Reset the current profile back to its default values, in case your configuration is broken, or you simply want to start over.",
-	reset_sub = "Reset the current profile to the default",
-}
-
-local LOCALE = GetLocale()
-if LOCALE == "deDE" then
-	L["choose"] = "Vorhandene Profile"
-	L["choose_desc"] = "Du kannst ein neues Profil erstellen, indem du einen neuen Namen in der Eingabebox 'Neu' eingibst, oder wähle eines der vorhandenen Profile aus."
-	L["choose_sub"] = "Wählt ein bereits vorhandenes Profil aus."
-	L["copy"] = "Kopieren von..."
-	L["copy_desc"] = "Kopiere die Einstellungen von einem vorhandenen Profil in das aktive Profil."
-	L["current"] = "Aktuelles Profil:"
-	L["default"] = "Standard"
-	L["delete"] = "Profil löschen"
-	L["delete_confirm"] = "Willst du das ausgewählte Profil wirklich löschen?"
-	L["delete_desc"] = "Lösche vorhandene oder unbenutzte Profile aus der Datenbank, um Platz zu sparen und die SavedVariables-Datei 'sauber' zu halten."
-	L["delete_sub"] = "Löscht ein Profil aus der Datenbank."
-	L["intro"] = "Hier kannst du das aktive Datenbankprofil ändern, damit du verschiedene Einstellungen für jeden Charakter erstellen kannst, wodurch eine sehr flexible Konfiguration möglich wird."
-	L["new"] = "Neu"
-	L["new_sub"] = "Ein neues Profil erstellen."
-	L["profiles"] = "Profile"
-	L["profiles_sub"] = "Profile verwalten"
-	L["reset"] = "Profil zurücksetzen"
-	L["reset_desc"] = "Setzt das momentane Profil auf Standardwerte zurück, für den Fall, dass mit der Konfiguration etwas schief lief oder weil du einfach neu starten willst."
-	L["reset_sub"] = "Das aktuelle Profil auf Standard zurücksetzen."
-elseif LOCALE == "frFR" then
-	L["choose"] = "Profils existants"
-	L["choose_desc"] = "Vous pouvez créer un nouveau profil en entrant un nouveau nom dans la boîte de saisie, ou en choississant un des profils déjà existants."
-	L["choose_sub"] = "Permet de choisir un des profils déjà disponibles."
-	L["copy"] = "Copier à partir de"
-	L["copy_desc"] = "Copie les paramètres d'un profil déjà existant dans le profil actuellement actif."
-	L["current"] = "Profil actuel :"
-	L["default"] = "Défaut"
-	L["delete"] = "Supprimer un profil"
-	L["delete_confirm"] = "Etes-vous sûr de vouloir supprimer le profil sélectionné ?"
-	L["delete_desc"] = "Supprime les profils existants inutilisés de la base de données afin de gagner de la place et de nettoyer le fichier SavedVariables."
-	L["delete_sub"] = "Supprime un profil de la base de données."
-	L["intro"] = "Vous pouvez changer le profil actuel afin d'avoir des paramètres différents pour chaque personnage, permettant ainsi d'avoir une configuration très flexible."
-	L["new"] = "Nouveau"
-	L["new_sub"] = "Créée un nouveau profil vierge."
-	L["profiles"] = "Profils"
-	L["profiles_sub"] = "Gestion des profils"
-	L["reset"] = "Réinitialiser le profil"
-	L["reset_desc"] = "Réinitialise le profil actuel au cas où votre configuration est corrompue ou si vous voulez tout simplement faire table rase."
-	L["reset_sub"] = "Réinitialise le profil actuel avec les paramètres par défaut."
-elseif LOCALE == "koKR" then
-	L["choose"] = "저장 중인 프로필"
-	L["choose_desc"] = "입력창에 새로운 이름을 입력하거나 저장 중인 프로필 중 하나를 선택하여 새로운 프로필을 만들 수 있습니다."
-	L["choose_sub"] = "현재 이용할 수 있는 프로필 중 하나를 선택합니다."
-	L["copy"] = "복사해오기"
-	L["copy_desc"] = "현재 사용 중인 프로필에 선택한 프로필의 설정을 복사합니다."
-	L["current"] = "현재 프로필:"
-	L["default"] = "기본값"
-	L["delete"] = "프로필 삭제"
-	L["delete_confirm"] = "정말로 선택한 프로필을 삭제할까요?"
-	L["delete_desc"] = "저장 공간 절약과 SavedVariables 파일의 정리를 위해 데이터베이스에서 사용하지 않는 프로필을 삭제하세요."
-	L["delete_sub"] = "데이터베이스의 프로필을 삭제합니다."
-	L["intro"] = "활성 데이터베이스 프로필을 변경할 수 있고, 각 캐릭터 별로 다른 설정을 할 수 있습니다."
-	L["new"] = "새로운 프로필"
-	L["new_sub"] = "새로운 프로필을 만듭니다."
-	L["profiles"] = "프로필"
-	L["profiles_sub"] = "프로필 관리"
-	L["reset"] = "프로필 초기화"
-	L["reset_desc"] = "설정이 깨졌거나 처음부터 다시 설정을 원하는 경우, 현재 프로필을 기본값으로 초기화하세요."
-	L["reset_sub"] = "현재 프로필을 기본값으로 초기화합니다"
-elseif LOCALE == "esES" or LOCALE == "esMX" then
-	L["choose"] = "Perfiles existentes"
-	L["choose_desc"] = "Puedes crear un nuevo perfil introduciendo un nombre en el recuadro o puedes seleccionar un perfil de los ya existentes."
-	L["choose_sub"] = "Selecciona uno de los perfiles disponibles."
-	L["copy"] = "Copiar de"
-	L["copy_desc"] = "Copia los ajustes de un perfil existente al perfil actual."
-	L["current"] = "Perfil actual:"
-	L["default"] = "Por defecto"
-	L["delete"] = "Borrar un Perfil"
-	L["delete_confirm"] = "¿Estas seguro que quieres borrar el perfil seleccionado?"
-	L["delete_desc"] = "Borra los perfiles existentes y sin uso de la base de datos para ganar espacio y limpiar el archivo SavedVariables."
-	L["delete_sub"] = "Borra un perfil de la base de datos."
-	L["intro"] = "Puedes cambiar el perfil activo de tal manera que cada personaje tenga diferentes configuraciones."
-	L["new"] = "Nuevo"
-	L["new_sub"] = "Crear un nuevo perfil vacio."
-	L["profiles"] = "Perfiles"
-	L["profiles_sub"] = "Manejar Perfiles"
-	L["reset"] = "Reiniciar Perfil"
-	L["reset_desc"] = "Reinicia el perfil actual a los valores por defectos, en caso de que se haya estropeado la configuración o quieras volver a empezar de nuevo."
-	L["reset_sub"] = "Reinicar el perfil actual al de por defecto"
-elseif LOCALE == "zhTW" then
-	L["choose"] = "現有的設定檔"
-	L["choose_desc"] = "您可以在文字方塊內輸入名字以建立新的設定檔，或是選擇一個現有的設定檔使用。"
-	L["choose_sub"] = "從當前可用的設定檔裡面選擇一個。"
-	L["copy"] = "複製自"
-	L["copy_desc"] = "從一個現有的設定檔，將設定複製到現在使用中的設定檔。"
-	L["current"] = "目前設定檔："
-	L["default"] = "預設"
-	L["delete"] = "刪除一個設定檔"
-	L["delete_confirm"] = "確定要刪除所選擇的設定檔嗎？"
-	L["delete_desc"] = "從資料庫裡刪除不再使用的設定檔，以節省空間，並且清理 SavedVariables 檔案。"
-	L["delete_sub"] = "從資料庫裡刪除一個設定檔。"
-	L["intro"] = "您可以從資料庫中選擇一個設定檔來使用，如此就可以讓每個角色使用不同的設定。"
-	L["new"] = "新建"
-	L["new_sub"] = "新建一個空的設定檔。"
-	L["profiles"] = "設定檔"
-	L["profiles_sub"] = "管理設定檔"
-	L["reset"] = "重置設定檔"
-	L["reset_desc"] = "將現用的設定檔重置為預設值；用於設定檔損壞，或者單純想要重來的情況。"
-	L["reset_sub"] = "將目前的設定檔重置為預設值"
-elseif LOCALE == "zhCN" then
-	L["choose"] = "现有的配置文件"
-	L["choose_desc"] = "你可以通过在文本框内输入一个名字创立一个新的配置文件，也可以选择一个已经存在的配置文件。"
-	L["choose_sub"] = "从当前可用的配置文件里面选择一个。"
-	L["copy"] = "复制自"
-	L["copy_desc"] = "从当前某个已保存的配置文件复制到当前正使用的配置文件。"
-	L["current"] = "当前配置文件："
-	L["default"] = "默认"
-	L["delete"] = "删除一个配置文件"
-	L["delete_confirm"] = "你确定要删除所选择的配置文件么？"
-	L["delete_desc"] = "从数据库里删除不再使用的配置文件，以节省空间，并且清理SavedVariables文件。"
-	L["delete_sub"] = "从数据库里删除一个配置文件。"
-	L["intro"] = "你可以选择一个活动的数据配置文件，这样你的每个角色就可以拥有不同的设置值，可以给你的插件配置带来极大的灵活性。"
-	L["new"] = "新建"
-	L["new_sub"] = "新建一个空的配置文件。"
-	L["profiles"] = "配置文件"
-	L["profiles_sub"] = "管理配置文件"
-	L["reset"] = "重置配置文件"
-	L["reset_desc"] = "将当前的配置文件恢复到它的默认值，用于你的配置文件损坏，或者你只是想重来的情况。"
-	L["reset_sub"] = "将当前的配置文件恢复为默认值"
-elseif LOCALE == "ruRU" then
-	L["choose"] = "Существующие профили"
-	L["choose_desc"] = "Вы можете создать новый профиль, введя название в поле ввода, или выбрать один из уже существующих профилей."
-	L["choose_sub"] = "Выбор одиного из уже доступных профилей"
-	L["copy"] = "Скопировать из"
-	L["copy_desc"] = "Скопировать настройки из выбранного профиля в активный."
-	L["current"] = "Текущий профиль:"
-	L["default"] = "По умолчанию"
-	L["delete"] = "Удалить профиль"
-	L["delete_confirm"] = "Вы уверены, что вы хотите удалить выбранный профиль?"
-	L["delete_desc"] = "Удалить существующий и неиспользуемый профиль из БД для сохранения места, и очистить SavedVariables файл."
-	L["delete_sub"] = "Удаление профиля из БД"
-	L["intro"] = "Изменяя активный профиль, вы можете задать различные настройки модификаций для каждого персонажа."
-	L["new"] = "Новый"
-	L["new_sub"] = "Создать новый чистый профиль"
-	L["profiles"] = "Профили"
-	L["profiles_sub"] = "Управление профилями"
-	L["reset"] = "Сброс профиля"
-	L["reset_desc"] = "Сбросить текущий профиль к стандартным настройкам, если ваша конфигурация испорчена или вы хотите настроить всё заново."
-	L["reset_sub"] = "Сброс текущего профиля на стандартный"
-elseif LOCALE == "itIT" then
-	L["choose"] = "Profili Esistenti"
-	L["choose_desc"] = "Puoi creare un nuovo profilo digitando il nome della casella di testo, oppure scegliendone uno tra i profili già esistenti."
-	L["choose_sub"] = "Seleziona uno dei profili attualmente disponibili."
-	L["copy"] = "Copia Da"
-	L["copy_desc"] = "Copia le impostazioni da un profilo esistente, nel profilo attivo in questo momento."
-	L["current"] = "Profilo Attivo:"
-	L["default"] = "Standard"
-	L["delete"] = "Cancella un Profilo"
-	L["delete_confirm"] = "Sei sicuro di voler cancellare il profilo selezionato?"
-	L["delete_desc"] = "Cancella i profili non utilizzati dal database per risparmiare spazio e mantenere puliti i file di configurazione SavedVariables."
-	L["delete_sub"] = "Cancella un profilo dal Database."
-	L["intro"] = "Puoi cambiare il profilo attivo, in modo da usare impostazioni diverse per ogni personaggio."
-	L["new"] = "Nuovo"
-	L["new_sub"] = "Crea un nuovo profilo vuoto."
-	L["profiles"] = "Profili"
-	L["profiles_sub"] = "Gestisci Profili"
-	L["reset"] = "Reimposta Profilo"
-	L["reset_desc"] = "Riporta il tuo profilo attivo alle sue impostazioni predefinite, nel caso in cui la tua configurazione si sia corrotta, o semplicemente tu voglia re-inizializzarla."
-	L["reset_sub"] = "Reimposta il profilo ai suoi valori predefiniti."
-elseif LOCALE == "ptBR" then
-	L["choose"] = "Perfis Existentes"
-	L["choose_desc"] = "Você pode tanto criar um perfil novo tanto digitando um nome na caixa de texto, quanto escolher um dos perfis já existentes."
-	L["choose_sub"] = "Selecione um de seus perfis atualmente disponíveis."
-	L["copy"] = "Copiar De"
-	L["copy_desc"] = "Copia as definições de um perfil existente no perfil atualmente ativo."
-	L["current"] = "Perfil Autal:"
-	L["default"] = "Padrão"
-	L["delete"] = "Remover um Perfil"
-	L["delete_confirm"] = "Tem certeza que deseja remover o perfil selecionado?"
-	L["delete_desc"] = "Remove perfis existentes e inutilizados do banco de dados para economizar espaço, e limpar o arquivo SavedVariables."
-	L["delete_sub"] = "Remove um perfil do banco de dados."
-	L["intro"] = "Você pode alterar o perfil do banco de dados ativo, para que possa ter definições diferentes para cada personagem."
-	L["new"] = "Novo"
-	L["new_sub"] = "Cria um novo perfil vazio."
-	L["profiles"] = "Perfis"
-	L["profiles_sub"] = "Gerenciar Perfis"
-	L["reset"] = "Resetar Perfil"
-	L["reset_desc"] = "Reseta o perfil atual para os valores padrões, no caso de sua configuração estar quebrada, ou simplesmente se deseja começar novamente."
-	L["reset_sub"] = "Resetar o perfil atual ao padrão"
-end
-
-local defaultProfiles
-local tmpprofiles = {}
-
--- Get a list of available profiles for the specified database.
--- You can specify which profiles to include/exclude in the list using the two boolean parameters listed below.
--- @param db The db object to retrieve the profiles from
--- @param common If true, getProfileList will add the default profiles to the return list, even if they have not been created yet
--- @param nocurrent If true, then getProfileList will not display the current profile in the list
--- @return Hashtable of all profiles with the internal name as keys and the display name as value.
-local function getProfileList(db, common, nocurrent)
-	local profiles = {}
-	
-	-- copy existing profiles into the table
-	local currentProfile = db:GetCurrentProfile()
-	for i,v in pairs(db:GetProfiles(tmpprofiles)) do 
-		if not (nocurrent and v == currentProfile) then 
-			profiles[v] = v 
-		end 
-	end
-	
-	-- add our default profiles to choose from ( or rename existing profiles)
-	for k,v in pairs(defaultProfiles) do
-		if (common or profiles[k]) and not (nocurrent and k == currentProfile) then
-			profiles[k] = v
-		end
-	end
-	
-	return profiles
-end
-
---[[
-	OptionsHandlerPrototype
-	prototype class for handling the options in a sane way
-]]
-local OptionsHandlerPrototype = {}
-
---[[ Reset the profile ]]
-function OptionsHandlerPrototype:Reset()
-	self.db:ResetProfile()
-end
-
---[[ Set the profile to value ]]
-function OptionsHandlerPrototype:SetProfile(info, value)
-	self.db:SetProfile(value)
-end
-
---[[ returns the currently active profile ]]
-function OptionsHandlerPrototype:GetCurrentProfile()
-	return self.db:GetCurrentProfile()
-end
-
---[[ 
-	List all active profiles
-	you can control the output with the .arg variable
-	currently four modes are supported
-	
-	(empty) - return all available profiles
-	"nocurrent" - returns all available profiles except the currently active profile
-	"common" - returns all avaialble profiles + some commonly used profiles ("char - realm", "realm", "class", "Default")
-	"both" - common except the active profile
-]]
-function OptionsHandlerPrototype:ListProfiles(info)
-	local arg = info.arg
-	local profiles
-	if arg == "common" and not self.noDefaultProfiles then
-		profiles = getProfileList(self.db, true, nil)
-	elseif arg == "nocurrent" then
-		profiles = getProfileList(self.db, nil, true)
-	elseif arg == "both" then -- currently not used
-		profiles = getProfileList(self.db, (not self.noDefaultProfiles) and true, true)
-	else
-		profiles = getProfileList(self.db)
-	end
-	
-	return profiles
-end
-
-function OptionsHandlerPrototype:HasNoProfiles(info)
-	local profiles = self:ListProfiles(info)
-	return ((not next(profiles)) and true or false)
-end
-
---[[ Copy a profile ]]
-function OptionsHandlerPrototype:CopyProfile(info, value)
-	self.db:CopyProfile(value)
-end
-
---[[ Delete a profile from the db ]]
-function OptionsHandlerPrototype:DeleteProfile(info, value)
-	self.db:DeleteProfile(value)
-end
-
---[[ fill defaultProfiles with some generic values ]]
-local function generateDefaultProfiles(db)
-	defaultProfiles = {
-		["Default"] = L["default"],
-		[db.keys.char] = db.keys.char,
-		[db.keys.realm] = db.keys.realm,
-		[db.keys.class] = UnitClass("player")
-	}
-end
-
---[[ create and return a handler object for the db, or upgrade it if it already existed ]]
-local function getOptionsHandler(db, noDefaultProfiles)
-	if not defaultProfiles then
-		generateDefaultProfiles(db)
-	end
-	
-	local handler = AceDBOptions.handlers[db] or { db = db, noDefaultProfiles = noDefaultProfiles }
-	
-	for k,v in pairs(OptionsHandlerPrototype) do
-		handler[k] = v
-	end
-	
-	AceDBOptions.handlers[db] = handler
-	return handler
-end
-
---[[
-	the real options table 
-]]
-local optionsTable = {
-	desc = {
-		order = 1,
-		type = "description",
-		name = L["intro"] .. "\n",
-	},
-	descreset = {
-		order = 9,
-		type = "description",
-		name = L["reset_desc"],
-	},
-	reset = {
-		order = 10,
-		type = "execute",
-		name = L["reset"],
-		desc = L["reset_sub"],
-		func = "Reset",
-	},
-	current = {
-		order = 11,
-		type = "description",
-		name = function(info) return L["current"] .. " " .. NORMAL_FONT_COLOR_CODE .. info.handler:GetCurrentProfile() .. FONT_COLOR_CODE_CLOSE end,
-		width = "default",
-	},
-	choosedesc = {
-		order = 20,
-		type = "description",
-		name = "\n" .. L["choose_desc"],
-	},
-	new = {
-		name = L["new"],
-		desc = L["new_sub"],
-		type = "input",
-		order = 30,
-		get = false,
-		set = "SetProfile",
-	},
-	choose = {
-		name = L["choose"],
-		desc = L["choose_sub"],
-		type = "select",
-		order = 40,
-		get = "GetCurrentProfile",
-		set = "SetProfile",
-		values = "ListProfiles",
-		arg = "common",
-	},
-	copydesc = {
-		order = 50,
-		type = "description",
-		name = "\n" .. L["copy_desc"],
-	},
-	copyfrom = {
-		order = 60,
-		type = "select",
-		name = L["copy"],
-		desc = L["copy_desc"],
-		get = false,
-		set = "CopyProfile",
-		values = "ListProfiles",
-		disabled = "HasNoProfiles",
-		arg = "nocurrent",
-	},
-	deldesc = {
-		order = 70,
-		type = "description",
-		name = "\n" .. L["delete_desc"],
-	},
-	delete = {
-		order = 80,
-		type = "select",
-		name = L["delete"],
-		desc = L["delete_sub"],
-		get = false,
-		set = "DeleteProfile",
-		values = "ListProfiles",
-		disabled = "HasNoProfiles",
-		arg = "nocurrent",
-		confirm = true,
-		confirmText = L["delete_confirm"],
-	},
-}
-
---- Get/Create a option table that you can use in your addon to control the profiles of AceDB-3.0.
--- @param db The database object to create the options table for.
--- @return The options table to be used in AceConfig-3.0
--- @usage 
--- -- Assuming `options` is your top-level options table and `self.db` is your database:
--- options.args.profiles = LibStub("AceDBOptions-3.0"):GetOptionsTable(self.db)
-function AceDBOptions:GetOptionsTable(db, noDefaultProfiles)
-	local tbl = AceDBOptions.optionTables[db] or {
-			type = "group",
-			name = L["profiles"],
-			desc = L["profiles_sub"],
-		}
-	
-	tbl.handler = getOptionsHandler(db, noDefaultProfiles)
-	tbl.args = optionsTable
-
-	AceDBOptions.optionTables[db] = tbl
-	return tbl
-end
-
--- upgrade existing tables
-for db,tbl in pairs(AceDBOptions.optionTables) do
-	tbl.handler = getOptionsHandler(db)
-	tbl.args = optionsTable
-end
diff --git a/OrderHallCommander/libs/LibInit/Ace3/AceDBOptions-3.0/AceDBOptions-3.0.xml b/OrderHallCommander/libs/LibInit/Ace3/AceDBOptions-3.0/AceDBOptions-3.0.xml
deleted file mode 100644
index 2668fb0..0000000
--- a/OrderHallCommander/libs/LibInit/Ace3/AceDBOptions-3.0/AceDBOptions-3.0.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
-..\FrameXML\UI.xsd">
-	<Script file="AceDBOptions-3.0.lua"/>
-</Ui>
\ No newline at end of file
diff --git a/OrderHallCommander/libs/LibInit/Ace3/AceEvent-3.0/AceEvent-3.0.lua b/OrderHallCommander/libs/LibInit/Ace3/AceEvent-3.0/AceEvent-3.0.lua
deleted file mode 100644
index 578ae25..0000000
--- a/OrderHallCommander/libs/LibInit/Ace3/AceEvent-3.0/AceEvent-3.0.lua
+++ /dev/null
@@ -1,126 +0,0 @@
---- AceEvent-3.0 provides event registration and secure dispatching.
--- All dispatching is done using **CallbackHandler-1.0**. AceEvent is a simple wrapper around
--- CallbackHandler, and dispatches all game events or addon message to the registrees.
---
--- **AceEvent-3.0** can be embeded into your addon, either explicitly by calling AceEvent:Embed(MyAddon) or by 
--- specifying it as an embeded library in your AceAddon. All functions will be available on your addon object
--- and can be accessed directly, without having to explicitly call AceEvent itself.\\
--- It is recommended to embed AceEvent, otherwise you'll have to specify a custom `self` on all calls you
--- make into AceEvent.
--- @class file
--- @name AceEvent-3.0
--- @release $Id: AceEvent-3.0.lua 975 2010-10-23 11:26:18Z nevcairiel $
-local MAJOR, MINOR = "AceEvent-3.0", 3
-local AceEvent = LibStub:NewLibrary(MAJOR, MINOR)
-
-if not AceEvent then return end
-
--- Lua APIs
-local pairs = pairs
-
-local CallbackHandler = LibStub:GetLibrary("CallbackHandler-1.0")
-
-AceEvent.frame = AceEvent.frame or CreateFrame("Frame", "AceEvent30Frame") -- our event frame
-AceEvent.embeds = AceEvent.embeds or {} -- what objects embed this lib
-
--- APIs and registry for blizzard events, using CallbackHandler lib
-if not AceEvent.events then
-	AceEvent.events = CallbackHandler:New(AceEvent, 
-		"RegisterEvent", "UnregisterEvent", "UnregisterAllEvents")
-end
-
-function AceEvent.events:OnUsed(target, eventname) 
-	AceEvent.frame:RegisterEvent(eventname)
-end
-
-function AceEvent.events:OnUnused(target, eventname) 
-	AceEvent.frame:UnregisterEvent(eventname)
-end
-
-
--- APIs and registry for IPC messages, using CallbackHandler lib
-if not AceEvent.messages then
-	AceEvent.messages = CallbackHandler:New(AceEvent, 
-		"RegisterMessage", "UnregisterMessage", "UnregisterAllMessages"
-	)
-	AceEvent.SendMessage = AceEvent.messages.Fire
-end
-
---- embedding and embed handling
-local mixins = {
-	"RegisterEvent", "UnregisterEvent",
-	"RegisterMessage", "UnregisterMessage",
-	"SendMessage",
-	"UnregisterAllEvents", "UnregisterAllMessages",
-}
-
---- Register for a Blizzard Event.
--- The callback will be called with the optional `arg` as the first argument (if supplied), and the event name as the second (or first, if no arg was supplied)
--- Any arguments to the event will be passed on after that.
--- @name AceEvent:RegisterEvent
--- @class function
--- @paramsig event[, callback [, arg]]
--- @param event The event to register for
--- @param callback The callback function to call when the event is triggered (funcref or method, defaults to a method with the event name)
--- @param arg An optional argument to pass to the callback function
-
---- Unregister an event.
--- @name AceEvent:UnregisterEvent
--- @class function
--- @paramsig event
--- @param event The event to unregister
-
---- Register for a custom AceEvent-internal message.
--- The callback will be called with the optional `arg` as the first argument (if supplied), and the event name as the second (or first, if no arg was supplied)
--- Any arguments to the event will be passed on after that.
--- @name AceEvent:RegisterMessage
--- @class function
--- @paramsig message[, callback [, arg]]
--- @param message The message to register for
--- @param callback The callback function to call when the message is triggered (funcref or method, defaults to a method with the event name)
--- @param arg An optional argument to pass to the callback function
-
---- Unregister a message
--- @name AceEvent:UnregisterMessage
--- @class function
--- @paramsig message
--- @param message The message to unregister
-
---- Send a message over the AceEvent-3.0 internal message system to other addons registered for this message.
--- @name AceEvent:SendMessage
--- @class function
--- @paramsig message, ...
--- @param message The message to send
--- @param ... Any arguments to the message
-
-
--- Embeds AceEvent into the target object making the functions from the mixins list available on target:..
--- @param target target object to embed AceEvent in
-function AceEvent:Embed(target)
-	for k, v in pairs(mixins) do
-		target[v] = self[v]
-	end
-	self.embeds[target] = true
-	return target
-end
-
--- AceEvent:OnEmbedDisable( target )
--- target (object) - target object that is being disabled
---
--- Unregister all events messages etc when the target disables.
--- this method should be called by the target manually or by an addon framework
-function AceEvent:OnEmbedDisable(target)
-	target:UnregisterAllEvents()
-	target:UnregisterAllMessages()
-end
-
--- Script to fire blizzard events into the event listeners
-local events = AceEvent.events
-AceEvent.frame:SetScript("OnEvent", function(this, event, ...)
-	events:Fire(event, ...)
-end)
-
---- Finally: upgrade our old embeds
-for target, v in pairs(AceEvent.embeds) do
-	AceEvent:Embed(target)
-end
diff --git a/OrderHallCommander/libs/LibInit/Ace3/AceEvent-3.0/AceEvent-3.0.xml b/OrderHallCommander/libs/LibInit/Ace3/AceEvent-3.0/AceEvent-3.0.xml
deleted file mode 100644
index 313ef4d..0000000
--- a/OrderHallCommander/libs/LibInit/Ace3/AceEvent-3.0/AceEvent-3.0.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
-..\FrameXML\UI.xsd">
-	<Script file="AceEvent-3.0.lua"/>
-</Ui>
\ No newline at end of file
diff --git a/OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/AceGUI-3.0.lua b/OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/AceGUI-3.0.lua
deleted file mode 100644
index 9853644..0000000
--- a/OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/AceGUI-3.0.lua
+++ /dev/null
@@ -1,813 +0,0 @@
---- **AceGUI-3.0** provides access to numerous widgets which can be used to create GUIs.
--- AceGUI is used by AceConfigDialog to create the option GUIs, but you can use it by itself
--- to create any custom GUI. There are more extensive examples in the test suite in the Ace3 
--- stand-alone distribution.
---
--- **Note**: When using AceGUI-3.0 directly, please do not modify the frames of the widgets directly,
--- as any "unknown" change to the widgets will cause addons that get your widget out of the widget pool
--- to misbehave. If you think some part of a widget should be modifiable, please open a ticket, and we"ll
--- implement a proper API to modify it.
--- @usage
--- local AceGUI = LibStub("AceGUI-3.0")
--- -- Create a container frame
--- local f = AceGUI:Create("Frame")
--- f:SetCallback("OnClose",function(widget) AceGUI:Release(widget) end)
--- f:SetTitle("AceGUI-3.0 Example")
--- f:SetStatusText("Status Bar")
--- f:SetLayout("Flow")
--- -- Create a button
--- local btn = AceGUI:Create("Button")
--- btn:SetWidth(170)
--- btn:SetText("Button !")
--- btn:SetCallback("OnClick", function() print("Click!") end)
--- -- Add the button to the container
--- f:AddChild(btn)
--- @class file
--- @name AceGUI-3.0
--- @release $Id: AceGUI-3.0.lua 1102 2013-10-25 14:15:23Z nevcairiel $
-local ACEGUI_MAJOR, ACEGUI_MINOR = "AceGUI-3.0", 34
-local AceGUI, oldminor = LibStub:NewLibrary(ACEGUI_MAJOR, ACEGUI_MINOR)
-
-if not AceGUI then return end -- No upgrade needed
-
--- Lua APIs
-local tconcat, tremove, tinsert = table.concat, table.remove, table.insert
-local select, pairs, next, type = select, pairs, next, type
-local error, assert, loadstring = error, assert, loadstring
-local setmetatable, rawget, rawset = setmetatable, rawget, rawset
-local math_max = math.max
-
--- WoW APIs
-local UIParent = UIParent
-
--- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
--- List them here for Mikk's FindGlobals script
--- GLOBALS: geterrorhandler, LibStub
-
---local con = LibStub("AceConsole-3.0",true)
-
-AceGUI.WidgetRegistry = AceGUI.WidgetRegistry or {}
-AceGUI.LayoutRegistry = AceGUI.LayoutRegistry or {}
-AceGUI.WidgetBase = AceGUI.WidgetBase or {}
-AceGUI.WidgetContainerBase = AceGUI.WidgetContainerBase or {}
-AceGUI.WidgetVersions = AceGUI.WidgetVersions or {}
- 
--- local upvalues
-local WidgetRegistry = AceGUI.WidgetRegistry
-local LayoutRegistry = AceGUI.LayoutRegistry
-local WidgetVersions = AceGUI.WidgetVersions
-
---[[
-	 xpcall safecall implementation
-]]
-local xpcall = xpcall
-
-local function errorhandler(err)
-	return geterrorhandler()(err)
-end
-
-local function CreateDispatcher(argCount)
-	local code = [[
-		local xpcall, eh = ...
-		local method, ARGS
-		local function call() return method(ARGS) end
-	
-		local function dispatch(func, ...)
-			method = func
-			if not method then return end
-			ARGS = ...
-			return xpcall(call, eh)
-		end
-	
-		return dispatch
-	]]
-	
-	local ARGS = {}
-	for i = 1, argCount do ARGS[i] = "arg"..i end
-	code = code:gsub("ARGS", tconcat(ARGS, ", "))
-	return assert(loadstring(code, "safecall Dispatcher["..argCount.."]"))(xpcall, errorhandler)
-end
-
-local Dispatchers = setmetatable({}, {__index=function(self, argCount)
-	local dispatcher = CreateDispatcher(argCount)
-	rawset(self, argCount, dispatcher)
-	return dispatcher
-end})
-Dispatchers[0] = function(func)
-	return xpcall(func, errorhandler)
-end
- 
-local function safecall(func, ...)
-	return Dispatchers[select("#", ...)](func, ...)
-end
-
--- Recycling functions
-local newWidget, delWidget
-do
-	-- Version Upgrade in Minor 29
-	-- Internal Storage of the objects changed, from an array table
-	-- to a hash table, and additionally we introduced versioning on
-	-- the widgets which would discard all widgets from a pre-29 version
-	-- anyway, so we just clear the storage now, and don't try to 
-	-- convert the storage tables to the new format.
-	-- This should generally not cause *many* widgets to end up in trash,
-	-- since once dialogs are opened, all addons should be loaded already
-	-- and AceGUI should be on the latest version available on the users
-	-- setup.
-	-- -- nevcairiel - Nov 2nd, 2009
-	if oldminor and oldminor < 29 and AceGUI.objPools then
-		AceGUI.objPools = nil
-	end
-	
-	AceGUI.objPools = AceGUI.objPools or {}
-	local objPools = AceGUI.objPools
-	--Returns a new instance, if none are available either returns a new table or calls the given contructor
-	function newWidget(type)
-		if not WidgetRegistry[type] then
-			error("Attempt to instantiate unknown widget type", 2)
-		end
-		
-		if not objPools[type] then
-			objPools[type] = {}
-		end
-		
-		local newObj = next(objPools[type])
-		if not newObj then
-			newObj = WidgetRegistry[type]()
-			newObj.AceGUIWidgetVersion = WidgetVersions[type]
-		else
-			objPools[type][newObj] = nil
-			-- if the widget is older then the latest, don't even try to reuse it
-			-- just forget about it, and grab a new one.
-			if not newObj.AceGUIWidgetVersion or newObj.AceGUIWidgetVersion < WidgetVersions[type] then
-				return newWidget(type)
-			end
-		end
-		return newObj
-	end
-	-- Releases an instance to the Pool
-	function delWidget(obj,type)
-		if not objPools[type] then
-			objPools[type] = {}
-		end
-		if objPools[type][obj] then
-			error("Attempt to Release Widget that is already released", 2)
-		end
-		objPools[type][obj] = true
-	end
-end
-
-
--------------------
--- API Functions --
--------------------
-
--- Gets a widget Object
-
---- Create a new Widget of the given type.
--- This function will instantiate a new widget (or use one from the widget pool), and call the
--- OnAcquire function on it, before returning.
--- @param type The type of the widget.
--- @return The newly created widget.
-function AceGUI:Create(type)
-	if WidgetRegistry[type] then
-		local widget = newWidget(type)
-
-		if rawget(widget, "Acquire") then
-			widget.OnAcquire = widget.Acquire
-			widget.Acquire = nil
-		elseif rawget(widget, "Aquire") then
-			widget.OnAcquire = widget.Aquire
-			widget.Aquire = nil
-		end
-		
-		if rawget(widget, "Release") then
-			widget.OnRelease = rawget(widget, "Release") 
-			widget.Release = nil
-		end
-		
-		if widget.OnAcquire then
-			widget:OnAcquire()
-		else
-			error(("Widget type %s doesn't supply an OnAcquire Function"):format(type))
-		end
-		-- Set the default Layout ("List")
-		safecall(widget.SetLayout, widget, "List")
-		safecall(widget.ResumeLayout, widget)
-		return widget
-	end
-end
-
---- Releases a widget Object.
--- This function calls OnRelease on the widget and places it back in the widget pool.
--- Any data on the widget is being erased, and the widget will be hidden.\\
--- If this widget is a Container-Widget, all of its Child-Widgets will be releases as well.
--- @param widget The widget to release
-function AceGUI:Release(widget)
-	safecall(widget.PauseLayout, widget)
-	widget:Fire("OnRelease")
-	safecall(widget.ReleaseChildren, widget)
-
-	if widget.OnRelease then
-		widget:OnRelease()
---	else
---		error(("Widget type %s doesn't supply an OnRelease Function"):format(widget.type))
-	end
-	for k in pairs(widget.userdata) do
-		widget.userdata[k] = nil
-	end
-	for k in pairs(widget.events) do
-		widget.events[k] = nil
-	end
-	widget.width = nil
-	widget.relWidth = nil
-	widget.height = nil
-	widget.relHeight = nil
-	widget.noAutoHeight = nil
-	widget.frame:ClearAllPoints()
-	widget.frame:Hide()
-	widget.frame:SetParent(UIParent)
-	widget.frame.width = nil
-	widget.frame.height = nil
-	if widget.content then
-		widget.content.width = nil
-		widget.content.height = nil
-	end
-	delWidget(widget, widget.type)
-end
-
------------
--- Focus --
------------
-
-
---- Called when a widget has taken focus.
--- e.g. Dropdowns opening, Editboxes gaining kb focus
--- @param widget The widget that should be focused
-function AceGUI:SetFocus(widget)
-	if self.FocusedWidget and self.FocusedWidget ~= widget then
-		safecall(self.FocusedWidget.ClearFocus, self.FocusedWidget)
-	end
-	self.FocusedWidget = widget
-end
-
-
---- Called when something has happened that could cause widgets with focus to drop it
--- e.g. titlebar of a frame being clicked
-function AceGUI:ClearFocus()
-	if self.FocusedWidget then
-		safecall(self.FocusedWidget.ClearFocus, self.FocusedWidget)
-		self.FocusedWidget = nil
-	end
-end
-
--------------
--- Widgets --
--------------
---[[
-	Widgets must provide the following functions
-		OnAcquire() - Called when the object is acquired, should set everything to a default hidden state
-		
-	And the following members
-		frame - the frame or derivitive object that will be treated as the widget for size and anchoring purposes
-		type - the type of the object, same as the name given to :RegisterWidget()
-		
-	Widgets contain a table called userdata, this is a safe place to store data associated with the wigdet
-	It will be cleared automatically when a widget is released
-	Placing values directly into a widget object should be avoided
-	
-	If the Widget can act as a container for other Widgets the following
-		content - frame or derivitive that children will be anchored to
-		
-	The Widget can supply the following Optional Members
-		:OnRelease() - Called when the object is Released, should remove any additional anchors and clear any data
-		:OnWidthSet(width) - Called when the width of the widget is changed
-		:OnHeightSet(height) - Called when the height of the widget is changed
-			Widgets should not use the OnSizeChanged events of thier frame or content members, use these methods instead
-			AceGUI already sets a handler to the event
-		:LayoutFinished(width, height) - called after a layout has finished, the width and height will be the width and height of the
-			area used for controls. These can be nil if the layout used the existing size to layout the controls.
-
-]]
-
---------------------------
--- Widget Base Template --
---------------------------
-do
-	local WidgetBase = AceGUI.WidgetBase 
-	
-	WidgetBase.SetParent = function(self, parent)
-		local frame = self.frame
-		frame:SetParent(nil)
-		frame:SetParent(parent.content)
-		self.parent = parent
-	end
-	
-	WidgetBase.SetCallback = function(self, name, func)
-		if type(func) == "function" then
-			self.events[name] = func
-		end
-	end
-	
-	WidgetBase.Fire = function(self, name, ...)
-		if self.events[name] then
-			local success, ret = safecall(self.events[name], self, name, ...)
-			if success then
-				return ret
-			end
-		end
-	end
-	
-	WidgetBase.SetWidth = function(self, width)
-		self.frame:SetWidth(width)
-		self.frame.width = width
-		if self.OnWidthSet then
-			self:OnWidthSet(width)
-		end
-	end
-	
-	WidgetBase.SetRelativeWidth = function(self, width)
-		if width <= 0 or width > 1 then
-			error(":SetRelativeWidth(width): Invalid relative width.", 2)
-		end
-		self.relWidth = width
-		self.width = "relative"
-	end
-	
-	WidgetBase.SetHeight = function(self, height)
-		self.frame:SetHeight(height)
-		self.frame.height = height
-		if self.OnHeightSet then
-			self:OnHeightSet(height)
-		end
-	end
-	
-	--[[ WidgetBase.SetRelativeHeight = function(self, height)
-		if height <= 0 or height > 1 then
-			error(":SetRelativeHeight(height): Invalid relative height.", 2)
-		end
-		self.relHeight = height
-		self.height = "relative"
-	end ]]
-
-	WidgetBase.IsVisible = function(self)
-		return self.frame:IsVisible()
-	end
-	
-	WidgetBase.IsShown= function(self)
-		return self.frame:IsShown()
-	end
-		
-	WidgetBase.Release = function(self)
-		AceGUI:Release(self)
-	end
-	
-	WidgetBase.SetPoint = function(self, ...)
-		return self.frame:SetPoint(...)
-	end
-	
-	WidgetBase.ClearAllPoints = function(self)
-		return self.frame:ClearAllPoints()
-	end
-	
-	WidgetBase.GetNumPoints = function(self)
-		return self.frame:GetNumPoints()
-	end
-	
-	WidgetBase.GetPoint = function(self, ...)
-		return self.frame:GetPoint(...)
-	end	
-	
-	WidgetBase.GetUserDataTable = function(self)
-		return self.userdata
-	end
-	
-	WidgetBase.SetUserData = function(self, key, value)
-		self.userdata[key] = value
-	end
-	
-	WidgetBase.GetUserData = function(self, key)
-		return self.userdata[key]
-	end
-	
-	WidgetBase.IsFullHeight = function(self)
-		return self.height == "fill"
-	end
-	
-	WidgetBase.SetFullHeight = function(self, isFull)
-		if isFull then
-			self.height = "fill"
-		else
-			self.height = nil
-		end
-	end
-	
-	WidgetBase.IsFullWidth = function(self)
-		return self.width == "fill"
-	end
-		
-	WidgetBase.SetFullWidth = function(self, isFull)
-		if isFull then
-			self.width = "fill"
-		else
-			self.width = nil
-		end
-	end
-	
---	local function LayoutOnUpdate(this)
---		this:SetScript("OnUpdate",nil)
---		this.obj:PerformLayout()
---	end
-	
-	local WidgetContainerBase = AceGUI.WidgetContainerBase
-		
-	WidgetContainerBase.PauseLayout = function(self)
-		self.LayoutPaused = true
-	end
-	
-	WidgetContainerBase.ResumeLayout = function(self)
-		self.LayoutPaused = nil
-	end
-	
-	WidgetContainerBase.PerformLayout = function(self)
-		if self.LayoutPaused then
-			return
-		end
-		safecall(self.LayoutFunc, self.content, self.children)
-	end
-	
-	--call this function to layout, makes sure layed out objects get a frame to get sizes etc
-	WidgetContainerBase.DoLayout = function(self)
-		self:PerformLayout()
---		if not self.parent then
---			self.frame:SetScript("OnUpdate", LayoutOnUpdate)
---		end
-	end
-	
-	WidgetContainerBase.AddChild = function(self, child, beforeWidget)
-		if beforeWidget then
-			local siblingIndex = 1
-			for _, widget in pairs(self.children) do
-				if widget == beforeWidget then
-					break
-				end
-				siblingIndex = siblingIndex + 1 
-			end
-			tinsert(self.children, siblingIndex, child)
-		else
-			tinsert(self.children, child)
-		end
-		child:SetParent(self)
-		child.frame:Show()
-		self:DoLayout()
-	end
-	
-	WidgetContainerBase.AddChildren = function(self, ...)
-		for i = 1, select("#", ...) do
-			local child = select(i, ...)
-			tinsert(self.children, child)
-			child:SetParent(self)
-			child.frame:Show()
-		end
-		self:DoLayout()
-	end
-	
-	WidgetContainerBase.ReleaseChildren = function(self)
-		local children = self.children
-		for i = 1,#children do
-			AceGUI:Release(children[i])
-			children[i] = nil
-		end
-	end
-	
-	WidgetContainerBase.SetLayout = function(self, Layout)
-		self.LayoutFunc = AceGUI:GetLayout(Layout)
-	end
-
-	WidgetContainerBase.SetAutoAdjustHeight = function(self, adjust)
-		if adjust then
-			self.noAutoHeight = nil
-		else
-			self.noAutoHeight = true
-		end
-	end
-
-	local function FrameResize(this)
-		local self = this.obj
-		if this:GetWidth() and this:GetHeight() then
-			if self.OnWidthSet then
-				self:OnWidthSet(this:GetWidth())
-			end
-			if self.OnHeightSet then
-				self:OnHeightSet(this:GetHeight())
-			end
-		end
-	end
-	
-	local function ContentResize(this)
-		if this:GetWidth() and this:GetHeight() then
-			this.width = this:GetWidth()
-			this.height = this:GetHeight()
-			this.obj:DoLayout()
-		end
-	end
-
-	setmetatable(WidgetContainerBase, {__index=WidgetBase})
-
-	--One of these function should be called on each Widget Instance as part of its creation process
-	
-	--- Register a widget-class as a container for newly created widgets.
-	-- @param widget The widget class
-	function AceGUI:RegisterAsContainer(widget)
-		widget.children = {}
-		widget.userdata = {}
-		widget.events = {}
-		widget.base = WidgetContainerBase
-		widget.content.obj = widget
-		widget.frame.obj = widget
-		widget.content:SetScript("OnSizeChanged", ContentResize)
-		widget.frame:SetScript("OnSizeChanged", FrameResize)
-		setmetatable(widget, {__index = WidgetContainerBase})
-		widget:SetLayout("List")
-		return widget
-	end
-	
-	--- Register a widget-class as a widget.
-	-- @param widget The widget class
-	function AceGUI:RegisterAsWidget(widget)
-		widget.userdata = {}
-		widget.events = {}
-		widget.base = WidgetBase
-		widget.frame.obj = widget
-		widget.frame:SetScript("OnSizeChanged", FrameResize)
-		setmetatable(widget, {__index = WidgetBase})
-		return widget
-	end
-end
-
-
-
-
-------------------
--- Widget API   --
-------------------
-
---- Registers a widget Constructor, this function returns a new instance of the Widget
--- @param Name The name of the widget
--- @param Constructor The widget constructor function
--- @param Version The version of the widget
-function AceGUI:RegisterWidgetType(Name, Constructor, Version)
-	assert(type(Constructor) == "function")
-	assert(type(Version) == "number") 
-	
-	local oldVersion = WidgetVersions[Name]
-	if oldVersion and oldVersion >= Version then return end
-	
-	WidgetVersions[Name] = Version
-	WidgetRegistry[Name] = Constructor
-end
-
---- Registers a Layout Function
--- @param Name The name of the layout
--- @param LayoutFunc Reference to the layout function
-function AceGUI:RegisterLayout(Name, LayoutFunc)
-	assert(type(LayoutFunc) == "function")
-	if type(Name) == "string" then
-		Name = Name:upper()
-	end
-	LayoutRegistry[Name] = LayoutFunc
-end
-
---- Get a Layout Function from the registry
--- @param Name The name of the layout
-function AceGUI:GetLayout(Name)
-	if type(Name) == "string" then
-		Name = Name:upper()
-	end
-	return LayoutRegistry[Name]
-end
-
-AceGUI.counts = AceGUI.counts or {}
-
---- A type-based counter to count the number of widgets created.
--- This is used by widgets that require a named frame, e.g. when a Blizzard
--- Template requires it.
--- @param type The widget type
-function AceGUI:GetNextWidgetNum(type)
-	if not self.counts[type] then
-		self.counts[type] = 0
-	end
-	self.counts[type] = self.counts[type] + 1
-	return self.counts[type]
-end
-
---- Return the number of created widgets for this type.
--- In contrast to GetNextWidgetNum, the number is not incremented.
--- @param type The widget type
-function AceGUI:GetWidgetCount(type)
-	return self.counts[type] or 0
-end
-
---- Return the version of the currently registered widget type.
--- @param type The widget type
-function AceGUI:GetWidgetVersion(type)
-	return WidgetVersions[type]
-end
-
--------------
--- Layouts --
--------------
-
---[[
-	A Layout is a func that takes 2 parameters
-		content - the frame that widgets will be placed inside
-		children - a table containing the widgets to layout
-]]
-
--- Very simple Layout, Children are stacked on top of each other down the left side
-AceGUI:RegisterLayout("List",
-	function(content, children)
-		local height = 0
-		local width = content.width or content:GetWidth() or 0
-		for i = 1, #children do
-			local child = children[i]
-			
-			local frame = child.frame
-			frame:ClearAllPoints()
-			frame:Show()
-			if i == 1 then
-				frame:SetPoint("TOPLEFT", content)
-			else
-				frame:SetPoint("TOPLEFT", children[i-1].frame, "BOTTOMLEFT")
-			end
-			
-			if child.width == "fill" then
-				child:SetWidth(width)
-				frame:SetPoint("RIGHT", content)
-				
-				if child.DoLayout then
-					child:DoLayout()
-				end
-			elseif child.width == "relative" then
-				child:SetWidth(width * child.relWidth)
-				
-				if child.DoLayout then
-					child:DoLayout()
-				end
-			end
-			
-			height = height + (frame.height or frame:GetHeight() or 0)
-		end
-		safecall(content.obj.LayoutFinished, content.obj, nil, height)
-	end)
-
--- A single control fills the whole content area
-AceGUI:RegisterLayout("Fill",
-	function(content, children)
-		if children[1] then
-			children[1]:SetWidth(content:GetWidth() or 0)
-			children[1]:SetHeight(content:GetHeight() or 0)
-			children[1].frame:SetAllPoints(content)
-			children[1].frame:Show()
-			safecall(content.obj.LayoutFinished, content.obj, nil, children[1].frame:GetHeight())
-		end
-	end)
-
-local layoutrecursionblock = nil
-local function safelayoutcall(object, func, ...)
-	layoutrecursionblock = true
-	object[func](object, ...)
-	layoutrecursionblock = nil
-end
-
-AceGUI:RegisterLayout("Flow",
-	function(content, children)
-		if layoutrecursionblock then return end
-		--used height so far
-		local height = 0
-		--width used in the current row
-		local usedwidth = 0
-		--height of the current row
-		local rowheight = 0
-		local rowoffset = 0
-		local lastrowoffset
-		
-		local width = content.width or content:GetWidth() or 0
-		
-		--control at the start of the row
-		local rowstart
-		local rowstartoffset
-		local lastrowstart
-		local isfullheight
-		
-		local frameoffset
-		local lastframeoffset
-		local oversize 
-		for i = 1, #children do
-			local child = children[i]
-			oversize = nil
-			local frame = child.frame
-			local frameheight = frame.height or frame:GetHeight() or 0
-			local framewidth = frame.width or frame:GetWidth() or 0
-			lastframeoffset = frameoffset
-			-- HACK: Why did we set a frameoffset of (frameheight / 2) ? 
-			-- That was moving all widgets half the widgets size down, is that intended?
-			-- Actually, it seems to be neccessary for many cases, we'll leave it in for now.
-			-- If widgets seem to anchor weirdly with this, provide a valid alignoffset for them.
-			-- TODO: Investigate moar!
-			frameoffset = child.alignoffset or (frameheight / 2)
-			
-			if child.width == "relative" then
-				framewidth = width * child.relWidth
-			end
-			
-			frame:Show()
-			frame:ClearAllPoints()
-			if i == 1 then
-				-- anchor the first control to the top left
-				frame:SetPoint("TOPLEFT", content)
-				rowheight = frameheight
-				rowoffset = frameoffset
-				rowstart = frame
-				rowstartoffset = frameoffset
-				usedwidth = framewidth
-				if usedwidth > width then
-					oversize = true
-				end
-			else
-				-- if there isn't available width for the control start a new row
-				-- if a control is "fill" it will be on a row of its own full width
-				if usedwidth == 0 or ((framewidth) + usedwidth > width) or child.width == "fill" then
-					if isfullheight then
-						-- a previous row has already filled the entire height, there's nothing we can usefully do anymore
-						-- (maybe error/warn about this?)
-						break
-					end
-					--anchor the previous row, we will now know its height and offset
-					rowstart:SetPoint("TOPLEFT", content, "TOPLEFT", 0, -(height + (rowoffset - rowstartoffset) + 3))
-					height = height + rowheight + 3
-					--save this as the rowstart so we can anchor it after the row is complete and we have the max height and offset of controls in it
-					rowstart = frame
-					rowstartoffset = frameoffset
-					rowheight = frameheight
-					rowoffset = frameoffset
-					usedwidth = framewidth
-					if usedwidth > width then
-						oversize = true
-					end
-				-- put the control on the current row, adding it to the width and checking if the height needs to be increased
-				else
-					--handles cases where the new height is higher than either control because of the offsets
-					--math.max(rowheight-rowoffset+frameoffset, frameheight-frameoffset+rowoffset)
-					
-					--offset is always the larger of the two offsets
-					rowoffset = math_max(rowoffset, frameoffset)
-					rowheight = math_max(rowheight, rowoffset + (frameheight / 2))
-					
-					frame:SetPoint("TOPLEFT", children[i-1].frame, "TOPRIGHT", 0, frameoffset - lastframeoffset)
-					usedwidth = framewidth + usedwidth
-				end
-			end
-
-			if child.width == "fill" then
-				safelayoutcall(child, "SetWidth", width)
-				frame:SetPoint("RIGHT", content)
-				
-				usedwidth = 0
-				rowstart = frame
-				rowstartoffset = frameoffset
-				
-				if child.DoLayout then
-					child:DoLayout()
-				end
-				rowheight = frame.height or frame:GetHeight() or 0
-				rowoffset = child.alignoffset or (rowheight / 2)
-				rowstartoffset = rowoffset
-			elseif child.width == "relative" then
-				safelayoutcall(child, "SetWidth", width * child.relWidth)
-				
-				if child.DoLayout then
-					child:DoLayout()
-				end
-			elseif oversize then
-				if width > 1 then
-					frame:SetPoint("RIGHT", content)
-				end
-			end
-			
-			if child.height == "fill" then
-				frame:SetPoint("BOTTOM", content)
-				isfullheight = true
-			end
-		end
-		
-		--anchor the last row, if its full height needs a special case since  its height has just been changed by the anchor
-		if isfullheight then
-			rowstart:SetPoint("TOPLEFT", content, "TOPLEFT", 0, -height)
-		elseif rowstart then
-			rowstart:SetPoint("TOPLEFT", content, "TOPLEFT", 0, -(height + (rowoffset - rowstartoffset) + 3))
-		end
-		
-		height = height + rowheight + 3
-		safecall(content.obj.LayoutFinished, content.obj, nil, height)
-	end)
diff --git a/OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/AceGUI-3.0.xml b/OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/AceGUI-3.0.xml
deleted file mode 100644
index b515077..0000000
--- a/OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/AceGUI-3.0.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
-..\FrameXML\UI.xsd">
-	<Script file="AceGUI-3.0.lua"/>
-	<!-- Container -->
-	<Script file="widgets\AceGUIContainer-BlizOptionsGroup.lua"/>
-	<Script file="widgets\AceGUIContainer-DropDownGroup.lua"/>
-	<Script file="widgets\AceGUIContainer-Frame.lua"/>
-	<Script file="widgets\AceGUIContainer-InlineGroup.lua"/>
-	<Script file="widgets\AceGUIContainer-ScrollFrame.lua"/>
-	<Script file="widgets\AceGUIContainer-SimpleGroup.lua"/>
-	<Script file="widgets\AceGUIContainer-TabGroup.lua"/>
-	<Script file="widgets\AceGUIContainer-TreeGroup.lua"/>
-	<Script file="widgets\AceGUIContainer-Window.lua"/>
-	<!-- Widgets -->
-	<Script file="widgets\AceGUIWidget-Button.lua"/>
-	<Script file="widgets\AceGUIWidget-CheckBox.lua"/>
-	<Script file="widgets\AceGUIWidget-ColorPicker.lua"/>
-	<Script file="widgets\AceGUIWidget-DropDown.lua"/>
-	<Script file="widgets\AceGUIWidget-DropDown-Items.lua"/>
-	<Script file="widgets\AceGUIWidget-EditBox.lua"/>
-	<Script file="widgets\AceGUIWidget-Heading.lua"/>
-	<Script file="widgets\AceGUIWidget-Icon.lua"/>
-	<Script file="widgets\AceGUIWidget-InteractiveLabel.lua"/>
-	<Script file="widgets\AceGUIWidget-Keybinding.lua"/>
-	<Script file="widgets\AceGUIWidget-Label.lua"/>
-	<Script file="widgets\AceGUIWidget-MultiLineEditBox.lua"/>
-	<Script file="widgets\AceGUIWidget-Slider.lua"/>
-</Ui>
diff --git a/OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIContainer-BlizOptionsGroup.lua b/OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIContainer-BlizOptionsGroup.lua
deleted file mode 100644
index 9a48f8b..0000000
--- a/OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIContainer-BlizOptionsGroup.lua
+++ /dev/null
@@ -1,138 +0,0 @@
---[[-----------------------------------------------------------------------------
-BlizOptionsGroup Container
-Simple container widget for the integration of AceGUI into the Blizzard Interface Options
--------------------------------------------------------------------------------]]
-local Type, Version = "BlizOptionsGroup", 21
-local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
-if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
-
--- Lua APIs
-local pairs = pairs
-
--- WoW APIs
-local CreateFrame = CreateFrame
-
---[[-----------------------------------------------------------------------------
-Scripts
--------------------------------------------------------------------------------]]
-
-local function OnShow(frame)
-	frame.obj:Fire("OnShow")
-end
-
-local function OnHide(frame)
-	frame.obj:Fire("OnHide")
-end
-
---[[-----------------------------------------------------------------------------
-Support functions
--------------------------------------------------------------------------------]]
-
-local function okay(frame)
-	frame.obj:Fire("okay")
-end
-
-local function cancel(frame)
-	frame.obj:Fire("cancel")
-end
-
-local function default(frame)
-	frame.obj:Fire("default")
-end
-
-local function refresh(frame)
-	frame.obj:Fire("refresh")
-end
-
---[[-----------------------------------------------------------------------------
-Methods
--------------------------------------------------------------------------------]]
-
-local methods = {
-	["OnAcquire"] = function(self)
-		self:SetName()
-		self:SetTitle()
-	end,
-
-	-- ["OnRelease"] = nil,
-
-	["OnWidthSet"] = function(self, width)
-		local content = self.content
-		local contentwidth = width - 63
-		if contentwidth < 0 then
-			contentwidth = 0
-		end
-		content:SetWidth(contentwidth)
-		content.width = contentwidth
-	end,
-
-	["OnHeightSet"] = function(self, height)
-		local content = self.content
-		local contentheight = height - 26
-		if contentheight < 0 then
-			contentheight = 0
-		end
-		content:SetHeight(contentheight)
-		content.height = contentheight
-	end,
-
-	["SetName"] = function(self, name, parent)
-		self.frame.name = name
-		self.frame.parent = parent
-	end,
-
-	["SetTitle"] = function(self, title)
-		local content = self.content
-		content:ClearAllPoints()
-		if not title or title == "" then
-			content:SetPoint("TOPLEFT", 10, -10)
-			self.label:SetText("")
-		else
-			content:SetPoint("TOPLEFT", 10, -40)
-			self.label:SetText(title)
-		end
-		content:SetPoint("BOTTOMRIGHT", -10, 10)
-	end
-}
-
---[[-----------------------------------------------------------------------------
-Constructor
--------------------------------------------------------------------------------]]
-local function Constructor()
-	local frame = CreateFrame("Frame")
-	frame:Hide()
-
-	-- support functions for the Blizzard Interface Options
-	frame.okay = okay
-	frame.cancel = cancel
-	frame.default = default
-	frame.refresh = refresh
-
-	frame:SetScript("OnHide", OnHide)
-	frame:SetScript("OnShow", OnShow)
-
-	local label = frame:CreateFontString(nil, "OVERLAY", "GameFontNormalLarge")
-	label:SetPoint("TOPLEFT", 10, -15)
-	label:SetPoint("BOTTOMRIGHT", frame, "TOPRIGHT", 10, -45)
-	label:SetJustifyH("LEFT")
-	label:SetJustifyV("TOP")
-
-	--Container Support
-	local content = CreateFrame("Frame", nil, frame)
-	content:SetPoint("TOPLEFT", 10, -10)
-	content:SetPoint("BOTTOMRIGHT", -10, 10)
-
-	local widget = {
-		label   = label,
-		frame   = frame,
-		content = content,
-		type    = Type
-	}
-	for method, func in pairs(methods) do
-		widget[method] = func
-	end
-
-	return AceGUI:RegisterAsContainer(widget)
-end
-
-AceGUI:RegisterWidgetType(Type, Constructor, Version)
diff --git a/OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIContainer-DropDownGroup.lua b/OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIContainer-DropDownGroup.lua
deleted file mode 100644
index b0f81b7..0000000
--- a/OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIContainer-DropDownGroup.lua
+++ /dev/null
@@ -1,157 +0,0 @@
---[[-----------------------------------------------------------------------------
-DropdownGroup Container
-Container controlled by a dropdown on the top.
--------------------------------------------------------------------------------]]
-local Type, Version = "DropdownGroup", 21
-local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
-if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
-
--- Lua APIs
-local assert, pairs, type = assert, pairs, type
-
--- WoW APIs
-local CreateFrame = CreateFrame
-
---[[-----------------------------------------------------------------------------
-Scripts
--------------------------------------------------------------------------------]]
-local function SelectedGroup(self, event, value)
-	local group = self.parentgroup
-	local status = group.status or group.localstatus
-	status.selected = value
-	self.parentgroup:Fire("OnGroupSelected", value)
-end
-
---[[-----------------------------------------------------------------------------
-Methods
--------------------------------------------------------------------------------]]
-local methods = {
-	["OnAcquire"] = function(self)
-		self.dropdown:SetText("")
-		self:SetDropdownWidth(200)
-		self:SetTitle("")
-	end,
-
-	["OnRelease"] = function(self)
-		self.dropdown.list = nil
-		self.status = nil
-		for k in pairs(self.localstatus) do
-			self.localstatus[k] = nil
-		end
-	end,
-
-	["SetTitle"] = function(self, title)
-		self.titletext:SetText(title)
-		self.dropdown.frame:ClearAllPoints()
-		if title and title ~= "" then
-			self.dropdown.frame:SetPoint("TOPRIGHT", -2, 0)
-		else
-			self.dropdown.frame:SetPoint("TOPLEFT", -1, 0)
-		end
-	end,
-
-	["SetGroupList"] = function(self,list,order)
-		self.dropdown:SetList(list,order)
-	end,
-
-	["SetStatusTable"] = function(self, status)
-		assert(type(status) == "table")
-		self.status = status
-	end,
-
-	["SetGroup"] = function(self,group)
-		self.dropdown:SetValue(group)
-		local status = self.status or self.localstatus
-		status.selected = group
-		self:Fire("OnGroupSelected", group)
-	end,
-
-	["OnWidthSet"] = function(self, width)
-		local content = self.content
-		local contentwidth = width - 26
-		if contentwidth < 0 then
-			contentwidth = 0
-		end
-		content:SetWidth(contentwidth)
-		content.width = contentwidth
-	end,
-
-	["OnHeightSet"] = function(self, height)
-		local content = self.content
-		local contentheight = height - 63
-		if contentheight < 0 then
-			contentheight = 0
-		end
-		content:SetHeight(contentheight)
-		content.height = contentheight
-	end,
-
-	["LayoutFinished"] = function(self, width, height)
-		self:SetHeight((height or 0) + 63)
-	end,
-
-	["SetDropdownWidth"] = function(self, width)
-		self.dropdown:SetWidth(width)
-	end
-}
-
---[[-----------------------------------------------------------------------------
-Constructor
--------------------------------------------------------------------------------]]
-local PaneBackdrop  = {
-	bgFile = "Interface\\ChatFrame\\ChatFrameBackground",
-	edgeFile = "Interface\\Tooltips\\UI-Tooltip-Border",
-	tile = true, tileSize = 16, edgeSize = 16,
-	insets = { left = 3, right = 3, top = 5, bottom = 3 }
-}
-
-local function Constructor()
-	local frame = CreateFrame("Frame")
-	frame:SetHeight(100)
-	frame:SetWidth(100)
-	frame:SetFrameStrata("FULLSCREEN_DIALOG")
-
-	local titletext = frame:CreateFontString(nil, "OVERLAY", "GameFontNormal")
-	titletext:SetPoint("TOPLEFT", 4, -5)
-	titletext:SetPoint("TOPRIGHT", -4, -5)
-	titletext:SetJustifyH("LEFT")
-	titletext:SetHeight(18)
-
-	local dropdown = AceGUI:Create("Dropdown")
-	dropdown.frame:SetParent(frame)
-	dropdown.frame:SetFrameLevel(dropdown.frame:GetFrameLevel() + 2)
-	dropdown:SetCallback("OnValueChanged", SelectedGroup)
-	dropdown.frame:SetPoint("TOPLEFT", -1, 0)
-	dropdown.frame:Show()
-	dropdown:SetLabel("")
-
-	local border = CreateFrame("Frame", nil, frame)
-	border:SetPoint("TOPLEFT", 0, -26)
-	border:SetPoint("BOTTOMRIGHT", 0, 3)
-	border:SetBackdrop(PaneBackdrop)
-	border:SetBackdropColor(0.1,0.1,0.1,0.5)
-	border:SetBackdropBorderColor(0.4,0.4,0.4)
-
-	--Container Support
-	local content = CreateFrame("Frame", nil, border)
-	content:SetPoint("TOPLEFT", 10, -10)
-	content:SetPoint("BOTTOMRIGHT", -10, 10)
-
-	local widget = {
-		frame       = frame,
-		localstatus = {},
-		titletext   = titletext,
-		dropdown    = dropdown,
-		border      = border,
-		content     = content,
-		type        = Type
-	}
-	for method, func in pairs(methods) do
-		widget[method] = func
-	end
-	dropdown.parentgroup = widget
-	
-	return AceGUI:RegisterAsContainer(widget)
-end
-
-AceGUI:RegisterWidgetType(Type, Constructor, Version)
diff --git a/OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIContainer-Frame.lua b/OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIContainer-Frame.lua
deleted file mode 100644
index 0dae68c..0000000
--- a/OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIContainer-Frame.lua
+++ /dev/null
@@ -1,311 +0,0 @@
---[[-----------------------------------------------------------------------------
-Frame Container
--------------------------------------------------------------------------------]]
-local Type, Version = "Frame", 24
-local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
-if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
-
--- Lua APIs
-local pairs, assert, type = pairs, assert, type
-local wipe = table.wipe
-
--- WoW APIs
-local PlaySound = PlaySound
-local CreateFrame, UIParent = CreateFrame, UIParent
-
--- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
--- List them here for Mikk's FindGlobals script
--- GLOBALS: CLOSE
-
---[[-----------------------------------------------------------------------------
-Scripts
--------------------------------------------------------------------------------]]
-local function Button_OnClick(frame)
-	PlaySound("gsTitleOptionExit")
-	frame.obj:Hide()
-end
-
-local function Frame_OnClose(frame)
-	frame.obj:Fire("OnClose")
-end
-
-local function Frame_OnMouseDown(frame)
-	AceGUI:ClearFocus()
-end
-
-local function Title_OnMouseDown(frame)
-	frame:GetParent():StartMoving()
-	AceGUI:ClearFocus()
-end
-
-local function MoverSizer_OnMouseUp(mover)
-	local frame = mover:GetParent()
-	frame:StopMovingOrSizing()
-	local self = frame.obj
-	local status = self.status or self.localstatus
-	status.width = frame:GetWidth()
-	status.height = frame:GetHeight()
-	status.top = frame:GetTop()
-	status.left = frame:GetLeft()
-end
-
-local function SizerSE_OnMouseDown(frame)
-	frame:GetParent():StartSizing("BOTTOMRIGHT")
-	AceGUI:ClearFocus()
-end
-
-local function SizerS_OnMouseDown(frame)
-	frame:GetParent():StartSizing("BOTTOM")
-	AceGUI:ClearFocus()
-end
-
-local function SizerE_OnMouseDown(frame)
-	frame:GetParent():StartSizing("RIGHT")
-	AceGUI:ClearFocus()
-end
-
-local function StatusBar_OnEnter(frame)
-	frame.obj:Fire("OnEnterStatusBar")
-end
-
-local function StatusBar_OnLeave(frame)
-	frame.obj:Fire("OnLeaveStatusBar")
-end
-
---[[-----------------------------------------------------------------------------
-Methods
--------------------------------------------------------------------------------]]
-local methods = {
-	["OnAcquire"] = function(self)
-		self.frame:SetParent(UIParent)
-		self.frame:SetFrameStrata("FULLSCREEN_DIALOG")
-		self:SetTitle()
-		self:SetStatusText()
-		self:ApplyStatus()
-		self:Show()
-        self:EnableResize(true)
-	end,
-
-	["OnRelease"] = function(self)
-		self.status = nil
-		wipe(self.localstatus)
-	end,
-
-	["OnWidthSet"] = function(self, width)
-		local content = self.content
-		local contentwidth = width - 34
-		if contentwidth < 0 then
-			contentwidth = 0
-		end
-		content:SetWidth(contentwidth)
-		content.width = contentwidth
-	end,
-
-	["OnHeightSet"] = function(self, height)
-		local content = self.content
-		local contentheight = height - 57
-		if contentheight < 0 then
-			contentheight = 0
-		end
-		content:SetHeight(contentheight)
-		content.height = contentheight
-	end,
-
-	["SetTitle"] = function(self, title)
-		self.titletext:SetText(title)
-		self.titlebg:SetWidth((self.titletext:GetWidth() or 0) + 10)
-	end,
-
-	["SetStatusText"] = function(self, text)
-		self.statustext:SetText(text)
-	end,
-
-	["Hide"] = function(self)
-		self.frame:Hide()
-	end,
-
-	["Show"] = function(self)
-		self.frame:Show()
-	end,
-
-	["EnableResize"] = function(self, state)
-		local func = state and "Show" or "Hide"
-		self.sizer_se[func](self.sizer_se)
-		self.sizer_s[func](self.sizer_s)
-		self.sizer_e[func](self.sizer_e)
-	end,
-
-	-- called to set an external table to store status in
-	["SetStatusTable"] = function(self, status)
-		assert(type(status) == "table")
-		self.status = status
-		self:ApplyStatus()
-	end,
-
-	["ApplyStatus"] = function(self)
-		local status = self.status or self.localstatus
-		local frame = self.frame
-		self:SetWidth(status.width or 700)
-		self:SetHeight(status.height or 500)
-		frame:ClearAllPoints()
-		if status.top and status.left then
-			frame:SetPoint("TOP", UIParent, "BOTTOM", 0, status.top)
-			frame:SetPoint("LEFT", UIParent, "LEFT", status.left, 0)
-		else
-			frame:SetPoint("CENTER")
-		end
-	end
-}
-
---[[-----------------------------------------------------------------------------
-Constructor
--------------------------------------------------------------------------------]]
-local FrameBackdrop = {
-	bgFile = "Interface\\DialogFrame\\UI-DialogBox-Background",
-	edgeFile = "Interface\\DialogFrame\\UI-DialogBox-Border",
-	tile = true, tileSize = 32, edgeSize = 32,
-	insets = { left = 8, right = 8, top = 8, bottom = 8 }
-}
-
-local PaneBackdrop  = {
-	bgFile = "Interface\\ChatFrame\\ChatFrameBackground",
-	edgeFile = "Interface\\Tooltips\\UI-Tooltip-Border",
-	tile = true, tileSize = 16, edgeSize = 16,
-	insets = { left = 3, right = 3, top = 5, bottom = 3 }
-}
-
-local function Constructor()
-	local frame = CreateFrame("Frame", nil, UIParent)
-	frame:Hide()
-
-	frame:EnableMouse(true)
-	frame:SetMovable(true)
-	frame:SetResizable(true)
-	frame:SetFrameStrata("FULLSCREEN_DIALOG")
-	frame:SetBackdrop(FrameBackdrop)
-	frame:SetBackdropColor(0, 0, 0, 1)
-	frame:SetMinResize(400, 200)
-	frame:SetToplevel(true)
-	frame:SetScript("OnHide", Frame_OnClose)
-	frame:SetScript("OnMouseDown", Frame_OnMouseDown)
-
-	local closebutton = CreateFrame("Button", nil, frame, "UIPanelButtonTemplate")
-	closebutton:SetScript("OnClick", Button_OnClick)
-	closebutton:SetPoint("BOTTOMRIGHT", -27, 17)
-	closebutton:SetHeight(20)
-	closebutton:SetWidth(100)
-	closebutton:SetText(CLOSE)
-
-	local statusbg = CreateFrame("Button", nil, frame)
-	statusbg:SetPoint("BOTTOMLEFT", 15, 15)
-	statusbg:SetPoint("BOTTOMRIGHT", -132, 15)
-	statusbg:SetHeight(24)
-	statusbg:SetBackdrop(PaneBackdrop)
-	statusbg:SetBackdropColor(0.1,0.1,0.1)
-	statusbg:SetBackdropBorderColor(0.4,0.4,0.4)
-	statusbg:SetScript("OnEnter", StatusBar_OnEnter)
-	statusbg:SetScript("OnLeave", StatusBar_OnLeave)
-
-	local statustext = statusbg:CreateFontString(nil, "OVERLAY", "GameFontNormal")
-	statustext:SetPoint("TOPLEFT", 7, -2)
-	statustext:SetPoint("BOTTOMRIGHT", -7, 2)
-	statustext:SetHeight(20)
-	statustext:SetJustifyH("LEFT")
-	statustext:SetText("")
-
-	local titlebg = frame:CreateTexture(nil, "OVERLAY")
-	titlebg:SetTexture("Interface\\DialogFrame\\UI-DialogBox-Header")
-	titlebg:SetTexCoord(0.31, 0.67, 0, 0.63)
-	titlebg:SetPoint("TOP", 0, 12)
-	titlebg:SetWidth(100)
-	titlebg:SetHeight(40)
-
-	local title = CreateFrame("Frame", nil, frame)
-	title:EnableMouse(true)
-	title:SetScript("OnMouseDown", Title_OnMouseDown)
-	title:SetScript("OnMouseUp", MoverSizer_OnMouseUp)
-	title:SetAllPoints(titlebg)
-
-	local titletext = title:CreateFontString(nil, "OVERLAY", "GameFontNormal")
-	titletext:SetPoint("TOP", titlebg, "TOP", 0, -14)
-
-	local titlebg_l = frame:CreateTexture(nil, "OVERLAY")
-	titlebg_l:SetTexture("Interface\\DialogFrame\\UI-DialogBox-Header")
-	titlebg_l:SetTexCoord(0.21, 0.31, 0, 0.63)
-	titlebg_l:SetPoint("RIGHT", titlebg, "LEFT")
-	titlebg_l:SetWidth(30)
-	titlebg_l:SetHeight(40)
-
-	local titlebg_r = frame:CreateTexture(nil, "OVERLAY")
-	titlebg_r:SetTexture("Interface\\DialogFrame\\UI-DialogBox-Header")
-	titlebg_r:SetTexCoord(0.67, 0.77, 0, 0.63)
-	titlebg_r:SetPoint("LEFT", titlebg, "RIGHT")
-	titlebg_r:SetWidth(30)
-	titlebg_r:SetHeight(40)
-
-	local sizer_se = CreateFrame("Frame", nil, frame)
-	sizer_se:SetPoint("BOTTOMRIGHT")
-	sizer_se:SetWidth(25)
-	sizer_se:SetHeight(25)
-	sizer_se:EnableMouse()
-	sizer_se:SetScript("OnMouseDown",SizerSE_OnMouseDown)
-	sizer_se:SetScript("OnMouseUp", MoverSizer_OnMouseUp)
-
-	local line1 = sizer_se:CreateTexture(nil, "BACKGROUND")
-	line1:SetWidth(14)
-	line1:SetHeight(14)
-	line1:SetPoint("BOTTOMRIGHT", -8, 8)
-	line1:SetTexture("Interface\\Tooltips\\UI-Tooltip-Border")
-	local x = 0.1 * 14/17
-	line1:SetTexCoord(0.05 - x, 0.5, 0.05, 0.5 + x, 0.05, 0.5 - x, 0.5 + x, 0.5)
-
-	local line2 = sizer_se:CreateTexture(nil, "BACKGROUND")
-	line2:SetWidth(8)
-	line2:SetHeight(8)
-	line2:SetPoint("BOTTOMRIGHT", -8, 8)
-	line2:SetTexture("Interface\\Tooltips\\UI-Tooltip-Border")
-	local x = 0.1 * 8/17
-	line2:SetTexCoord(0.05 - x, 0.5, 0.05, 0.5 + x, 0.05, 0.5 - x, 0.5 + x, 0.5)
-
-	local sizer_s = CreateFrame("Frame", nil, frame)
-	sizer_s:SetPoint("BOTTOMRIGHT", -25, 0)
-	sizer_s:SetPoint("BOTTOMLEFT")
-	sizer_s:SetHeight(25)
-	sizer_s:EnableMouse(true)
-	sizer_s:SetScript("OnMouseDown", SizerS_OnMouseDown)
-	sizer_s:SetScript("OnMouseUp", MoverSizer_OnMouseUp)
-
-	local sizer_e = CreateFrame("Frame", nil, frame)
-	sizer_e:SetPoint("BOTTOMRIGHT", 0, 25)
-	sizer_e:SetPoint("TOPRIGHT")
-	sizer_e:SetWidth(25)
-	sizer_e:EnableMouse(true)
-	sizer_e:SetScript("OnMouseDown", SizerE_OnMouseDown)
-	sizer_e:SetScript("OnMouseUp", MoverSizer_OnMouseUp)
-
-	--Container Support
-	local content = CreateFrame("Frame", nil, frame)
-	content:SetPoint("TOPLEFT", 17, -27)
-	content:SetPoint("BOTTOMRIGHT", -17, 40)
-
-	local widget = {
-		localstatus = {},
-		titletext   = titletext,
-		statustext  = statustext,
-		titlebg     = titlebg,
-		sizer_se    = sizer_se,
-		sizer_s     = sizer_s,
-		sizer_e     = sizer_e,
-		content     = content,
-		frame       = frame,
-		type        = Type
-	}
-	for method, func in pairs(methods) do
-		widget[method] = func
-	end
-	closebutton.obj, statusbg.obj = widget, widget
-
-	return AceGUI:RegisterAsContainer(widget)
-end
-
-AceGUI:RegisterWidgetType(Type, Constructor, Version)
diff --git a/OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIContainer-InlineGroup.lua b/OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIContainer-InlineGroup.lua
deleted file mode 100644
index f3db7d6..0000000
--- a/OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIContainer-InlineGroup.lua
+++ /dev/null
@@ -1,103 +0,0 @@
---[[-----------------------------------------------------------------------------
-InlineGroup Container
-Simple container widget that creates a visible "box" with an optional title.
--------------------------------------------------------------------------------]]
-local Type, Version = "InlineGroup", 21
-local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
-if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
-
--- Lua APIs
-local pairs = pairs
-
--- WoW APIs
-local CreateFrame, UIParent = CreateFrame, UIParent
-
---[[-----------------------------------------------------------------------------
-Methods
--------------------------------------------------------------------------------]]
-local methods = {
-	["OnAcquire"] = function(self)
-		self:SetWidth(300)
-		self:SetHeight(100)
-		self:SetTitle("")
-	end,
-
-	-- ["OnRelease"] = nil,
-
-	["SetTitle"] = function(self,title)
-		self.titletext:SetText(title)
-	end,
-
-
-	["LayoutFinished"] = function(self, width, height)
-		if self.noAutoHeight then return end
-		self:SetHeight((height or 0) + 40)
-	end,
-
-	["OnWidthSet"] = function(self, width)
-		local content = self.content
-		local contentwidth = width - 20
-		if contentwidth < 0 then
-			contentwidth = 0
-		end
-		content:SetWidth(contentwidth)
-		content.width = contentwidth
-	end,
-
-	["OnHeightSet"] = function(self, height)
-		local content = self.content
-		local contentheight = height - 20
-		if contentheight < 0 then
-			contentheight = 0
-		end
-		content:SetHeight(contentheight)
-		content.height = contentheight
-	end
-}
-
---[[-----------------------------------------------------------------------------
-Constructor
--------------------------------------------------------------------------------]]
-local PaneBackdrop  = {
-	bgFile = "Interface\\ChatFrame\\ChatFrameBackground",
-	edgeFile = "Interface\\Tooltips\\UI-Tooltip-Border",
-	tile = true, tileSize = 16, edgeSize = 16,
-	insets = { left = 3, right = 3, top = 5, bottom = 3 }
-}
-
-local function Constructor()
-	local frame = CreateFrame("Frame", nil, UIParent)
-	frame:SetFrameStrata("FULLSCREEN_DIALOG")
-
-	local titletext = frame:CreateFontString(nil, "OVERLAY", "GameFontNormal")
-	titletext:SetPoint("TOPLEFT", 14, 0)
-	titletext:SetPoint("TOPRIGHT", -14, 0)
-	titletext:SetJustifyH("LEFT")
-	titletext:SetHeight(18)
-
-	local border = CreateFrame("Frame", nil, frame)
-	border:SetPoint("TOPLEFT", 0, -17)
-	border:SetPoint("BOTTOMRIGHT", -1, 3)
-	border:SetBackdrop(PaneBackdrop)
-	border:SetBackdropColor(0.1, 0.1, 0.1, 0.5)
-	border:SetBackdropBorderColor(0.4, 0.4, 0.4)
-
-	--Container Support
-	local content = CreateFrame("Frame", nil, border)
-	content:SetPoint("TOPLEFT", 10, -10)
-	content:SetPoint("BOTTOMRIGHT", -10, 10)
-
-	local widget = {
-		frame     = frame,
-		content   = content,
-		titletext = titletext,
-		type      = Type
-	}
-	for method, func in pairs(methods) do
-		widget[method] = func
-	end
-
-	return AceGUI:RegisterAsContainer(widget)
-end
-
-AceGUI:RegisterWidgetType(Type, Constructor, Version)
diff --git a/OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIContainer-ScrollFrame.lua b/OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIContainer-ScrollFrame.lua
deleted file mode 100644
index 6dd0c4d..0000000
--- a/OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIContainer-ScrollFrame.lua
+++ /dev/null
@@ -1,210 +0,0 @@
---[[-----------------------------------------------------------------------------
-ScrollFrame Container
-Plain container that scrolls its content and doesn't grow in height.
--------------------------------------------------------------------------------]]
-local Type, Version = "ScrollFrame", 24
-local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
-if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
-
-local IsLegion = select(4, GetBuildInfo()) >= 70000
-
--- Lua APIs
-local pairs, assert, type = pairs, assert, type
-local min, max, floor, abs = math.min, math.max, math.floor, math.abs
-
--- WoW APIs
-local CreateFrame, UIParent = CreateFrame, UIParent
-
---[[-----------------------------------------------------------------------------
-Support functions
--------------------------------------------------------------------------------]]
-local function FixScrollOnUpdate(frame)
-	frame:SetScript("OnUpdate", nil)
-	frame.obj:FixScroll()
-end
-
---[[-----------------------------------------------------------------------------
-Scripts
--------------------------------------------------------------------------------]]
-local function ScrollFrame_OnMouseWheel(frame, value)
-	frame.obj:MoveScroll(value)
-end
-
-local function ScrollFrame_OnSizeChanged(frame)
-	frame:SetScript("OnUpdate", FixScrollOnUpdate)
-end
-
-local function ScrollBar_OnScrollValueChanged(frame, value)
-	frame.obj:SetScroll(value)
-end
-
---[[-----------------------------------------------------------------------------
-Methods
--------------------------------------------------------------------------------]]
-local methods = {
-	["OnAcquire"] = function(self) 
-		self:SetScroll(0)
-		self.scrollframe:SetScript("OnUpdate", FixScrollOnUpdate)
-	end,
-
-	["OnRelease"] = function(self)
-		self.status = nil
-		for k in pairs(self.localstatus) do
-			self.localstatus[k] = nil
-		end
-		self.scrollframe:SetPoint("BOTTOMRIGHT")
-		self.scrollbar:Hide()
-		self.scrollBarShown = nil
-		self.content.height, self.content.width = nil, nil
-	end,
-
-	["SetScroll"] = function(self, value)
-		local status = self.status or self.localstatus
-		local viewheight = self.scrollframe:GetHeight()
-		local height = self.content:GetHeight()
-		local offset
-
-		if viewheight > height then
-			offset = 0
-		else
-			offset = floor((height - viewheight) / 1000.0 * value)
-		end
-		self.content:ClearAllPoints()
-		self.content:SetPoint("TOPLEFT", 0, offset)
-		self.content:SetPoint("TOPRIGHT", 0, offset)
-		status.offset = offset
-		status.scrollvalue = value
-	end,
-
-	["MoveScroll"] = function(self, value)
-		local status = self.status or self.localstatus
-		local height, viewheight = self.scrollframe:GetHeight(), self.content:GetHeight()
-		
-		if self.scrollBarShown then
-			local diff = height - viewheight
-			local delta = 1
-			if value < 0 then
-				delta = -1
-			end
-			self.scrollbar:SetValue(min(max(status.scrollvalue + delta*(1000/(diff/45)),0), 1000))
-		end
-	end,
-
-	["FixScroll"] = function(self)
-		if self.updateLock then return end
-		self.updateLock = true
-		local status = self.status or self.localstatus
-		local height, viewheight = self.scrollframe:GetHeight(), self.content:GetHeight()
-		local offset = status.offset or 0
-		local curvalue = self.scrollbar:GetValue()
-		-- Give us a margin of error of 2 pixels to stop some conditions that i would blame on floating point inaccuracys
-		-- No-one is going to miss 2 pixels at the bottom of the frame, anyhow!
-		if viewheight < height + 2 then
-			if self.scrollBarShown then
-				self.scrollBarShown = nil
-				self.scrollbar:Hide()
-				self.scrollbar:SetValue(0)
-				self.scrollframe:SetPoint("BOTTOMRIGHT")
-				self:DoLayout()
-			end
-		else
-			if not self.scrollBarShown then
-				self.scrollBarShown = true
-				self.scrollbar:Show()
-				self.scrollframe:SetPoint("BOTTOMRIGHT", -20, 0)
-				self:DoLayout()
-			end
-			local value = (offset / (viewheight - height) * 1000)
-			if value > 1000 then value = 1000 end
-			self.scrollbar:SetValue(value)
-			self:SetScroll(value)
-			if value < 1000 then
-				self.content:ClearAllPoints()
-				self.content:SetPoint("TOPLEFT", 0, offset)
-				self.content:SetPoint("TOPRIGHT", 0, offset)
-				status.offset = offset
-			end
-		end
-		self.updateLock = nil
-	end,
-
-	["LayoutFinished"] = function(self, width, height)
-		self.content:SetHeight(height or 0 + 20)
-		self.scrollframe:SetScript("OnUpdate", FixScrollOnUpdate)
-	end,
-
-	["SetStatusTable"] = function(self, status)
-		assert(type(status) == "table")
-		self.status = status
-		if not status.scrollvalue then
-			status.scrollvalue = 0
-		end
-	end,
-
-	["OnWidthSet"] = function(self, width)
-		local content = self.content
-		content.width = width
-	end,
-
-	["OnHeightSet"] = function(self, height)
-		local content = self.content
-		content.height = height
-	end
-}
---[[-----------------------------------------------------------------------------
-Constructor
--------------------------------------------------------------------------------]]
-local function Constructor()
-	local frame = CreateFrame("Frame", nil, UIParent)
-	local num = AceGUI:GetNextWidgetNum(Type)
-
-	local scrollframe = CreateFrame("ScrollFrame", nil, frame)
-	scrollframe:SetPoint("TOPLEFT")
-	scrollframe:SetPoint("BOTTOMRIGHT")
-	scrollframe:EnableMouseWheel(true)
-	scrollframe:SetScript("OnMouseWheel", ScrollFrame_OnMouseWheel)
-	scrollframe:SetScript("OnSizeChanged", ScrollFrame_OnSizeChanged)
-
-	local scrollbar = CreateFrame("Slider", ("AceConfigDialogScrollFrame%dScrollBar"):format(num), scrollframe, "UIPanelScrollBarTemplate")
-	scrollbar:SetPoint("TOPLEFT", scrollframe, "TOPRIGHT", 4, -16)
-	scrollbar:SetPoint("BOTTOMLEFT", scrollframe, "BOTTOMRIGHT", 4, 16)
-	scrollbar:SetMinMaxValues(0, 1000)
-	scrollbar:SetValueStep(1)
-	scrollbar:SetValue(0)
-	scrollbar:SetWidth(16)
-	scrollbar:Hide()
-	-- set the script as the last step, so it doesn't fire yet
-	scrollbar:SetScript("OnValueChanged", ScrollBar_OnScrollValueChanged)
-
-	local scrollbg = scrollbar:CreateTexture(nil, "BACKGROUND")
-	scrollbg:SetAllPoints(scrollbar)
-	if IsLegion then
-		scrollbg:SetColorTexture(0, 0, 0, 0.4)
-	else
-		scrollbg:SetTexture(0, 0, 0, 0.4)
-	end
-
-	--Container Support
-	local content = CreateFrame("Frame", nil, scrollframe)
-	content:SetPoint("TOPLEFT")
-	content:SetPoint("TOPRIGHT")
-	content:SetHeight(400)
-	scrollframe:SetScrollChild(content)
-
-	local widget = {
-		localstatus = { scrollvalue = 0 },
-		scrollframe = scrollframe,
-		scrollbar   = scrollbar,
-		content     = content,
-		frame       = frame,
-		type        = Type
-	}
-	for method, func in pairs(methods) do
-		widget[method] = func
-	end
-	scrollframe.obj, scrollbar.obj = widget, widget
-
-	return AceGUI:RegisterAsContainer(widget)
-end
-
-AceGUI:RegisterWidgetType(Type, Constructor, Version)
diff --git a/OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIContainer-SimpleGroup.lua b/OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIContainer-SimpleGroup.lua
deleted file mode 100644
index 57512c3..0000000
--- a/OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIContainer-SimpleGroup.lua
+++ /dev/null
@@ -1,69 +0,0 @@
---[[-----------------------------------------------------------------------------
-SimpleGroup Container
-Simple container widget that just groups widgets.
--------------------------------------------------------------------------------]]
-local Type, Version = "SimpleGroup", 20
-local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
-if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
-
--- Lua APIs
-local pairs = pairs
-
--- WoW APIs
-local CreateFrame, UIParent = CreateFrame, UIParent
-
-
---[[-----------------------------------------------------------------------------
-Methods
--------------------------------------------------------------------------------]]
-local methods = {
-	["OnAcquire"] = function(self)
-		self:SetWidth(300)
-		self:SetHeight(100)
-	end,
-
-	-- ["OnRelease"] = nil,
-
-	["LayoutFinished"] = function(self, width, height)
-		if self.noAutoHeight then return end
-		self:SetHeight(height or 0)
-	end,
-
-	["OnWidthSet"] = function(self, width)
-		local content = self.content
-		content:SetWidth(width)
-		content.width = width
-	end,
-
-	["OnHeightSet"] = function(self, height)
-		local content = self.content
-		content:SetHeight(height)
-		content.height = height
-	end
-}
-
---[[-----------------------------------------------------------------------------
-Constructor
--------------------------------------------------------------------------------]]
-local function Constructor()
-	local frame = CreateFrame("Frame", nil, UIParent)
-	frame:SetFrameStrata("FULLSCREEN_DIALOG")
-
-	--Container Support
-	local content = CreateFrame("Frame", nil, frame)
-	content:SetPoint("TOPLEFT")
-	content:SetPoint("BOTTOMRIGHT")
-
-	local widget = {
-		frame     = frame,
-		content   = content,
-		type      = Type
-	}
-	for method, func in pairs(methods) do
-		widget[method] = func
-	end
-
-	return AceGUI:RegisterAsContainer(widget)
-end
-
-AceGUI:RegisterWidgetType(Type, Constructor, Version)
diff --git a/OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIContainer-TabGroup.lua b/OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIContainer-TabGroup.lua
deleted file mode 100644
index 00be129..0000000
--- a/OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIContainer-TabGroup.lua
+++ /dev/null
@@ -1,350 +0,0 @@
---[[-----------------------------------------------------------------------------
-TabGroup Container
-Container that uses tabs on top to switch between groups.
--------------------------------------------------------------------------------]]
-local Type, Version = "TabGroup", 35
-local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
-if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
-
--- Lua APIs
-local pairs, ipairs, assert, type, wipe = pairs, ipairs, assert, type, wipe
-
--- WoW APIs
-local PlaySound = PlaySound
-local CreateFrame, UIParent = CreateFrame, UIParent
-local _G = _G
-
--- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
--- List them here for Mikk's FindGlobals script
--- GLOBALS: PanelTemplates_TabResize, PanelTemplates_SetDisabledTabState, PanelTemplates_SelectTab, PanelTemplates_DeselectTab
-
--- local upvalue storage used by BuildTabs
-local widths = {}
-local rowwidths = {}
-local rowends = {}
-
---[[-----------------------------------------------------------------------------
-Support functions
--------------------------------------------------------------------------------]]
-local function UpdateTabLook(frame)
-	if frame.disabled then
-		PanelTemplates_SetDisabledTabState(frame)
-	elseif frame.selected then
-		PanelTemplates_SelectTab(frame)
-	else
-		PanelTemplates_DeselectTab(frame)
-	end
-end
-
-local function Tab_SetText(frame, text)
-	frame:_SetText(text)
-	local width = frame.obj.frame.width or frame.obj.frame:GetWidth() or 0
-	PanelTemplates_TabResize(frame, 0, nil, nil, width, frame:GetFontString():GetStringWidth())
-end
-
-local function Tab_SetSelected(frame, selected)
-	frame.selected = selected
-	UpdateTabLook(frame)
-end
-
-local function Tab_SetDisabled(frame, disabled)
-	frame.disabled = disabled
-	UpdateTabLook(frame)
-end
-
-local function BuildTabsOnUpdate(frame)
-	local self = frame.obj
-	self:BuildTabs()
-	frame:SetScript("OnUpdate", nil)
-end
-
---[[-----------------------------------------------------------------------------
-Scripts
--------------------------------------------------------------------------------]]
-local function Tab_OnClick(frame)
-	if not (frame.selected or frame.disabled) then
-		PlaySound("igCharacterInfoTab")
-		frame.obj:SelectTab(frame.value)
-	end
-end
-
-local function Tab_OnEnter(frame)
-	local self = frame.obj
-	self:Fire("OnTabEnter", self.tabs[frame.id].value, frame)
-end
-
-local function Tab_OnLeave(frame)
-	local self = frame.obj
-	self:Fire("OnTabLeave", self.tabs[frame.id].value, frame)
-end
-
-local function Tab_OnShow(frame)
-	_G[frame:GetName().."HighlightTexture"]:SetWidth(frame:GetTextWidth() + 30)
-end
-
---[[-----------------------------------------------------------------------------
-Methods
--------------------------------------------------------------------------------]]
-local methods = {
-	["OnAcquire"] = function(self)
-		self:SetTitle()
-	end,
-
-	["OnRelease"] = function(self)
-		self.status = nil
-		for k in pairs(self.localstatus) do
-			self.localstatus[k] = nil
-		end
-		self.tablist = nil
-		for _, tab in pairs(self.tabs) do
-			tab:Hide()
-		end
-	end,
-
-	["CreateTab"] = function(self, id)
-		local tabname = ("AceGUITabGroup%dTab%d"):format(self.num, id)
-		local tab = CreateFrame("Button", tabname, self.border, "OptionsFrameTabButtonTemplate")
-		tab.obj = self
-		tab.id = id
-
-		tab.text = _G[tabname .. "Text"]
-		tab.text:ClearAllPoints()
-		tab.text:SetPoint("LEFT", 14, -3)
-		tab.text:SetPoint("RIGHT", -12, -3)
-
-		tab:SetScript("OnClick", Tab_OnClick)
-		tab:SetScript("OnEnter", Tab_OnEnter)
-		tab:SetScript("OnLeave", Tab_OnLeave)
-		tab:SetScript("OnShow", Tab_OnShow)
-
-		tab._SetText = tab.SetText
-		tab.SetText = Tab_SetText
-		tab.SetSelected = Tab_SetSelected
-		tab.SetDisabled = Tab_SetDisabled
-
-		return tab
-	end,
-
-	["SetTitle"] = function(self, text)
-		self.titletext:SetText(text or "")
-		if text and text ~= "" then
-			self.alignoffset = 25
-		else
-			self.alignoffset = 18
-		end
-		self:BuildTabs()
-	end,
-
-	["SetStatusTable"] = function(self, status)
-		assert(type(status) == "table")
-		self.status = status
-	end,
-
-	["SelectTab"] = function(self, value)
-		local status = self.status or self.localstatus
-		local found
-		for i, v in ipairs(self.tabs) do
-			if v.value == value then
-				v:SetSelected(true)
-				found = true
-			else
-				v:SetSelected(false)
-			end
-		end
-		status.selected = value
-		if found then
-			self:Fire("OnGroupSelected",value)
-		end
-	end,
-
-	["SetTabs"] = function(self, tabs)
-		self.tablist = tabs
-		self:BuildTabs()
-	end,
-	
-
-	["BuildTabs"] = function(self)
-		local hastitle = (self.titletext:GetText() and self.titletext:GetText() ~= "")
-		local status = self.status or self.localstatus
-		local tablist = self.tablist
-		local tabs = self.tabs
-		
-		if not tablist then return end
-		
-		local width = self.frame.width or self.frame:GetWidth() or 0
-		
-		wipe(widths)
-		wipe(rowwidths)
-		wipe(rowends)
-		
-		--Place Text into tabs and get thier initial width
-		for i, v in ipairs(tablist) do
-			local tab = tabs[i]
-			if not tab then
-				tab = self:CreateTab(i)
-				tabs[i] = tab
-			end
-			
-			tab:Show()
-			tab:SetText(v.text)
-			tab:SetDisabled(v.disabled)
-			tab.value = v.value
-			
-			widths[i] = tab:GetWidth() - 6 --tabs are anchored 10 pixels from the right side of the previous one to reduce spacing, but add a fixed 4px padding for the text
-		end
-		
-		for i = (#tablist)+1, #tabs, 1 do
-			tabs[i]:Hide()
-		end
-		
-		--First pass, find the minimum number of rows needed to hold all tabs and the initial tab layout
-		local numtabs = #tablist
-		local numrows = 1
-		local usedwidth = 0
-
-		for i = 1, #tablist do
-			--If this is not the first tab of a row and there isn't room for it
-			if usedwidth ~= 0 and (width - usedwidth - widths[i]) < 0 then
-				rowwidths[numrows] = usedwidth + 10 --first tab in each row takes up an extra 10px
-				rowends[numrows] = i - 1
-				numrows = numrows + 1
-				usedwidth = 0
-			end
-			usedwidth = usedwidth + widths[i]
-		end
-		rowwidths[numrows] = usedwidth + 10 --first tab in each row takes up an extra 10px
-		rowends[numrows] = #tablist
-		
-		--Fix for single tabs being left on the last row, move a tab from the row above if applicable
-		if numrows > 1 then
-			--if the last row has only one tab
-			if rowends[numrows-1] == numtabs-1 then
-				--if there are more than 2 tabs in the 2nd last row
-				if (numrows == 2 and rowends[numrows-1] > 2) or (rowends[numrows] - rowends[numrows-1] > 2) then
-					--move 1 tab from the second last row to the last, if there is enough space
-					if (rowwidths[numrows] + widths[numtabs-1]) <= width then
-						rowends[numrows-1] = rowends[numrows-1] - 1
-						rowwidths[numrows] = rowwidths[numrows] + widths[numtabs-1]
-						rowwidths[numrows-1] = rowwidths[numrows-1] - widths[numtabs-1]
-					end
-				end
-			end
-		end
-
-		--anchor the rows as defined and resize tabs to fill thier row
-		local starttab = 1
-		for row, endtab in ipairs(rowends) do
-			local first = true
-			for tabno = starttab, endtab do
-				local tab = tabs[tabno]
-				tab:ClearAllPoints()
-				if first then
-					tab:SetPoint("TOPLEFT", self.frame, "TOPLEFT", 0, -(hastitle and 14 or 7)-(row-1)*20 )
-					first = false
-				else
-					tab:SetPoint("LEFT", tabs[tabno-1], "RIGHT", -10, 0)
-				end
-			end
-			
-			-- equal padding for each tab to fill the available width,
-			-- if the used space is above 75% already
-			-- the 18 pixel is the typical width of a scrollbar, so we can have a tab group inside a scrolling frame, 
-			-- and not have the tabs jump around funny when switching between tabs that need scrolling and those that don't
-			local padding = 0
-			if not (numrows == 1 and rowwidths[1] < width*0.75 - 18) then
-				padding = (width - rowwidths[row]) / (endtab - starttab+1)
-			end
-			
-			for i = starttab, endtab do
-				PanelTemplates_TabResize(tabs[i], padding + 4, nil, nil, width, tabs[i]:GetFontString():GetStringWidth())
-			end
-			starttab = endtab + 1
-		end
-		
-		self.borderoffset = (hastitle and 17 or 10)+((numrows)*20)
-		self.border:SetPoint("TOPLEFT", 1, -self.borderoffset)
-	end,
-
-	["OnWidthSet"] = function(self, width)
-		local content = self.content
-		local contentwidth = width - 60
-		if contentwidth < 0 then
-			contentwidth = 0
-		end
-		content:SetWidth(contentwidth)
-		content.width = contentwidth
-		self:BuildTabs(self)
-		self.frame:SetScript("OnUpdate", BuildTabsOnUpdate)
-	end,
-
-	["OnHeightSet"] = function(self, height)
-		local content = self.content
-		local contentheight = height - (self.borderoffset + 23)
-		if contentheight < 0 then
-			contentheight = 0
-		end
-		content:SetHeight(contentheight)
-		content.height = contentheight
-	end,
-	
-	["LayoutFinished"] = function(self, width, height)
-		if self.noAutoHeight then return end
-		self:SetHeight((height or 0) + (self.borderoffset + 23))
-	end
-}
-
---[[-----------------------------------------------------------------------------
-Constructor
--------------------------------------------------------------------------------]]
-local PaneBackdrop  = {
-	bgFile = "Interface\\ChatFrame\\ChatFrameBackground",
-	edgeFile = "Interface\\Tooltips\\UI-Tooltip-Border",
-	tile = true, tileSize = 16, edgeSize = 16,
-	insets = { left = 3, right = 3, top = 5, bottom = 3 }
-}
-
-local function Constructor()
-	local num = AceGUI:GetNextWidgetNum(Type)
-	local frame = CreateFrame("Frame",nil,UIParent)
-	frame:SetHeight(100)
-	frame:SetWidth(100)
-	frame:SetFrameStrata("FULLSCREEN_DIALOG")
-
-	local titletext = frame:CreateFontString(nil,"OVERLAY","GameFontNormal")
-	titletext:SetPoint("TOPLEFT", 14, 0)
-	titletext:SetPoint("TOPRIGHT", -14, 0)
-	titletext:SetJustifyH("LEFT")
-	titletext:SetHeight(18)
-	titletext:SetText("")
-
-	local border = CreateFrame("Frame", nil, frame)
-	border:SetPoint("TOPLEFT", 1, -27)
-	border:SetPoint("BOTTOMRIGHT", -1, 3)
-	border:SetBackdrop(PaneBackdrop)
-	border:SetBackdropColor(0.1, 0.1, 0.1, 0.5)
-	border:SetBackdropBorderColor(0.4, 0.4, 0.4)
-
-	local content = CreateFrame("Frame", nil, border)
-	content:SetPoint("TOPLEFT", 10, -7)
-	content:SetPoint("BOTTOMRIGHT", -10, 7)
-
-	local widget = {
-		num          = num,
-		frame        = frame,
-		localstatus  = {},
-		alignoffset  = 18,
-		titletext    = titletext,
-		border       = border,
-		borderoffset = 27,
-		tabs         = {},
-		content      = content,
-		type         = Type
-	}
-	for method, func in pairs(methods) do
-		widget[method] = func
-	end
-	
-	return AceGUI:RegisterAsContainer(widget)
-end
-
-AceGUI:RegisterWidgetType(Type, Constructor, Version)
diff --git a/OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIContainer-TreeGroup.lua b/OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIContainer-TreeGroup.lua
deleted file mode 100644
index 9bf17d8..0000000
--- a/OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIContainer-TreeGroup.lua
+++ /dev/null
@@ -1,717 +0,0 @@
---[[-----------------------------------------------------------------------------
-TreeGroup Container
-Container that uses a tree control to switch between groups.
--------------------------------------------------------------------------------]]
-local Type, Version = "TreeGroup", 40
-local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
-if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
-
-local IsLegion = select(4, GetBuildInfo()) >= 70000
-
--- Lua APIs
-local next, pairs, ipairs, assert, type = next, pairs, ipairs, assert, type
-local math_min, math_max, floor = math.min, math.max, floor
-local select, tremove, unpack, tconcat = select, table.remove, unpack, table.concat
-
--- WoW APIs
-local CreateFrame, UIParent = CreateFrame, UIParent
-
--- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
--- List them here for Mikk's FindGlobals script
--- GLOBALS: GameTooltip, FONT_COLOR_CODE_CLOSE
-
--- Recycling functions
-local new, del
-do
-	local pool = setmetatable({},{__mode='k'})
-	function new()
-		local t = next(pool)
-		if t then
-			pool[t] = nil
-			return t
-		else
-			return {}
-		end
-	end
-	function del(t)
-		for k in pairs(t) do
-			t[k] = nil
-		end	
-		pool[t] = true
-	end
-end
-
-local DEFAULT_TREE_WIDTH = 175
-local DEFAULT_TREE_SIZABLE = true
-
---[[-----------------------------------------------------------------------------
-Support functions
--------------------------------------------------------------------------------]]
-local function GetButtonUniqueValue(line)
-	local parent = line.parent
-	if parent and parent.value then
-		return GetButtonUniqueValue(parent).."\001"..line.value
-	else
-		return line.value
-	end
-end
-
-local function UpdateButton(button, treeline, selected, canExpand, isExpanded)
-	local self = button.obj
-	local toggle = button.toggle
-	local frame = self.frame
-	local text = treeline.text or ""
-	local icon = treeline.icon
-	local iconCoords = treeline.iconCoords
-	local level = treeline.level
-	local value = treeline.value
-	local uniquevalue = treeline.uniquevalue
-	local disabled = treeline.disabled
-	
-	button.treeline = treeline
-	button.value = value
-	button.uniquevalue = uniquevalue
-	if selected then
-		button:LockHighlight()
-		button.selected = true
-	else
-		button:UnlockHighlight()
-		button.selected = false
-	end
-	local normalTexture = button:GetNormalTexture()
-	local line = button.line
-	button.level = level
-	if ( level == 1 ) then
-		button:SetNormalFontObject("GameFontNormal")
-		button:SetHighlightFontObject("GameFontHighlight")
-		button.text:SetPoint("LEFT", (icon and 16 or 0) + 8, 2)
-	else
-		button:SetNormalFontObject("GameFontHighlightSmall")
-		button:SetHighlightFontObject("GameFontHighlightSmall")
-		button.text:SetPoint("LEFT", (icon and 16 or 0) + 8 * level, 2)
-	end
-	
-	if disabled then
-		button:EnableMouse(false)
-		button.text:SetText("|cff808080"..text..FONT_COLOR_CODE_CLOSE)
-	else
-		button.text:SetText(text)
-		button:EnableMouse(true)
-	end
-	
-	if icon then
-		button.icon:SetTexture(icon)
-		button.icon:SetPoint("LEFT", 8 * level, (level == 1) and 0 or 1)
-	else
-		button.icon:SetTexture(nil)
-	end
-	
-	if iconCoords then
-		button.icon:SetTexCoord(unpack(iconCoords))
-	else
-		button.icon:SetTexCoord(0, 1, 0, 1)
-	end
-	
-	if canExpand then
-		if not isExpanded then
-			toggle:SetNormalTexture("Interface\\Buttons\\UI-PlusButton-UP")
-			toggle:SetPushedTexture("Interface\\Buttons\\UI-PlusButton-DOWN")
-		else
-			toggle:SetNormalTexture("Interface\\Buttons\\UI-MinusButton-UP")
-			toggle:SetPushedTexture("Interface\\Buttons\\UI-MinusButton-DOWN")
-		end
-		toggle:Show()
-	else
-		toggle:Hide()
-	end
-end
-
-local function ShouldDisplayLevel(tree)
-	local result = false
-	for k, v in ipairs(tree) do
-		if v.children == nil and v.visible ~= false then
-			result = true
-		elseif v.children then
-			result = result or ShouldDisplayLevel(v.children)
-		end
-		if result then return result end
-	end
-	return false
-end
-
-local function addLine(self, v, tree, level, parent)
-	local line = new()
-	line.value = v.value
-	line.text = v.text
-	line.icon = v.icon
-	line.iconCoords = v.iconCoords
-	line.disabled = v.disabled
-	line.tree = tree
-	line.level = level
-	line.parent = parent
-	line.visible = v.visible
-	line.uniquevalue = GetButtonUniqueValue(line)
-	if v.children then
-		line.hasChildren = true
-	else
-		line.hasChildren = nil
-	end
-	self.lines[#self.lines+1] = line
-	return line
-end
-
---fire an update after one frame to catch the treeframes height
-local function FirstFrameUpdate(frame)
-	local self = frame.obj
-	frame:SetScript("OnUpdate", nil)
-	self:RefreshTree()
-end
-
-local function BuildUniqueValue(...)
-	local n = select('#', ...)
-	if n == 1 then
-		return ...
-	else
-		return (...).."\001"..BuildUniqueValue(select(2,...))
-	end
-end
-
---[[-----------------------------------------------------------------------------
-Scripts
--------------------------------------------------------------------------------]]
-local function Expand_OnClick(frame)
-	local button = frame.button
-	local self = button.obj
-	local status = (self.status or self.localstatus).groups
-	status[button.uniquevalue] = not status[button.uniquevalue]
-	self:RefreshTree()
-end
-
-local function Button_OnClick(frame)
-	local self = frame.obj
-	self:Fire("OnClick", frame.uniquevalue, frame.selected)
-	if not frame.selected then
-		self:SetSelected(frame.uniquevalue)
-		frame.selected = true
-		frame:LockHighlight()
-		self:RefreshTree()
-	end
-	AceGUI:ClearFocus()
-end
-
-local function Button_OnDoubleClick(button)
-	local self = button.obj
-	local status = self.status or self.localstatus
-	local status = (self.status or self.localstatus).groups
-	status[button.uniquevalue] = not status[button.uniquevalue]
-	self:RefreshTree()
-end
-
-local function Button_OnEnter(frame)
-	local self = frame.obj
-	self:Fire("OnButtonEnter", frame.uniquevalue, frame)
-
-	if self.enabletooltips then
-		GameTooltip:SetOwner(frame, "ANCHOR_NONE")
-		GameTooltip:SetPoint("LEFT",frame,"RIGHT")
-		GameTooltip:SetText(frame.text:GetText() or "", 1, .82, 0, true)
-
-		GameTooltip:Show()
-	end
-end
-
-local function Button_OnLeave(frame)
-	local self = frame.obj
-	self:Fire("OnButtonLeave", frame.uniquevalue, frame)
-
-	if self.enabletooltips then
-		GameTooltip:Hide()
-	end
-end
-
-local function OnScrollValueChanged(frame, value)
-	if frame.obj.noupdate then return end
-	local self = frame.obj
-	local status = self.status or self.localstatus
-	status.scrollvalue = floor(value + 0.5)
-	self:RefreshTree()
-	AceGUI:ClearFocus()
-end
-
-local function Tree_OnSizeChanged(frame)
-	frame.obj:RefreshTree()
-end
-
-local function Tree_OnMouseWheel(frame, delta)
-	local self = frame.obj
-	if self.showscroll then
-		local scrollbar = self.scrollbar
-		local min, max = scrollbar:GetMinMaxValues()
-		local value = scrollbar:GetValue()
-		local newvalue = math_min(max,math_max(min,value - delta))
-		if value ~= newvalue then
-			scrollbar:SetValue(newvalue)
-		end
-	end
-end
-
-local function Dragger_OnLeave(frame)
-	frame:SetBackdropColor(1, 1, 1, 0)
-end
-
-local function Dragger_OnEnter(frame)
-	frame:SetBackdropColor(1, 1, 1, 0.8)
-end
-
-local function Dragger_OnMouseDown(frame)
-	local treeframe = frame:GetParent()
-	treeframe:StartSizing("RIGHT")
-end
-
-local function Dragger_OnMouseUp(frame)
-	local treeframe = frame:GetParent()
-	local self = treeframe.obj
-	local frame = treeframe:GetParent()
-	treeframe:StopMovingOrSizing()
-	--treeframe:SetScript("OnUpdate", nil)
-	treeframe:SetUserPlaced(false)
-	--Without this :GetHeight will get stuck on the current height, causing the tree contents to not resize
-	treeframe:SetHeight(0)
-	treeframe:SetPoint("TOPLEFT", frame, "TOPLEFT",0,0)
-	treeframe:SetPoint("BOTTOMLEFT", frame, "BOTTOMLEFT",0,0)
-	
-	local status = self.status or self.localstatus
-	status.treewidth = treeframe:GetWidth()
-	
-	treeframe.obj:Fire("OnTreeResize",treeframe:GetWidth())
-	-- recalculate the content width
-	treeframe.obj:OnWidthSet(status.fullwidth)
-	-- update the layout of the content
-	treeframe.obj:DoLayout()
-end
-
---[[-----------------------------------------------------------------------------
-Methods
--------------------------------------------------------------------------------]]
-local methods = {
-	["OnAcquire"] = function(self)
-		self:SetTreeWidth(DEFAULT_TREE_WIDTH, DEFAULT_TREE_SIZABLE)
-		self:EnableButtonTooltips(true)
-		self.frame:SetScript("OnUpdate", FirstFrameUpdate)
-	end,
-
-	["OnRelease"] = function(self)
-		self.status = nil
-		for k, v in pairs(self.localstatus) do
-			if k == "groups" then
-				for k2 in pairs(v) do
-					v[k2] = nil
-				end
-			else
-				self.localstatus[k] = nil
-			end
-		end
-		self.localstatus.scrollvalue = 0
-		self.localstatus.treewidth = DEFAULT_TREE_WIDTH
-		self.localstatus.treesizable = DEFAULT_TREE_SIZABLE
-	end,
-
-	["EnableButtonTooltips"] = function(self, enable)
-		self.enabletooltips = enable
-	end,
-
-	["CreateButton"] = function(self)
-		local num = AceGUI:GetNextWidgetNum("TreeGroupButton")
-		local button = CreateFrame("Button", ("AceGUI30TreeButton%d"):format(num), self.treeframe, "OptionsListButtonTemplate")
-		button.obj = self
-
-		local icon = button:CreateTexture(nil, "OVERLAY")
-		icon:SetWidth(14)
-		icon:SetHeight(14)
-		button.icon = icon
-
-		button:SetScript("OnClick",Button_OnClick)
-		button:SetScript("OnDoubleClick", Button_OnDoubleClick)
-		button:SetScript("OnEnter",Button_OnEnter)
-		button:SetScript("OnLeave",Button_OnLeave)
-
-		button.toggle.button = button
-		button.toggle:SetScript("OnClick",Expand_OnClick)
-
-		button.text:SetHeight(14) -- Prevents text wrapping
-
-		return button
-	end,
-
-	["SetStatusTable"] = function(self, status)
-		assert(type(status) == "table")
-		self.status = status
-		if not status.groups then
-			status.groups = {}
-		end
-		if not status.scrollvalue then
-			status.scrollvalue = 0
-		end
-		if not status.treewidth then
-			status.treewidth = DEFAULT_TREE_WIDTH
-		end
-		if status.treesizable == nil then
-			status.treesizable = DEFAULT_TREE_SIZABLE
-		end
-		self:SetTreeWidth(status.treewidth,status.treesizable)
-		self:RefreshTree()
-	end,
-
-	--sets the tree to be displayed
-	["SetTree"] = function(self, tree, filter)
-		self.filter = filter
-		if tree then 
-			assert(type(tree) == "table") 
-		end
-		self.tree = tree
-		self:RefreshTree()
-	end,
-
-	["BuildLevel"] = function(self, tree, level, parent)
-		local groups = (self.status or self.localstatus).groups
-		local hasChildren = self.hasChildren
-		
-		for i, v in ipairs(tree) do
-			if v.children then
-				if not self.filter or ShouldDisplayLevel(v.children) then
-					local line = addLine(self, v, tree, level, parent)
-					if groups[line.uniquevalue] then
-						self:BuildLevel(v.children, level+1, line)
-					end
-				end
-			elseif v.visible ~= false or not self.filter then
-				addLine(self, v, tree, level, parent)
-			end
-		end
-	end,
-
-	["RefreshTree"] = function(self,scrollToSelection)
-		local buttons = self.buttons 
-		local lines = self.lines
-
-		for i, v in ipairs(buttons) do
-			v:Hide()
-		end
-		while lines[1] do
-			local t = tremove(lines)
-			for k in pairs(t) do
-				t[k] = nil
-			end
-			del(t)
-		end
-
-		if not self.tree then return end
-		--Build the list of visible entries from the tree and status tables
-		local status = self.status or self.localstatus
-		local groupstatus = status.groups
-		local tree = self.tree
-
-		local treeframe = self.treeframe
-		
-		status.scrollToSelection = status.scrollToSelection or scrollToSelection	-- needs to be cached in case the control hasn't been drawn yet (code bails out below)
-
-		self:BuildLevel(tree, 1)
-
-		local numlines = #lines
-
-		local maxlines = (floor(((self.treeframe:GetHeight()or 0) - 20 ) / 18))
-		if maxlines <= 0 then return end
-
-		local first, last
-		
-		scrollToSelection = status.scrollToSelection
-		status.scrollToSelection = nil
-
-		if numlines <= maxlines then
-			--the whole tree fits in the frame
-			status.scrollvalue = 0
-			self:ShowScroll(false)
-			first, last = 1, numlines
-		else
-			self:ShowScroll(true)
-			--scrolling will be needed
-			self.noupdate = true
-			self.scrollbar:SetMinMaxValues(0, numlines - maxlines)
-			--check if we are scrolled down too far
-			if numlines - status.scrollvalue < maxlines then
-				status.scrollvalue = numlines - maxlines
-			end
-			self.noupdate = nil
-			first, last = status.scrollvalue+1, status.scrollvalue + maxlines
-			--show selection?
-			if scrollToSelection and status.selected then
-				local show
-				for i,line in ipairs(lines) do	-- find the line number
-					if line.uniquevalue==status.selected then
-						show=i
-					end
-				end
-				if not show then
-					-- selection was deleted or something?
-				elseif show>=first and show<=last then
-					-- all good
-				else
-					-- scrolling needed!
-					if show<first then
-						status.scrollvalue = show-1
-					else
-						status.scrollvalue = show-maxlines
-					end
-					first, last = status.scrollvalue+1, status.scrollvalue + maxlines
-				end
-			end
-			if self.scrollbar:GetValue() ~= status.scrollvalue then
-				self.scrollbar:SetValue(status.scrollvalue)
-			end
-		end
-
-		local buttonnum = 1
-		for i = first, last do
-			local line = lines[i]
-			local button = buttons[buttonnum]
-			if not button then
-				button = self:CreateButton()
-
-				buttons[buttonnum] = button
-				button:SetParent(treeframe)
-				button:SetFrameLevel(treeframe:GetFrameLevel()+1)
-				button:ClearAllPoints()
-				if buttonnum == 1 then
-					if self.showscroll then
-						button:SetPoint("TOPRIGHT", -22, -10)
-						button:SetPoint("TOPLEFT", 0, -10)
-					else
-						button:SetPoint("TOPRIGHT", 0, -10)
-						button:SetPoint("TOPLEFT", 0, -10)
-					end
-				else
-					button:SetPoint("TOPRIGHT", buttons[buttonnum-1], "BOTTOMRIGHT",0,0)
-					button:SetPoint("TOPLEFT", buttons[buttonnum-1], "BOTTOMLEFT",0,0)
-				end
-			end
-
-			UpdateButton(button, line, status.selected == line.uniquevalue, line.hasChildren, groupstatus[line.uniquevalue] )
-			button:Show()
-			buttonnum = buttonnum + 1
-		end
-		
-	end,
-	
-	["SetSelected"] = function(self, value)
-		local status = self.status or self.localstatus
-		if status.selected ~= value then
-			status.selected = value
-			self:Fire("OnGroupSelected", value)
-		end
-	end,
-
-	["Select"] = function(self, uniquevalue, ...)
-		self.filter = false
-		local status = self.status or self.localstatus
-		local groups = status.groups
-		local path = {...}
-		for i = 1, #path do
-			groups[tconcat(path, "\001", 1, i)] = true
-		end
-		status.selected = uniquevalue
-		self:RefreshTree(true)
-		self:Fire("OnGroupSelected", uniquevalue)
-	end,
-
-	["SelectByPath"] = function(self, ...)
-		self:Select(BuildUniqueValue(...), ...)
-	end,
-
-	["SelectByValue"] = function(self, uniquevalue)
-		self:Select(uniquevalue, ("\001"):split(uniquevalue))
-	end,
-
-	["ShowScroll"] = function(self, show)
-		self.showscroll = show
-		if show then
-			self.scrollbar:Show()
-			if self.buttons[1] then
-				self.buttons[1]:SetPoint("TOPRIGHT", self.treeframe,"TOPRIGHT",-22,-10)
-			end
-		else
-			self.scrollbar:Hide()
-			if self.buttons[1] then
-				self.buttons[1]:SetPoint("TOPRIGHT", self.treeframe,"TOPRIGHT",0,-10)
-			end
-		end
-	end,
-
-	["OnWidthSet"] = function(self, width)
-		local content = self.content
-		local treeframe = self.treeframe
-		local status = self.status or self.localstatus
-		status.fullwidth = width
-		
-		local contentwidth = width - status.treewidth - 20
-		if contentwidth < 0 then
-			contentwidth = 0
-		end
-		content:SetWidth(contentwidth)
-		content.width = contentwidth
-		
-		local maxtreewidth = math_min(400, width - 50)
-		
-		if maxtreewidth > 100 and status.treewidth > maxtreewidth then
-			self:SetTreeWidth(maxtreewidth, status.treesizable)
-		end
-		treeframe:SetMaxResize(maxtreewidth, 1600)
-	end,
-
-	["OnHeightSet"] = function(self, height)
-		local content = self.content
-		local contentheight = height - 20
-		if contentheight < 0 then
-			contentheight = 0
-		end
-		content:SetHeight(contentheight)
-		content.height = contentheight
-	end,
-
-	["SetTreeWidth"] = function(self, treewidth, resizable)
-		if not resizable then
-			if type(treewidth) == 'number' then
-				resizable = false
-			elseif type(treewidth) == 'boolean' then
-				resizable = treewidth
-				treewidth = DEFAULT_TREE_WIDTH
-			else
-				resizable = false
-				treewidth = DEFAULT_TREE_WIDTH 
-			end
-		end
-		self.treeframe:SetWidth(treewidth)
-		self.dragger:EnableMouse(resizable)
-		
-		local status = self.status or self.localstatus
-		status.treewidth = treewidth
-		status.treesizable = resizable
-		
-		-- recalculate the content width
-		if status.fullwidth then
-			self:OnWidthSet(status.fullwidth)
-		end
-	end,
-
-	["GetTreeWidth"] = function(self)
-		local status = self.status or self.localstatus
-		return status.treewidth or DEFAULT_TREE_WIDTH
-	end,
-
-	["LayoutFinished"] = function(self, width, height)
-		if self.noAutoHeight then return end
-		self:SetHeight((height or 0) + 20)
-	end
-}
-
---[[-----------------------------------------------------------------------------
-Constructor
--------------------------------------------------------------------------------]]
-local PaneBackdrop  = {
-	bgFile = "Interface\\ChatFrame\\ChatFrameBackground",
-	edgeFile = "Interface\\Tooltips\\UI-Tooltip-Border",
-	tile = true, tileSize = 16, edgeSize = 16,
-	insets = { left = 3, right = 3, top = 5, bottom = 3 }
-}
-
-local DraggerBackdrop  = {
-	bgFile = "Interface\\Tooltips\\UI-Tooltip-Background",
-	edgeFile = nil,
-	tile = true, tileSize = 16, edgeSize = 0,
-	insets = { left = 3, right = 3, top = 7, bottom = 7 }
-}
-
-local function Constructor()
-	local num = AceGUI:GetNextWidgetNum(Type)
-	local frame = CreateFrame("Frame", nil, UIParent)
-
-	local treeframe = CreateFrame("Frame", nil, frame)
-	treeframe:SetPoint("TOPLEFT")
-	treeframe:SetPoint("BOTTOMLEFT")
-	treeframe:SetWidth(DEFAULT_TREE_WIDTH)
-	treeframe:EnableMouseWheel(true)
-	treeframe:SetBackdrop(PaneBackdrop)
-	treeframe:SetBackdropColor(0.1, 0.1, 0.1, 0.5)
-	treeframe:SetBackdropBorderColor(0.4, 0.4, 0.4)
-	treeframe:SetResizable(true)
-	treeframe:SetMinResize(100, 1)
-	treeframe:SetMaxResize(400, 1600)
-	treeframe:SetScript("OnUpdate", FirstFrameUpdate)
-	treeframe:SetScript("OnSizeChanged", Tree_OnSizeChanged)
-	treeframe:SetScript("OnMouseWheel", Tree_OnMouseWheel)
-
-	local dragger = CreateFrame("Frame", nil, treeframe)
-	dragger:SetWidth(8)
-	dragger:SetPoint("TOP", treeframe, "TOPRIGHT")
-	dragger:SetPoint("BOTTOM", treeframe, "BOTTOMRIGHT")
-	dragger:SetBackdrop(DraggerBackdrop)
-	dragger:SetBackdropColor(1, 1, 1, 0)
-	dragger:SetScript("OnEnter", Dragger_OnEnter)
-	dragger:SetScript("OnLeave", Dragger_OnLeave)
-	dragger:SetScript("OnMouseDown", Dragger_OnMouseDown)
-	dragger:SetScript("OnMouseUp", Dragger_OnMouseUp)
-
-	local scrollbar = CreateFrame("Slider", ("AceConfigDialogTreeGroup%dScrollBar"):format(num), treeframe, "UIPanelScrollBarTemplate")
-	scrollbar:SetScript("OnValueChanged", nil)
-	scrollbar:SetPoint("TOPRIGHT", -10, -26)
-	scrollbar:SetPoint("BOTTOMRIGHT", -10, 26)
-	scrollbar:SetMinMaxValues(0,0)
-	scrollbar:SetValueStep(1)
-	scrollbar:SetValue(0)
-	scrollbar:SetWidth(16)
-	scrollbar:SetScript("OnValueChanged", OnScrollValueChanged)
-
-	local scrollbg = scrollbar:CreateTexture(nil, "BACKGROUND")
-	scrollbg:SetAllPoints(scrollbar)
-
-	if IsLegion then
-		scrollbg:SetColorTexture(0,0,0,0.4)
-	else
-		scrollbg:SetTexture(0,0,0,0.4)
-	end
-
-	local border = CreateFrame("Frame",nil,frame)
-	border:SetPoint("TOPLEFT", treeframe, "TOPRIGHT")
-	border:SetPoint("BOTTOMRIGHT")
-	border:SetBackdrop(PaneBackdrop)
-	border:SetBackdropColor(0.1, 0.1, 0.1, 0.5)
-	border:SetBackdropBorderColor(0.4, 0.4, 0.4)
-
-	--Container Support
-	local content = CreateFrame("Frame", nil, border)
-	content:SetPoint("TOPLEFT", 10, -10)
-	content:SetPoint("BOTTOMRIGHT", -10, 10)
-
-	local widget = {
-		frame        = frame,
-		lines        = {},
-		levels       = {},
-		buttons      = {},
-		hasChildren  = {},
-		localstatus  = { groups = {}, scrollvalue = 0 },
-		filter       = false,
-		treeframe    = treeframe,
-		dragger      = dragger,
-		scrollbar    = scrollbar,
-		border       = border,
-		content      = content,
-		type         = Type
-	}
-	for method, func in pairs(methods) do
-		widget[method] = func
-	end
-	treeframe.obj, dragger.obj, scrollbar.obj = widget, widget, widget
-
-	return AceGUI:RegisterAsContainer(widget)
-end
-
-AceGUI:RegisterWidgetType(Type, Constructor, Version)
diff --git a/OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIContainer-Window.lua b/OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIContainer-Window.lua
deleted file mode 100644
index bb0a2a2..0000000
--- a/OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIContainer-Window.lua
+++ /dev/null
@@ -1,331 +0,0 @@
-local AceGUI = LibStub("AceGUI-3.0")
-
--- Lua APIs
-local pairs, assert, type = pairs, assert, type
-
--- WoW APIs
-local PlaySound = PlaySound
-local CreateFrame, UIParent = CreateFrame, UIParent
-
--- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
--- List them here for Mikk's FindGlobals script
--- GLOBALS: GameFontNormal
-
-----------------
--- Main Frame --
-----------------
---[[
-	Events :
-		OnClose
-
-]]
-do
-	local Type = "Window"
-	local Version = 4
-
-	local function frameOnClose(this)
-		this.obj:Fire("OnClose")
-	end
-	
-	local function closeOnClick(this)
-		PlaySound("gsTitleOptionExit")
-		this.obj:Hide()
-	end
-	
-	local function frameOnMouseDown(this)
-		AceGUI:ClearFocus()
-	end
-	
-	local function titleOnMouseDown(this)
-		this:GetParent():StartMoving()
-		AceGUI:ClearFocus()
-	end
-	
-	local function frameOnMouseUp(this)
-		local frame = this:GetParent()
-		frame:StopMovingOrSizing()
-		local self = frame.obj
-		local status = self.status or self.localstatus
-		status.width = frame:GetWidth()
-		status.height = frame:GetHeight()
-		status.top = frame:GetTop()
-		status.left = frame:GetLeft()
-	end
-	
-	local function sizerseOnMouseDown(this)
-		this:GetParent():StartSizing("BOTTOMRIGHT")
-		AceGUI:ClearFocus()
-	end
-	
-	local function sizersOnMouseDown(this)
-		this:GetParent():StartSizing("BOTTOM")
-		AceGUI:ClearFocus()
-	end
-	
-	local function sizereOnMouseDown(this)
-		this:GetParent():StartSizing("RIGHT")
-		AceGUI:ClearFocus()
-	end
-	
-	local function sizerOnMouseUp(this)
-		this:GetParent():StopMovingOrSizing()
-	end
-
-	local function SetTitle(self,title)
-		self.titletext:SetText(title)
-	end
-	
-	local function SetStatusText(self,text)
-		-- self.statustext:SetText(text)
-	end
-	
-	local function Hide(self)
-		self.frame:Hide()
-	end
-	
-	local function Show(self)
-		self.frame:Show()
-	end
-	
-	local function OnAcquire(self)
-		self.frame:SetParent(UIParent)
-		self.frame:SetFrameStrata("FULLSCREEN_DIALOG")
-		self:ApplyStatus()
-		self:EnableResize(true)
-		self:Show()
-	end
-	
-	local function OnRelease(self)
-		self.status = nil
-		for k in pairs(self.localstatus) do
-			self.localstatus[k] = nil
-		end
-	end
-	
-	-- called to set an external table to store status in
-	local function SetStatusTable(self, status)
-		assert(type(status) == "table")
-		self.status = status
-		self:ApplyStatus()
-	end
-	
-	local function ApplyStatus(self)
-		local status = self.status or self.localstatus
-		local frame = self.frame
-		self:SetWidth(status.width or 700)
-		self:SetHeight(status.height or 500)
-		if status.top and status.left then
-			frame:SetPoint("TOP",UIParent,"BOTTOM",0,status.top)
-			frame:SetPoint("LEFT",UIParent,"LEFT",status.left,0)
-		else
-			frame:SetPoint("CENTER",UIParent,"CENTER")
-		end
-	end
-	
-	local function OnWidthSet(self, width)
-		local content = self.content
-		local contentwidth = width - 34
-		if contentwidth < 0 then
-			contentwidth = 0
-		end
-		content:SetWidth(contentwidth)
-		content.width = contentwidth
-	end
-	
-	
-	local function OnHeightSet(self, height)
-		local content = self.content
-		local contentheight = height - 57
-		if contentheight < 0 then
-			contentheight = 0
-		end
-		content:SetHeight(contentheight)
-		content.height = contentheight
-	end
-	
-	local function EnableResize(self, state)
-		local func = state and "Show" or "Hide"
-		self.sizer_se[func](self.sizer_se)
-		self.sizer_s[func](self.sizer_s)
-		self.sizer_e[func](self.sizer_e)
-	end
-	
-	local function Constructor()
-		local frame = CreateFrame("Frame",nil,UIParent)
-		local self = {}
-		self.type = "Window"
-		
-		self.Hide = Hide
-		self.Show = Show
-		self.SetTitle =  SetTitle
-		self.OnRelease = OnRelease
-		self.OnAcquire = OnAcquire
-		self.SetStatusText = SetStatusText
-		self.SetStatusTable = SetStatusTable
-		self.ApplyStatus = ApplyStatus
-		self.OnWidthSet = OnWidthSet
-		self.OnHeightSet = OnHeightSet
-		self.EnableResize = EnableResize
-		
-		self.localstatus = {}
-		
-		self.frame = frame
-		frame.obj = self
-		frame:SetWidth(700)
-		frame:SetHeight(500)
-		frame:SetPoint("CENTER",UIParent,"CENTER",0,0)
-		frame:EnableMouse()
-		frame:SetMovable(true)
-		frame:SetResizable(true)
-		frame:SetFrameStrata("FULLSCREEN_DIALOG")
-		frame:SetScript("OnMouseDown", frameOnMouseDown)
-		
-		frame:SetScript("OnHide",frameOnClose)
-		frame:SetMinResize(240,240)
-		frame:SetToplevel(true)
-
-		local titlebg = frame:CreateTexture(nil, "BACKGROUND")
-		titlebg:SetTexture([[Interface\PaperDollInfoFrame\UI-GearManager-Title-Background]])
-		titlebg:SetPoint("TOPLEFT", 9, -6)
-		titlebg:SetPoint("BOTTOMRIGHT", frame, "TOPRIGHT", -28, -24)
-		
-		local dialogbg = frame:CreateTexture(nil, "BACKGROUND")
-		dialogbg:SetTexture([[Interface\Tooltips\UI-Tooltip-Background]])
-		dialogbg:SetPoint("TOPLEFT", 8, -24)
-		dialogbg:SetPoint("BOTTOMRIGHT", -6, 8)
-		dialogbg:SetVertexColor(0, 0, 0, .75)
-		
-		local topleft = frame:CreateTexture(nil, "BORDER")
-		topleft:SetTexture([[Interface\PaperDollInfoFrame\UI-GearManager-Border]])
-		topleft:SetWidth(64)
-		topleft:SetHeight(64)
-		topleft:SetPoint("TOPLEFT")
-		topleft:SetTexCoord(0.501953125, 0.625, 0, 1)
-		
-		local topright = frame:CreateTexture(nil, "BORDER")
-		topright:SetTexture([[Interface\PaperDollInfoFrame\UI-GearManager-Border]])
-		topright:SetWidth(64)
-		topright:SetHeight(64)
-		topright:SetPoint("TOPRIGHT")
-		topright:SetTexCoord(0.625, 0.75, 0, 1)
-		
-		local top = frame:CreateTexture(nil, "BORDER")
-		top:SetTexture([[Interface\PaperDollInfoFrame\UI-GearManager-Border]])
-		top:SetHeight(64)
-		top:SetPoint("TOPLEFT", topleft, "TOPRIGHT")
-		top:SetPoint("TOPRIGHT", topright, "TOPLEFT")
-		top:SetTexCoord(0.25, 0.369140625, 0, 1)
-		
-		local bottomleft = frame:CreateTexture(nil, "BORDER")
-		bottomleft:SetTexture([[Interface\PaperDollInfoFrame\UI-GearManager-Border]])
-		bottomleft:SetWidth(64)
-		bottomleft:SetHeight(64)
-		bottomleft:SetPoint("BOTTOMLEFT")
-		bottomleft:SetTexCoord(0.751953125, 0.875, 0, 1)
-		
-		local bottomright = frame:CreateTexture(nil, "BORDER")
-		bottomright:SetTexture([[Interface\PaperDollInfoFrame\UI-GearManager-Border]])
-		bottomright:SetWidth(64)
-		bottomright:SetHeight(64)
-		bottomright:SetPoint("BOTTOMRIGHT")
-		bottomright:SetTexCoord(0.875, 1, 0, 1)
-		
-		local bottom = frame:CreateTexture(nil, "BORDER")
-		bottom:SetTexture([[Interface\PaperDollInfoFrame\UI-GearManager-Border]])
-		bottom:SetHeight(64)
-		bottom:SetPoint("BOTTOMLEFT", bottomleft, "BOTTOMRIGHT")
-		bottom:SetPoint("BOTTOMRIGHT", bottomright, "BOTTOMLEFT")
-		bottom:SetTexCoord(0.376953125, 0.498046875, 0, 1)
-		
-		local left = frame:CreateTexture(nil, "BORDER")
-		left:SetTexture([[Interface\PaperDollInfoFrame\UI-GearManager-Border]])
-		left:SetWidth(64)
-		left:SetPoint("TOPLEFT", topleft, "BOTTOMLEFT")
-		left:SetPoint("BOTTOMLEFT", bottomleft, "TOPLEFT")
-		left:SetTexCoord(0.001953125, 0.125, 0, 1)
-		
-		local right = frame:CreateTexture(nil, "BORDER")
-		right:SetTexture([[Interface\PaperDollInfoFrame\UI-GearManager-Border]])
-		right:SetWidth(64)
-		right:SetPoint("TOPRIGHT", topright, "BOTTOMRIGHT")
-		right:SetPoint("BOTTOMRIGHT", bottomright, "TOPRIGHT")
-		right:SetTexCoord(0.1171875, 0.2421875, 0, 1)
-		
-		local close = CreateFrame("Button", nil, frame, "UIPanelCloseButton")
-		close:SetPoint("TOPRIGHT", 2, 1)
-		close:SetScript("OnClick", closeOnClick)
-		self.closebutton = close
-		close.obj = self
-		
-		local titletext = frame:CreateFontString(nil, "ARTWORK")
-		titletext:SetFontObject(GameFontNormal)
-		titletext:SetPoint("TOPLEFT", 12, -8)
-		titletext:SetPoint("TOPRIGHT", -32, -8)
-		self.titletext = titletext
-		
-		local title = CreateFrame("Button", nil, frame)
-		title:SetPoint("TOPLEFT", titlebg)
-		title:SetPoint("BOTTOMRIGHT", titlebg)
-		title:EnableMouse()
-		title:SetScript("OnMouseDown",titleOnMouseDown)
-		title:SetScript("OnMouseUp", frameOnMouseUp)
-		self.title = title
-		
-		local sizer_se = CreateFrame("Frame",nil,frame)
-		sizer_se:SetPoint("BOTTOMRIGHT",frame,"BOTTOMRIGHT",0,0)
-		sizer_se:SetWidth(25)
-		sizer_se:SetHeight(25)
-		sizer_se:EnableMouse()
-		sizer_se:SetScript("OnMouseDown",sizerseOnMouseDown)
-		sizer_se:SetScript("OnMouseUp", sizerOnMouseUp)
-		self.sizer_se = sizer_se
-
-		local line1 = sizer_se:CreateTexture(nil, "BACKGROUND")
-		self.line1 = line1
-		line1:SetWidth(14)
-		line1:SetHeight(14)
-		line1:SetPoint("BOTTOMRIGHT", -8, 8)
-		line1:SetTexture("Interface\\Tooltips\\UI-Tooltip-Border")
-		local x = 0.1 * 14/17
-		line1:SetTexCoord(0.05 - x, 0.5, 0.05, 0.5 + x, 0.05, 0.5 - x, 0.5 + x, 0.5)
-
-		local line2 = sizer_se:CreateTexture(nil, "BACKGROUND")
-		self.line2 = line2
-		line2:SetWidth(8)
-		line2:SetHeight(8)
-		line2:SetPoint("BOTTOMRIGHT", -8, 8)
-		line2:SetTexture("Interface\\Tooltips\\UI-Tooltip-Border")
-		local x = 0.1 * 8/17
-		line2:SetTexCoord(0.05 - x, 0.5, 0.05, 0.5 + x, 0.05, 0.5 - x, 0.5 + x, 0.5)
-
-		local sizer_s = CreateFrame("Frame",nil,frame)
-		sizer_s:SetPoint("BOTTOMRIGHT",frame,"BOTTOMRIGHT",-25,0)
-		sizer_s:SetPoint("BOTTOMLEFT",frame,"BOTTOMLEFT",0,0)
-		sizer_s:SetHeight(25)
-		sizer_s:EnableMouse()
-		sizer_s:SetScript("OnMouseDown",sizersOnMouseDown)
-		sizer_s:SetScript("OnMouseUp", sizerOnMouseUp)
-		self.sizer_s = sizer_s
-		
-		local sizer_e = CreateFrame("Frame",nil,frame)
-		sizer_e:SetPoint("BOTTOMRIGHT",frame,"BOTTOMRIGHT",0,25)
-		sizer_e:SetPoint("TOPRIGHT",frame,"TOPRIGHT",0,0)
-		sizer_e:SetWidth(25)
-		sizer_e:EnableMouse()
-		sizer_e:SetScript("OnMouseDown",sizereOnMouseDown)
-		sizer_e:SetScript("OnMouseUp", sizerOnMouseUp)
-		self.sizer_e = sizer_e
-	
-		--Container Support
-		local content = CreateFrame("Frame",nil,frame)
-		self.content = content
-		content.obj = self
-		content:SetPoint("TOPLEFT",frame,"TOPLEFT",12,-32)
-		content:SetPoint("BOTTOMRIGHT",frame,"BOTTOMRIGHT",-12,13)
-		
-		AceGUI:RegisterAsContainer(self)
-		return self	
-	end
-	
-	AceGUI:RegisterWidgetType(Type,Constructor,Version)
-end
diff --git a/OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIWidget-Button.lua b/OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIWidget-Button.lua
deleted file mode 100644
index c7c72c1..0000000
--- a/OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIWidget-Button.lua
+++ /dev/null
@@ -1,103 +0,0 @@
---[[-----------------------------------------------------------------------------
-Button Widget
-Graphical Button.
--------------------------------------------------------------------------------]]
-local Type, Version = "Button", 23
-local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
-if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
-
--- Lua APIs
-local pairs = pairs
-
--- WoW APIs
-local _G = _G
-local PlaySound, CreateFrame, UIParent = PlaySound, CreateFrame, UIParent
-
---[[-----------------------------------------------------------------------------
-Scripts
--------------------------------------------------------------------------------]]
-local function Button_OnClick(frame, ...)
-	AceGUI:ClearFocus()
-	PlaySound("igMainMenuOption")
-	frame.obj:Fire("OnClick", ...)
-end
-
-local function Control_OnEnter(frame)
-	frame.obj:Fire("OnEnter")
-end
-
-local function Control_OnLeave(frame)
-	frame.obj:Fire("OnLeave")
-end
-
---[[-----------------------------------------------------------------------------
-Methods
--------------------------------------------------------------------------------]]
-local methods = {
-	["OnAcquire"] = function(self)
-		-- restore default values
-		self:SetHeight(24)
-		self:SetWidth(200)
-		self:SetDisabled(false)
-		self:SetAutoWidth(false)
-		self:SetText()
-	end,
-
-	-- ["OnRelease"] = nil,
-
-	["SetText"] = function(self, text)
-		self.text:SetText(text)
-		if self.autoWidth then
-			self:SetWidth(self.text:GetStringWidth() + 30)
-		end
-	end,
-	
-	["SetAutoWidth"] = function(self, autoWidth)
-		self.autoWidth = autoWidth
-		if self.autoWidth then
-			self:SetWidth(self.text:GetStringWidth() + 30)
-		end
-	end,
-
-	["SetDisabled"] = function(self, disabled)
-		self.disabled = disabled
-		if disabled then
-			self.frame:Disable()
-		else
-			self.frame:Enable()
-		end
-	end
-}
-
---[[-----------------------------------------------------------------------------
-Constructor
--------------------------------------------------------------------------------]]
-local function Constructor()
-	local name = "AceGUI30Button" .. AceGUI:GetNextWidgetNum(Type)
-	local frame = CreateFrame("Button", name, UIParent, "UIPanelButtonTemplate")
-	frame:Hide()
-
-	frame:EnableMouse(true)
-	frame:SetScript("OnClick", Button_OnClick)
-	frame:SetScript("OnEnter", Control_OnEnter)
-	frame:SetScript("OnLeave", Control_OnLeave)
-
-	local text = frame:GetFontString()
-	text:ClearAllPoints()
-	text:SetPoint("TOPLEFT", 15, -1)
-	text:SetPoint("BOTTOMRIGHT", -15, 1)
-	text:SetJustifyV("MIDDLE")
-
-	local widget = {
-		text  = text,
-		frame = frame,
-		type  = Type
-	}
-	for method, func in pairs(methods) do
-		widget[method] = func
-	end
-
-	return AceGUI:RegisterAsWidget(widget)
-end
-
-AceGUI:RegisterWidgetType(Type, Constructor, Version)
diff --git a/OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIWidget-CheckBox.lua b/OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIWidget-CheckBox.lua
deleted file mode 100644
index 8847ebc..0000000
--- a/OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIWidget-CheckBox.lua
+++ /dev/null
@@ -1,295 +0,0 @@
---[[-----------------------------------------------------------------------------
-Checkbox Widget
--------------------------------------------------------------------------------]]
-local Type, Version = "CheckBox", 22
-local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
-if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
-
--- Lua APIs
-local select, pairs = select, pairs
-
--- WoW APIs
-local PlaySound = PlaySound
-local CreateFrame, UIParent = CreateFrame, UIParent
-
--- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
--- List them here for Mikk's FindGlobals script
--- GLOBALS: SetDesaturation, GameFontHighlight
-
---[[-----------------------------------------------------------------------------
-Support functions
--------------------------------------------------------------------------------]]
-local function AlignImage(self)
-	local img = self.image:GetTexture()
-	self.text:ClearAllPoints()
-	if not img then
-		self.text:SetPoint("LEFT", self.checkbg, "RIGHT")
-		self.text:SetPoint("RIGHT")
-	else
-		self.text:SetPoint("LEFT", self.image,"RIGHT", 1, 0)
-		self.text:SetPoint("RIGHT")
-	end
-end
-
---[[-----------------------------------------------------------------------------
-Scripts
--------------------------------------------------------------------------------]]
-local function Control_OnEnter(frame)
-	frame.obj:Fire("OnEnter")
-end
-
-local function Control_OnLeave(frame)
-	frame.obj:Fire("OnLeave")
-end
-
-local function CheckBox_OnMouseDown(frame)
-	local self = frame.obj
-	if not self.disabled then
-		if self.image:GetTexture() then
-			self.text:SetPoint("LEFT", self.image,"RIGHT", 2, -1)
-		else
-			self.text:SetPoint("LEFT", self.checkbg, "RIGHT", 1, -1)
-		end
-	end
-	AceGUI:ClearFocus()
-end
-
-local function CheckBox_OnMouseUp(frame)
-	local self = frame.obj
-	if not self.disabled then
-		self:ToggleChecked()
-
-		if self.checked then
-			PlaySound("igMainMenuOptionCheckBoxOn")
-		else -- for both nil and false (tristate)
-			PlaySound("igMainMenuOptionCheckBoxOff")
-		end
-
-		self:Fire("OnValueChanged", self.checked)
-		AlignImage(self)
-	end
-end
-
---[[-----------------------------------------------------------------------------
-Methods
--------------------------------------------------------------------------------]]
-local methods = {
-	["OnAcquire"] = function(self)
-		self:SetType()
-		self:SetValue(false)
-		self:SetTriState(nil)
-		-- height is calculated from the width and required space for the description
-		self:SetWidth(200)
-		self:SetImage()
-		self:SetDisabled(nil)
-		self:SetDescription(nil)
-	end,
-
-	-- ["OnRelease"] = nil,
-
-	["OnWidthSet"] = function(self, width)
-		if self.desc then
-			self.desc:SetWidth(width - 30)
-			if self.desc:GetText() and self.desc:GetText() ~= "" then
-				self:SetHeight(28 + self.desc:GetHeight())
-			end
-		end
-	end,
-
-	["SetDisabled"] = function(self, disabled)
-		self.disabled = disabled
-		if disabled then
-			self.frame:Disable()
-			self.text:SetTextColor(0.5, 0.5, 0.5)
-			SetDesaturation(self.check, true)
-			if self.desc then
-				self.desc:SetTextColor(0.5, 0.5, 0.5)
-			end
-		else
-			self.frame:Enable()
-			self.text:SetTextColor(1, 1, 1)
-			if self.tristate and self.checked == nil then
-				SetDesaturation(self.check, true)
-			else
-				SetDesaturation(self.check, false)
-			end
-			if self.desc then
-				self.desc:SetTextColor(1, 1, 1)
-			end
-		end
-	end,
-
-	["SetValue"] = function(self,value)
-		local check = self.check
-		self.checked = value
-		if value then
-			SetDesaturation(self.check, false)
-			self.check:Show()
-		else
-			--Nil is the unknown tristate value
-			if self.tristate and value == nil then
-				SetDesaturation(self.check, true)
-				self.check:Show()
-			else
-				SetDesaturation(self.check, false)
-				self.check:Hide()
-			end
-		end
-		self:SetDisabled(self.disabled)
-	end,
-
-	["GetValue"] = function(self)
-		return self.checked
-	end,
-
-	["SetTriState"] = function(self, enabled)
-		self.tristate = enabled
-		self:SetValue(self:GetValue())
-	end,
-
-	["SetType"] = function(self, type)
-		local checkbg = self.checkbg
-		local check = self.check
-		local highlight = self.highlight
-
-		local size
-		if type == "radio" then
-			size = 16
-			checkbg:SetTexture("Interface\\Buttons\\UI-RadioButton")
-			checkbg:SetTexCoord(0, 0.25, 0, 1)
-			check:SetTexture("Interface\\Buttons\\UI-RadioButton")
-			check:SetTexCoord(0.25, 0.5, 0, 1)
-			check:SetBlendMode("ADD")
-			highlight:SetTexture("Interface\\Buttons\\UI-RadioButton")
-			highlight:SetTexCoord(0.5, 0.75, 0, 1)
-		else
-			size = 24
-			checkbg:SetTexture("Interface\\Buttons\\UI-CheckBox-Up")
-			checkbg:SetTexCoord(0, 1, 0, 1)
-			check:SetTexture("Interface\\Buttons\\UI-CheckBox-Check")
-			check:SetTexCoord(0, 1, 0, 1)
-			check:SetBlendMode("BLEND")
-			highlight:SetTexture("Interface\\Buttons\\UI-CheckBox-Highlight")
-			highlight:SetTexCoord(0, 1, 0, 1)
-		end
-		checkbg:SetHeight(size)
-		checkbg:SetWidth(size)
-	end,
-
-	["ToggleChecked"] = function(self)
-		local value = self:GetValue()
-		if self.tristate then
-			--cycle in true, nil, false order
-			if value then
-				self:SetValue(nil)
-			elseif value == nil then
-				self:SetValue(false)
-			else
-				self:SetValue(true)
-			end
-		else
-			self:SetValue(not self:GetValue())
-		end
-	end,
-
-	["SetLabel"] = function(self, label)
-		self.text:SetText(label)
-	end,
-
-	["SetDescription"] = function(self, desc)
-		if desc then
-			if not self.desc then
-				local desc = self.frame:CreateFontString(nil, "OVERLAY", "GameFontHighlightSmall")
-				desc:ClearAllPoints()
-				desc:SetPoint("TOPLEFT", self.checkbg, "TOPRIGHT", 5, -21)
-				desc:SetWidth(self.frame.width - 30)
-				desc:SetJustifyH("LEFT")
-				desc:SetJustifyV("TOP")
-				self.desc = desc
-			end
-			self.desc:Show()
-			--self.text:SetFontObject(GameFontNormal)
-			self.desc:SetText(desc)
-			self:SetHeight(28 + self.desc:GetHeight())
-		else
-			if self.desc then
-				self.desc:SetText("")
-				self.desc:Hide()
-			end
-			--self.text:SetFontObject(GameFontHighlight)
-			self:SetHeight(24)
-		end
-	end,
-	
-	["SetImage"] = function(self, path, ...)
-		local image = self.image
-		image:SetTexture(path)
-		
-		if image:GetTexture() then
-			local n = select("#", ...)
-			if n == 4 or n == 8 then
-				image:SetTexCoord(...)
-			else
-				image:SetTexCoord(0, 1, 0, 1)
-			end
-		end
-		AlignImage(self)
-	end
-}
-
---[[-----------------------------------------------------------------------------
-Constructor
--------------------------------------------------------------------------------]]
-local function Constructor()
-	local frame = CreateFrame("Button", nil, UIParent)
-	frame:Hide()
-
-	frame:EnableMouse(true)
-	frame:SetScript("OnEnter", Control_OnEnter)
-	frame:SetScript("OnLeave", Control_OnLeave)
-	frame:SetScript("OnMouseDown", CheckBox_OnMouseDown)
-	frame:SetScript("OnMouseUp", CheckBox_OnMouseUp)
-
-	local checkbg = frame:CreateTexture(nil, "ARTWORK")
-	checkbg:SetWidth(24)
-	checkbg:SetHeight(24)
-	checkbg:SetPoint("TOPLEFT")
-	checkbg:SetTexture("Interface\\Buttons\\UI-CheckBox-Up")
-
-	local check = frame:CreateTexture(nil, "OVERLAY")
-	check:SetAllPoints(checkbg)
-	check:SetTexture("Interface\\Buttons\\UI-CheckBox-Check")
-
-	local text = frame:CreateFontString(nil, "OVERLAY", "GameFontHighlight")
-	text:SetJustifyH("LEFT")
-	text:SetHeight(18)
-	text:SetPoint("LEFT", checkbg, "RIGHT")
-	text:SetPoint("RIGHT")
-
-	local highlight = frame:CreateTexture(nil, "HIGHLIGHT")
-	highlight:SetTexture("Interface\\Buttons\\UI-CheckBox-Highlight")
-	highlight:SetBlendMode("ADD")
-	highlight:SetAllPoints(checkbg)
-
-	local image = frame:CreateTexture(nil, "OVERLAY")
-	image:SetHeight(16)
-	image:SetWidth(16)
-	image:SetPoint("LEFT", checkbg, "RIGHT", 1, 0)
-
-	local widget = {
-		checkbg   = checkbg,
-		check     = check,
-		text      = text,
-		highlight = highlight,
-		image     = image,
-		frame     = frame,
-		type      = Type
-	}
-	for method, func in pairs(methods) do
-		widget[method] = func
-	end
-
-	return AceGUI:RegisterAsWidget(widget)
-end
-
-AceGUI:RegisterWidgetType(Type, Constructor, Version)
diff --git a/OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIWidget-ColorPicker.lua b/OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIWidget-ColorPicker.lua
deleted file mode 100644
index 740a467..0000000
--- a/OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIWidget-ColorPicker.lua
+++ /dev/null
@@ -1,194 +0,0 @@
---[[-----------------------------------------------------------------------------
-ColorPicker Widget
--------------------------------------------------------------------------------]]
-local Type, Version = "ColorPicker", 23
-local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
-if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
-
-local IsLegion = select(4, GetBuildInfo()) >= 70000
-
--- Lua APIs
-local pairs = pairs
-
--- WoW APIs
-local CreateFrame, UIParent = CreateFrame, UIParent
-
--- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
--- List them here for Mikk's FindGlobals script
--- GLOBALS: ShowUIPanel, HideUIPanel, ColorPickerFrame, OpacitySliderFrame
-
---[[-----------------------------------------------------------------------------
-Support functions
--------------------------------------------------------------------------------]]
-local function ColorCallback(self, r, g, b, a, isAlpha)
-	if not self.HasAlpha then
-		a = 1
-	end
-	self:SetColor(r, g, b, a)
-	if ColorPickerFrame:IsVisible() then
-		--colorpicker is still open
-		self:Fire("OnValueChanged", r, g, b, a)
-	else
-		--colorpicker is closed, color callback is first, ignore it,
-		--alpha callback is the final call after it closes so confirm now
-		if isAlpha then
-			self:Fire("OnValueConfirmed", r, g, b, a)
-		end
-	end
-end
-
---[[-----------------------------------------------------------------------------
-Scripts
--------------------------------------------------------------------------------]]
-local function Control_OnEnter(frame)
-	frame.obj:Fire("OnEnter")
-end
-
-local function Control_OnLeave(frame)
-	frame.obj:Fire("OnLeave")
-end
-
-local function ColorSwatch_OnClick(frame)
-	HideUIPanel(ColorPickerFrame)
-	local self = frame.obj
-	if not self.disabled then
-		ColorPickerFrame:SetFrameStrata("FULLSCREEN_DIALOG")
-		ColorPickerFrame:SetFrameLevel(frame:GetFrameLevel() + 10)
-		ColorPickerFrame:SetClampedToScreen(true)
-
-		ColorPickerFrame.func = function()
-			local r, g, b = ColorPickerFrame:GetColorRGB()
-			local a = 1 - OpacitySliderFrame:GetValue()
-			ColorCallback(self, r, g, b, a)
-		end
-
-		ColorPickerFrame.hasOpacity = self.HasAlpha
-		ColorPickerFrame.opacityFunc = function()
-			local r, g, b = ColorPickerFrame:GetColorRGB()
-			local a = 1 - OpacitySliderFrame:GetValue()
-			ColorCallback(self, r, g, b, a, true)
-		end
-
-		local r, g, b, a = self.r, self.g, self.b, self.a
-		if self.HasAlpha then
-			ColorPickerFrame.opacity = 1 - (a or 0)
-		end
-		ColorPickerFrame:SetColorRGB(r, g, b)
-
-		ColorPickerFrame.cancelFunc = function()
-			ColorCallback(self, r, g, b, a, true)
-		end
-
-		ShowUIPanel(ColorPickerFrame)
-	end
-	AceGUI:ClearFocus()
-end
-
---[[-----------------------------------------------------------------------------
-Methods
--------------------------------------------------------------------------------]]
-local methods = {
-	["OnAcquire"] = function(self)
-		self:SetHeight(24)
-		self:SetWidth(200)
-		self:SetHasAlpha(false)
-		self:SetColor(0, 0, 0, 1)
-		self:SetDisabled(nil)
-		self:SetLabel(nil)
-	end,
-
-	-- ["OnRelease"] = nil,
-
-	["SetLabel"] = function(self, text)
-		self.text:SetText(text)
-	end,
-
-	["SetColor"] = function(self, r, g, b, a)
-		self.r = r
-		self.g = g
-		self.b = b
-		self.a = a or 1
-		self.colorSwatch:SetVertexColor(r, g, b, a)
-	end,
-
-	["SetHasAlpha"] = function(self, HasAlpha)
-		self.HasAlpha = HasAlpha
-	end,
-
-	["SetDisabled"] = function(self, disabled)
-		self.disabled = disabled
-		if self.disabled then
-			self.frame:Disable()
-			self.text:SetTextColor(0.5, 0.5, 0.5)
-		else
-			self.frame:Enable()
-			self.text:SetTextColor(1, 1, 1)
-		end
-	end
-}
-
---[[-----------------------------------------------------------------------------
-Constructor
--------------------------------------------------------------------------------]]
-local function Constructor()
-	local frame = CreateFrame("Button", nil, UIParent)
-	frame:Hide()
-
-	frame:EnableMouse(true)
-	frame:SetScript("OnEnter", Control_OnEnter)
-	frame:SetScript("OnLeave", Control_OnLeave)
-	frame:SetScript("OnClick", ColorSwatch_OnClick)
-
-	local colorSwatch = frame:CreateTexture(nil, "OVERLAY")
-	colorSwatch:SetWidth(19)
-	colorSwatch:SetHeight(19)
-	colorSwatch:SetTexture("Interface\\ChatFrame\\ChatFrameColorSwatch")
-	colorSwatch:SetPoint("LEFT")
-
-	local texture = frame:CreateTexture(nil, "BACKGROUND")
-	texture:SetWidth(16)
-	texture:SetHeight(16)
-	if IsLegion then
-		texture:SetColorTexture(1, 1, 1)
-	else
-		texture:SetTexture(1, 1, 1)
-	end
-	texture:SetPoint("CENTER", colorSwatch)
-	texture:Show()
-
-	local checkers = frame:CreateTexture(nil, "BACKGROUND")
-	checkers:SetWidth(14)
-	checkers:SetHeight(14)
-	checkers:SetTexture("Tileset\\Generic\\Checkers")
-	checkers:SetTexCoord(.25, 0, 0.5, .25)
-	checkers:SetDesaturated(true)
-	checkers:SetVertexColor(1, 1, 1, 0.75)
-	checkers:SetPoint("CENTER", colorSwatch)
-	checkers:Show()
-
-	local text = frame:CreateFontString(nil,"OVERLAY","GameFontHighlight")
-	text:SetHeight(24)
-	text:SetJustifyH("LEFT")
-	text:SetTextColor(1, 1, 1)
-	text:SetPoint("LEFT", colorSwatch, "RIGHT", 2, 0)
-	text:SetPoint("RIGHT")
-
-	--local highlight = frame:CreateTexture(nil, "HIGHLIGHT")
-	--highlight:SetTexture("Interface\\QuestFrame\\UI-QuestTitleHighlight")
-	--highlight:SetBlendMode("ADD")
-	--highlight:SetAllPoints(frame)
-
-	local widget = {
-		colorSwatch = colorSwatch,
-		text        = text,
-		frame       = frame,
-		type        = Type
-	}
-	for method, func in pairs(methods) do
-		widget[method] = func
-	end
-
-	return AceGUI:RegisterAsWidget(widget)
-end
-
-AceGUI:RegisterWidgetType(Type, Constructor, Version)
diff --git a/OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIWidget-DropDown-Items.lua b/OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIWidget-DropDown-Items.lua
deleted file mode 100644
index 5ea840f..0000000
--- a/OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIWidget-DropDown-Items.lua
+++ /dev/null
@@ -1,477 +0,0 @@
---[[ $Id: AceGUIWidget-DropDown-Items.lua 1137 2016-05-15 10:57:36Z nevcairiel $ ]]--
-
-local AceGUI = LibStub("AceGUI-3.0")
-
-local IsLegion = select(4, GetBuildInfo()) >= 70000
-
--- Lua APIs
-local select, assert = select, assert
-
--- WoW APIs
-local PlaySound = PlaySound
-local CreateFrame = CreateFrame
-
-local function fixlevels(parent,...)
-	local i = 1
-	local child = select(i, ...)
-	while child do
-		child:SetFrameLevel(parent:GetFrameLevel()+1)
-		fixlevels(child, child:GetChildren())
-		i = i + 1
-		child = select(i, ...)
-	end
-end
-
-local function fixstrata(strata, parent, ...)
-	local i = 1
-	local child = select(i, ...)
-	parent:SetFrameStrata(strata)
-	while child do
-		fixstrata(strata, child, child:GetChildren())
-		i = i + 1
-		child = select(i, ...)
-	end
-end
-
--- ItemBase is the base "class" for all dropdown items.
--- Each item has to use ItemBase.Create(widgetType) to
--- create an initial 'self' value. 
--- ItemBase will add common functions and ui event handlers.
--- Be sure to keep basic usage when you override functions.
-
-local ItemBase = {
-	-- NOTE: The ItemBase version is added to each item's version number
-	--       to ensure proper updates on ItemBase changes.
-	--       Use at least 1000er steps.
-	version = 1000,
-	counter = 0,
-}
-
-function ItemBase.Frame_OnEnter(this)
-	local self = this.obj
-
-	if self.useHighlight then
-		self.highlight:Show()
-	end
-	self:Fire("OnEnter")
-	
-	if self.specialOnEnter then
-		self.specialOnEnter(self)
-	end
-end
-
-function ItemBase.Frame_OnLeave(this)
-	local self = this.obj
-	
-	self.highlight:Hide()
-	self:Fire("OnLeave")
-	
-	if self.specialOnLeave then
-		self.specialOnLeave(self)
-	end
-end
-
--- exported, AceGUI callback
-function ItemBase.OnAcquire(self)
-	self.frame:SetToplevel(true)
-	self.frame:SetFrameStrata("FULLSCREEN_DIALOG")
-end
-
--- exported, AceGUI callback
-function ItemBase.OnRelease(self)
-	self:SetDisabled(false)
-	self.pullout = nil
-	self.frame:SetParent(nil)
-	self.frame:ClearAllPoints()
-	self.frame:Hide()
-end
-
--- exported
--- NOTE: this is called by a Dropdown-Pullout.
---       Do not call this method directly
-function ItemBase.SetPullout(self, pullout)
-	self.pullout = pullout
-	
-	self.frame:SetParent(nil)
-	self.frame:SetParent(pullout.itemFrame)
-	self.parent = pullout.itemFrame
-	fixlevels(pullout.itemFrame, pullout.itemFrame:GetChildren())
-end
-
--- exported
-function ItemBase.SetText(self, text)
-	self.text:SetText(text or "")
-end
-
--- exported
-function ItemBase.GetText(self)
-	return self.text:GetText()
-end
-
--- exported
-function ItemBase.SetPoint(self, ...)
-	self.frame:SetPoint(...)
-end
-
--- exported
-function ItemBase.Show(self)
-	self.frame:Show()
-end
-
--- exported
-function ItemBase.Hide(self)
-	self.frame:Hide()
-end
-
--- exported
-function ItemBase.SetDisabled(self, disabled)
-	self.disabled = disabled
-	if disabled then
-		self.useHighlight = false
-		self.text:SetTextColor(.5, .5, .5)
-	else
-		self.useHighlight = true
-		self.text:SetTextColor(1, 1, 1)
-	end
-end
-
--- exported
--- NOTE: this is called by a Dropdown-Pullout.
---       Do not call this method directly
-function ItemBase.SetOnLeave(self, func)
-	self.specialOnLeave = func
-end
-
--- exported
--- NOTE: this is called by a Dropdown-Pullout.
---       Do not call this method directly
-function ItemBase.SetOnEnter(self, func)
-	self.specialOnEnter = func
-end
-
-function ItemBase.Create(type)
-	-- NOTE: Most of the following code is copied from AceGUI-3.0/Dropdown widget
-	local count = AceGUI:GetNextWidgetNum(type)
-	local frame = CreateFrame("Button", "AceGUI30DropDownItem"..count)
-	local self = {}
-	self.frame = frame
-	frame.obj = self
-	self.type = type
-	
-	self.useHighlight = true
-	
-	frame:SetHeight(17)
-	frame:SetFrameStrata("FULLSCREEN_DIALOG")
-	
-	local text = frame:CreateFontString(nil,"OVERLAY","GameFontNormalSmall")
-	text:SetTextColor(1,1,1)
-	text:SetJustifyH("LEFT")
-	text:SetPoint("TOPLEFT",frame,"TOPLEFT",18,0)
-	text:SetPoint("BOTTOMRIGHT",frame,"BOTTOMRIGHT",-8,0)
-	self.text = text
-
-	local highlight = frame:CreateTexture(nil, "OVERLAY")
-	highlight:SetTexture("Interface\\QuestFrame\\UI-QuestTitleHighlight")
-	highlight:SetBlendMode("ADD")
-	highlight:SetHeight(14)
-	highlight:ClearAllPoints()
-	highlight:SetPoint("RIGHT",frame,"RIGHT",-3,0)
-	highlight:SetPoint("LEFT",frame,"LEFT",5,0)
-	highlight:Hide()
-	self.highlight = highlight
-
-	local check = frame:CreateTexture("OVERLAY")	
-	check:SetWidth(16)
-	check:SetHeight(16)
-	check:SetPoint("LEFT",frame,"LEFT",3,-1)
-	check:SetTexture("Interface\\Buttons\\UI-CheckBox-Check")
-	check:Hide()
-	self.check = check
-
-	local sub = frame:CreateTexture("OVERLAY")
-	sub:SetWidth(16)
-	sub:SetHeight(16)
-	sub:SetPoint("RIGHT",frame,"RIGHT",-3,-1)
-	sub:SetTexture("Interface\\ChatFrame\\ChatFrameExpandArrow")
-	sub:Hide()
-	self.sub = sub	
-	
-	frame:SetScript("OnEnter", ItemBase.Frame_OnEnter)
-	frame:SetScript("OnLeave", ItemBase.Frame_OnLeave)
-	
-	self.OnAcquire = ItemBase.OnAcquire
-	self.OnRelease = ItemBase.OnRelease
-	
-	self.SetPullout = ItemBase.SetPullout
-	self.GetText    = ItemBase.GetText
-	self.SetText    = ItemBase.SetText
-	self.SetDisabled = ItemBase.SetDisabled
-	
-	self.SetPoint   = ItemBase.SetPoint
-	self.Show       = ItemBase.Show
-	self.Hide       = ItemBase.Hide
-	
-	self.SetOnLeave = ItemBase.SetOnLeave
-	self.SetOnEnter = ItemBase.SetOnEnter
-	
-	return self
-end
-
--- Register a dummy LibStub library to retrieve the ItemBase, so other addons can use it.
-local IBLib = LibStub:NewLibrary("AceGUI-3.0-DropDown-ItemBase", ItemBase.version)
-if IBLib then
-	IBLib.GetItemBase = function() return ItemBase end
-end
-
---[[
-	Template for items:
-	
--- Item:
---
-do
-	local widgetType = "Dropdown-Item-"
-	local widgetVersion = 1
-	
-	local function Constructor()
-		local self = ItemBase.Create(widgetType)
-		
-		AceGUI:RegisterAsWidget(self)
-		return self
-	end
-	
-	AceGUI:RegisterWidgetType(widgetType, Constructor, widgetVersion + ItemBase.version)
-end
---]]
-
--- Item: Header
--- A single text entry.
--- Special: Different text color and no highlight
-do
-	local widgetType = "Dropdown-Item-Header"
-	local widgetVersion = 1
-	
-	local function OnEnter(this)
-		local self = this.obj
-		self:Fire("OnEnter")
-		
-		if self.specialOnEnter then
-			self.specialOnEnter(self)
-		end
-	end
-	
-	local function OnLeave(this)
-		local self = this.obj
-		self:Fire("OnLeave")
-		
-		if self.specialOnLeave then
-			self.specialOnLeave(self)
-		end
-	end
-	
-	-- exported, override
-	local function SetDisabled(self, disabled)
-		ItemBase.SetDisabled(self, disabled)
-		if not disabled then
-			self.text:SetTextColor(1, 1, 0)
-		end
-	end
-	
-	local function Constructor()
-		local self = ItemBase.Create(widgetType)
-		
-		self.SetDisabled = SetDisabled
-		
-		self.frame:SetScript("OnEnter", OnEnter)
-		self.frame:SetScript("OnLeave", OnLeave)
-		
-		self.text:SetTextColor(1, 1, 0)
-		
-		AceGUI:RegisterAsWidget(self)
-		return self
-	end
-	
-	AceGUI:RegisterWidgetType(widgetType, Constructor, widgetVersion + ItemBase.version)
-end
-
--- Item: Execute
--- A simple button
-do
-	local widgetType = "Dropdown-Item-Execute"
-	local widgetVersion = 1
-	
-	local function Frame_OnClick(this, button)
-		local self = this.obj
-		if self.disabled then return end
-		self:Fire("OnClick")
-		if self.pullout then
-			self.pullout:Close()
-		end
-	end
-	
-	local function Constructor()
-		local self = ItemBase.Create(widgetType)
-		
-		self.frame:SetScript("OnClick", Frame_OnClick)
-		
-		AceGUI:RegisterAsWidget(self)
-		return self
-	end
-	
-	AceGUI:RegisterWidgetType(widgetType, Constructor, widgetVersion + ItemBase.version)
-end
-
--- Item: Toggle
--- Some sort of checkbox for dropdown menus.
--- Does not close the pullout on click.
-do
-	local widgetType = "Dropdown-Item-Toggle"
-	local widgetVersion = 3
-	
-	local function UpdateToggle(self)
-		if self.value then
-			self.check:Show()
-		else
-			self.check:Hide()
-		end
-	end
-	
-	local function OnRelease(self)
-		ItemBase.OnRelease(self)
-		self:SetValue(nil)
-	end
-	
-	local function Frame_OnClick(this, button)
-		local self = this.obj
-		if self.disabled then return end
-		self.value = not self.value
-		if self.value then
-			PlaySound("igMainMenuOptionCheckBoxOn")
-		else
-			PlaySound("igMainMenuOptionCheckBoxOff")
-		end
-		UpdateToggle(self)
-		self:Fire("OnValueChanged", self.value)
-	end
-	
-	-- exported
-	local function SetValue(self, value)
-		self.value = value
-		UpdateToggle(self)
-	end
-	
-	-- exported
-	local function GetValue(self)
-		return self.value
-	end
-	
-	local function Constructor()
-		local self = ItemBase.Create(widgetType)
-		
-		self.frame:SetScript("OnClick", Frame_OnClick)
-		
-		self.SetValue = SetValue
-		self.GetValue = GetValue
-		self.OnRelease = OnRelease
-		
-		AceGUI:RegisterAsWidget(self)
-		return self
-	end
-	
-	AceGUI:RegisterWidgetType(widgetType, Constructor, widgetVersion + ItemBase.version)
-end
-
--- Item: Menu
--- Shows a submenu on mouse over
--- Does not close the pullout on click
-do
-	local widgetType = "Dropdown-Item-Menu"
-	local widgetVersion = 2
-	
-	local function OnEnter(this)
-		local self = this.obj
-		self:Fire("OnEnter")
-		
-		if self.specialOnEnter then
-			self.specialOnEnter(self)
-		end
-		
-		self.highlight:Show()
-		
-		if not self.disabled and self.submenu then
-			self.submenu:Open("TOPLEFT", self.frame, "TOPRIGHT", self.pullout:GetRightBorderWidth(), 0, self.frame:GetFrameLevel() + 100)
-		end
-	end
-	
-	local function OnHide(this)
-		local self = this.obj
-		if self.submenu then
-			self.submenu:Close()
-		end
-	end
-	
-	-- exported
-	local function SetMenu(self, menu)
-		assert(menu.type == "Dropdown-Pullout")
-		self.submenu = menu
-	end
-		
-	-- exported
-	local function CloseMenu(self)
-		self.submenu:Close()
-	end
-		
-	local function Constructor()
-		local self = ItemBase.Create(widgetType)
-		
-		self.sub:Show()
-		
-		self.frame:SetScript("OnEnter", OnEnter)
-		self.frame:SetScript("OnHide", OnHide)
-		
-		self.SetMenu   = SetMenu
-		self.CloseMenu = CloseMenu
-		
-		AceGUI:RegisterAsWidget(self)
-		return self
-	end
-	
-	AceGUI:RegisterWidgetType(widgetType, Constructor, widgetVersion + ItemBase.version)
-end
-
--- Item: Separator
--- A single line to separate items
-do
-	local widgetType = "Dropdown-Item-Separator"
-	local widgetVersion = 2
-	
-	-- exported, override
-	local function SetDisabled(self, disabled)
-		ItemBase.SetDisabled(self, disabled)
-		self.useHighlight = false
-	end
-		
-	local function Constructor()
-		local self = ItemBase.Create(widgetType)
-		
-		self.SetDisabled = SetDisabled
-		
-		local line = self.frame:CreateTexture(nil, "OVERLAY")
-		line:SetHeight(1)
-		if IsLegion then
-			line:SetColorTexture(.5, .5, .5)
-		else
-			line:SetTexture(.5, .5, .5)
-		end
-		line:SetPoint("LEFT", self.frame, "LEFT", 10, 0)
-		line:SetPoint("RIGHT", self.frame, "RIGHT", -10, 0)
-		
-		self.text:Hide()
-		
-		self.useHighlight = false
-		
-		AceGUI:RegisterAsWidget(self)
-		return self
-	end
-	
-	AceGUI:RegisterWidgetType(widgetType, Constructor, widgetVersion + ItemBase.version)
-end
diff --git a/OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIWidget-DropDown.lua b/OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIWidget-DropDown.lua
deleted file mode 100644
index 0dd3bff..0000000
--- a/OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIWidget-DropDown.lua
+++ /dev/null
@@ -1,737 +0,0 @@
---[[ $Id: AceGUIWidget-DropDown.lua 1116 2014-10-12 08:15:46Z nevcairiel $ ]]--
-local AceGUI = LibStub("AceGUI-3.0")
-
--- Lua APIs
-local min, max, floor = math.min, math.max, math.floor
-local select, pairs, ipairs, type = select, pairs, ipairs, type
-local tsort = table.sort
-
--- WoW APIs
-local PlaySound = PlaySound
-local UIParent, CreateFrame = UIParent, CreateFrame
-local _G = _G
-
--- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
--- List them here for Mikk's FindGlobals script
--- GLOBALS: CLOSE
-
-local function fixlevels(parent,...)
-	local i = 1
-	local child = select(i, ...)
-	while child do
-		child:SetFrameLevel(parent:GetFrameLevel()+1)
-		fixlevels(child, child:GetChildren())
-		i = i + 1
-		child = select(i, ...)
-	end
-end
-
-local function fixstrata(strata, parent, ...)
-	local i = 1
-	local child = select(i, ...)
-	parent:SetFrameStrata(strata)
-	while child do
-		fixstrata(strata, child, child:GetChildren())
-		i = i + 1
-		child = select(i, ...)
-	end
-end
-
-do
-	local widgetType = "Dropdown-Pullout"
-	local widgetVersion = 3
-	
-	--[[ Static data ]]--
-	
-	local backdrop = {
-		bgFile = "Interface\\ChatFrame\\ChatFrameBackground",
-		edgeFile = "Interface\\DialogFrame\\UI-DialogBox-Border",
-		edgeSize = 32,
-		tileSize = 32,
-		tile = true,
-		insets = { left = 11, right = 12, top = 12, bottom = 11 },
-	}
-	local sliderBackdrop  = {
-		bgFile = "Interface\\Buttons\\UI-SliderBar-Background",
-		edgeFile = "Interface\\Buttons\\UI-SliderBar-Border",
-		tile = true, tileSize = 8, edgeSize = 8,
-		insets = { left = 3, right = 3, top = 3, bottom = 3 }
-	}
-
-	local defaultWidth = 200
-	local defaultMaxHeight = 600
-	
-	--[[ UI Event Handlers ]]--
-	
-	-- HACK: This should be no part of the pullout, but there
-	--       is no other 'clean' way to response to any item-OnEnter
-	--       Used to close Submenus when an other item is entered
-	local function OnEnter(item)
-		local self = item.pullout
-		for k, v in ipairs(self.items) do
-			if v.CloseMenu and v ~= item then
-				v:CloseMenu()
-			end
-		end
-	end
-	
-	-- See the note in Constructor() for each scroll related function
-	local function OnMouseWheel(this, value)
-		this.obj:MoveScroll(value)
-	end
-	
-	local function OnScrollValueChanged(this, value)
-		this.obj:SetScroll(value)
-	end
-	
-	local function OnSizeChanged(this)
-		this.obj:FixScroll()
-	end
-	
-	--[[ Exported methods ]]--
-	
-	-- exported
-	local function SetScroll(self, value)
-		local status = self.scrollStatus
-		local frame, child = self.scrollFrame, self.itemFrame
-		local height, viewheight = frame:GetHeight(), child:GetHeight()
-
-		local offset
-		if height > viewheight then
-			offset = 0
-		else
-			offset = floor((viewheight - height) / 1000 * value)
-		end
-		child:ClearAllPoints()
-		child:SetPoint("TOPLEFT", frame, "TOPLEFT", 0, offset)
-		child:SetPoint("TOPRIGHT", frame, "TOPRIGHT", self.slider:IsShown() and -12 or 0, offset)
-		status.offset = offset
-		status.scrollvalue = value		
-	end
-	
-	-- exported
-	local function MoveScroll(self, value)
-		local status = self.scrollStatus
-		local frame, child = self.scrollFrame, self.itemFrame
-		local height, viewheight = frame:GetHeight(), child:GetHeight()
-
-		if height > viewheight then
-			self.slider:Hide()
-		else
-			self.slider:Show()
-			local diff = height - viewheight
-			local delta = 1
-			if value < 0 then
-				delta = -1
-			end
-			self.slider:SetValue(min(max(status.scrollvalue + delta*(1000/(diff/45)),0), 1000))
-		end
-	end
-	
-	-- exported
-	local function FixScroll(self)
-		local status = self.scrollStatus
-		local frame, child = self.scrollFrame, self.itemFrame
-		local height, viewheight = frame:GetHeight(), child:GetHeight()
-		local offset = status.offset or 0
-
-		if viewheight < height then
-			self.slider:Hide()
-			child:SetPoint("TOPRIGHT", frame, "TOPRIGHT", 0, offset)
-			self.slider:SetValue(0)
-		else
-			self.slider:Show()			
-			local value = (offset / (viewheight - height) * 1000)
-			if value > 1000 then value = 1000 end
-			self.slider:SetValue(value)
-			self:SetScroll(value)
-			if value < 1000 then
-				child:ClearAllPoints()
-				child:SetPoint("TOPLEFT", frame, "TOPLEFT", 0, offset)
-				child:SetPoint("TOPRIGHT", frame, "TOPRIGHT", -12, offset)
-				status.offset = offset
-			end
-		end
-	end
-	
-	-- exported, AceGUI callback
-	local function OnAcquire(self)
-		self.frame:SetParent(UIParent)
-		--self.itemFrame:SetToplevel(true)
-	end
-	
-	-- exported, AceGUI callback
-	local function OnRelease(self)
-		self:Clear()
-		self.frame:ClearAllPoints()
-		self.frame:Hide()
-	end
-	
-	-- exported
-	local function AddItem(self, item)
-		self.items[#self.items + 1] = item
-		
-		local h = #self.items * 16
-		self.itemFrame:SetHeight(h)
-		self.frame:SetHeight(min(h + 34, self.maxHeight)) -- +34: 20 for scrollFrame placement (10 offset) and +14 for item placement
-		
-		item.frame:SetPoint("LEFT", self.itemFrame, "LEFT")
-		item.frame:SetPoint("RIGHT", self.itemFrame, "RIGHT")
-		
-		item:SetPullout(self)
-		item:SetOnEnter(OnEnter)
-	end
-		
-	-- exported
-	local function Open(self, point, relFrame, relPoint, x, y)		
-		local items = self.items
-		local frame = self.frame
-		local itemFrame = self.itemFrame
-		
-		frame:SetPoint(point, relFrame, relPoint, x, y)
-
-				
-		local height = 8
-		for i, item in pairs(items) do
-			if i == 1 then
-				item:SetPoint("TOP", itemFrame, "TOP", 0, -2)
-			else
-				item:SetPoint("TOP", items[i-1].frame, "BOTTOM", 0, 1)
-			end
-			
-			item:Show()
-			
-			height = height + 16
-		end
-		itemFrame:SetHeight(height)
-		fixstrata("TOOLTIP", frame, frame:GetChildren())
-		frame:Show()
-		self:Fire("OnOpen")
-	end	
-	
-	-- exported
-	local function Close(self)
-		self.frame:Hide()
-		self:Fire("OnClose")
-	end	
-	
-	-- exported
-	local function Clear(self)
-		local items = self.items
-		for i, item in pairs(items) do
-			AceGUI:Release(item)
-			items[i] = nil
-		end
-	end	
-	
-	-- exported
-	local function IterateItems(self)
-		return ipairs(self.items)
-	end
-	
-	-- exported
-	local function SetHideOnLeave(self, val)
-		self.hideOnLeave = val
-	end
-	
-	-- exported
-	local function SetMaxHeight(self, height)
-		self.maxHeight = height or defaultMaxHeight
-		if self.frame:GetHeight() > height then
-			self.frame:SetHeight(height)
-		elseif (self.itemFrame:GetHeight() + 34) < height then
-			self.frame:SetHeight(self.itemFrame:GetHeight() + 34) -- see :AddItem
-		end
-	end
-		
-	-- exported
-	local function GetRightBorderWidth(self)
-		return 6 + (self.slider:IsShown() and 12 or 0)
-	end
-	
-	-- exported
-	local function GetLeftBorderWidth(self)
-		return 6
-	end
-	
-	--[[ Constructor ]]--
-	
-	local function Constructor()
-		local count = AceGUI:GetNextWidgetNum(widgetType)
-		local frame = CreateFrame("Frame", "AceGUI30Pullout"..count, UIParent)
-		local self = {}
-		self.count = count
-		self.type = widgetType
-		self.frame = frame
-		frame.obj = self
-		
-		self.OnAcquire = OnAcquire
-		self.OnRelease = OnRelease
-
-		self.AddItem = AddItem
-		self.Open    = Open
-		self.Close   = Close
-		self.Clear   = Clear
-		self.IterateItems = IterateItems
-		self.SetHideOnLeave = SetHideOnLeave
-
-		self.SetScroll  = SetScroll
-		self.MoveScroll = MoveScroll
-		self.FixScroll  = FixScroll
-		
-		self.SetMaxHeight = SetMaxHeight
-		self.GetRightBorderWidth = GetRightBorderWidth
-		self.GetLeftBorderWidth = GetLeftBorderWidth
-		
-		self.items = {}
-		
-		self.scrollStatus = {
-			scrollvalue = 0,
-		}
-		
-		self.maxHeight = defaultMaxHeight
-			
-		frame:SetBackdrop(backdrop)
-		frame:SetBackdropColor(0, 0, 0)
-		frame:SetFrameStrata("FULLSCREEN_DIALOG")
-		frame:SetClampedToScreen(true)
-		frame:SetWidth(defaultWidth)
-		frame:SetHeight(self.maxHeight)	
-		--frame:SetToplevel(true)
-	
-		-- NOTE: The whole scroll frame code is copied from the AceGUI-3.0 widget ScrollFrame
-		local scrollFrame = CreateFrame("ScrollFrame", nil, frame)
-		local itemFrame = CreateFrame("Frame", nil, scrollFrame)
-		
-		self.scrollFrame = scrollFrame
-		self.itemFrame = itemFrame
-		
-		scrollFrame.obj = self
-		itemFrame.obj = self
-		
-		local slider = CreateFrame("Slider", "AceGUI30PulloutScrollbar"..count, scrollFrame)
-		slider:SetOrientation("VERTICAL")
-		slider:SetHitRectInsets(0, 0, -10, 0)
-		slider:SetBackdrop(sliderBackdrop)
-		slider:SetWidth(8)
-		slider:SetThumbTexture("Interface\\Buttons\\UI-SliderBar-Button-Vertical")
-		slider:SetFrameStrata("FULLSCREEN_DIALOG")
-		self.slider = slider
-		slider.obj = self
-					
-		scrollFrame:SetScrollChild(itemFrame)
-		scrollFrame:SetPoint("TOPLEFT", frame, "TOPLEFT", 6, -12)
-		scrollFrame:SetPoint("BOTTOMRIGHT", frame, "BOTTOMRIGHT", -6, 12)
-		scrollFrame:EnableMouseWheel(true)
-		scrollFrame:SetScript("OnMouseWheel", OnMouseWheel)
-		scrollFrame:SetScript("OnSizeChanged", OnSizeChanged)
-		scrollFrame:SetToplevel(true)
-		scrollFrame:SetFrameStrata("FULLSCREEN_DIALOG")
-		
-		itemFrame:SetPoint("TOPLEFT", scrollFrame, "TOPLEFT", 0, 0)
-		itemFrame:SetPoint("TOPRIGHT", scrollFrame, "TOPRIGHT", -12, 0)
-		itemFrame:SetHeight(400)
-		itemFrame:SetToplevel(true)
-		itemFrame:SetFrameStrata("FULLSCREEN_DIALOG")
-		
-		slider:SetPoint("TOPLEFT", scrollFrame, "TOPRIGHT", -16, 0)
-		slider:SetPoint("BOTTOMLEFT", scrollFrame, "BOTTOMRIGHT", -16, 0)
-		slider:SetScript("OnValueChanged", OnScrollValueChanged)
-		slider:SetMinMaxValues(0, 1000)
-		slider:SetValueStep(1)
-		slider:SetValue(0)
-		
-		scrollFrame:Show()
-		itemFrame:Show()
-		slider:Hide()
-						
-		self:FixScroll()
-		
-		AceGUI:RegisterAsWidget(self)
-		return self
-	end
-	
-	AceGUI:RegisterWidgetType(widgetType, Constructor, widgetVersion)
-end
-
-do
-	local widgetType = "Dropdown"
-	local widgetVersion = 30
-	
-	--[[ Static data ]]--
-	
-	--[[ UI event handler ]]--
-	
-	local function Control_OnEnter(this)
-		this.obj.button:LockHighlight()
-		this.obj:Fire("OnEnter")
-	end
-	
-	local function Control_OnLeave(this)
-		this.obj.button:UnlockHighlight()
-		this.obj:Fire("OnLeave")
-	end
-
-	local function Dropdown_OnHide(this)
-		local self = this.obj
-		if self.open then
-			self.pullout:Close()
-		end
-	end
-	
-	local function Dropdown_TogglePullout(this)
-		local self = this.obj
-		PlaySound("igMainMenuOptionCheckBoxOn") -- missleading name, but the Blizzard code uses this sound
-		if self.open then
-			self.open = nil
-			self.pullout:Close()
-			AceGUI:ClearFocus()
-		else
-			self.open = true
-			self.pullout:SetWidth(self.pulloutWidth or self.frame:GetWidth())
-			self.pullout:Open("TOPLEFT", self.frame, "BOTTOMLEFT", 0, self.label:IsShown() and -2 or 0)
-			AceGUI:SetFocus(self)
-		end
-	end
-	
-	local function OnPulloutOpen(this)
-		local self = this.userdata.obj
-		local value = self.value
-		
-		if not self.multiselect then
-			for i, item in this:IterateItems() do
-				item:SetValue(item.userdata.value == value)
-			end
-		end
-		
-		self.open = true
-		self:Fire("OnOpened")
-	end
-
-	local function OnPulloutClose(this)
-		local self = this.userdata.obj
-		self.open = nil
-		self:Fire("OnClosed")
-	end
-	
-	local function ShowMultiText(self)
-		local text
-		for i, widget in self.pullout:IterateItems() do
-			if widget.type == "Dropdown-Item-Toggle" then
-				if widget:GetValue() then
-					if text then
-						text = text..", "..widget:GetText()
-					else
-						text = widget:GetText()
-					end
-				end
-			end
-		end
-		self:SetText(text)
-	end
-	
-	local function OnItemValueChanged(this, event, checked)
-		local self = this.userdata.obj
-		
-		if self.multiselect then
-			self:Fire("OnValueChanged", this.userdata.value, checked)
-			ShowMultiText(self)
-		else
-			if checked then
-				self:SetValue(this.userdata.value)
-				self:Fire("OnValueChanged", this.userdata.value)
-			else
-				this:SetValue(true)
-			end
-			if self.open then	
-				self.pullout:Close()
-			end
-		end
-	end
-	
-	--[[ Exported methods ]]--
-	
-	-- exported, AceGUI callback
-	local function OnAcquire(self)
-		local pullout = AceGUI:Create("Dropdown-Pullout")
-		self.pullout = pullout
-		pullout.userdata.obj = self
-		pullout:SetCallback("OnClose", OnPulloutClose)
-		pullout:SetCallback("OnOpen", OnPulloutOpen)
-		self.pullout.frame:SetFrameLevel(self.frame:GetFrameLevel() + 1)
-		fixlevels(self.pullout.frame, self.pullout.frame:GetChildren())
-		
-		self:SetHeight(44)
-		self:SetWidth(200)
-		self:SetLabel()
-		self:SetPulloutWidth(nil)
-	end
-	
-	-- exported, AceGUI callback
-	local function OnRelease(self)
-		if self.open then
-			self.pullout:Close()
-		end
-		AceGUI:Release(self.pullout)
-		self.pullout = nil
-		
-		self:SetText("")
-		self:SetDisabled(false)
-		self:SetMultiselect(false)
-		
-		self.value = nil
-		self.list = nil
-		self.open = nil
-		self.hasClose = nil
-		
-		self.frame:ClearAllPoints()
-		self.frame:Hide()
-	end
-	
-	-- exported
-	local function SetDisabled(self, disabled)
-		self.disabled = disabled
-		if disabled then
-			self.text:SetTextColor(0.5,0.5,0.5)
-			self.button:Disable()
-			self.button_cover:Disable()
-			self.label:SetTextColor(0.5,0.5,0.5)
-		else
-			self.button:Enable()
-			self.button_cover:Enable()
-			self.label:SetTextColor(1,.82,0)
-			self.text:SetTextColor(1,1,1)
-		end
-	end
-	
-	-- exported
-	local function ClearFocus(self)
-		if self.open then
-			self.pullout:Close()
-		end
-	end
-	
-	-- exported
-	local function SetText(self, text)
-		self.text:SetText(text or "")
-	end
-	
-	-- exported
-	local function SetLabel(self, text)
-		if text and text ~= "" then
-			self.label:SetText(text)
-			self.label:Show()
-			self.dropdown:SetPoint("TOPLEFT",self.frame,"TOPLEFT",-15,-14)
-			self:SetHeight(40)
-			self.alignoffset = 26
-		else
-			self.label:SetText("")
-			self.label:Hide()
-			self.dropdown:SetPoint("TOPLEFT",self.frame,"TOPLEFT",-15,0)
-			self:SetHeight(26)
-			self.alignoffset = 12
-		end
-	end
-	
-	-- exported
-	local function SetValue(self, value)
-		if self.list then
-			self:SetText(self.list[value] or "")
-		end
-		self.value = value
-	end
-	
-	-- exported
-	local function GetValue(self)
-		return self.value
-	end
-	
-	-- exported
-	local function SetItemValue(self, item, value)
-		if not self.multiselect then return end
-		for i, widget in self.pullout:IterateItems() do
-			if widget.userdata.value == item then
-				if widget.SetValue then
-					widget:SetValue(value)
-				end
-			end
-		end
-		ShowMultiText(self)
-	end
-	
-	-- exported
-	local function SetItemDisabled(self, item, disabled)
-		for i, widget in self.pullout:IterateItems() do
-			if widget.userdata.value == item then
-				widget:SetDisabled(disabled)
-			end
-		end
-	end
-	
-	local function AddListItem(self, value, text, itemType)
-		if not itemType then itemType = "Dropdown-Item-Toggle" end
-		local exists = AceGUI:GetWidgetVersion(itemType)
-		if not exists then error(("The given item type, %q, does not exist within AceGUI-3.0"):format(tostring(itemType)), 2) end
-
-		local item = AceGUI:Create(itemType)
-		item:SetText(text)
-		item.userdata.obj = self
-		item.userdata.value = value
-		item:SetCallback("OnValueChanged", OnItemValueChanged)
-		self.pullout:AddItem(item)
-	end
-	
-	local function AddCloseButton(self)
-		if not self.hasClose then
-			local close = AceGUI:Create("Dropdown-Item-Execute")
-			close:SetText(CLOSE)
-			self.pullout:AddItem(close)
-			self.hasClose = true
-		end
-	end
-	
-	-- exported
-	local sortlist = {}
-	local function SetList(self, list, order, itemType)
-		self.list = list
-		self.pullout:Clear()
-		self.hasClose = nil
-		if not list then return end
-		
-		if type(order) ~= "table" then
-			for v in pairs(list) do
-				sortlist[#sortlist + 1] = v
-			end
-			tsort(sortlist)
-			
-			for i, key in ipairs(sortlist) do
-				AddListItem(self, key, list[key], itemType)
-				sortlist[i] = nil
-			end
-		else
-			for i, key in ipairs(order) do
-				AddListItem(self, key, list[key], itemType)
-			end
-		end
-		if self.multiselect then
-			ShowMultiText(self)
-			AddCloseButton(self)
-		end
-	end
-	
-	-- exported
-	local function AddItem(self, value, text, itemType)
-		if self.list then
-			self.list[value] = text
-			AddListItem(self, value, text, itemType)
-		end
-	end
-	
-	-- exported
-	local function SetMultiselect(self, multi)
-		self.multiselect = multi
-		if multi then
-			ShowMultiText(self)
-			AddCloseButton(self)
-		end
-	end
-	
-	-- exported
-	local function GetMultiselect(self)
-		return self.multiselect
-	end
-	
-	local function SetPulloutWidth(self, width)
-		self.pulloutWidth = width
-	end
-	
-	--[[ Constructor ]]--
-	
-	local function Constructor()
-		local count = AceGUI:GetNextWidgetNum(widgetType)
-		local frame = CreateFrame("Frame", nil, UIParent)
-		local dropdown = CreateFrame("Frame", "AceGUI30DropDown"..count, frame, "UIDropDownMenuTemplate")
-		
-		local self = {}
-		self.type = widgetType
-		self.frame = frame
-		self.dropdown = dropdown
-		self.count = count
-		frame.obj = self
-		dropdown.obj = self
-		
-		self.OnRelease   = OnRelease
-		self.OnAcquire   = OnAcquire
-		
-		self.ClearFocus  = ClearFocus
-
-		self.SetText     = SetText
-		self.SetValue    = SetValue
-		self.GetValue    = GetValue
-		self.SetList     = SetList
-		self.SetLabel    = SetLabel
-		self.SetDisabled = SetDisabled
-		self.AddItem     = AddItem
-		self.SetMultiselect = SetMultiselect
-		self.GetMultiselect = GetMultiselect
-		self.SetItemValue = SetItemValue
-		self.SetItemDisabled = SetItemDisabled
-		self.SetPulloutWidth = SetPulloutWidth
-		
-		self.alignoffset = 26
-		
-		frame:SetScript("OnHide",Dropdown_OnHide)
-
-		dropdown:ClearAllPoints()
-		dropdown:SetPoint("TOPLEFT",frame,"TOPLEFT",-15,0)
-		dropdown:SetPoint("BOTTOMRIGHT",frame,"BOTTOMRIGHT",17,0)
-		dropdown:SetScript("OnHide", nil)
-
-		local left = _G[dropdown:GetName() .. "Left"]
-		local middle = _G[dropdown:GetName() .. "Middle"]
-		local right = _G[dropdown:GetName() .. "Right"]
-		
-		middle:ClearAllPoints()
-		right:ClearAllPoints()
-		
-		middle:SetPoint("LEFT", left, "RIGHT", 0, 0)
-		middle:SetPoint("RIGHT", right, "LEFT", 0, 0)
-		right:SetPoint("TOPRIGHT", dropdown, "TOPRIGHT", 0, 17)
-
-		local button = _G[dropdown:GetName() .. "Button"]
-		self.button = button
-		button.obj = self
-		button:SetScript("OnEnter",Control_OnEnter)
-		button:SetScript("OnLeave",Control_OnLeave)
-		button:SetScript("OnClick",Dropdown_TogglePullout)
-		
-		local button_cover = CreateFrame("BUTTON",nil,self.frame)
-		self.button_cover = button_cover
-		button_cover.obj = self
-		button_cover:SetPoint("TOPLEFT",self.frame,"BOTTOMLEFT",0,25)
-		button_cover:SetPoint("BOTTOMRIGHT",self.frame,"BOTTOMRIGHT")
-		button_cover:SetScript("OnEnter",Control_OnEnter)
-		button_cover:SetScript("OnLeave",Control_OnLeave)
-		button_cover:SetScript("OnClick",Dropdown_TogglePullout)
-		
-		local text = _G[dropdown:GetName() .. "Text"]
-		self.text = text
-		text.obj = self
-		text:ClearAllPoints()
-		text:SetPoint("RIGHT", right, "RIGHT" ,-43, 2)
-		text:SetPoint("LEFT", left, "LEFT", 25, 2)
-		
-		local label = frame:CreateFontString(nil,"OVERLAY","GameFontNormalSmall")
-		label:SetPoint("TOPLEFT",frame,"TOPLEFT",0,0)
-		label:SetPoint("TOPRIGHT",frame,"TOPRIGHT",0,0)
-		label:SetJustifyH("LEFT")
-		label:SetHeight(18)
-		label:Hide()
-		self.label = label
-
-		AceGUI:RegisterAsWidget(self)
-		return self
-	end
-	
-	AceGUI:RegisterWidgetType(widgetType, Constructor, widgetVersion)
-end	
diff --git a/OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIWidget-EditBox.lua b/OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIWidget-EditBox.lua
deleted file mode 100644
index d039026..0000000
--- a/OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIWidget-EditBox.lua
+++ /dev/null
@@ -1,265 +0,0 @@
---[[-----------------------------------------------------------------------------
-EditBox Widget
--------------------------------------------------------------------------------]]
-local Type, Version = "EditBox", 26
-local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
-if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
-
--- Lua APIs
-local tostring, pairs = tostring, pairs
-
--- WoW APIs
-local PlaySound = PlaySound
-local GetCursorInfo, ClearCursor, GetSpellInfo = GetCursorInfo, ClearCursor, GetSpellInfo
-local CreateFrame, UIParent = CreateFrame, UIParent
-local _G = _G
-
--- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
--- List them here for Mikk's FindGlobals script
--- GLOBALS: AceGUIEditBoxInsertLink, ChatFontNormal, OKAY
-
---[[-----------------------------------------------------------------------------
-Support functions
--------------------------------------------------------------------------------]]
-if not AceGUIEditBoxInsertLink then
-	-- upgradeable hook
-	hooksecurefunc("ChatEdit_InsertLink", function(...) return _G.AceGUIEditBoxInsertLink(...) end)
-end
-
-function _G.AceGUIEditBoxInsertLink(text)
-	for i = 1, AceGUI:GetWidgetCount(Type) do
-		local editbox = _G["AceGUI-3.0EditBox"..i]
-		if editbox and editbox:IsVisible() and editbox:HasFocus() then
-			editbox:Insert(text)
-			return true
-		end
-	end
-end
-
-local function ShowButton(self)
-	if not self.disablebutton then
-		self.button:Show()
-		self.editbox:SetTextInsets(0, 20, 3, 3)
-	end
-end
-
-local function HideButton(self)
-	self.button:Hide()
-	self.editbox:SetTextInsets(0, 0, 3, 3)
-end
-
---[[-----------------------------------------------------------------------------
-Scripts
--------------------------------------------------------------------------------]]
-local function Control_OnEnter(frame)
-	frame.obj:Fire("OnEnter")
-end
-
-local function Control_OnLeave(frame)
-	frame.obj:Fire("OnLeave")
-end
-
-local function Frame_OnShowFocus(frame)
-	frame.obj.editbox:SetFocus()
-	frame:SetScript("OnShow", nil)
-end
-
-local function EditBox_OnEscapePressed(frame)
-	AceGUI:ClearFocus()
-end
-
-local function EditBox_OnEnterPressed(frame)
-	local self = frame.obj
-	local value = frame:GetText()
-	local cancel = self:Fire("OnEnterPressed", value)
-	if not cancel then
-		PlaySound("igMainMenuOptionCheckBoxOn")
-		HideButton(self)
-	end
-end
-
-local function EditBox_OnReceiveDrag(frame)
-	local self = frame.obj
-	local type, id, info = GetCursorInfo()
-	if type == "item" then
-		self:SetText(info)
-		self:Fire("OnEnterPressed", info)
-		ClearCursor()
-	elseif type == "spell" then
-		local name = GetSpellInfo(id, info)
-		self:SetText(name)
-		self:Fire("OnEnterPressed", name)
-		ClearCursor()
-	elseif type == "macro" then
-		local name = GetMacroInfo(id)
-		self:SetText(name)
-		self:Fire("OnEnterPressed", name)
-		ClearCursor()
-	end
-	HideButton(self)
-	AceGUI:ClearFocus()
-end
-
-local function EditBox_OnTextChanged(frame)
-	local self = frame.obj
-	local value = frame:GetText()
-	if tostring(value) ~= tostring(self.lasttext) then
-		self:Fire("OnTextChanged", value)
-		self.lasttext = value
-		ShowButton(self)
-	end
-end
-
-local function EditBox_OnFocusGained(frame)
-	AceGUI:SetFocus(frame.obj)
-end
-
-local function Button_OnClick(frame)
-	local editbox = frame.obj.editbox
-	editbox:ClearFocus()
-	EditBox_OnEnterPressed(editbox)
-end
-
---[[-----------------------------------------------------------------------------
-Methods
--------------------------------------------------------------------------------]]
-local methods = {
-	["OnAcquire"] = function(self)
-		-- height is controlled by SetLabel
-		self:SetWidth(200)
-		self:SetDisabled(false)
-		self:SetLabel()
-		self:SetText()
-		self:DisableButton(false)
-		self:SetMaxLetters(0)
-	end,
-
-	["OnRelease"] = function(self)
-		self:ClearFocus()
-	end,
-
-	["SetDisabled"] = function(self, disabled)
-		self.disabled = disabled
-		if disabled then
-			self.editbox:EnableMouse(false)
-			self.editbox:ClearFocus()
-			self.editbox:SetTextColor(0.5,0.5,0.5)
-			self.label:SetTextColor(0.5,0.5,0.5)
-		else
-			self.editbox:EnableMouse(true)
-			self.editbox:SetTextColor(1,1,1)
-			self.label:SetTextColor(1,.82,0)
-		end
-	end,
-
-	["SetText"] = function(self, text)
-		self.lasttext = text or ""
-		self.editbox:SetText(text or "")
-		self.editbox:SetCursorPosition(0)
-		HideButton(self)
-	end,
-
-	["GetText"] = function(self, text)
-		return self.editbox:GetText()
-	end,
-
-	["SetLabel"] = function(self, text)
-		if text and text ~= "" then
-			self.label:SetText(text)
-			self.label:Show()
-			self.editbox:SetPoint("TOPLEFT",self.frame,"TOPLEFT",7,-18)
-			self:SetHeight(44)
-			self.alignoffset = 30
-		else
-			self.label:SetText("")
-			self.label:Hide()
-			self.editbox:SetPoint("TOPLEFT",self.frame,"TOPLEFT",7,0)
-			self:SetHeight(26)
-			self.alignoffset = 12
-		end
-	end,
-
-	["DisableButton"] = function(self, disabled)
-		self.disablebutton = disabled
-		if disabled then
-			HideButton(self)
-		end
-	end,
-
-	["SetMaxLetters"] = function (self, num)
-		self.editbox:SetMaxLetters(num or 0)
-	end,
-
-	["ClearFocus"] = function(self)
-		self.editbox:ClearFocus()
-		self.frame:SetScript("OnShow", nil)
-	end,
-
-	["SetFocus"] = function(self)
-		self.editbox:SetFocus()
-		if not self.frame:IsShown() then
-			self.frame:SetScript("OnShow", Frame_OnShowFocus)
-		end
-	end,
-
-	["HighlightText"] = function(self, from, to)
-		self.editbox:HighlightText(from, to)
-	end
-}
-
---[[-----------------------------------------------------------------------------
-Constructor
--------------------------------------------------------------------------------]]
-local function Constructor()
-	local num  = AceGUI:GetNextWidgetNum(Type)
-	local frame = CreateFrame("Frame", nil, UIParent)
-	frame:Hide()
-
-	local editbox = CreateFrame("EditBox", "AceGUI-3.0EditBox"..num, frame, "InputBoxTemplate")
-	editbox:SetAutoFocus(false)
-	editbox:SetFontObject(ChatFontNormal)
-	editbox:SetScript("OnEnter", Control_OnEnter)
-	editbox:SetScript("OnLeave", Control_OnLeave)
-	editbox:SetScript("OnEscapePressed", EditBox_OnEscapePressed)
-	editbox:SetScript("OnEnterPressed", EditBox_OnEnterPressed)
-	editbox:SetScript("OnTextChanged", EditBox_OnTextChanged)
-	editbox:SetScript("OnReceiveDrag", EditBox_OnReceiveDrag)
-	editbox:SetScript("OnMouseDown", EditBox_OnReceiveDrag)
-	editbox:SetScript("OnEditFocusGained", EditBox_OnFocusGained)
-	editbox:SetTextInsets(0, 0, 3, 3)
-	editbox:SetMaxLetters(256)
-	editbox:SetPoint("BOTTOMLEFT", 6, 0)
-	editbox:SetPoint("BOTTOMRIGHT")
-	editbox:SetHeight(19)
-
-	local label = frame:CreateFontString(nil, "OVERLAY", "GameFontNormalSmall")
-	label:SetPoint("TOPLEFT", 0, -2)
-	label:SetPoint("TOPRIGHT", 0, -2)
-	label:SetJustifyH("LEFT")
-	label:SetHeight(18)
-
-	local button = CreateFrame("Button", nil, editbox, "UIPanelButtonTemplate")
-	button:SetWidth(40)
-	button:SetHeight(20)
-	button:SetPoint("RIGHT", -2, 0)
-	button:SetText(OKAY)
-	button:SetScript("OnClick", Button_OnClick)
-	button:Hide()
-
-	local widget = {
-		alignoffset = 30,
-		editbox     = editbox,
-		label       = label,
-		button      = button,
-		frame       = frame,
-		type        = Type
-	}
-	for method, func in pairs(methods) do
-		widget[method] = func
-	end
-	editbox.obj, button.obj = widget, widget
-
-	return AceGUI:RegisterAsWidget(widget)
-end
-
-AceGUI:RegisterWidgetType(Type, Constructor, Version)
diff --git a/OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIWidget-Heading.lua b/OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIWidget-Heading.lua
deleted file mode 100644
index 1aaf3f5..0000000
--- a/OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIWidget-Heading.lua
+++ /dev/null
@@ -1,78 +0,0 @@
---[[-----------------------------------------------------------------------------
-Heading Widget
--------------------------------------------------------------------------------]]
-local Type, Version = "Heading", 20
-local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
-if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
-
--- Lua APIs
-local pairs = pairs
-
--- WoW APIs
-local CreateFrame, UIParent = CreateFrame, UIParent
-
---[[-----------------------------------------------------------------------------
-Methods
--------------------------------------------------------------------------------]]
-local methods = {
-	["OnAcquire"] = function(self)
-		self:SetText()
-		self:SetFullWidth()
-		self:SetHeight(18)
-	end,
-
-	-- ["OnRelease"] = nil,
-
-	["SetText"] = function(self, text)
-		self.label:SetText(text or "")
-		if text and text ~= "" then
-			self.left:SetPoint("RIGHT", self.label, "LEFT", -5, 0)
-			self.right:Show()
-		else
-			self.left:SetPoint("RIGHT", -3, 0)
-			self.right:Hide()
-		end
-	end
-}
-
---[[-----------------------------------------------------------------------------
-Constructor
--------------------------------------------------------------------------------]]
-local function Constructor()
-	local frame = CreateFrame("Frame", nil, UIParent)
-	frame:Hide()
-
-	local label = frame:CreateFontString(nil, "BACKGROUND", "GameFontNormal")
-	label:SetPoint("TOP")
-	label:SetPoint("BOTTOM")
-	label:SetJustifyH("CENTER")
-
-	local left = frame:CreateTexture(nil, "BACKGROUND")
-	left:SetHeight(8)
-	left:SetPoint("LEFT", 3, 0)
-	left:SetPoint("RIGHT", label, "LEFT", -5, 0)
-	left:SetTexture("Interface\\Tooltips\\UI-Tooltip-Border")
-	left:SetTexCoord(0.81, 0.94, 0.5, 1)
-
-	local right = frame:CreateTexture(nil, "BACKGROUND")
-	right:SetHeight(8)
-	right:SetPoint("RIGHT", -3, 0)
-	right:SetPoint("LEFT", label, "RIGHT", 5, 0)
-	right:SetTexture("Interface\\Tooltips\\UI-Tooltip-Border")
-	right:SetTexCoord(0.81, 0.94, 0.5, 1)
-
-	local widget = {
-		label = label,
-		left  = left,
-		right = right,
-		frame = frame,
-		type  = Type
-	}
-	for method, func in pairs(methods) do
-		widget[method] = func
-	end
-
-	return AceGUI:RegisterAsWidget(widget)
-end
-
-AceGUI:RegisterWidgetType(Type, Constructor, Version)
diff --git a/OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIWidget-Icon.lua b/OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIWidget-Icon.lua
deleted file mode 100644
index 561da73..0000000
--- a/OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIWidget-Icon.lua
+++ /dev/null
@@ -1,140 +0,0 @@
---[[-----------------------------------------------------------------------------
-Icon Widget
--------------------------------------------------------------------------------]]
-local Type, Version = "Icon", 21
-local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
-if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
-
--- Lua APIs
-local select, pairs, print = select, pairs, print
-
--- WoW APIs
-local CreateFrame, UIParent = CreateFrame, UIParent
-
---[[-----------------------------------------------------------------------------
-Scripts
--------------------------------------------------------------------------------]]
-local function Control_OnEnter(frame)
-	frame.obj:Fire("OnEnter")
-end
-
-local function Control_OnLeave(frame)
-	frame.obj:Fire("OnLeave")
-end
-
-local function Button_OnClick(frame, button)
-	frame.obj:Fire("OnClick", button)
-	AceGUI:ClearFocus()
-end
-
---[[-----------------------------------------------------------------------------
-Methods
--------------------------------------------------------------------------------]]
-local methods = {
-	["OnAcquire"] = function(self)
-		self:SetHeight(110)
-		self:SetWidth(110)
-		self:SetLabel()
-		self:SetImage(nil)
-		self:SetImageSize(64, 64)
-		self:SetDisabled(false)
-	end,
-
-	-- ["OnRelease"] = nil,
-
-	["SetLabel"] = function(self, text)
-		if text and text ~= "" then
-			self.label:Show()
-			self.label:SetText(text)
-			self:SetHeight(self.image:GetHeight() + 25)
-		else
-			self.label:Hide()
-			self:SetHeight(self.image:GetHeight() + 10)
-		end
-	end,
-
-	["SetImage"] = function(self, path, ...)
-		local image = self.image
-		image:SetTexture(path)
-		
-		if image:GetTexture() then
-			local n = select("#", ...)
-			if n == 4 or n == 8 then
-				image:SetTexCoord(...)
-			else
-				image:SetTexCoord(0, 1, 0, 1)
-			end
-		end
-	end,
-
-	["SetImageSize"] = function(self, width, height)
-		self.image:SetWidth(width)
-		self.image:SetHeight(height)
-		--self.frame:SetWidth(width + 30)
-		if self.label:IsShown() then
-			self:SetHeight(height + 25)
-		else
-			self:SetHeight(height + 10)
-		end
-	end,
-
-	["SetDisabled"] = function(self, disabled)
-		self.disabled = disabled
-		if disabled then
-			self.frame:Disable()
-			self.label:SetTextColor(0.5, 0.5, 0.5)
-			self.image:SetVertexColor(0.5, 0.5, 0.5, 0.5)
-		else
-			self.frame:Enable()
-			self.label:SetTextColor(1, 1, 1)
-			self.image:SetVertexColor(1, 1, 1, 1)
-		end
-	end
-}
-
---[[-----------------------------------------------------------------------------
-Constructor
--------------------------------------------------------------------------------]]
-local function Constructor()
-	local frame = CreateFrame("Button", nil, UIParent)
-	frame:Hide()
-
-	frame:EnableMouse(true)
-	frame:SetScript("OnEnter", Control_OnEnter)
-	frame:SetScript("OnLeave", Control_OnLeave)
-	frame:SetScript("OnClick", Button_OnClick)
-
-	local label = frame:CreateFontString(nil, "BACKGROUND", "GameFontHighlight")
-	label:SetPoint("BOTTOMLEFT")
-	label:SetPoint("BOTTOMRIGHT")
-	label:SetJustifyH("CENTER")
-	label:SetJustifyV("TOP")
-	label:SetHeight(18)
-
-	local image = frame:CreateTexture(nil, "BACKGROUND")
-	image:SetWidth(64)
-	image:SetHeight(64)
-	image:SetPoint("TOP", 0, -5)
-
-	local highlight = frame:CreateTexture(nil, "HIGHLIGHT")
-	highlight:SetAllPoints(image)
-	highlight:SetTexture("Interface\\PaperDollInfoFrame\\UI-Character-Tab-Highlight")
-	highlight:SetTexCoord(0, 1, 0.23, 0.77)
-	highlight:SetBlendMode("ADD")
-
-	local widget = {
-		label = label,
-		image = image,
-		frame = frame,
-		type  = Type
-	}
-	for method, func in pairs(methods) do
-		widget[method] = func
-	end
-
-	widget.SetText = function(self, ...) print("AceGUI-3.0-Icon: SetText is deprecated! Use SetLabel instead!"); self:SetLabel(...) end
-
-	return AceGUI:RegisterAsWidget(widget)
-end
-
-AceGUI:RegisterWidgetType(Type, Constructor, Version)
diff --git a/OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIWidget-InteractiveLabel.lua b/OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIWidget-InteractiveLabel.lua
deleted file mode 100644
index 9e06049..0000000
--- a/OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIWidget-InteractiveLabel.lua
+++ /dev/null
@@ -1,101 +0,0 @@
---[[-----------------------------------------------------------------------------
-InteractiveLabel Widget
--------------------------------------------------------------------------------]]
-local Type, Version = "InteractiveLabel", 20
-local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
-if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
-
--- Lua APIs
-local select, pairs = select, pairs
-
--- WoW APIs
-local CreateFrame, UIParent = CreateFrame, UIParent
-
--- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
--- List them here for Mikk's FindGlobals script
--- GLOBALS: GameFontHighlightSmall
-
---[[-----------------------------------------------------------------------------
-Scripts
--------------------------------------------------------------------------------]]
-local function Control_OnEnter(frame)
-	frame.obj:Fire("OnEnter")
-end
-
-local function Control_OnLeave(frame)
-	frame.obj:Fire("OnLeave")
-end
-
-local function Label_OnClick(frame, button)
-	frame.obj:Fire("OnClick", button)
-	AceGUI:ClearFocus()
-end
-
---[[-----------------------------------------------------------------------------
-Methods
--------------------------------------------------------------------------------]]
-local methods = {
-	["OnAcquire"] = function(self)
-		self:LabelOnAcquire()
-		self:SetHighlight()
-		self:SetHighlightTexCoord()
-		self:SetDisabled(false)
-	end,
-
-	-- ["OnRelease"] = nil,
-
-	["SetHighlight"] = function(self, ...)
-		self.highlight:SetTexture(...)
-	end,
-
-	["SetHighlightTexCoord"] = function(self, ...)
-		local c = select("#", ...)
-		if c == 4 or c == 8 then
-			self.highlight:SetTexCoord(...)
-		else
-			self.highlight:SetTexCoord(0, 1, 0, 1)
-		end
-	end,
-
-	["SetDisabled"] = function(self,disabled)
-		self.disabled = disabled
-		if disabled then
-			self.frame:EnableMouse(false)
-			self.label:SetTextColor(0.5, 0.5, 0.5)
-		else
-			self.frame:EnableMouse(true)
-			self.label:SetTextColor(1, 1, 1)
-		end
-	end
-}
-
---[[-----------------------------------------------------------------------------
-Constructor
--------------------------------------------------------------------------------]]
-local function Constructor()
-	-- create a Label type that we will hijack
-	local label = AceGUI:Create("Label")
-
-	local frame = label.frame
-	frame:EnableMouse(true)
-	frame:SetScript("OnEnter", Control_OnEnter)
-	frame:SetScript("OnLeave", Control_OnLeave)
-	frame:SetScript("OnMouseDown", Label_OnClick)
-
-	local highlight = frame:CreateTexture(nil, "HIGHLIGHT")
-	highlight:SetTexture(nil)
-	highlight:SetAllPoints()
-	highlight:SetBlendMode("ADD")
-
-	label.highlight = highlight
-	label.type = Type
-	label.LabelOnAcquire = label.OnAcquire
-	for method, func in pairs(methods) do
-		label[method] = func
-	end
-
-	return label
-end
-
-AceGUI:RegisterWidgetType(Type, Constructor, Version)
-
diff --git a/OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIWidget-Keybinding.lua b/OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIWidget-Keybinding.lua
deleted file mode 100644
index ec4cead..0000000
--- a/OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIWidget-Keybinding.lua
+++ /dev/null
@@ -1,249 +0,0 @@
---[[-----------------------------------------------------------------------------
-Keybinding Widget
-Set Keybindings in the Config UI.
--------------------------------------------------------------------------------]]
-local Type, Version = "Keybinding", 25
-local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
-if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
-
--- Lua APIs
-local pairs = pairs
-
--- WoW APIs
-local IsShiftKeyDown, IsControlKeyDown, IsAltKeyDown = IsShiftKeyDown, IsControlKeyDown, IsAltKeyDown
-local CreateFrame, UIParent = CreateFrame, UIParent
-
--- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
--- List them here for Mikk's FindGlobals script
--- GLOBALS: NOT_BOUND
-
---[[-----------------------------------------------------------------------------
-Scripts
--------------------------------------------------------------------------------]]
-
-local function Control_OnEnter(frame)
-	frame.obj:Fire("OnEnter")
-end
-
-local function Control_OnLeave(frame)
-	frame.obj:Fire("OnLeave")
-end
-
-local function Keybinding_OnClick(frame, button)
-	if button == "LeftButton" or button == "RightButton" then
-		local self = frame.obj
-		if self.waitingForKey then
-			frame:EnableKeyboard(false)
-			frame:EnableMouseWheel(false)
-			self.msgframe:Hide()
-			frame:UnlockHighlight()
-			self.waitingForKey = nil
-		else
-			frame:EnableKeyboard(true)
-			frame:EnableMouseWheel(true)
-			self.msgframe:Show()
-			frame:LockHighlight()
-			self.waitingForKey = true
-		end
-	end
-	AceGUI:ClearFocus()
-end
-
-local ignoreKeys = {
-	["BUTTON1"] = true, ["BUTTON2"] = true,
-	["UNKNOWN"] = true,
-	["LSHIFT"] = true, ["LCTRL"] = true, ["LALT"] = true,
-	["RSHIFT"] = true, ["RCTRL"] = true, ["RALT"] = true,
-}
-local function Keybinding_OnKeyDown(frame, key)
-	local self = frame.obj
-	if self.waitingForKey then
-		local keyPressed = key
-		if keyPressed == "ESCAPE" then
-			keyPressed = ""
-		else
-			if ignoreKeys[keyPressed] then return end
-			if IsShiftKeyDown() then
-				keyPressed = "SHIFT-"..keyPressed
-			end
-			if IsControlKeyDown() then
-				keyPressed = "CTRL-"..keyPressed
-			end
-			if IsAltKeyDown() then
-				keyPressed = "ALT-"..keyPressed
-			end
-		end
-
-		frame:EnableKeyboard(false)
-		frame:EnableMouseWheel(false)
-		self.msgframe:Hide()
-		frame:UnlockHighlight()
-		self.waitingForKey = nil
-
-		if not self.disabled then
-			self:SetKey(keyPressed)
-			self:Fire("OnKeyChanged", keyPressed)
-		end
-	end
-end
-
-local function Keybinding_OnMouseDown(frame, button)
-	if button == "LeftButton" or button == "RightButton" then
-		return
-	elseif button == "MiddleButton" then
-		button = "BUTTON3"
-	elseif button == "Button4" then
-		button = "BUTTON4"
-	elseif button == "Button5" then
-		button = "BUTTON5"
-	end
-	Keybinding_OnKeyDown(frame, button)
-end
-
-local function Keybinding_OnMouseWheel(frame, direction)
-	local button
-	if direction >= 0 then
-		button = "MOUSEWHEELUP"
-	else
-		button = "MOUSEWHEELDOWN"
-	end
-	Keybinding_OnKeyDown(frame, button)
-end
-
---[[-----------------------------------------------------------------------------
-Methods
--------------------------------------------------------------------------------]]
-local methods = {
-	["OnAcquire"] = function(self)
-		self:SetWidth(200)
-		self:SetLabel("")
-		self:SetKey("")
-		self.waitingForKey = nil
-		self.msgframe:Hide()
-		self:SetDisabled(false)
-		self.button:EnableKeyboard(false)
-		self.button:EnableMouseWheel(false)
-	end,
-
-	-- ["OnRelease"] = nil,
-
-	["SetDisabled"] = function(self, disabled)
-		self.disabled = disabled
-		if disabled then
-			self.button:Disable()
-			self.label:SetTextColor(0.5,0.5,0.5)
-		else
-			self.button:Enable()
-			self.label:SetTextColor(1,1,1)
-		end
-	end,
-
-	["SetKey"] = function(self, key)
-		if (key or "") == "" then
-			self.button:SetText(NOT_BOUND)
-			self.button:SetNormalFontObject("GameFontNormal")
-		else
-			self.button:SetText(key)
-			self.button:SetNormalFontObject("GameFontHighlight")
-		end
-	end,
-
-	["GetKey"] = function(self)
-		local key = self.button:GetText()
-		if key == NOT_BOUND then
-			key = nil
-		end
-		return key
-	end,
-
-	["SetLabel"] = function(self, label)
-		self.label:SetText(label or "")
-		if (label or "") == "" then
-			self.alignoffset = nil
-			self:SetHeight(24)
-		else
-			self.alignoffset = 30
-			self:SetHeight(44)
-		end
-	end,
-}
-
---[[-----------------------------------------------------------------------------
-Constructor
--------------------------------------------------------------------------------]]
-
-local ControlBackdrop  = {
-	bgFile = "Interface\\Tooltips\\UI-Tooltip-Background",
-	edgeFile = "Interface\\Tooltips\\UI-Tooltip-Border",
-	tile = true, tileSize = 16, edgeSize = 16,
-	insets = { left = 3, right = 3, top = 3, bottom = 3 }
-}
-
-local function keybindingMsgFixWidth(frame)
-	frame:SetWidth(frame.msg:GetWidth() + 10)
-	frame:SetScript("OnUpdate", nil)
-end
-
-local function Constructor()
-	local name = "AceGUI30KeybindingButton" .. AceGUI:GetNextWidgetNum(Type)
-
-	local frame = CreateFrame("Frame", nil, UIParent)
-	local button = CreateFrame("Button", name, frame, "UIPanelButtonTemplate")
-
-	button:EnableMouse(true)
-	button:EnableMouseWheel(false)
-	button:RegisterForClicks("AnyDown")
-	button:SetScript("OnEnter", Control_OnEnter)
-	button:SetScript("OnLeave", Control_OnLeave)
-	button:SetScript("OnClick", Keybinding_OnClick)
-	button:SetScript("OnKeyDown", Keybinding_OnKeyDown)
-	button:SetScript("OnMouseDown", Keybinding_OnMouseDown)
-	button:SetScript("OnMouseWheel", Keybinding_OnMouseWheel)
-	button:SetPoint("BOTTOMLEFT")
-	button:SetPoint("BOTTOMRIGHT")
-	button:SetHeight(24)
-	button:EnableKeyboard(false)
-
-	local text = button:GetFontString()
-	text:SetPoint("LEFT", 7, 0)
-	text:SetPoint("RIGHT", -7, 0)
-
-	local label = frame:CreateFontString(nil, "OVERLAY", "GameFontHighlight")
-	label:SetPoint("TOPLEFT")
-	label:SetPoint("TOPRIGHT")
-	label:SetJustifyH("CENTER")
-	label:SetHeight(18)
-
-	local msgframe = CreateFrame("Frame", nil, UIParent)
-	msgframe:SetHeight(30)
-	msgframe:SetBackdrop(ControlBackdrop)
-	msgframe:SetBackdropColor(0,0,0)
-	msgframe:SetFrameStrata("FULLSCREEN_DIALOG")
-	msgframe:SetFrameLevel(1000)
-	msgframe:SetToplevel(true)
-
-	local msg = msgframe:CreateFontString(nil, "OVERLAY", "GameFontNormal")
-	msg:SetText("Press a key to bind, ESC to clear the binding or click the button again to cancel.")
-	msgframe.msg = msg
-	msg:SetPoint("TOPLEFT", 5, -5)
-	msgframe:SetScript("OnUpdate", keybindingMsgFixWidth)
-	msgframe:SetPoint("BOTTOM", button, "TOP")
-	msgframe:Hide()
-
-	local widget = {
-		button      = button,
-		label       = label,
-		msgframe    = msgframe,
-		frame       = frame,
-		alignoffset = 30,
-		type        = Type
-	}
-	for method, func in pairs(methods) do
-		widget[method] = func
-	end
-	button.obj = widget
-
-	return AceGUI:RegisterAsWidget(widget)
-end
-
-AceGUI:RegisterWidgetType(Type, Constructor, Version)
diff --git a/OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIWidget-Label.lua b/OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIWidget-Label.lua
deleted file mode 100644
index 23897d5..0000000
--- a/OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIWidget-Label.lua
+++ /dev/null
@@ -1,166 +0,0 @@
---[[-----------------------------------------------------------------------------
-Label Widget
-Displays text and optionally an icon.
--------------------------------------------------------------------------------]]
-local Type, Version = "Label", 23
-local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
-if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
-
--- Lua APIs
-local max, select, pairs = math.max, select, pairs
-
--- WoW APIs
-local CreateFrame, UIParent = CreateFrame, UIParent
-
--- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
--- List them here for Mikk's FindGlobals script
--- GLOBALS: GameFontHighlightSmall
-
---[[-----------------------------------------------------------------------------
-Support functions
--------------------------------------------------------------------------------]]
-
-local function UpdateImageAnchor(self)
-	if self.resizing then return end
-	local frame = self.frame
-	local width = frame.width or frame:GetWidth() or 0
-	local image = self.image
-	local label = self.label
-	local height
-
-	label:ClearAllPoints()
-	image:ClearAllPoints()
-
-	if self.imageshown then
-		local imagewidth = image:GetWidth()
-		if (width - imagewidth) < 200 or (label:GetText() or "") == "" then
-			-- image goes on top centered when less than 200 width for the text, or if there is no text
-			image:SetPoint("TOP")
-			label:SetPoint("TOP", image, "BOTTOM")
-			label:SetPoint("LEFT")
-			label:SetWidth(width)
-			height = image:GetHeight() + label:GetHeight()
-		else
-			-- image on the left
-			image:SetPoint("TOPLEFT")
-			if image:GetHeight() > label:GetHeight() then
-				label:SetPoint("LEFT", image, "RIGHT", 4, 0)
-			else
-				label:SetPoint("TOPLEFT", image, "TOPRIGHT", 4, 0)
-			end
-			label:SetWidth(width - imagewidth - 4)
-			height = max(image:GetHeight(), label:GetHeight())
-		end
-	else
-		-- no image shown
-		label:SetPoint("TOPLEFT")
-		label:SetWidth(width)
-		height = label:GetHeight()
-	end
-	
-	self.resizing = true
-	frame:SetHeight(height)
-	frame.height = height
-	self.resizing = nil
-end
-
---[[-----------------------------------------------------------------------------
-Methods
--------------------------------------------------------------------------------]]
-local methods = {
-	["OnAcquire"] = function(self)
-		-- set the flag to stop constant size updates
-		self.resizing = true
-		-- height is set dynamically by the text and image size
-		self:SetWidth(200)
-		self:SetText()
-		self:SetImage(nil)
-		self:SetImageSize(16, 16)
-		self:SetColor()
-		self:SetFontObject()
-
-		-- reset the flag
-		self.resizing = nil
-		-- run the update explicitly
-		UpdateImageAnchor(self)
-	end,
-
-	-- ["OnRelease"] = nil,
-
-	["OnWidthSet"] = function(self, width)
-		UpdateImageAnchor(self)
-	end,
-
-	["SetText"] = function(self, text)
-		self.label:SetText(text)
-		UpdateImageAnchor(self)
-	end,
-
-	["SetColor"] = function(self, r, g, b)
-		if not (r and g and b) then
-			r, g, b = 1, 1, 1
-		end
-		self.label:SetVertexColor(r, g, b)
-	end,
-
-	["SetImage"] = function(self, path, ...)
-		local image = self.image
-		image:SetTexture(path)
-		
-		if image:GetTexture() then
-			self.imageshown = true
-			local n = select("#", ...)
-			if n == 4 or n == 8 then
-				image:SetTexCoord(...)
-			else
-				image:SetTexCoord(0, 1, 0, 1)
-			end
-		else
-			self.imageshown = nil
-		end
-		UpdateImageAnchor(self)
-	end,
-
-	["SetFont"] = function(self, font, height, flags)
-		self.label:SetFont(font, height, flags)
-	end,
-
-	["SetFontObject"] = function(self, font)
-		self:SetFont((font or GameFontHighlightSmall):GetFont())
-	end,
-
-	["SetImageSize"] = function(self, width, height)
-		self.image:SetWidth(width)
-		self.image:SetHeight(height)
-		UpdateImageAnchor(self)
-	end,
-}
-
---[[-----------------------------------------------------------------------------
-Constructor
--------------------------------------------------------------------------------]]
-local function Constructor()
-	local frame = CreateFrame("Frame", nil, UIParent)
-	frame:Hide()
-
-	local label = frame:CreateFontString(nil, "BACKGROUND", "GameFontHighlightSmall")
-	label:SetJustifyH("LEFT")
-	label:SetJustifyV("TOP")
-
-	local image = frame:CreateTexture(nil, "BACKGROUND")
-
-	-- create widget
-	local widget = {
-		label = label,
-		image = image,
-		frame = frame,
-		type  = Type
-	}
-	for method, func in pairs(methods) do
-		widget[method] = func
-	end
-
-	return AceGUI:RegisterAsWidget(widget)
-end
-
-AceGUI:RegisterWidgetType(Type, Constructor, Version)
diff --git a/OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIWidget-MultiLineEditBox.lua b/OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIWidget-MultiLineEditBox.lua
deleted file mode 100644
index 9af4b87..0000000
--- a/OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIWidget-MultiLineEditBox.lua
+++ /dev/null
@@ -1,366 +0,0 @@
-local Type, Version = "MultiLineEditBox", 28
-local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
-if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
-
--- Lua APIs
-local pairs = pairs
-
--- WoW APIs
-local GetCursorInfo, GetSpellInfo, ClearCursor = GetCursorInfo, GetSpellInfo, ClearCursor
-local CreateFrame, UIParent = CreateFrame, UIParent
-local _G = _G
-
--- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
--- List them here for Mikk's FindGlobals script
--- GLOBALS: ACCEPT, ChatFontNormal
-
---[[-----------------------------------------------------------------------------
-Support functions
--------------------------------------------------------------------------------]]
-
-if not AceGUIMultiLineEditBoxInsertLink then
-	-- upgradeable hook
-	hooksecurefunc("ChatEdit_InsertLink", function(...) return _G.AceGUIMultiLineEditBoxInsertLink(...) end)
-end
-
-function _G.AceGUIMultiLineEditBoxInsertLink(text)
-	for i = 1, AceGUI:GetWidgetCount(Type) do
-		local editbox = _G[("MultiLineEditBox%uEdit"):format(i)]
-		if editbox and editbox:IsVisible() and editbox:HasFocus() then
-			editbox:Insert(text)
-			return true
-		end
-	end
-end
-
-
-local function Layout(self)
-	self:SetHeight(self.numlines * 14 + (self.disablebutton and 19 or 41) + self.labelHeight)
-
-	if self.labelHeight == 0 then
-		self.scrollBar:SetPoint("TOP", self.frame, "TOP", 0, -23)
-	else
-		self.scrollBar:SetPoint("TOP", self.label, "BOTTOM", 0, -19)
-	end
-
-	if self.disablebutton then
-		self.scrollBar:SetPoint("BOTTOM", self.frame, "BOTTOM", 0, 21)
-		self.scrollBG:SetPoint("BOTTOMLEFT", 0, 4)
-	else
-		self.scrollBar:SetPoint("BOTTOM", self.button, "TOP", 0, 18)
-		self.scrollBG:SetPoint("BOTTOMLEFT", self.button, "TOPLEFT")
-	end
-end
-
---[[-----------------------------------------------------------------------------
-Scripts
--------------------------------------------------------------------------------]]
-local function OnClick(self)                                                     -- Button
-	self = self.obj
-	self.editBox:ClearFocus()
-	if not self:Fire("OnEnterPressed", self.editBox:GetText()) then
-		self.button:Disable()
-	end
-end
-
-local function OnCursorChanged(self, _, y, _, cursorHeight)                      -- EditBox
-	self, y = self.obj.scrollFrame, -y
-	local offset = self:GetVerticalScroll()
-	if y < offset then
-		self:SetVerticalScroll(y)
-	else
-		y = y + cursorHeight - self:GetHeight()
-		if y > offset then
-			self:SetVerticalScroll(y)
-		end
-	end
-end
-
-local function OnEditFocusLost(self)                                             -- EditBox
-	self:HighlightText(0, 0)
-	self.obj:Fire("OnEditFocusLost")
-end
-
-local function OnEnter(self)                                                     -- EditBox / ScrollFrame
-	self = self.obj
-	if not self.entered then
-		self.entered = true
-		self:Fire("OnEnter")
-	end
-end
-
-local function OnLeave(self)                                                     -- EditBox / ScrollFrame
-	self = self.obj
-	if self.entered then
-		self.entered = nil
-		self:Fire("OnLeave")
-	end
-end
-
-local function OnMouseUp(self)                                                   -- ScrollFrame
-	self = self.obj.editBox
-	self:SetFocus()
-	self:SetCursorPosition(self:GetNumLetters())
-end
-
-local function OnReceiveDrag(self)                                               -- EditBox / ScrollFrame
-	local type, id, info = GetCursorInfo()
-	if type == "spell" then
-		info = GetSpellInfo(id, info)
-	elseif type ~= "item" then
-		return
-	end
-	ClearCursor()
-	self = self.obj
-	local editBox = self.editBox
-	if not editBox:HasFocus() then
-		editBox:SetFocus()
-		editBox:SetCursorPosition(editBox:GetNumLetters())
-	end
-	editBox:Insert(info)
-	self.button:Enable()
-end
-
-local function OnSizeChanged(self, width, height)                                -- ScrollFrame
-	self.obj.editBox:SetWidth(width)
-end
-
-local function OnTextChanged(self, userInput)                                    -- EditBox
-	if userInput then
-		self = self.obj
-		self:Fire("OnTextChanged", self.editBox:GetText())
-		self.button:Enable()
-	end
-end
-
-local function OnTextSet(self)                                                   -- EditBox
-	self:HighlightText(0, 0)
-	self:SetCursorPosition(self:GetNumLetters())
-	self:SetCursorPosition(0)
-	self.obj.button:Disable()
-end
-
-local function OnVerticalScroll(self, offset)                                    -- ScrollFrame
-	local editBox = self.obj.editBox
-	editBox:SetHitRectInsets(0, 0, offset, editBox:GetHeight() - offset - self:GetHeight())
-end
-
-local function OnShowFocus(frame)
-	frame.obj.editBox:SetFocus()
-	frame:SetScript("OnShow", nil)
-end
-
-local function OnEditFocusGained(frame)
-	AceGUI:SetFocus(frame.obj)
-	frame.obj:Fire("OnEditFocusGained")
-end
-
---[[-----------------------------------------------------------------------------
-Methods
--------------------------------------------------------------------------------]]
-local methods = {
-	["OnAcquire"] = function(self)
-		self.editBox:SetText("")
-		self:SetDisabled(false)
-		self:SetWidth(200)
-		self:DisableButton(false)
-		self:SetNumLines()
-		self.entered = nil
-		self:SetMaxLetters(0)
-	end,
-
-	["OnRelease"] = function(self)
-		self:ClearFocus()
-	end,
-
-	["SetDisabled"] = function(self, disabled)
-		local editBox = self.editBox
-		if disabled then
-			editBox:ClearFocus()
-			editBox:EnableMouse(false)
-			editBox:SetTextColor(0.5, 0.5, 0.5)
-			self.label:SetTextColor(0.5, 0.5, 0.5)
-			self.scrollFrame:EnableMouse(false)
-			self.button:Disable()
-		else
-			editBox:EnableMouse(true)
-			editBox:SetTextColor(1, 1, 1)
-			self.label:SetTextColor(1, 0.82, 0)
-			self.scrollFrame:EnableMouse(true)
-		end
-	end,
-
-	["SetLabel"] = function(self, text)
-		if text and text ~= "" then
-			self.label:SetText(text)
-			if self.labelHeight ~= 10 then
-				self.labelHeight = 10
-				self.label:Show()
-			end
-		elseif self.labelHeight ~= 0 then
-			self.labelHeight = 0
-			self.label:Hide()
-		end
-		Layout(self)
-	end,
-
-	["SetNumLines"] = function(self, value)
-		if not value or value < 4 then
-			value = 4
-		end
-		self.numlines = value
-		Layout(self)
-	end,
-
-	["SetText"] = function(self, text)
-		self.editBox:SetText(text)
-	end,
-
-	["GetText"] = function(self)
-		return self.editBox:GetText()
-	end,
-
-	["SetMaxLetters"] = function (self, num)
-		self.editBox:SetMaxLetters(num or 0)
-	end,
-
-	["DisableButton"] = function(self, disabled)
-		self.disablebutton = disabled
-		if disabled then
-			self.button:Hide()
-		else
-			self.button:Show()
-		end
-		Layout(self)
-	end,
-	
-	["ClearFocus"] = function(self)
-		self.editBox:ClearFocus()
-		self.frame:SetScript("OnShow", nil)
-	end,
-
-	["SetFocus"] = function(self)
-		self.editBox:SetFocus()
-		if not self.frame:IsShown() then
-			self.frame:SetScript("OnShow", OnShowFocus)
-		end
-	end,
-
-	["HighlightText"] = function(self, from, to)
-		self.editBox:HighlightText(from, to)
-	end,
-
-	["GetCursorPosition"] = function(self)
-		return self.editBox:GetCursorPosition()
-	end,
-	
-	["SetCursorPosition"] = function(self, ...)
-		return self.editBox:SetCursorPosition(...)
-	end,
-	
-	
-}
-
---[[-----------------------------------------------------------------------------
-Constructor
--------------------------------------------------------------------------------]]
-local backdrop = {
-	bgFile = [[Interface\Tooltips\UI-Tooltip-Background]],
-	edgeFile = [[Interface\Tooltips\UI-Tooltip-Border]], edgeSize = 16,
-	insets = { left = 4, right = 3, top = 4, bottom = 3 }
-}
-
-local function Constructor()
-	local frame = CreateFrame("Frame", nil, UIParent)
-	frame:Hide()
-	
-	local widgetNum = AceGUI:GetNextWidgetNum(Type)
-
-	local label = frame:CreateFontString(nil, "OVERLAY", "GameFontNormalSmall")
-	label:SetPoint("TOPLEFT", frame, "TOPLEFT", 0, -4)
-	label:SetPoint("TOPRIGHT", frame, "TOPRIGHT", 0, -4)
-	label:SetJustifyH("LEFT")
-	label:SetText(ACCEPT)
-	label:SetHeight(10)
-
-	local button = CreateFrame("Button", ("%s%dButton"):format(Type, widgetNum), frame, "UIPanelButtonTemplate")
-	button:SetPoint("BOTTOMLEFT", 0, 4)
-	button:SetHeight(22)
-	button:SetWidth(label:GetStringWidth() + 24)
-	button:SetText(ACCEPT)
-	button:SetScript("OnClick", OnClick)
-	button:Disable()
-	
-	local text = button:GetFontString()
-	text:ClearAllPoints()
-	text:SetPoint("TOPLEFT", button, "TOPLEFT", 5, -5)
-	text:SetPoint("BOTTOMRIGHT", button, "BOTTOMRIGHT", -5, 1)
-	text:SetJustifyV("MIDDLE")
-
-	local scrollBG = CreateFrame("Frame", nil, frame)
-	scrollBG:SetBackdrop(backdrop)
-	scrollBG:SetBackdropColor(0, 0, 0)
-	scrollBG:SetBackdropBorderColor(0.4, 0.4, 0.4)
-
-	local scrollFrame = CreateFrame("ScrollFrame", ("%s%dScrollFrame"):format(Type, widgetNum), frame, "UIPanelScrollFrameTemplate")
-
-	local scrollBar = _G[scrollFrame:GetName() .. "ScrollBar"]
-	scrollBar:ClearAllPoints()
-	scrollBar:SetPoint("TOP", label, "BOTTOM", 0, -19)
-	scrollBar:SetPoint("BOTTOM", button, "TOP", 0, 18)
-	scrollBar:SetPoint("RIGHT", frame, "RIGHT")
-
-	scrollBG:SetPoint("TOPRIGHT", scrollBar, "TOPLEFT", 0, 19)
-	scrollBG:SetPoint("BOTTOMLEFT", button, "TOPLEFT")
-
-	scrollFrame:SetPoint("TOPLEFT", scrollBG, "TOPLEFT", 5, -6)
-	scrollFrame:SetPoint("BOTTOMRIGHT", scrollBG, "BOTTOMRIGHT", -4, 4)
-	scrollFrame:SetScript("OnEnter", OnEnter)
-	scrollFrame:SetScript("OnLeave", OnLeave)
-	scrollFrame:SetScript("OnMouseUp", OnMouseUp)
-	scrollFrame:SetScript("OnReceiveDrag", OnReceiveDrag)
-	scrollFrame:SetScript("OnSizeChanged", OnSizeChanged)
-	scrollFrame:HookScript("OnVerticalScroll", OnVerticalScroll)
-
-	local editBox = CreateFrame("EditBox", ("%s%dEdit"):format(Type, widgetNum), scrollFrame)
-	editBox:SetAllPoints()
-	editBox:SetFontObject(ChatFontNormal)
-	editBox:SetMultiLine(true)
-	editBox:EnableMouse(true)
-	editBox:SetAutoFocus(false)
-	editBox:SetCountInvisibleLetters(false)
-	editBox:SetScript("OnCursorChanged", OnCursorChanged)
-	editBox:SetScript("OnEditFocusLost", OnEditFocusLost)
-	editBox:SetScript("OnEnter", OnEnter)
-	editBox:SetScript("OnEscapePressed", editBox.ClearFocus)
-	editBox:SetScript("OnLeave", OnLeave)
-	editBox:SetScript("OnMouseDown", OnReceiveDrag)
-	editBox:SetScript("OnReceiveDrag", OnReceiveDrag)
-	editBox:SetScript("OnTextChanged", OnTextChanged)
-	editBox:SetScript("OnTextSet", OnTextSet)
-	editBox:SetScript("OnEditFocusGained", OnEditFocusGained)
-	
-
-	scrollFrame:SetScrollChild(editBox)
-
-	local widget = {
-		button      = button,
-		editBox     = editBox,
-		frame       = frame,
-		label       = label,
-		labelHeight = 10,
-		numlines    = 4,
-		scrollBar   = scrollBar,
-		scrollBG    = scrollBG,
-		scrollFrame = scrollFrame,
-		type        = Type
-	}
-	for method, func in pairs(methods) do
-		widget[method] = func
-	end
-	button.obj, editBox.obj, scrollFrame.obj = widget, widget, widget
-
-	return AceGUI:RegisterAsWidget(widget)
-end
-
-AceGUI:RegisterWidgetType(Type, Constructor, Version)
diff --git a/OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIWidget-Slider.lua b/OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIWidget-Slider.lua
deleted file mode 100644
index 583f29d..0000000
--- a/OrderHallCommander/libs/LibInit/Ace3/AceGUI-3.0/widgets/AceGUIWidget-Slider.lua
+++ /dev/null
@@ -1,285 +0,0 @@
---[[-----------------------------------------------------------------------------
-Slider Widget
-Graphical Slider, like, for Range values.
--------------------------------------------------------------------------------]]
-local Type, Version = "Slider", 21
-local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
-if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
-
--- Lua APIs
-local min, max, floor = math.min, math.max, math.floor
-local tonumber, pairs = tonumber, pairs
-
--- WoW APIs
-local PlaySound = PlaySound
-local CreateFrame, UIParent = CreateFrame, UIParent
-
--- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
--- List them here for Mikk's FindGlobals script
--- GLOBALS: GameFontHighlightSmall
-
---[[-----------------------------------------------------------------------------
-Support functions
--------------------------------------------------------------------------------]]
-local function UpdateText(self)
-	local value = self.value or 0
-	if self.ispercent then
-		self.editbox:SetText(("%s%%"):format(floor(value * 1000 + 0.5) / 10))
-	else
-		self.editbox:SetText(floor(value * 100 + 0.5) / 100)
-	end
-end
-
-local function UpdateLabels(self)
-	local min, max = (self.min or 0), (self.max or 100)
-	if self.ispercent then
-		self.lowtext:SetFormattedText("%s%%", (min * 100))
-		self.hightext:SetFormattedText("%s%%", (max * 100))
-	else
-		self.lowtext:SetText(min)
-		self.hightext:SetText(max)
-	end
-end
-
---[[-----------------------------------------------------------------------------
-Scripts
--------------------------------------------------------------------------------]]
-local function Control_OnEnter(frame)
-	frame.obj:Fire("OnEnter")
-end
-
-local function Control_OnLeave(frame)
-	frame.obj:Fire("OnLeave")
-end
-
-local function Frame_OnMouseDown(frame)
-	frame.obj.slider:EnableMouseWheel(true)
-	AceGUI:ClearFocus()
-end
-
-local function Slider_OnValueChanged(frame)
-	local self = frame.obj
-	if not frame.setup then
-		local newvalue = frame:GetValue()
-		if self.step and self.step > 0 then
-			local min_value = self.min or 0
-			newvalue = floor((newvalue - min_value) / self.step + 0.5) * self.step + min_value
-		end
-		if newvalue ~= self.value and not self.disabled then
-			self.value = newvalue
-			self:Fire("OnValueChanged", newvalue)
-		end
-		if self.value then
-			UpdateText(self)
-		end
-	end
-end
-
-local function Slider_OnMouseUp(frame)
-	local self = frame.obj
-	self:Fire("OnMouseUp", self.value)
-end
-
-local function Slider_OnMouseWheel(frame, v)
-	local self = frame.obj
-	if not self.disabled then
-		local value = self.value
-		if v > 0 then
-			value = min(value + (self.step or 1), self.max)
-		else
-			value = max(value - (self.step or 1), self.min)
-		end
-		self.slider:SetValue(value)
-	end
-end
-
-local function EditBox_OnEscapePressed(frame)
-	frame:ClearFocus()
-end
-
-local function EditBox_OnEnterPressed(frame)
-	local self = frame.obj
-	local value = frame:GetText()
-	if self.ispercent then
-		value = value:gsub('%%', '')
-		value = tonumber(value) / 100
-	else
-		value = tonumber(value)
-	end
-	
-	if value then
-		PlaySound("igMainMenuOptionCheckBoxOn")
-		self.slider:SetValue(value)
-		self:Fire("OnMouseUp", value)
-	end
-end
-
-local function EditBox_OnEnter(frame)
-	frame:SetBackdropBorderColor(0.5, 0.5, 0.5, 1)
-end
-
-local function EditBox_OnLeave(frame)
-	frame:SetBackdropBorderColor(0.3, 0.3, 0.3, 0.8)
-end
-
---[[-----------------------------------------------------------------------------
-Methods
--------------------------------------------------------------------------------]]
-local methods = {
-	["OnAcquire"] = function(self)
-		self:SetWidth(200)
-		self:SetHeight(44)
-		self:SetDisabled(false)
-		self:SetIsPercent(nil)
-		self:SetSliderValues(0,100,1)
-		self:SetValue(0)
-		self.slider:EnableMouseWheel(false)
-	end,
-
-	-- ["OnRelease"] = nil,
-
-	["SetDisabled"] = function(self, disabled)
-		self.disabled = disabled
-		if disabled then
-			self.slider:EnableMouse(false)
-			self.label:SetTextColor(.5, .5, .5)
-			self.hightext:SetTextColor(.5, .5, .5)
-			self.lowtext:SetTextColor(.5, .5, .5)
-			--self.valuetext:SetTextColor(.5, .5, .5)
-			self.editbox:SetTextColor(.5, .5, .5)
-			self.editbox:EnableMouse(false)
-			self.editbox:ClearFocus()
-		else
-			self.slider:EnableMouse(true)
-			self.label:SetTextColor(1, .82, 0)
-			self.hightext:SetTextColor(1, 1, 1)
-			self.lowtext:SetTextColor(1, 1, 1)
-			--self.valuetext:SetTextColor(1, 1, 1)
-			self.editbox:SetTextColor(1, 1, 1)
-			self.editbox:EnableMouse(true)
-		end
-	end,
-
-	["SetValue"] = function(self, value)
-		self.slider.setup = true
-		self.slider:SetValue(value)
-		self.value = value
-		UpdateText(self)
-		self.slider.setup = nil
-	end,
-
-	["GetValue"] = function(self)
-		return self.value
-	end,
-
-	["SetLabel"] = function(self, text)
-		self.label:SetText(text)
-	end,
-
-	["SetSliderValues"] = function(self, min, max, step)
-		local frame = self.slider
-		frame.setup = true
-		self.min = min
-		self.max = max
-		self.step = step
-		frame:SetMinMaxValues(min or 0,max or 100)
-		UpdateLabels(self)
-		frame:SetValueStep(step or 1)
-		if self.value then
-			frame:SetValue(self.value)
-		end
-		frame.setup = nil
-	end,
-
-	["SetIsPercent"] = function(self, value)
-		self.ispercent = value
-		UpdateLabels(self)
-		UpdateText(self)
-	end
-}
-
---[[-----------------------------------------------------------------------------
-Constructor
--------------------------------------------------------------------------------]]
-local SliderBackdrop  = {
-	bgFile = "Interface\\Buttons\\UI-SliderBar-Background",
-	edgeFile = "Interface\\Buttons\\UI-SliderBar-Border",
-	tile = true, tileSize = 8, edgeSize = 8,
-	insets = { left = 3, right = 3, top = 6, bottom = 6 }
-}
-
-local ManualBackdrop = {
-	bgFile = "Interface\\ChatFrame\\ChatFrameBackground",
-	edgeFile = "Interface\\ChatFrame\\ChatFrameBackground",
-	tile = true, edgeSize = 1, tileSize = 5,
-}
-
-local function Constructor()
-	local frame = CreateFrame("Frame", nil, UIParent)
-
-	frame:EnableMouse(true)
-	frame:SetScript("OnMouseDown", Frame_OnMouseDown)
-
-	local label = frame:CreateFontString(nil, "OVERLAY", "GameFontNormal")
-	label:SetPoint("TOPLEFT")
-	label:SetPoint("TOPRIGHT")
-	label:SetJustifyH("CENTER")
-	label:SetHeight(15)
-
-	local slider = CreateFrame("Slider", nil, frame)
-	slider:SetOrientation("HORIZONTAL")
-	slider:SetHeight(15)
-	slider:SetHitRectInsets(0, 0, -10, 0)
-	slider:SetBackdrop(SliderBackdrop)
-	slider:SetThumbTexture("Interface\\Buttons\\UI-SliderBar-Button-Horizontal")
-	slider:SetPoint("TOP", label, "BOTTOM")
-	slider:SetPoint("LEFT", 3, 0)
-	slider:SetPoint("RIGHT", -3, 0)
-	slider:SetValue(0)
-	slider:SetScript("OnValueChanged",Slider_OnValueChanged)
-	slider:SetScript("OnEnter", Control_OnEnter)
-	slider:SetScript("OnLeave", Control_OnLeave)
-	slider:SetScript("OnMouseUp", Slider_OnMouseUp)
-	slider:SetScript("OnMouseWheel", Slider_OnMouseWheel)
-
-	local lowtext = slider:CreateFontString(nil, "ARTWORK", "GameFontHighlightSmall")
-	lowtext:SetPoint("TOPLEFT", slider, "BOTTOMLEFT", 2, 3)
-
-	local hightext = slider:CreateFontString(nil, "ARTWORK", "GameFontHighlightSmall")
-	hightext:SetPoint("TOPRIGHT", slider, "BOTTOMRIGHT", -2, 3)
-
-	local editbox = CreateFrame("EditBox", nil, frame)
-	editbox:SetAutoFocus(false)
-	editbox:SetFontObject(GameFontHighlightSmall)
-	editbox:SetPoint("TOP", slider, "BOTTOM")
-	editbox:SetHeight(14)
-	editbox:SetWidth(70)
-	editbox:SetJustifyH("CENTER")
-	editbox:EnableMouse(true)
-	editbox:SetBackdrop(ManualBackdrop)
-	editbox:SetBackdropColor(0, 0, 0, 0.5)
-	editbox:SetBackdropBorderColor(0.3, 0.3, 0.30, 0.80)
-	editbox:SetScript("OnEnter", EditBox_OnEnter)
-	editbox:SetScript("OnLeave", EditBox_OnLeave)
-	editbox:SetScript("OnEnterPressed", EditBox_OnEnterPressed)
-	editbox:SetScript("OnEscapePressed", EditBox_OnEscapePressed)
-
-	local widget = {
-		label       = label,
-		slider      = slider,
-		lowtext     = lowtext,
-		hightext    = hightext,
-		editbox     = editbox,
-		alignoffset = 25,
-		frame       = frame,
-		type        = Type
-	}
-	for method, func in pairs(methods) do
-		widget[method] = func
-	end
-	slider.obj, editbox.obj = widget, widget
-
-	return AceGUI:RegisterAsWidget(widget)
-end
-
-AceGUI:RegisterWidgetType(Type,Constructor,Version)
diff --git a/OrderHallCommander/libs/LibInit/Ace3/AceHook-3.0/AceHook-3.0.lua b/OrderHallCommander/libs/LibInit/Ace3/AceHook-3.0/AceHook-3.0.lua
deleted file mode 100644
index 8302334..0000000
--- a/OrderHallCommander/libs/LibInit/Ace3/AceHook-3.0/AceHook-3.0.lua
+++ /dev/null
@@ -1,511 +0,0 @@
---- **AceHook-3.0** offers safe Hooking/Unhooking of functions, methods and frame scripts.
--- Using AceHook-3.0 is recommended when you need to unhook your hooks again, so the hook chain isn't broken
--- when you manually restore the original function.
---
--- **AceHook-3.0** can be embeded into your addon, either explicitly by calling AceHook:Embed(MyAddon) or by 
--- specifying it as an embeded library in your AceAddon. All functions will be available on your addon object
--- and can be accessed directly, without having to explicitly call AceHook itself.\\
--- It is recommended to embed AceHook, otherwise you'll have to specify a custom `self` on all calls you
--- make into AceHook.
--- @class file
--- @name AceHook-3.0
--- @release $Id: AceHook-3.0.lua 1118 2014-10-12 08:21:54Z nevcairiel $
-local ACEHOOK_MAJOR, ACEHOOK_MINOR = "AceHook-3.0", 8
-local AceHook, oldminor = LibStub:NewLibrary(ACEHOOK_MAJOR, ACEHOOK_MINOR)
-
-if not AceHook then return end -- No upgrade needed
-
-AceHook.embeded = AceHook.embeded or {}
-AceHook.registry = AceHook.registry or setmetatable({}, {__index = function(tbl, key) tbl[key] = {} return tbl[key] end })
-AceHook.handlers = AceHook.handlers or {}
-AceHook.actives = AceHook.actives or {}
-AceHook.scripts = AceHook.scripts or {}
-AceHook.onceSecure = AceHook.onceSecure or {}
-AceHook.hooks = AceHook.hooks or {}
-
--- local upvalues
-local registry = AceHook.registry
-local handlers = AceHook.handlers
-local actives = AceHook.actives
-local scripts = AceHook.scripts
-local onceSecure = AceHook.onceSecure
-
--- Lua APIs
-local pairs, next, type = pairs, next, type
-local format = string.format
-local assert, error = assert, error
-
--- WoW APIs
-local issecurevariable, hooksecurefunc = issecurevariable, hooksecurefunc
-local _G = _G
-
--- functions for later definition
-local donothing, createHook, hook
-
-local protectedScripts = {
-	OnClick = true,
-}
-
--- upgrading of embeded is done at the bottom of the file
-
-local mixins = {
-	"Hook", "SecureHook",
-	"HookScript", "SecureHookScript",
-	"Unhook", "UnhookAll",
-	"IsHooked",
-	"RawHook", "RawHookScript"
-}
-
--- AceHook:Embed( target )
--- target (object) - target object to embed AceHook in
---
--- Embeds AceEevent into the target object making the functions from the mixins list available on target:..
-function AceHook:Embed( target )
-	for k, v in pairs( mixins ) do
-		target[v] = self[v]
-	end
-	self.embeded[target] = true
-	-- inject the hooks table safely
-	target.hooks = target.hooks or {}
-	return target
-end
-
--- AceHook:OnEmbedDisable( target )
--- target (object) - target object that is being disabled
---
--- Unhooks all hooks when the target disables.
--- this method should be called by the target manually or by an addon framework
-function AceHook:OnEmbedDisable( target )
-	target:UnhookAll()
-end
-
-function createHook(self, handler, orig, secure, failsafe)
-	local uid
-	local method = type(handler) == "string"
-	if failsafe and not secure then
-		-- failsafe hook creation
-		uid = function(...)
-			if actives[uid] then
-				if method then
-					self[handler](self, ...)
-				else
-					handler(...)
-				end
-			end
-			return orig(...)
-		end
-		-- /failsafe hook
-	else
-		-- all other hooks
-		uid = function(...)
-			if actives[uid] then
-				if method then
-					return self[handler](self, ...)
-				else
-					return handler(...)
-				end
-			elseif not secure then -- backup on non secure
-				return orig(...)
-			end
-		end
-		-- /hook
-	end
-	return uid
-end
-
-function donothing() end
-
-function hook(self, obj, method, handler, script, secure, raw, forceSecure, usage)
-	if not handler then handler = method end
-	
-	-- These asserts make sure AceHooks's devs play by the rules.
-	assert(not script or type(script) == "boolean")
-	assert(not secure or type(secure) == "boolean")
-	assert(not raw or type(raw) == "boolean")
-	assert(not forceSecure or type(forceSecure) == "boolean")
-	assert(usage)
-	
-	-- Error checking Battery!
-	if obj and type(obj) ~= "table" then
-		error(format("%s: 'object' - nil or table expected got %s", usage, type(obj)), 3)
-	end
-	if type(method) ~= "string" then
-		error(format("%s: 'method' - string expected got %s", usage, type(method)), 3)
-	end
-	if type(handler) ~= "string" and type(handler) ~= "function" then
-		error(format("%s: 'handler' - nil, string, or function expected got %s", usage, type(handler)), 3)
-	end
-	if type(handler) == "string" and type(self[handler]) ~= "function" then
-		error(format("%s: 'handler' - Handler specified does not exist at self[handler]", usage), 3)
-	end
-	if script then
-		if not obj or not obj.GetScript or not obj:HasScript(method) then
-			error(format("%s: You can only hook a script on a frame object", usage), 3)
-		end
-		if not secure and obj.IsProtected and obj:IsProtected() and protectedScripts[method] then
-			error(format("Cannot hook secure script %q; Use SecureHookScript(obj, method, [handler]) instead.", method), 3)
-		end
-	else
-		local issecure 
-		if obj then 
-			issecure = onceSecure[obj] and onceSecure[obj][method] or issecurevariable(obj, method)
-		else
-			issecure = onceSecure[method] or issecurevariable(method)
-		end
-		if issecure then
-			if forceSecure then
-				if obj then
-					onceSecure[obj] = onceSecure[obj] or {}
-					onceSecure[obj][method] = true
-				else
-					onceSecure[method] = true
-				end
-			elseif not secure then
-				error(format("%s: Attempt to hook secure function %s. Use `SecureHook' or add `true' to the argument list to override.", usage, method), 3)
-			end
-		end
-	end
-	
-	local uid
-	if obj then
-		uid = registry[self][obj] and registry[self][obj][method]
-	else
-		uid = registry[self][method]
-	end
-	
-	if uid then
-		if actives[uid] then
-			-- Only two sane choices exist here.  We either a) error 100% of the time or b) always unhook and then hook
-			-- choice b would likely lead to odd debuging conditions or other mysteries so we're going with a.
-			error(format("Attempting to rehook already active hook %s.", method))
-		end
-		
-		if handlers[uid] == handler then -- turn on a decative hook, note enclosures break this ability, small memory leak
-			actives[uid] = true
-			return
-		elseif obj then -- is there any reason not to call unhook instead of doing the following several lines?
-			if self.hooks and self.hooks[obj] then
-				self.hooks[obj][method] = nil
-			end
-			registry[self][obj][method] = nil
-		else
-			if self.hooks then
-				self.hooks[method] = nil
-			end
-			registry[self][method] = nil
-		end
-		handlers[uid], actives[uid], scripts[uid] = nil, nil, nil
-		uid = nil
-	end
-	
-	local orig
-	if script then
-		orig = obj:GetScript(method) or donothing
-	elseif obj then
-		orig = obj[method]
-	else
-		orig = _G[method]
-	end
-	
-	if not orig then
-		error(format("%s: Attempting to hook a non existing target", usage), 3)
-	end
-	
-	uid = createHook(self, handler, orig, secure, not (raw or secure))
-	
-	if obj then
-		self.hooks[obj] = self.hooks[obj] or {}
-		registry[self][obj] = registry[self][obj] or {}
-		registry[self][obj][method] = uid
-
-		if not secure then
-			self.hooks[obj][method] = orig
-		end
-		
-		if script then
-			if not secure then
-				obj:SetScript(method, uid)
-			else
-				obj:HookScript(method, uid)
-			end
-		else
-			if not secure then
-				obj[method] = uid
-			else
-				hooksecurefunc(obj, method, uid)
-			end
-		end
-	else
-		registry[self][method] = uid
-		
-		if not secure then
-			_G[method] = uid
-			self.hooks[method] = orig
-		else
-			hooksecurefunc(method, uid)
-		end
-	end
-	
-	actives[uid], handlers[uid], scripts[uid] = true, handler, script and true or nil	
-end
-
---- Hook a function or a method on an object.
--- The hook created will be a "safe hook", that means that your handler will be called
--- before the hooked function ("Pre-Hook"), and you don't have to call the original function yourself,
--- however you cannot stop the execution of the function, or modify any of the arguments/return values.\\
--- This type of hook is typically used if you need to know if some function got called, and don't want to modify it.
--- @paramsig [object], method, [handler], [hookSecure]
--- @param object The object to hook a method from
--- @param method If object was specified, the name of the method, or the name of the function to hook.
--- @param handler The handler for the hook, a funcref or a method name. (Defaults to the name of the hooked function)
--- @param hookSecure If true, AceHook will allow hooking of secure functions.
--- @usage
--- -- create an addon with AceHook embeded
--- MyAddon = LibStub("AceAddon-3.0"):NewAddon("HookDemo", "AceHook-3.0")
--- 
--- function MyAddon:OnEnable()
---   -- Hook ActionButton_UpdateHotkeys, overwriting the secure status
---   self:Hook("ActionButton_UpdateHotkeys", true)
--- end
---
--- function MyAddon:ActionButton_UpdateHotkeys(button, type)
---   print(button:GetName() .. " is updating its HotKey")
--- end
-function AceHook:Hook(object, method, handler, hookSecure)
-	if type(object) == "string" then
-		method, handler, hookSecure, object = object, method, handler, nil
-	end
-	
-	if handler == true then
-		handler, hookSecure = nil, true
-	end
-
-	hook(self, object, method, handler, false, false, false, hookSecure or false, "Usage: Hook([object], method, [handler], [hookSecure])")	
-end
-
---- RawHook a function or a method on an object.
--- The hook created will be a "raw hook", that means that your handler will completly replace
--- the original function, and your handler has to call the original function (or not, depending on your intentions).\\
--- The original function will be stored in `self.hooks[object][method]` or `self.hooks[functionName]` respectively.\\
--- This type of hook can be used for all purposes, and is usually the most common case when you need to modify arguments
--- or want to control execution of the original function.
--- @paramsig [object], method, [handler], [hookSecure]
--- @param object The object to hook a method from
--- @param method If object was specified, the name of the method, or the name of the function to hook.
--- @param handler The handler for the hook, a funcref or a method name. (Defaults to the name of the hooked function)
--- @param hookSecure If true, AceHook will allow hooking of secure functions.
--- @usage
--- -- create an addon with AceHook embeded
--- MyAddon = LibStub("AceAddon-3.0"):NewAddon("HookDemo", "AceHook-3.0")
--- 
--- function MyAddon:OnEnable()
---   -- Hook ActionButton_UpdateHotkeys, overwriting the secure status
---   self:RawHook("ActionButton_UpdateHotkeys", true)
--- end
---
--- function MyAddon:ActionButton_UpdateHotkeys(button, type)
---   if button:GetName() == "MyButton" then
---     -- do stuff here
---   else
---     self.hooks.ActionButton_UpdateHotkeys(button, type)
---   end
--- end
-function AceHook:RawHook(object, method, handler, hookSecure)
-	if type(object) == "string" then
-		method, handler, hookSecure, object = object, method, handler, nil
-	end
-	
-	if handler == true then
-		handler, hookSecure = nil, true
-	end
-	
-	hook(self, object, method, handler, false, false, true, hookSecure or false,  "Usage: RawHook([object], method, [handler], [hookSecure])")
-end
-
---- SecureHook a function or a method on an object.
--- This function is a wrapper around the `hooksecurefunc` function in the WoW API. Using AceHook
--- extends the functionality of secure hooks, and adds the ability to unhook once the hook isn't
--- required anymore, or the addon is being disabled.\\
--- Secure Hooks should be used if the secure-status of the function is vital to its function,
--- and taint would block execution. Secure Hooks are always called after the original function was called
--- ("Post Hook"), and you cannot modify the arguments, return values or control the execution.
--- @paramsig [object], method, [handler]
--- @param object The object to hook a method from
--- @param method If object was specified, the name of the method, or the name of the function to hook.
--- @param handler The handler for the hook, a funcref or a method name. (Defaults to the name of the hooked function)
-function AceHook:SecureHook(object, method, handler)
-	if type(object) == "string" then
-		method, handler, object = object, method, nil
-	end
-	
-	hook(self, object, method, handler, false, true, false, false,  "Usage: SecureHook([object], method, [handler])")
-end
-
---- Hook a script handler on a frame.
--- The hook created will be a "safe hook", that means that your handler will be called
--- before the hooked script ("Pre-Hook"), and you don't have to call the original function yourself,
--- however you cannot stop the execution of the function, or modify any of the arguments/return values.\\
--- This is the frame script equivalent of the :Hook safe-hook. It would typically be used to be notified
--- when a certain event happens to a frame.
--- @paramsig frame, script, [handler]
--- @param frame The Frame to hook the script on
--- @param script The script to hook
--- @param handler The handler for the hook, a funcref or a method name. (Defaults to the name of the hooked script)
--- @usage
--- -- create an addon with AceHook embeded
--- MyAddon = LibStub("AceAddon-3.0"):NewAddon("HookDemo", "AceHook-3.0")
--- 
--- function MyAddon:OnEnable()
---   -- Hook the OnShow of FriendsFrame 
---   self:HookScript(FriendsFrame, "OnShow", "FriendsFrameOnShow")
--- end
---
--- function MyAddon:FriendsFrameOnShow(frame)
---   print("The FriendsFrame was shown!")
--- end
-function AceHook:HookScript(frame, script, handler)
-	hook(self, frame, script, handler, true, false, false, false,  "Usage: HookScript(object, method, [handler])")
-end
-
---- RawHook a script handler on a frame.
--- The hook created will be a "raw hook", that means that your handler will completly replace
--- the original script, and your handler has to call the original script (or not, depending on your intentions).\\
--- The original script will be stored in `self.hooks[frame][script]`.\\
--- This type of hook can be used for all purposes, and is usually the most common case when you need to modify arguments
--- or want to control execution of the original script.
--- @paramsig frame, script, [handler]
--- @param frame The Frame to hook the script on
--- @param script The script to hook
--- @param handler The handler for the hook, a funcref or a method name. (Defaults to the name of the hooked script)
--- @usage
--- -- create an addon with AceHook embeded
--- MyAddon = LibStub("AceAddon-3.0"):NewAddon("HookDemo", "AceHook-3.0")
--- 
--- function MyAddon:OnEnable()
---   -- Hook the OnShow of FriendsFrame 
---   self:RawHookScript(FriendsFrame, "OnShow", "FriendsFrameOnShow")
--- end
---
--- function MyAddon:FriendsFrameOnShow(frame)
---   -- Call the original function
---   self.hooks[frame].OnShow(frame)
---   -- Do our processing
---   -- .. stuff
--- end
-function AceHook:RawHookScript(frame, script, handler)
-	hook(self, frame, script, handler, true, false, true, false, "Usage: RawHookScript(object, method, [handler])")
-end
-
---- SecureHook a script handler on a frame.
--- This function is a wrapper around the `frame:HookScript` function in the WoW API. Using AceHook
--- extends the functionality of secure hooks, and adds the ability to unhook once the hook isn't
--- required anymore, or the addon is being disabled.\\
--- Secure Hooks should be used if the secure-status of the function is vital to its function,
--- and taint would block execution. Secure Hooks are always called after the original function was called
--- ("Post Hook"), and you cannot modify the arguments, return values or control the execution.
--- @paramsig frame, script, [handler]
--- @param frame The Frame to hook the script on
--- @param script The script to hook
--- @param handler The handler for the hook, a funcref or a method name. (Defaults to the name of the hooked script)
-function AceHook:SecureHookScript(frame, script, handler)
-	hook(self, frame, script, handler, true, true, false, false, "Usage: SecureHookScript(object, method, [handler])")
-end
-
---- Unhook from the specified function, method or script.
--- @paramsig [obj], method
--- @param obj The object or frame to unhook from
--- @param method The name of the method, function or script to unhook from.
-function AceHook:Unhook(obj, method)
-	local usage = "Usage: Unhook([obj], method)"
-	if type(obj) == "string" then
-		method, obj = obj, nil
-	end
-		
-	if obj and type(obj) ~= "table" then
-		error(format("%s: 'obj' - expecting nil or table got %s", usage, type(obj)), 2)
-	end
-	if type(method) ~= "string" then
-		error(format("%s: 'method' - expeting string got %s", usage, type(method)), 2)
-	end
-	
-	local uid
-	if obj then
-		uid = registry[self][obj] and registry[self][obj][method]
-	else
-		uid = registry[self][method]
-	end
-	
-	if not uid or not actives[uid] then
-		-- Declining to error on an unneeded unhook since the end effect is the same and this would just be annoying.
-		return false
-	end
-	
-	actives[uid], handlers[uid] = nil, nil
-	
-	if obj then
-		registry[self][obj][method] = nil
-		registry[self][obj] = next(registry[self][obj]) and registry[self][obj] or nil
-		
-		-- if the hook reference doesnt exist, then its a secure hook, just bail out and dont do any unhooking
-		if not self.hooks[obj] or not self.hooks[obj][method] then return true end
-		
-		if scripts[uid] and obj:GetScript(method) == uid then  -- unhooks scripts
-			obj:SetScript(method, self.hooks[obj][method] ~= donothing and self.hooks[obj][method] or nil)	
-			scripts[uid] = nil
-		elseif obj and self.hooks[obj] and self.hooks[obj][method] and obj[method] == uid then -- unhooks methods
-			obj[method] = self.hooks[obj][method]
-		end
-		
-		self.hooks[obj][method] = nil
-		self.hooks[obj] = next(self.hooks[obj]) and self.hooks[obj] or nil
-	else
-		registry[self][method] = nil
-		
-		-- if self.hooks[method] doesn't exist, then this is a SecureHook, just bail out
-		if not self.hooks[method] then return true end
-		
-		if self.hooks[method] and _G[method] == uid then -- unhooks functions
-			_G[method] = self.hooks[method]
-		end
-		
-		self.hooks[method] = nil
-	end
-	return true
-end
-
---- Unhook all existing hooks for this addon.
-function AceHook:UnhookAll()
-	for key, value in pairs(registry[self]) do
-		if type(key) == "table" then
-			for method in pairs(value) do
-				self:Unhook(key, method)
-			end
-		else
-			self:Unhook(key)
-		end
-	end
-end
-
---- Check if the specific function, method or script is already hooked.
--- @paramsig [obj], method
--- @param obj The object or frame to unhook from
--- @param method The name of the method, function or script to unhook from.
-function AceHook:IsHooked(obj, method)
-	-- we don't check if registry[self] exists, this is done by evil magicks in the metatable
-	if type(obj) == "string" then
-		if registry[self][obj] and actives[registry[self][obj]] then
-			return true, handlers[registry[self][obj]]
-		end
-	else
-		if registry[self][obj] and registry[self][obj][method] and actives[registry[self][obj][method]] then
-			return true, handlers[registry[self][obj][method]]
-		end
-	end
-	
-	return false, nil
-end
-
---- Upgrade our old embeded
-for target, v in pairs( AceHook.embeded ) do
-	AceHook:Embed( target )
-end
diff --git a/OrderHallCommander/libs/LibInit/Ace3/AceHook-3.0/AceHook-3.0.xml b/OrderHallCommander/libs/LibInit/Ace3/AceHook-3.0/AceHook-3.0.xml
deleted file mode 100644
index add0f26..0000000
--- a/OrderHallCommander/libs/LibInit/Ace3/AceHook-3.0/AceHook-3.0.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
-..\FrameXML\UI.xsd">
-	<Script file="AceHook-3.0.lua"/>
-</Ui>
\ No newline at end of file
diff --git a/OrderHallCommander/libs/LibInit/Ace3/AceLocale-3.0/AceLocale-3.0.lua b/OrderHallCommander/libs/LibInit/Ace3/AceLocale-3.0/AceLocale-3.0.lua
deleted file mode 100644
index e133781..0000000
--- a/OrderHallCommander/libs/LibInit/Ace3/AceLocale-3.0/AceLocale-3.0.lua
+++ /dev/null
@@ -1,137 +0,0 @@
---- **AceLocale-3.0** manages localization in addons, allowing for multiple locale to be registered with fallback to the base locale for untranslated strings.
--- @class file
--- @name AceLocale-3.0
--- @release $Id: AceLocale-3.0.lua 1035 2011-07-09 03:20:13Z kaelten $
-local MAJOR,MINOR = "AceLocale-3.0", 6
-
-local AceLocale, oldminor = LibStub:NewLibrary(MAJOR, MINOR)
-
-if not AceLocale then return end -- no upgrade needed
-
--- Lua APIs
-local assert, tostring, error = assert, tostring, error
-local getmetatable, setmetatable, rawset, rawget = getmetatable, setmetatable, rawset, rawget
-
--- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
--- List them here for Mikk's FindGlobals script
--- GLOBALS: GAME_LOCALE, geterrorhandler
-
-local gameLocale = GetLocale()
-if gameLocale == "enGB" then
-	gameLocale = "enUS"
-end
-
-AceLocale.apps = AceLocale.apps or {}          -- array of ["AppName"]=localetableref
-AceLocale.appnames = AceLocale.appnames or {}  -- array of [localetableref]="AppName"
-
--- This metatable is used on all tables returned from GetLocale
-local readmeta = {
-	__index = function(self, key) -- requesting totally unknown entries: fire off a nonbreaking error and return key
-		rawset(self, key, key)      -- only need to see the warning once, really
-		geterrorhandler()(MAJOR..": "..tostring(AceLocale.appnames[self])..": Missing entry for '"..tostring(key).."'")
-		return key
-	end
-}
-
--- This metatable is used on all tables returned from GetLocale if the silent flag is true, it does not issue a warning on unknown keys
-local readmetasilent = {
-	__index = function(self, key) -- requesting totally unknown entries: return key
-		rawset(self, key, key)      -- only need to invoke this function once
-		return key
-	end
-}
-
--- Remember the locale table being registered right now (it gets set by :NewLocale())
--- NOTE: Do never try to register 2 locale tables at once and mix their definition.
-local registering
-
--- local assert false function
-local assertfalse = function() assert(false) end
-
--- This metatable proxy is used when registering nondefault locales
-local writeproxy = setmetatable({}, {
-	__newindex = function(self, key, value)
-		rawset(registering, key, value == true and key or value) -- assigning values: replace 'true' with key string
-	end,
-	__index = assertfalse
-})
-
--- This metatable proxy is used when registering the default locale.
--- It refuses to overwrite existing values
--- Reason 1: Allows loading locales in any order
--- Reason 2: If 2 modules have the same string, but only the first one to be
---           loaded has a translation for the current locale, the translation
---           doesn't get overwritten.
---
-local writedefaultproxy = setmetatable({}, {
-	__newindex = function(self, key, value)
-		if not rawget(registering, key) then
-			rawset(registering, key, value == true and key or value)
-		end
-	end,
-	__index = assertfalse
-})
-
---- Register a new locale (or extend an existing one) for the specified application.
--- :NewLocale will return a table you can fill your locale into, or nil if the locale isn't needed for the players
--- game locale.
--- @paramsig application, locale[, isDefault[, silent]]
--- @param application Unique name of addon / module
--- @param locale Name of the locale to register, e.g. "enUS", "deDE", etc.
--- @param isDefault If this is the default locale being registered (your addon is written in this language, generally enUS)
--- @param silent If true, the locale will not issue warnings for missing keys. Must be set on the first locale registered. If set to "raw", nils will be returned for unknown keys (no metatable used).
--- @usage
--- -- enUS.lua
--- local L = LibStub("AceLocale-3.0"):NewLocale("TestLocale", "enUS", true)
--- L["string1"] = true
---
--- -- deDE.lua
--- local L = LibStub("AceLocale-3.0"):NewLocale("TestLocale", "deDE")
--- if not L then return end
--- L["string1"] = "Zeichenkette1"
--- @return Locale Table to add localizations to, or nil if the current locale is not required.
-function AceLocale:NewLocale(application, locale, isDefault, silent)
-
-	-- GAME_LOCALE allows translators to test translations of addons without having that wow client installed
-	local gameLocale = GAME_LOCALE or gameLocale
-
-	local app = AceLocale.apps[application]
-
-	if silent and app and getmetatable(app) ~= readmetasilent then
-		geterrorhandler()("Usage: NewLocale(application, locale[, isDefault[, silent]]): 'silent' must be specified for the first locale registered")
-	end
-
-	if not app then
-		if silent=="raw" then
-			app = {}
-		else
-			app = setmetatable({}, silent and readmetasilent or readmeta)
-		end
-		AceLocale.apps[application] = app
-		AceLocale.appnames[app] = application
-	end
-
-	if locale ~= gameLocale and not isDefault then
-		return -- nop, we don't need these translations
-	end
-
-	registering = app -- remember globally for writeproxy and writedefaultproxy
-
-	if isDefault then
-		return writedefaultproxy
-	end
-
-	return writeproxy
-end
-
---- Returns localizations for the current locale (or default locale if translations are missing).
--- Errors if nothing is registered (spank developer, not just a missing translation)
--- @param application Unique name of addon / module
--- @param silent If true, the locale is optional, silently return nil if it's not found (defaults to false, optional)
--- @return The locale table for the current language.
-function AceLocale:GetLocale(application, silent)
-	if not silent and not AceLocale.apps[application] then
-		error("Usage: GetLocale(application[, silent]): 'application' - No locales registered for '"..tostring(application).."'", 2)
-	end
-	return AceLocale.apps[application]
-end
diff --git a/OrderHallCommander/libs/LibInit/Ace3/AceLocale-3.0/AceLocale-3.0.xml b/OrderHallCommander/libs/LibInit/Ace3/AceLocale-3.0/AceLocale-3.0.xml
deleted file mode 100644
index e017af0..0000000
--- a/OrderHallCommander/libs/LibInit/Ace3/AceLocale-3.0/AceLocale-3.0.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
-..\FrameXML\UI.xsd">
-	<Script file="AceLocale-3.0.lua"/>
-</Ui>
\ No newline at end of file
diff --git a/OrderHallCommander/libs/LibInit/Ace3/AceTimer-3.0/AceTimer-3.0.lua b/OrderHallCommander/libs/LibInit/Ace3/AceTimer-3.0/AceTimer-3.0.lua
deleted file mode 100644
index 8ba6b3c..0000000
--- a/OrderHallCommander/libs/LibInit/Ace3/AceTimer-3.0/AceTimer-3.0.lua
+++ /dev/null
@@ -1,276 +0,0 @@
---- **AceTimer-3.0** provides a central facility for registering timers.
--- AceTimer supports one-shot timers and repeating timers. All timers are stored in an efficient
--- data structure that allows easy dispatching and fast rescheduling. Timers can be registered
--- or canceled at any time, even from within a running timer, without conflict or large overhead.\\
--- AceTimer is currently limited to firing timers at a frequency of 0.01s as this is what the WoW timer API
--- restricts us to.
---
--- All `:Schedule` functions will return a handle to the current timer, which you will need to store if you
--- need to cancel the timer you just registered.
---
--- **AceTimer-3.0** can be embeded into your addon, either explicitly by calling AceTimer:Embed(MyAddon) or by
--- specifying it as an embeded library in your AceAddon. All functions will be available on your addon object
--- and can be accessed directly, without having to explicitly call AceTimer itself.\\
--- It is recommended to embed AceTimer, otherwise you'll have to specify a custom `self` on all calls you
--- make into AceTimer.
--- @class file
--- @name AceTimer-3.0
--- @release $Id: AceTimer-3.0.lua 1119 2014-10-14 17:23:29Z nevcairiel $
-
-local MAJOR, MINOR = "AceTimer-3.0", 17 -- Bump minor on changes
-local AceTimer, oldminor = LibStub:NewLibrary(MAJOR, MINOR)
-
-if not AceTimer then return end -- No upgrade needed
-AceTimer.activeTimers = AceTimer.activeTimers or {} -- Active timer list
-local activeTimers = AceTimer.activeTimers -- Upvalue our private data
-
--- Lua APIs
-local type, unpack, next, error, select = type, unpack, next, error, select
--- WoW APIs
-local GetTime, C_TimerAfter = GetTime, C_Timer.After
-
-local function new(self, loop, func, delay, ...)
-	if delay < 0.01 then
-		delay = 0.01 -- Restrict to the lowest time that the C_Timer API allows us
-	end
-
-	local timer = {...}
-	timer.object = self
-	timer.func = func
-	timer.looping = loop
-	timer.argsCount = select("#", ...)
-	timer.delay = delay
-	timer.ends = GetTime() + delay
-
-	activeTimers[timer] = timer
-
-	-- Create new timer closure to wrap the "timer" object
-	timer.callback = function() 
-		if not timer.cancelled then
-			if type(timer.func) == "string" then
-				-- We manually set the unpack count to prevent issues with an arg set that contains nil and ends with nil
-				-- e.g. local t = {1, 2, nil, 3, nil} print(#t) will result in 2, instead of 5. This fixes said issue.
-				timer.object[timer.func](timer.object, unpack(timer, 1, timer.argsCount))
-			else
-				timer.func(unpack(timer, 1, timer.argsCount))
-			end
-
-			if timer.looping and not timer.cancelled then
-				-- Compensate delay to get a perfect average delay, even if individual times don't match up perfectly
-				-- due to fps differences
-				local time = GetTime()
-				local delay = timer.delay - (time - timer.ends)
-				-- Ensure the delay doesn't go below the threshold
-				if delay < 0.01 then delay = 0.01 end
-				C_TimerAfter(delay, timer.callback)
-				timer.ends = time + delay
-			else
-				activeTimers[timer.handle or timer] = nil
-			end
-		end
-	end
-
-	C_TimerAfter(delay, timer.callback)
-	return timer
-end
-
---- Schedule a new one-shot timer.
--- The timer will fire once in `delay` seconds, unless canceled before.
--- @param callback Callback function for the timer pulse (funcref or method name).
--- @param delay Delay for the timer, in seconds.
--- @param ... An optional, unlimited amount of arguments to pass to the callback function.
--- @usage
--- MyAddOn = LibStub("AceAddon-3.0"):NewAddon("MyAddOn", "AceTimer-3.0")
---
--- function MyAddOn:OnEnable()
---   self:ScheduleTimer("TimerFeedback", 5)
--- end
---
--- function MyAddOn:TimerFeedback()
---   print("5 seconds passed")
--- end
-function AceTimer:ScheduleTimer(func, delay, ...)
-	if not func or not delay then
-		error(MAJOR..": ScheduleTimer(callback, delay, args...): 'callback' and 'delay' must have set values.", 2)
-	end
-	if type(func) == "string" then
-		if type(self) ~= "table" then
-			error(MAJOR..": ScheduleTimer(callback, delay, args...): 'self' - must be a table.", 2)
-		elseif not self[func] then
-			error(MAJOR..": ScheduleTimer(callback, delay, args...): Tried to register '"..func.."' as the callback, but it doesn't exist in the module.", 2)
-		end
-	end
-	return new(self, nil, func, delay, ...)
-end
-
---- Schedule a repeating timer.
--- The timer will fire every `delay` seconds, until canceled.
--- @param callback Callback function for the timer pulse (funcref or method name).
--- @param delay Delay for the timer, in seconds.
--- @param ... An optional, unlimited amount of arguments to pass to the callback function.
--- @usage
--- MyAddOn = LibStub("AceAddon-3.0"):NewAddon("MyAddOn", "AceTimer-3.0")
---
--- function MyAddOn:OnEnable()
---   self.timerCount = 0
---   self.testTimer = self:ScheduleRepeatingTimer("TimerFeedback", 5)
--- end
---
--- function MyAddOn:TimerFeedback()
---   self.timerCount = self.timerCount + 1
---   print(("%d seconds passed"):format(5 * self.timerCount))
---   -- run 30 seconds in total
---   if self.timerCount == 6 then
---     self:CancelTimer(self.testTimer)
---   end
--- end
-function AceTimer:ScheduleRepeatingTimer(func, delay, ...)
-	if not func or not delay then
-		error(MAJOR..": ScheduleRepeatingTimer(callback, delay, args...): 'callback' and 'delay' must have set values.", 2)
-	end
-	if type(func) == "string" then
-		if type(self) ~= "table" then
-			error(MAJOR..": ScheduleRepeatingTimer(callback, delay, args...): 'self' - must be a table.", 2)
-		elseif not self[func] then
-			error(MAJOR..": ScheduleRepeatingTimer(callback, delay, args...): Tried to register '"..func.."' as the callback, but it doesn't exist in the module.", 2)
-		end
-	end
-	return new(self, true, func, delay, ...)
-end
-
---- Cancels a timer with the given id, registered by the same addon object as used for `:ScheduleTimer`
--- Both one-shot and repeating timers can be canceled with this function, as long as the `id` is valid
--- and the timer has not fired yet or was canceled before.
--- @param id The id of the timer, as returned by `:ScheduleTimer` or `:ScheduleRepeatingTimer`
-function AceTimer:CancelTimer(id)
-	local timer = activeTimers[id]
-
-	if not timer then
-		return false
-	else
-		timer.cancelled = true
-		activeTimers[id] = nil
-		return true
-	end
-end
-
---- Cancels all timers registered to the current addon object ('self')
-function AceTimer:CancelAllTimers()
-	for k,v in pairs(activeTimers) do
-		if v.object == self then
-			AceTimer.CancelTimer(self, k)
-		end
-	end
-end
-
---- Returns the time left for a timer with the given id, registered by the current addon object ('self').
--- This function will return 0 when the id is invalid.
--- @param id The id of the timer, as returned by `:ScheduleTimer` or `:ScheduleRepeatingTimer`
--- @return The time left on the timer.
-function AceTimer:TimeLeft(id)
-	local timer = activeTimers[id]
-	if not timer then
-		return 0
-	else
-		return timer.ends - GetTime()
-	end
-end
-
-
--- ---------------------------------------------------------------------
--- Upgrading
-
--- Upgrade from old hash-bucket based timers to C_Timer.After timers.
-if oldminor and oldminor < 10 then
-	-- disable old timer logic
-	AceTimer.frame:SetScript("OnUpdate", nil)
-	AceTimer.frame:SetScript("OnEvent", nil)
-	AceTimer.frame:UnregisterAllEvents()
-	-- convert timers
-	for object,timers in pairs(AceTimer.selfs) do
-		for handle,timer in pairs(timers) do
-			if type(timer) == "table" and timer.callback then
-				local newTimer
-				if timer.delay then
-					newTimer = AceTimer.ScheduleRepeatingTimer(timer.object, timer.callback, timer.delay, timer.arg)
-				else
-					newTimer = AceTimer.ScheduleTimer(timer.object, timer.callback, timer.when - GetTime(), timer.arg)
-				end
-				-- Use the old handle for old timers
-				activeTimers[newTimer] = nil
-				activeTimers[handle] = newTimer
-				newTimer.handle = handle
-			end
-		end
-	end
-	AceTimer.selfs = nil
-	AceTimer.hash = nil
-	AceTimer.debug = nil
-elseif oldminor and oldminor < 17 then
-	-- Upgrade from old animation based timers to C_Timer.After timers.
-	AceTimer.inactiveTimers = nil
-	AceTimer.frame = nil
-	local oldTimers = AceTimer.activeTimers
-	-- Clear old timer table and update upvalue
-	AceTimer.activeTimers = {}
-	activeTimers = AceTimer.activeTimers
-	for handle, timer in pairs(oldTimers) do
-		local newTimer
-		-- Stop the old timer animation
-		local duration, elapsed = timer:GetDuration(), timer:GetElapsed()
-		timer:GetParent():Stop()
-		if timer.looping then
-			newTimer = AceTimer.ScheduleRepeatingTimer(timer.object, timer.func, duration, unpack(timer.args, 1, timer.argsCount))
-		else
-			newTimer = AceTimer.ScheduleTimer(timer.object, timer.func, duration - elapsed, unpack(timer.args, 1, timer.argsCount))
-		end
-		-- Use the old handle for old timers
-		activeTimers[newTimer] = nil
-		activeTimers[handle] = newTimer
-		newTimer.handle = handle
-	end
-
-	-- Migrate transitional handles
-	if oldminor < 13 and AceTimer.hashCompatTable then
-		for handle, id in pairs(AceTimer.hashCompatTable) do
-			local t = activeTimers[id]
-			if t then
-				activeTimers[id] = nil
-				activeTimers[handle] = t
-				t.handle = handle
-			end
-		end
-		AceTimer.hashCompatTable = nil
-	end
-end
-
--- ---------------------------------------------------------------------
--- Embed handling
-
-AceTimer.embeds = AceTimer.embeds or {}
-
-local mixins = {
-	"ScheduleTimer", "ScheduleRepeatingTimer",
-	"CancelTimer", "CancelAllTimers",
-	"TimeLeft"
-}
-
-function AceTimer:Embed(target)
-	AceTimer.embeds[target] = true
-	for _,v in pairs(mixins) do
-		target[v] = AceTimer[v]
-	end
-	return target
-end
-
--- AceTimer:OnEmbedDisable(target)
--- target (object) - target object that AceTimer is embedded in.
---
--- cancel all timers registered for the object
-function AceTimer:OnEmbedDisable(target)
-	target:CancelAllTimers()
-end
-
-for addon in pairs(AceTimer.embeds) do
-	AceTimer:Embed(addon)
-end
diff --git a/OrderHallCommander/libs/LibInit/Ace3/AceTimer-3.0/AceTimer-3.0.xml b/OrderHallCommander/libs/LibInit/Ace3/AceTimer-3.0/AceTimer-3.0.xml
deleted file mode 100644
index 38e9021..0000000
--- a/OrderHallCommander/libs/LibInit/Ace3/AceTimer-3.0/AceTimer-3.0.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
-..\FrameXML\UI.xsd">
-	<Script file="AceTimer-3.0.lua"/>
-</Ui>
\ No newline at end of file
diff --git a/OrderHallCommander/libs/LibInit/Ace3/CallbackHandler-1.0/CallbackHandler-1.0.lua b/OrderHallCommander/libs/LibInit/Ace3/CallbackHandler-1.0/CallbackHandler-1.0.lua
deleted file mode 100644
index 675d7b0..0000000
--- a/OrderHallCommander/libs/LibInit/Ace3/CallbackHandler-1.0/CallbackHandler-1.0.lua
+++ /dev/null
@@ -1,238 +0,0 @@
---[[ $Id: CallbackHandler-1.0.lua 1131 2015-06-04 07:29:24Z nevcairiel $ ]]
-local MAJOR, MINOR = "CallbackHandler-1.0", 6
-local CallbackHandler = LibStub:NewLibrary(MAJOR, MINOR)
-
-if not CallbackHandler then return end -- No upgrade needed
-
-local meta = {__index = function(tbl, key) tbl[key] = {} return tbl[key] end}
-
--- Lua APIs
-local tconcat = table.concat
-local assert, error, loadstring = assert, error, loadstring
-local setmetatable, rawset, rawget = setmetatable, rawset, rawget
-local next, select, pairs, type, tostring = next, select, pairs, type, tostring
-
--- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
--- List them here for Mikk's FindGlobals script
--- GLOBALS: geterrorhandler
-
-local xpcall = xpcall
-
-local function errorhandler(err)
-	return geterrorhandler()(err)
-end
-
-local function CreateDispatcher(argCount)
-	local code = [[
-	local next, xpcall, eh = ...
-
-	local method, ARGS
-	local function call() method(ARGS) end
-
-	local function dispatch(handlers, ...)
-		local index
-		index, method = next(handlers)
-		if not method then return end
-		local OLD_ARGS = ARGS
-		ARGS = ...
-		repeat
-			xpcall(call, eh)
-			index, method = next(handlers, index)
-		until not method
-		ARGS = OLD_ARGS
-	end
-
-	return dispatch
-	]]
-
-	local ARGS, OLD_ARGS = {}, {}
-	for i = 1, argCount do ARGS[i], OLD_ARGS[i] = "arg"..i, "old_arg"..i end
-	code = code:gsub("OLD_ARGS", tconcat(OLD_ARGS, ", ")):gsub("ARGS", tconcat(ARGS, ", "))
-	return assert(loadstring(code, "safecall Dispatcher["..argCount.."]"))(next, xpcall, errorhandler)
-end
-
-local Dispatchers = setmetatable({}, {__index=function(self, argCount)
-	local dispatcher = CreateDispatcher(argCount)
-	rawset(self, argCount, dispatcher)
-	return dispatcher
-end})
-
---------------------------------------------------------------------------
--- CallbackHandler:New
---
---   target            - target object to embed public APIs in
---   RegisterName      - name of the callback registration API, default "RegisterCallback"
---   UnregisterName    - name of the callback unregistration API, default "UnregisterCallback"
---   UnregisterAllName - name of the API to unregister all callbacks, default "UnregisterAllCallbacks". false == don't publish this API.
-
-function CallbackHandler:New(target, RegisterName, UnregisterName, UnregisterAllName)
-
-	RegisterName = RegisterName or "RegisterCallback"
-	UnregisterName = UnregisterName or "UnregisterCallback"
-	if UnregisterAllName==nil then	-- false is used to indicate "don't want this method"
-		UnregisterAllName = "UnregisterAllCallbacks"
-	end
-
-	-- we declare all objects and exported APIs inside this closure to quickly gain access
-	-- to e.g. function names, the "target" parameter, etc
-
-
-	-- Create the registry object
-	local events = setmetatable({}, meta)
-	local registry = { recurse=0, events=events }
-
-	-- registry:Fire() - fires the given event/message into the registry
-	function registry:Fire(eventname, ...)
-		if not rawget(events, eventname) or not next(events[eventname]) then return end
-		local oldrecurse = registry.recurse
-		registry.recurse = oldrecurse + 1
-
-		Dispatchers[select('#', ...) + 1](events[eventname], eventname, ...)
-
-		registry.recurse = oldrecurse
-
-		if registry.insertQueue and oldrecurse==0 then
-			-- Something in one of our callbacks wanted to register more callbacks; they got queued
-			for eventname,callbacks in pairs(registry.insertQueue) do
-				local first = not rawget(events, eventname) or not next(events[eventname])	-- test for empty before. not test for one member after. that one member may have been overwritten.
-				for self,func in pairs(callbacks) do
-					events[eventname][self] = func
-					-- fire OnUsed callback?
-					if first and registry.OnUsed then
-						registry.OnUsed(registry, target, eventname)
-						first = nil
-					end
-				end
-			end
-			registry.insertQueue = nil
-		end
-	end
-
-	-- Registration of a callback, handles:
-	--   self["method"], leads to self["method"](self, ...)
-	--   self with function ref, leads to functionref(...)
-	--   "addonId" (instead of self) with function ref, leads to functionref(...)
-	-- all with an optional arg, which, if present, gets passed as first argument (after self if present)
-	target[RegisterName] = function(self, eventname, method, ... --[[actually just a single arg]])
-		if type(eventname) ~= "string" then
-			error("Usage: "..RegisterName.."(eventname, method[, arg]): 'eventname' - string expected.", 2)
-		end
-
-		method = method or eventname
-
-		local first = not rawget(events, eventname) or not next(events[eventname])	-- test for empty before. not test for one member after. that one member may have been overwritten.
-
-		if type(method) ~= "string" and type(method) ~= "function" then
-			error("Usage: "..RegisterName.."(\"eventname\", \"methodname\"): 'methodname' - string or function expected.", 2)
-		end
-
-		local regfunc
-
-		if type(method) == "string" then
-			-- self["method"] calling style
-			if type(self) ~= "table" then
-				error("Usage: "..RegisterName.."(\"eventname\", \"methodname\"): self was not a table?", 2)
-			elseif self==target then
-				error("Usage: "..RegisterName.."(\"eventname\", \"methodname\"): do not use Library:"..RegisterName.."(), use your own 'self'", 2)
-			elseif type(self[method]) ~= "function" then
-				error("Usage: "..RegisterName.."(\"eventname\", \"methodname\"): 'methodname' - method '"..tostring(method).."' not found on self.", 2)
-			end
-
-			if select("#",...)>=1 then	-- this is not the same as testing for arg==nil!
-				local arg=select(1,...)
-				regfunc = function(...) self[method](self,arg,...) end
-			else
-				regfunc = function(...) self[method](self,...) end
-			end
-		else
-			-- function ref with self=object or self="addonId" or self=thread
-			if type(self)~="table" and type(self)~="string" and type(self)~="thread" then
-				error("Usage: "..RegisterName.."(self or \"addonId\", eventname, method): 'self or addonId': table or string or thread expected.", 2)
-			end
-
-			if select("#",...)>=1 then	-- this is not the same as testing for arg==nil!
-				local arg=select(1,...)
-				regfunc = function(...) method(arg,...) end
-			else
-				regfunc = method
-			end
-		end
-
-
-		if events[eventname][self] or registry.recurse<1 then
-		-- if registry.recurse<1 then
-			-- we're overwriting an existing entry, or not currently recursing. just set it.
-			events[eventname][self] = regfunc
-			-- fire OnUsed callback?
-			if registry.OnUsed and first then
-				registry.OnUsed(registry, target, eventname)
-			end
-		else
-			-- we're currently processing a callback in this registry, so delay the registration of this new entry!
-			-- yes, we're a bit wasteful on garbage, but this is a fringe case, so we're picking low implementation overhead over garbage efficiency
-			registry.insertQueue = registry.insertQueue or setmetatable({},meta)
-			registry.insertQueue[eventname][self] = regfunc
-		end
-	end
-
-	-- Unregister a callback
-	target[UnregisterName] = function(self, eventname)
-		if not self or self==target then
-			error("Usage: "..UnregisterName.."(eventname): bad 'self'", 2)
-		end
-		if type(eventname) ~= "string" then
-			error("Usage: "..UnregisterName.."(eventname): 'eventname' - string expected.", 2)
-		end
-		if rawget(events, eventname) and events[eventname][self] then
-			events[eventname][self] = nil
-			-- Fire OnUnused callback?
-			if registry.OnUnused and not next(events[eventname]) then
-				registry.OnUnused(registry, target, eventname)
-			end
-		end
-		if registry.insertQueue and rawget(registry.insertQueue, eventname) and registry.insertQueue[eventname][self] then
-			registry.insertQueue[eventname][self] = nil
-		end
-	end
-
-	-- OPTIONAL: Unregister all callbacks for given selfs/addonIds
-	if UnregisterAllName then
-		target[UnregisterAllName] = function(...)
-			if select("#",...)<1 then
-				error("Usage: "..UnregisterAllName.."([whatFor]): missing 'self' or \"addonId\" to unregister events for.", 2)
-			end
-			if select("#",...)==1 and ...==target then
-				error("Usage: "..UnregisterAllName.."([whatFor]): supply a meaningful 'self' or \"addonId\"", 2)
-			end
-
-
-			for i=1,select("#",...) do
-				local self = select(i,...)
-				if registry.insertQueue then
-					for eventname, callbacks in pairs(registry.insertQueue) do
-						if callbacks[self] then
-							callbacks[self] = nil
-						end
-					end
-				end
-				for eventname, callbacks in pairs(events) do
-					if callbacks[self] then
-						callbacks[self] = nil
-						-- Fire OnUnused callback?
-						if registry.OnUnused and not next(callbacks) then
-							registry.OnUnused(registry, target, eventname)
-						end
-					end
-				end
-			end
-		end
-	end
-
-	return registry
-end
-
-
--- CallbackHandler purposefully does NOT do explicit embedding. Nor does it
--- try to upgrade old implicit embeds since the system is selfcontained and
--- relies on closures to work.
-
diff --git a/OrderHallCommander/libs/LibInit/Ace3/CallbackHandler-1.0/CallbackHandler-1.0.xml b/OrderHallCommander/libs/LibInit/Ace3/CallbackHandler-1.0/CallbackHandler-1.0.xml
deleted file mode 100644
index 876df83..0000000
--- a/OrderHallCommander/libs/LibInit/Ace3/CallbackHandler-1.0/CallbackHandler-1.0.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
-..\FrameXML\UI.xsd">
-	<Script file="CallbackHandler-1.0.lua"/>
-</Ui>
\ No newline at end of file
diff --git a/OrderHallCommander/libs/LibInit/Ace3/LibStub/LibStub.lua b/OrderHallCommander/libs/LibInit/Ace3/LibStub/LibStub.lua
deleted file mode 100644
index 0a41ac0..0000000
--- a/OrderHallCommander/libs/LibInit/Ace3/LibStub/LibStub.lua
+++ /dev/null
@@ -1,30 +0,0 @@
--- LibStub is a simple versioning stub meant for use in Libraries.  http://www.wowace.com/wiki/LibStub for more info
--- LibStub is hereby placed in the Public Domain Credits: Kaelten, Cladhaire, ckknight, Mikk, Ammo, Nevcairiel, joshborke
-local LIBSTUB_MAJOR, LIBSTUB_MINOR = "LibStub", 2  -- NEVER MAKE THIS AN SVN REVISION! IT NEEDS TO BE USABLE IN ALL REPOS!
-local LibStub = _G[LIBSTUB_MAJOR]
-
-if not LibStub or LibStub.minor < LIBSTUB_MINOR then
-	LibStub = LibStub or {libs = {}, minors = {} }
-	_G[LIBSTUB_MAJOR] = LibStub
-	LibStub.minor = LIBSTUB_MINOR
-	
-	function LibStub:NewLibrary(major, minor)
-		assert(type(major) == "string", "Bad argument #2 to `NewLibrary' (string expected)")
-		minor = assert(tonumber(strmatch(minor, "%d+")), "Minor version must either be a number or contain a number.")
-		
-		local oldminor = self.minors[major]
-		if oldminor and oldminor >= minor then return nil end
-		self.minors[major], self.libs[major] = minor, self.libs[major] or {}
-		return self.libs[major], oldminor
-	end
-	
-	function LibStub:GetLibrary(major, silent)
-		if not self.libs[major] and not silent then
-			error(("Cannot find a library instance of %q."):format(tostring(major)), 2)
-		end
-		return self.libs[major], self.minors[major]
-	end
-	
-	function LibStub:IterateLibraries() return pairs(self.libs) end
-	setmetatable(LibStub, { __call = LibStub.GetLibrary })
-end
diff --git a/OrderHallCommander/libs/LibInit/LibDataBroker-1.1.lua b/OrderHallCommander/libs/LibInit/LibDataBroker-1.1.lua
deleted file mode 100644
index f47c0cd..0000000
--- a/OrderHallCommander/libs/LibInit/LibDataBroker-1.1.lua
+++ /dev/null
@@ -1,90 +0,0 @@
-
-assert(LibStub, "LibDataBroker-1.1 requires LibStub")
-assert(LibStub:GetLibrary("CallbackHandler-1.0", true), "LibDataBroker-1.1 requires CallbackHandler-1.0")
-
-local lib, oldminor = LibStub:NewLibrary("LibDataBroker-1.1", 4)
-if not lib then return end
-oldminor = oldminor or 0
-
-
-lib.callbacks = lib.callbacks or LibStub:GetLibrary("CallbackHandler-1.0"):New(lib)
-lib.attributestorage, lib.namestorage, lib.proxystorage = lib.attributestorage or {}, lib.namestorage or {}, lib.proxystorage or {}
-local attributestorage, namestorage, callbacks = lib.attributestorage, lib.namestorage, lib.callbacks
-
-if oldminor < 2 then
-	lib.domt = {
-		__metatable = "access denied",
-		__index = function(self, key) return attributestorage[self] and attributestorage[self][key] end,
-	}
-end
-
-if oldminor < 3 then
-	lib.domt.__newindex = function(self, key, value)
-		if not attributestorage[self] then attributestorage[self] = {} end
-		if attributestorage[self][key] == value then return end
-		attributestorage[self][key] = value
-		local name = namestorage[self]
-		if not name then return end
-		callbacks:Fire("LibDataBroker_AttributeChanged", name, key, value, self)
-		callbacks:Fire("LibDataBroker_AttributeChanged_"..name, name, key, value, self)
-		callbacks:Fire("LibDataBroker_AttributeChanged_"..name.."_"..key, name, key, value, self)
-		callbacks:Fire("LibDataBroker_AttributeChanged__"..key, name, key, value, self)
-	end
-end
-
-if oldminor < 2 then
-	function lib:NewDataObject(name, dataobj)
-		if self.proxystorage[name] then return end
-
-		if dataobj then
-			assert(type(dataobj) == "table", "Invalid dataobj, must be nil or a table")
-			self.attributestorage[dataobj] = {}
-			for i,v in pairs(dataobj) do
-				self.attributestorage[dataobj][i] = v
-				dataobj[i] = nil
-			end
-		end
-		dataobj = setmetatable(dataobj or {}, self.domt)
-		self.proxystorage[name], self.namestorage[dataobj] = dataobj, name
-		self.callbacks:Fire("LibDataBroker_DataObjectCreated", name, dataobj)
-		return dataobj
-	end
-end
-
-if oldminor < 1 then
-	function lib:DataObjectIterator()
-		return pairs(self.proxystorage)
-	end
-
-	function lib:GetDataObjectByName(dataobjectname)
-		return self.proxystorage[dataobjectname]
-	end
-
-	function lib:GetNameByDataObject(dataobject)
-		return self.namestorage[dataobject]
-	end
-end
-
-if oldminor < 4 then
-	local next = pairs(attributestorage)
-	function lib:pairs(dataobject_or_name)
-		local t = type(dataobject_or_name)
-		assert(t == "string" or t == "table", "Usage: ldb:pairs('dataobjectname') or ldb:pairs(dataobject)")
-
-		local dataobj = self.proxystorage[dataobject_or_name] or dataobject_or_name
-		assert(attributestorage[dataobj], "Data object not found")
-
-		return next, attributestorage[dataobj], nil
-	end
-
-	local ipairs_iter = ipairs(attributestorage)
-	function lib:ipairs(dataobject_or_name)
-		local t = type(dataobject_or_name)
-		assert(t == "string" or t == "table", "Usage: ldb:ipairs('dataobjectname') or ldb:ipairs(dataobject)")
-
-		local dataobj = self.proxystorage[dataobject_or_name] or dataobject_or_name
-		assert(attributestorage[dataobj], "Data object not found")
-
-		return ipairs_iter, attributestorage[dataobj], 0
-	end
-end
diff --git a/OrderHallCommander/libs/LibInit/LibInit.lua b/OrderHallCommander/libs/LibInit/LibInit.lua
deleted file mode 100644
index 26b0558..0000000
--- a/OrderHallCommander/libs/LibInit/LibInit.lua
+++ /dev/null
@@ -1,2302 +0,0 @@
---- **LibInit** should make using Ace3 even more easier and pleasant.
--- An embeddable library which offer clean methods to build a configuration table
--- instead of directly fiddling wit an Ace options table
--- @name LibInit
--- @class module
--- @author Alar of Runetotem
--- @release 37
---
-local __FILE__=tostring(debugstack(1,2,0):match("(.*):9:")) -- Always check line number in regexp and file
-
-local MAJOR_VERSION = "LibInit"
-local MINOR_VERSION = 37
-local off=(_G.RED_FONT_COLOR_CODE or '|cffff0000') .. _G.VIDEO_OPTIONS_DISABLED ..  _G.FONT_COLOR_CODE_CLOSE or '|r'
-local on=(_G.GREEN_FONT_COLOR_CODE or '|cff00ff00') .. _G.VIDEO_OPTIONS_ENABLED ..  _G.FONT_COLOR_CODE_CLOSE or '|r'
-local nop=function()end
-local pp=print -- Keeping a handy plain print around
-local assert=assert
-local strconcat=strconcat
-local tostring=tostring
-local _G=_G -- Unmodified env
-local dprint=function() end
---@debug@
--- Checking packager behaviour
---@end-debug@
---[===[@debug@
-LoadAddOn("LibDebug")
-LoadAddOn("Blizzard_DebugTools")
-if LibDebug then
-	--pulling libdebug print in without pulling also the whole _G management and without changing loading addon env
-	LibDebug()
-	dprint=print
-	setfenv(1,_G)
-end
---@end-debug@]===]
---GAME_LOCALE="itIT"
-local me, ns = ...
-local LibStub=LibStub
-local obj,old=LibStub:NewLibrary(MAJOR_VERSION,MINOR_VERSION)
-local upgrading
-if obj then
-	upgrading=old
---[===[@debug@
-	if old then
-		dprint(strconcat("Upgrading ",MAJOR_VERSION,'.',old,' to',MINOR_VERSION,' from ',__FILE__))
-	else
-		dprint(strconcat("Loading ",MAJOR_VERSION,'.',MINOR_VERSION,' from ',__FILE__))
-	end
---@end-debug@]===]
-else
---[===[@debug@
-	dprint(strconcat("Equal or newer ",MAJOR_VERSION,' already loaded from ',__FILE__))
---@end-debug@]===]
-	return
-end
-local lib=obj --#Lib
-local L
-local C=LibStub("LibInit-Colorize")()
-local CallbackHandler = LibStub:GetLibrary("CallbackHandler-1.0")
--- Upvalues
-local _G=_G
-local floor=floor
-local abs=abs
-local wipe=wipe
-local print=print
-local next = next
-local pairs = pairs
-local pcall = pcall
-local type = type
-local GetTime = GetTime
-local gcinfo = gcinfo
-local unpack = unpack
-local geterrorhandler = geterrorhandler
-local GetContainerNumSlots=GetContainerNumSlots
-local GetContainerItemID=GetContainerItemID
-local GetItemInfo=GetItemInfo
-local UnitHealth=UnitHealth
-local UnitHealthMax=UnitHealthMax
-local setmetatable=setmetatable
-local NUM_BAG_SLOTS=NUM_BAG_SLOTS
-local InCombatLockdown=InCombatLockdown
-local error=error
-local tinsert=tinsert
-local debugstack=debugstack
-local ipairs=ipairs
-local GetAddOnMetadata=GetAddOnMetadata
-local format=format
-local tostringall=tostringall
-local tonumber=tonumber
-local strconcat=strconcat
-local strjoin=strjoin
-local strsplit=strsplit
-local select=select
-local coroutine=coroutine
-local cachedGetItemInfo
-local toc=select(4,GetBuildInfo())
-
---]]
--- Help sections
-local titles
-local RELNOTES
-local LIBRARIES
-local PROFILE
-local HELPSECTIONS
-local AceConfig = LibStub("AceConfig-3.0",true)
-assert(AceConfig,"LibInit needs AceConfig-3.0")
-local AceRegistry = LibStub("AceConfigRegistry-3.0",true)
-local AceDBOptions=LibStub("AceDBOptions-3.0",true)
-local AceConfigDialog=LibStub("AceConfigDialog-3.0",true)
-local AceGUI=LibStub("AceGUI-3.0",true)
-local Ace=LibStub("AceAddon-3.0")
-local AceLocale=LibStub("AceLocale-3.0",true)
-local AceDB  = LibStub("AceDB-3.0",true)
-
-
--- Persistent tables
-lib.mixinTargets=lib.mixinTargets or {}
-lib.toggles=lib.toggles or {}
-lib.chats=lib.chats or {}
-lib.options=lib.options or {}
-lib.pool=lib.pool or setmetatable({},{__mode="k"})
--- Recycling function from ACE3
-local new, del, recursivedel,copy, cached, stats
-do
-	local pool = lib.pool
---[===[@debug@
-	local newcount, delcount,createdcount,cached = 0,0,0
---@end-debug@]===]
-	function new()
---[===[@debug@
-		newcount = newcount + 1
---@end-debug@]===]
-		local t = next(pool)
-		if t then
-			pool[t] = nil
-			return t
-		else
---[===[@debug@
-			createdcount = createdcount + 1
---@end-debug@]===]
-			return {}
-		end
-	end
-	function copy(t)
-		local c = new()
-		for k, v in pairs(t) do
-			c[k] = v
-		end
-		return c
-	end
-	function del(t)
---[===[@debug@
-		delcount = delcount + 1
---@end-debug@]===]
-		wipe(t)
-		pool[t] = true
-	end
-	function recursivedel(t)
---[===[@debug@
-		delcount = delcount + 1
---@end-debug@]===]
-		for k,v in pairs(t) do
-			if type(v)=="table" then
-				recursivedel(v)
-			end
-		end
-		wipe(t)
-		pool[t] = true
-	end
-	function cached()
-		local n = 0
-		for k in pairs(pool) do
-			n = n + 1
-		end
-		return n
-	end
---[===[@debug@
-	function stats()
-		print("Created:",createdcount)
-		print("Aquired:",newcount)
-		print("Released:",delcount)
-		print("Cached:",cached())
-	end
---@end-debug@]===]
---@non-debug@
-	function stats()
-		return
-	end
---@end-non-debug@
-end
-function lib.NewTable()
-	return new()
-end
----
--- Must support both calling style
-function lib.DelTable(...)
-	local n=select('#',...)
-	local tbl,recursive
-	if n==3 then
-		tbl,recursive=select(2,...)
-	else
-		tbl,recursive=...
-	end
-	if type(recursive)=="table" then
-		tbl,recursive=recursive,nil
-	end
-	if n==0 then
-		error("Usage: DelTable(table[,recursive]")
-	end
-	if lib.options[tbl] then
-		error("Called as :DelTable without arguments")
-	end		
-	assert(type(tbl)=="table","Usage: DelTable(table)")
-	return recursive and recursivedel(tbl) or del(tbl)
-end
-function lib:CachedTableCount()
-	return cached()
-end
-function lib:CacheStats()
-	return stats()
-end--- Create a new AceAddon-3.0 addon.
--- Any library you specified will be embeded, and the addon will be scheduled for
--- its OnInitializee and OnEnabled callbacks.
--- The final addon object, with all libraries embeded, will be returned.
--- Options table format:
--- 	*profile: choose the initial profile (if omittete, uses a per character one)
---		*noswitch: disables Ace profile managemente, user will not be able to change it
---		*nogui: do not generate a gui for configuration
---		*nohelp: do not generate help (actually, help generation is not yet implemented)
---		*enhancedProfile: adds "Switch all profiles to default" and "Remove unused profiles" do Ace profile gui
---
--- @tparam[opt] table target to use as a base for the addon (optional)
--- @tparam string name Name of the addon object to create
--- @tparam[opt] table options options list
--- @tparam[opt] bool full If true, all available and embeddable Ace3 library are embedded
--- @tparam[opt] string ... List of libraries to embed into the addon
--- @treturn table new addon
---
--- @usage
--- --Create a simple addon object
--- MyAddon = LibStub("LibInit"):NewAddon("MyAddon", "AceEvent-3.0")
---
--- -- Create a Addon object based on the table of a frame
--- local MyFrame = CreateFrame("Frame")
--- MyAddon = LibStub("LibInit"):NewAddon(MyFrame, "MyAddon", "AceEvent-3.0")
--- -- Create an Addon based on the private table provided by Blizzard Code:
--- local myname,addon = ...
--- LibStub("LibInit"):NewAddon(addon,myname)
---
----
-function lib:NewAddon(target,...)
-	local name
-	local customOptions
-	local start=1
-	if type(target) ~= "table" then
-		name=target
-		target={}
-	else
-		name=(select(1,...))
-		start=2
-	end
-	assert(Ace,"Could not find Ace3 Library")
-	assert(type(name)=="string","Name is mandatory")
-	local appo={}
-	appo[MAJOR_VERSION]=true
-	appo["AceConsole-3.0"]=true
-	for i=start,select('#',...) do
-		local mix=select(i,...)
-		if type(mix)=="boolean" and mix then
-			for n,k in  LibStub:IterateLibraries() do
-				if (n:match("Ace%w*-3%.0") and k.Embed) then appo[n]=true end
-			end
-		elseif type(mix)=="string" then
-			appo[mix]=true
-		elseif type(mix)=="table" then
-			customOptions=mix
-		end
-	end
-	local mixins=new()
-	for i,_ in pairs(appo) do
-		tinsert(mixins,i)
-	end
-	local target=Ace:NewAddon(target,name,unpack(mixins))
-	del(mixins)
-	appo=nil
-	local options={}
-	options.name=name
-	options.first=true
-	options.libstub=__FILE__
-	options.version=GetAddOnMetadata(name,'Version') or "Internal"
-	if (options.version:sub(1,1)=='@') then
-		options.version=GetAddOnMetadata(name,'X-Version') or "Internal"
-	end
-	local b,e=options.version:find(" ")
-	if b and b>1 then
-		options.version=options.version:sub(1,b-1)
-	end
-	options.revision=GetAddOnMetadata(name,'X-revision') or "Alpha"
-	if (options.revision:sub(1,1)=='@') then
-		options.revision='Development'
-	end
-	options.prettyversion=format("%s (Revision: %s)",tostringall(options.version,options.revision))
-	options.title=GetAddOnMetadata(name,"title") or 'No title'
-	options.notes=GetAddOnMetadata(name,"notes") or 'No notes'
-	options.libinit=MAJOR_VERSION .. ' ' .. MINOR_VERSION
-	-- Setting sensible default for mandatory fields
-	options.ID=GetAddOnMetadata(name,"X-ID") or name
-	options.DATABASE=GetAddOnMetadata(name,"X-Database") or "db" .. options.ID
-	lib.toggles[target]={}
-	if customOptions then
-		for k,v in pairs(customOptions) do
-			local key=strlower(k)
-			if key=="enhanceprofile" then key = "enhancedprofile" end
-			if 	key=="profile"
-				or key=="noswitch"
-				or key=="nogui"
-				or key=="nohelp"
-				or key=="enhancedprofile"
-					then
-				options[key]=v
-			else
-				error("Invalid options: " .. k)
-			end
-		end
-	end
-	lib.options[target]=options
-	RELNOTES=L["Release Notes"]
-	PROFILE=L["Profile"]
-	HELPSECTIONS={PROFILE,RELNOTES}
-	titles={
-		RELNOTES=RELNOTES,
-		PROFILE=PROFILE
-	}
-	return target
-end
--- Combat scheduler done with LibCallbackHandler
-if not lib.CombatScheduler then
-	lib.CombatScheduler = CallbackHandler:New(lib,"_OnLeaveCombat","_CancelCombatAction")
-	lib.CombatFrame=CreateFrame("Frame")
-	lib.CombatFrame:SetScript("OnEvent",function()
-		lib.CombatScheduler:Fire("LIBINIT_END_COMBAT")
-		if lib.CombatScheduler.insertQueue then
-			wipe(lib.CombatScheduler.insertQueue) -- hackish, depends on internal callbackhanlder implementation
-		end
-		wipe(lib.CombatScheduler.events)
-		lib.CombatScheduler.recurse=0
-		for _,c in pairs(lib.coroutines) do
-			if c.waiting then
-				c.waiting=false
-				C_Timer.After(c.interval,c.repeater) -- to avoid hammering client with a shitload of corooutines starting together				
-			end
-		end
-	end)
-	lib.CombatFrame:RegisterEvent("PLAYER_REGEN_ENABLED")
-end
-local tremove=tremove
-local function Run(args) tremove(args,1)(unpack(args)) end
---- Executes an action as soon as combat restrictions lift
--- Action can be executed immediately if toon is out of combat
--- @tparam string|function action To be executed, Can be a function or a method name
--- @tparam[opt] mixed ... More parameters will be directly passed to action
---
-function lib:OnLeaveCombat(action,...)
-	if type(action)~="string" and type(action)~="function" then
-		error("Usage: OnLeaveCombat (\"action\", ...): 'action' - string or function expected.", 2)
-	end
-	if type(action)=="string" and type(self[action]) ~= "function" then
-		error("Usage: OnLeaveCombat (\"action\", ...): 'action' - method '"..tostring(action).."' not found on self.", 2)
-	end
-	if type(action) =="string" then
-		lib._OnLeaveCombat(self,"LIBINIT_END_COMBAT",Run,{self[action],self,...})
-	else
-		lib._OnLeaveCombat(self,"LIBINIT_END_COMBAT",Run,{action,...})
-	end
-	if (not InCombatLockdown()) then
-		lib.CombatFrame:GetScript("OnEvent")()
-	end
-end
-
-function lib:NewSubModule(name,...)
-	local obj=self:NewModule(name,...)
-	-- To avoid strange interactions
-	obj.OnInitialized=function()end -- placeholder
-	obj.OnInitialize=function(self,...) return  self:OnInitialized(...) end
-	obj.OnEnable=nil
-	obj.OnDisable=nil
-	return obj
-end
-function lib:NewSubClass(name)
-	return self:NewSubModule(name,self)
-end
-
---- Returns a closure to call a method as simple local function
--- @tparam string name Method name
--- @usage local print=self:Wrap("print") ; print("Hello") same as self:print("Hello") 
--- @return function Wrapper
-function lib:Wrap(nome)
-	if (nome=="Trace") then
-		return function(...) lib._Trace(self,1,...) end
-	end
-	if (type(self[nome])=="function") then
-		return function(...) self[nome](self,...) end
-	else
-		return nop
-	end
-end
-function lib:GetAddon(name)
-	return Ace:GetAddon(name,true)
-end
-function lib:GetLocale()
-	return AceLocale:GetLocale(self.name)
-end
-function lib:Gradient(perc)
-	return self:ColorGradient(perc,0,1,0,1,1,0,1,0,0)
-end
-function lib:ColorToString(r,g,b)
-	return format("%02X%02X%02X", 255*r, 255*g, 255*b)
-end
-function lib:ColorGradient(perc, ...)
-	if perc >= 1 then
-		local r, g, b = select(select('#', ...) - 2, ...)
-		return r, g, b
-	elseif perc <= 0 then
-		local r, g, b = ...
-		return r, g, b
-	end
-	local num = select('#', ...) / 3
-	local segment, relperc = math.modf(perc*(num-1))
-	local r1, g1, b1, r2, g2, b2 = select((segment*3)+1, ...)
-	return r1 + (r2-r1)*relperc, g1 + (g2-g1)*relperc, b1 + (b2-b1)*relperc
-end
--- Gestione variabili
-local varmeta={}
-do
-	local function f1(self,flag,value)
-		return self:Apply(flag,value)
-	end
-	local function f2(self,flag,value)
-		return self['Apply' .. flag](self,value)
-	end
-	varmeta={
-		__index =
-		function(table,cmd)
-			local self=rawget(table,'_handler')
-			if (type(self["Apply" .. cmd]) =='function') then
-				rawset(table,cmd,f2)
-			elseif (type(self.Apply)=='function') then
-				rawset(table,cmd,f1)
-			else
-				rawset(table,cmd,function(...) end)
-			end
-			return rawget(table,cmd)
-		end
-	}
-end
----
--- Return a named chatframe or the default one if no parameter passed
--- @tparam[opt] chat string Chat name
--- @return frame requested chat frame, can be nil if "chat" does not exist 
-function lib:GetChatFrame(chat)
-	if (chat) then
-		if (lib.chats[chat]) then return lib.chats[chat] end
-		for i=1,NUM_CHAT_WINDOWS do
-			local frame=_G["ChatFrame" .. i]
-			if (not frame) then break end
-			if (frame.name==chat) then lib.chats[chat]=frame return frame end
-		end
-		return nil
-	end
-	return DEFAULT_CHAT_FRAME
-end
-
-local Myclass
----
--- Check if the unit in target hast the requested class
--- @tparam string class Requested Class
--- @tparam string target Requested Unit (default 'player')
--- @return boolean true if target has the requeste class
-function lib:Is(class,target)
-	target=target or "player"
-	if (target == "player") then
-		if (not Myclass) then
-			Myclass=select(2,UnitClass('player'))
-		end
-		return Myclass==strupper(class)
-	else
-		local    rc,_,unitclass=pcall(UnitClass,target)
-		if (rc) then
-			return unitclass==strupper(class)
-		else
-			return false
-		end
-	end
-end
----
--- Parses a command from chat or from an table options handjer command
--- Internally calls AceConsole-3.0:GetArgs
--- @tparam mixed msg Can be a string (chat command) or a table (called by Ace3 Options Table Handler)
--- @tparam number n index in command list
--- @return command,subcommand,arg,full string after command
-function lib:Parse(msg,n)
-	if (not msg) then
-		return nil
-	end
-	if (type(msg) == 'table' and msg.input ) then msg=msg.input end
-	if (type(msg) ~= 'string') then return end
-	return self:GetArgs(msg,n)
-end
----
--- Parses an itemlink and returns itemId without calling API again
--- @tparam string itemlink A standard wow itemlink
--- @treturn number itemId or 0
-function lib:GetItemID(itemlink)
-	if (type(itemlink)=="string") then
-			local itemid,context=GetItemInfoFromHyperlink(itemlink)
-			return tonumber(itemid) or 0
-			--return tonumber(itemlink:match("Hitem:(%d+):")) or 0
-	else
-			return 0
-	end
-end
----
--- Return the toal numner of bag slots
-function lib:GetTotalBagSlots()
-	local i=0
-	for bag=0,NUM_BAG_SLOTS do
-		i=i+GetContainerNumSlots(bag)
-	end
-	return i
-end
----
--- Scans Bags for an item based on different criteria
---
--- All parameters are optional.
--- With no parameters ScanBags returns the first empty slot
---
--- @tparam[opt] number index is index in GetItemInfo result. 0 is a special case to match just itemid
--- @tparam[opt] number value is the value against to match. 0 is a special case for empty slot
--- @tparam[opt] number startbag and startslot are used to restart scan from the last item found
--- @tparam[opt] number startslot
--- @return Found ItemId,bag,slot,full GetItemInfo result
-function lib:ScanBags(index,value,startbag,startslot)
-	index=index or 0
-	value=value or 0
-	startbag=startbag or 0
-	startslot=startslot or 1
-	for bag=startbag,NUM_BAG_SLOTS do
-		for slot=startslot,GetContainerNumSlots(bag),1 do
-			local itemlink=GetContainerItemLink(bag,slot)
-			if (itemlink) then
-				if (index==0) then
-					if (self:GetItemID(itemlink)==value) then
-						return itemlink,bag,slot
-					end
-				else
-					local test=CachedGetItemInfo(itemlink,index)
-					if (value==test) then
-						return itemlink,bag,slot
-					end
-				end
-			elseif value==0 then
-				return bag,slot
-
-			end
-		end
-	end
-	return false
-end
---- Returns unit's health as a normalized percent value
--- @tparam string unit A standard unit name
--- @treturn number health as percent value
-
-function lib:Health(unit)
-		local totale=UnitHealthMax(unit) or 1
-		local corrente=UnitHealth(unit) or 1
-		if (corrente == 0) then corrente =1 end
-		if (totale==0) then totale = corrente end
-		local life=corrente/totale*100
-		return math.ceil(life)
-end
-
-function lib:Age(secs)
-		return self:TimeToStr(GetTime() - secs)
-end
-function lib:Mana(unit)
-		local totale=UnitManaMax(unit) or 1
-		local corrente=UnitMana(unit) or 1
-		if (corrente == 0) then corrente =1 end
-		if (totale==0) then totale = corrente end
-		local life=corrente/totale*100
-		return math.ceil(life)
-end
-function lib:IsFriend(player)
-	local i
-	for i =1,GetNumFriends() do
-		local name,_,_,_,_ =GetFriendInfo(i)
-		if (name == player) then
-			return true
-		end
-	end
-	return false
-end
-function lib:GetDistanceFromMe(unit)
-	if not unit then return 99999 end
-	local x,y=GetPlayerMapPosition(unit)
-	return self:GetUnitDistance(x,y)
-end
-function lib:GetUnitDistance(x,y,unit)
-		unit=unit or "player"
-		local from={}
-		local to={}
-		from.x,from.y=GetPlayerMapPosition(unit)
-		to.x=x
-		to.y=y
-		return self:GetDistance(from,to) * 10000
-end
-function lib:GetDistance(a,b)
---------------
--- Calculates distance betweeb 2 points given as
--- a.x,a.y and b.x,b.y
-	local x=b.x - a.x
-	local y=b.y -a.y
-	local d=x*x + y* y
-	local rc,distance=pcall(math.sqrt,d)
-	if (rc) then
-				return distance
-		else
-				return 99999
-		end
-end
----
--- Returns a numeric representation of version.
--- Can be overridden
--- In default incarnation assumes that version is in the form x,y,z
--- @return z+y*100+x*10000
---
-function lib:NumericVersion()
-	local v=tonumber(self.version)
-	if (v) then return v end
-	if (type(self.version) == "string") then
-		local a,b,c=self.version:match("(%d*)%D?(%d*)%D?(%d*)%D*")
-		a=tonumber(a) or 0
-		b=tonumber(b) or 0
-		c=tonumber(c) or 0
-		return a*10000+b*100+c
-	else
-		return 0
-	end
-end
-function lib:OnInitialized()
-	print("|cff33ff99"..tostring( self ).."|r:",format(ITEM_MISSING,"OnInitialized"))
-end
-function lib:LoadHelp()
-end
-function lib:SetDbDefaults()
-end
-function lib:SetOptionsTable()
-end
-local function loadOptionsTable(self)
-	local options=lib.options[self]
-	self.OptionsTable={
-		handler=self,
-		type="group",
-		childGroups="tab",
-		name=options.title,
-		desc=options.notes,
-		args={
-			gui = {
-				name="GUI",
-				desc=_G.CHAT_CONFIGURATION,
-				type="execute",
-				func="Gui",
-				guiHidden=true,
-			},
---[===[@debug@
-			help = {
-				name="HELP",
-				desc="Show help",
-				type="execute",
-				func="Help",
-				guiHidden=true,
-			},
-			debug = {
-				name="DBG",
-				desc="Enable debug",
-				type="execute",
-				func="Debug",
-				guiHidden=true,
-				cmdHidden=true,
-			},
---@end-debug@]===]
-			silent = {
-				name="SILENT",
-				desc="Eliminates startup messages",
-				type="execute",
-				func=function()
-					self.db.global.silent=not self.db.global.silent
-					self:Print("Silent is now",self.db.global.silent and "true" or "false" )
-				end,
-				guiHidden=true,
-			},
-			on = {
-				name=strlower(_G.ENABLE),
-				desc=_G.ENABLE .. ' ' .. options.title,
-				type="execute",
-				func="Enable",
-				guiHidden=true,
-			},
-			off = {
-				name=strlower(_G.DISABLE),
-				desc=_G.DISABLE .. ' ' .. options.title,
-				type="execute",
-				func="Disable",
-				guiHidden=true,
-				arg='Active'
-			},
-		}
-	}
-end
-local function loadDbDefaults(self)
-	self.DbDefaults={
-		char={
-			firstrun=true,
-			lastversion=0,
-		},
-		global={
-			firstrun=true,
-			lastversion=0,
-			lastinterface=60200
-		},
-		profile={
-			toggles={
-					Active=true,
-			},
-			["*"]={},
-		}
-	}
-	self.MenuLevels={"root"}
-	self.ItemOrder=setmetatable({},{
-		__index=function(table,key) rawset(table,key,1)
-			return 1
-		end
-		}
-	)
-end
-local function BuildHelp(self)
-	local main=self.name
-	for _,section in ipairs(HELPSECTIONS) do
-		if (section == RELNOTES) then
-			self:HF_Load(section,main..section,' ' .. tostring(self.version) .. ' (r:' .. tostring(self.revision) ..')')
-		else
-			self:HF_Load(section,main .. section,'')
-		end
-	end
-end
-function lib:IsFirstRun()
-	return self.db.global.firstrun
-end
-function lib:IsNewVersion()
-	return self.numericversion > self.db.global.lastnumericversion and self.db.global.lastnumericversion or false
-end
-function lib:IsNewTocVersion()
-	return self.interface > self.db.global.lastinterface  and self.db.global.lastinterface or false
-end
-function lib:RegisterDatabase(dbname,defaults,profile)
-	return AceDB:New(dbname,defaults,profile)
-end
-local function SetCommonProfile(info,...)
-	local db=info.handler.db
-	for k,v in pairs(db.sv.profileKeys) do
-		db.sv.profileKeys[k]="Default"
-	end
-	db:SetProfile("Default")
-end
-local function PurgeProfiles(info,...)
-	local profiles=new()
-	local used=new()
-	local db=info.handler.db
-	db:GetProfiles(profiles)
-	for k,v in pairs(db.sv.profileKeys) do
-		used[v]=true
-	end
---[===[@debug@
-	DevTools_Dump(profiles)
-	DevTools_Dump(used)
---@end-debug@]===]
-	for _,v in ipairs(profiles) do
-		if not used[v] then
-			db:DeleteProfile(v)
-		end
-	end
-	del(used)
-	del(profiles)
-
-end
-local function SetupProfileSwitcher(tbl,addon)
-	local profiles=tbl.handler:ListProfiles({args="both"})
-	local default=profiles.Default or "Default"
-	wipe(profiles)
-	tbl.args.UseDefault_Desc={
-		order=900,
-		type='description',
-		name="\n"..format(L['UseDefault_Desc'],default)
-	}
-	tbl.args.UseDefault={
-		order=910,
-		type='execute',
-		func=SetCommonProfile,
-		name=format(L['UseDefault1'],default),
-		desc=format(L['UseDefault2'],default),
-		width="double",
-	}
-	tbl.args.Purge_Desc={
-		order=920,
-		type='description',
-		--name="forcedescname",
-		name="\n"..L['Purge_Desc'],
-	}
-	tbl.args.Purge={
-		order=930,
-		type='execute',
-		func=PurgeProfiles,
-		name=L['Purge1'],
-		desc=L['Purge2'],
-		width="double",
-	}
-end
-function lib:OnInitialize(...)
-	self.numericversion=self:NumericVersion() -- Initialized now becaus NumericVersion could be overrided
-	--CachedGetItemInfo=self:GetCachingGetItemInfo()
-	loadOptionsTable(self)
-	loadDbDefaults(self)
-	self:SetOptionsTable(self.OptionsTable) --hook
-	self:SetDbDefaults(self.DbDefaults) -- hook
-	local options=lib.options[self]
-	self.version=self.version or options.version
-	self.prettyversion=self.prettyversion or options.prettyversion
-	self.revision=self.revision or options.revision
-	if (AceDB and not self.db) then
-		self.db=AceDB:New(options.DATABASE,nil,options.profile)
-		dprint(self.db:GetCurrentProfile())
-	end
-	if self.db then
-		self.db:RegisterDefaults(self.DbDefaults)
-		if (not self.db.global.silent) then
-			self:Print(format("Version %s %s loaded (%s)",
-				self:Colorize(options.version,'green'),
-				self:Colorize(format("(Revision: %s)",options.revision),"silver"),
-				"Disable message with /" .. strlower(options.ID) .. " silent")
-			)
-		end
-		self:SetEnabledState(self:GetBoolean("Active"))
-	else
-		self.db=setmetatable({},{
-			__index=function(t,l)
-				assert(false,"You need AceDB-3.0 in order to use database")
-			end
-			}
-		)
-		self:SetEnabledState(true)
-	end
-	-- I have for sure some library that needs to be intialized Before the addon
-	for _,library in self:IterateEmbeds(self) do
-		local lib=LibStub(library)
-		if (lib.OnEmbedPreInitialize) then
-			lib:OnEmbedPreInitialize(self)
-		end
-	end
-
-	self.help=setmetatable(
-			{},
-			{__index=function(table,key)
-					rawset(table,key,"")
-					return rawget(table,key)
-					end
-			}
-	)
-	--===============================================================================
-	-- Calls initialization Callback
-	local ignoreProfile=self:OnInitialized(...)
-	--===============================================================================
-	if (not self.OnDisabled) then
-		self.OptionsTable.args.on=nil
-		self.OptionsTable.args.off=nil
-		self.OptionsTable.args.standby=nil
-	end
-	if (type(self.LoadHelp)=="function") then self:LoadHelp() end
-	local main=options.name
-	BuildHelp(self)
-	if AceConfig and not options.nogui then
-		AceConfig:RegisterOptionsTable(main,self.OptionsTable,{main,strlower(options.ID)})
-		self.CfgDlg=AceConfigDialog:AddToBlizOptions(main,main )
-		if (not ignoreProfile and not options.noswitch) then
-			if (AceDBOptions) then
-				local profileOpts=AceDBOptions:GetOptionsTable(self.db)
-				self.ProfileOpts={} -- We dont want to propagate this change to all ace3 addons
-				for k,v in pairs(profileOpts) do
-					if k=='args' then
-						self.ProfileOpts.args={}
-						for k2,v2 in pairs(v) do
-							self.ProfileOpts.args[k2]=v2
-						end
-					else
-						self.ProfileOpts[k]=v
-					end
-				end
-				titles.PROFILE=self.ProfileOpts.name
-				self.ProfileOpts.name=self.name
-				if options.enhancedprofile then
-					SetupProfileSwitcher(self.ProfileOpts,self)
-				end
-				local profile=main..PROFILE
-			end
-			AceConfig:RegisterOptionsTable(main .. PROFILE,self.ProfileOpts)
-			AceConfigDialog:AddToBlizOptions(main .. PROFILE,titles.PROFILE,main)
-		end
-	else
-		self.OptionsTable.args.gui=nil
-	end
-	if (self.help[RELNOTES]~='') then
-		self.CfgRel=AceConfigDialog:AddToBlizOptions(main..RELNOTES,titles.RELNOTES,main)
-	end
-	if AceDB then
-		self:UpdateVersion()
-	end
-end
-function lib:UpdateVersion()
-	if (type(self.db.char) == "table") then
-		self.db.char.lastversion=self.numericversion
-		self.db.char.firstun=false
-	end
-	if (type(self.db.global)=="table") then
-		self.db.global.lastversion=self.numericversion
-		self.db.global.firstrun=false
-		self.db.global.lastinterface=self.interface
-	end
-end
-
--- help related functions
-function lib:HF_Push(section,text)
-	if section then section=titles[section] end
-	section=section or self.lastsection or RELNOTES
-	self.lastsection=section
-	self.help[section]=self.help[section]  .. '\n' .. text
-end
-local getlibs
-do
-	local libs={}
-		function lib:HF_Lib(libname)
-				local o,minor=LibStub(libname,true)
-				if (o and libs) then
-						if (not libs[o] or libs[o] <minor) then
-								libs[libname]=minor
-						end
-				end
-		end
-		function getlibs(self)
-				local appo={}
-				if (not libs) then return end
-				for i,_ in pairs(libs) do
-						table.insert(appo,i)
-				end
-				table.sort(appo)
-				for _,libname in pairs(appo) do
-						local minor=libs[libname]
-						self:HF_Pre(format("%s release: %s",self:Colorize(libname,'green'),self:Colorize(minor,'orange')),LIBRARIES)
-				end
-				libs=nil
-		end
-end
-
-function lib:HF_Toggle(flag,description)
-	flag=C(format("/%s toggle %s: ",strlower(lib.options[self].ID),flag),'orange') ..C(description,'white')
-	self:HF_Push(TOGGLES,"\n" .. C(flag,'orange'))
-end
-
-function lib:HF_Title(text,section)
-	self:HF_Push(section,C(text or '','yellow') .. "\n")
-end
-function lib:HF_Command(text,description,section)
-	self:HF_Push(section,C(text or '','orange') .. ':' ..  C(description or '','yellow') .. "\n")
-end
-
-function lib:HF_Paragraph(text,section)
-	self:HF_Push(section,"\n"..C(text,'green'))
-end
-function lib:HF_CmdA(command,description,tooltip)
-	self:HF_Push(nil,
-	C('/' .. command,'orange') .. ' : ' .. (description or '') .. '\n' .. C(tooltip or '','yellow'))
-end
-function lib:HF_Cmd(command,description,tooltip)
-	command=lib.options[self].ID .. ' ' .. command
-	self:HF_CmdA(command,description,tooltip)
-end
-function lib:HF_Pre(testo,section)
-	self:HF_Push(section,testo)
-end
-function lib:Wiki(testo,section)
-	section=section or self.lastsection or RELNOTES
-	self.lastsection=section
-	local fmtbullet=" * %s\n"
-	local progressive=1
-	local fmtnum=" %2d. %s\n"
-	local fmthead1="|cff" .. C.Orange  .."%s|r\n \n \n"
-	local fmthead2="|cff" .. C.Yellow  .."%s|r\n \n"
-	local text=''
-	for line in testo:gmatch("(%C*)%c+") do
-		line=line:gsub("^ *","")
-		line=line:gsub(" *$","")
-		local i,j= line:find('^%=+')
-		if (i) then
-			if (j==1) then
-				text=text .. fmthead1:format(line:sub(j+1,-j-1))
-			else
-				text=text .. fmthead2:format(line:sub(j+1,-j-1))
-			end
-		else
-			local i,j= line:find('^%*+')
-			if (i) then
-				text=text.. fmtbullet:format(line:sub(j+1))
-			else
-				local i,j= line:find('^#+')
-				if (i) then
-					text=text .. fmtnum:format(progressive,line:sub(j+1))
-					progressive=progressive + 1
-				else
-					text=text .. line.."\n"
-				end
-			end
-		end
-	end
-	self.help[section]=self.help[section]  .. '\n' .. text
-end
-
-function lib:RelNotes(major,minor,revision,t)
-	local fmt=self:Colorize("Release note for %d.%d.%s",'Yellow') .."\n%s"
-	local lines={}
-	local spacer=""
-	local maxpanlen=70
-	lines={strsplit("\n",t)}
-	local max=5
-	for i,tt in ipairs(lines) do
-		local prefix,text=tt:match("^(%a+):(.*)")
-		if (prefix == "Fixed" or prefix=="Fix") then
-			prefix=self:Colorize("Fix: ",'Red')
-			spacer="       "
-		elseif (prefix == "Feature") then
-			prefix=self:Colorize("Feature: ",'Green')
-			spacer=             "         "
-		else
-			text=tt
-			prefix=spacer
-		end
-		local tta=""
-		tt=text
-		while (tt:len() > maxpanlen)  do
-			local p=tt:find("[%s%p]",maxpanlen -10) or maxpanlen
-			tta=tta..prefix..tt:sub(1,p) .. "\n"
-			prefix=spacer
-			tt=tt:sub(p+1)
-		end
-		tta=tta..prefix..tt
-		tta=tta:gsub("Upgrade:",self:Colorize("Upgrade:",'Azure'))
-		lines[i]=tta:gsub("Example:",self:Colorize("Example:",'Orange'))
-		max=max-1
-		if (max<1) then
-			break
-		end
-	end
-	self:HF_Push(RELNOTES,fmt:format(major,minor,revision,strjoin("\n",unpack(lines))))
-end
-
-function lib:HF_Load(section,optionname,versione)
--- Creazione pannello di help
--- Livello due del
-	if (section == LIBRARIES) then
-		getlibs(self)
-	end
-	local testo =self.help[section]
-	--debug(section)
-	--debug(optionname)
-	--debug(self.title)
-	if (testo ~= '') then
-		AceConfig:RegisterOptionsTable(optionname, {
-			name = lib.options[self].title .. (versione or ""),
-			type = "group",
-			args = {
-				help = {
-					type = "description",
-					name = testo,
-					fontSize='medium',
-				},
-			},
-		})
-		AceConfigDialog:SetDefaultSize(optionname, 600, 400)
-	end
-end
--- var area
-local function getgroup(self)
-	local group=self.OptionsTable
-	local m=self.MenuLevels
-	for i=2,#m do
-			group=group.args[self.MenuLevels[i]]
-	end
-	if (type(group) ~= "table") then
-			group={}
-	end
-	return group
-end
-local function getorder(self,group)
-	local i=self.ItemOrder[group.name]+1
-	self.ItemOrder[group.name]=i
-	return i
-end
-local function toflag(...)
-	local appo=''
-	for i=1,select("#",...) do
-		appo=appo .. tostring(select(i,...))
-	end
-		return appo:gsub("%W",'')
-end
-function lib:EndLabel()
-	local m=self.MenuLevels
-	if (#m > 1) then
-			table.remove(m)
-	end
-end
-
---self:AddLabel("General","General Options",C.Green)
-function lib:AddLabel(title,description,stringcolor)
-	self:EndLabel()
-	description=description or title
-	stringcolor=stringcolor or C.yellow
-	local t=self:AddSubLabel(title,description,stringcolor)
-	t.childGroups="tab"
-	self:AddSeparator(description)
-	return t
-end
---self:AddSubLabel("Local","Local Options",C.Green)
-function lib:AddSubLabel(title,description,stringcolor)
-	local m=self.MenuLevels
-	description=description or title
-	stringcolor=stringcolor or C.orange
-	local group=getgroup(self)
-	local flag=toflag(group.name,title)
-	group.args[flag]={
-			name="|cff" .. stringcolor .. title .. "|r",
-			desc=description,
-			type="group",
-			cmdHidden=true,
-			args={},
-			order=getorder(self,group),
-	}
-	table.insert(m,flag)
-	return group.args[flag]
-end
-
---self:AddText("Testo"[,texture[,height[,width[,texcoords]]]])
-function lib:AddText(text,image,imageHeight,imageWidth,imageCoords)
-	local group=getgroup(self)
-	local flag=toflag(group.name,text)
-	local t={
-			name=text,
-			type="description",
-			image=image,
-			imageHeight=imageHeight,
-			imageWidth=imageWidth,
-			imageCoords=imageCoords,
-			desc=text,
-			order=getorder(self,group),
-
-	}
-	group.args[flag]=t
-	return t
-end
-
---self:AddToggle("AUTOLEAVE",true,"Quick Battlefield Leave","Alt-Click on hide button in battlefield alert leaves the queue")
-function lib:AddBoolean(...) return self:AddToggle(...) end
-function lib:AddToggle(flag,defaultvalue,name,description,icon)
-	description=description or name
-	local group=getgroup(self)
-	local t={
-			name=name,
-			type="toggle",
-			get="OptToggleGet",
-			set="OptToggleSet",
-			desc=description,
-			width='full',
-			arg=flag,
-			cmdHidden=true,
-			icon=icon,
-			order=getorder(self,group),
-	}
-	lib.toggles[self][flag]=t
-	group.args[flag]=t
-	if (self.db.profile.toggles[flag]== nil) then
-		self.db.profile.toggles[flag]=defaultvalue
-	end
-	return t
-end
-
--- self:AddEdit("REFLECTTO",1,{a=1,b=2},"Whisper reflection receiver:","All your whispers will be forwarded to this guy")
-function lib:AddSelect(flag,defaultvalue,values,name,description)
-	description=description or name
-	local group=getgroup(self)
-	local t={
-			name=name,
-			type="select",
-			get="OptToggleGet",
-			set="OptToggleSet",
-			desc=description,
-			width="full",
-			values=values,
-			arg=flag,
-			cmdHidden=true,
-			order=getorder(self,group)
-	}
-	group.args[flag]=t
-	if (self.db.profile.toggles[flag]== nil) then
-		self.db.profile.toggles[flag]=defaultvalue
-	end
-	lib.toggles[self][flag]=t
-	return t
-end
-function lib:AddMultiSelect(flag,defaultvalue,...)
-	local t=self:AddSelect(flag,defaultvalue,...)
-	t.type="multiselect"
-	if type(self.db.profile.toggles[flag])~="table" then
-		self.db.profile.toggles[flag]={}
-	end
-	if type(self.db.profile.toggles[flag]._default)=="nil" then
-		self.db.profile.toggles[flag]=defaultvalue
-		self.db.profile.toggles[flag]._default=true
-	end
-	return t
-end
---self:AddSlider("RESTIMER",5,1,10,"Enable res timer","Shows a timer for battlefield resser",1)
-function lib:AddRange(...) return self:AddSlider(...) end
-function lib:AddSlider(flag,defaultvalue,min,max,name,description,step)
-	description=description or name
-	min=min or 0
-	max=max or 100
-	local group=getgroup(self)
-	local isPercent=nil
-	if (type(step)=="boolean") then
-		isPercent=step
-		step=nil
-	else
-		step=tonumber(step) or 1
-	end
-	local t={
-		name=name,
-		type="range",
-		get="OptToggleGet",
-		set="OptToggleSet",
-		desc=description,
-		width="full",
-		arg=flag,
-		step=step,
-		isPercent=isPercent,
-		min=min,
-		max=max,
-		order=getorder(self,group),
-	}
-	group.args[flag]=t
-	if (self.db.profile.toggles[flag]== nil) then
-		self.db.profile.toggles[flag]=defaultvalue
-	end
-	lib.toggles[self][flag]=t
-	return t
-end
--- self:AddEdit("REFLECTTO","","Whisper reflection receiver:","All your whispers will be forwarded to this guy","How to use it")
-function lib:AddEdit(flag,defaultvalue,name,description,usage)
-	description=description or name
-	usage = usage or description
-	local group=getgroup(self)
-	local t={
-			name=name,
-			type="input",
-			get="OptToggleGet",
-			set="OptToggleSet",
-			desc=description,
-			arg=flag,
-			usage=usage,
-			order=getorder(self,group),
-
-	}
-	group.args[flag]=t
-	if (self.db.profile.toggles[flag]== nil) then
-			self.db.profile.toggles[flag]=defaultvalue
-	end
-	lib.toggles[self][flag]=t
-	return t
-end
-
--- self:AddAction("openSpells","Opens spell panel","You can choose yoru spells in spell panel")
-function lib:AddAction(method,label,description,private)
-	label=label or method
-	description=description or label
-		local group=getgroup(self)
-		local t={
-			func=method,
-			name=label,
-			type="execute",
-			desc=description,
-			confirm=false,
-			cmdHidden=true,
-			order=getorder(self,group)
-		}
-	if (private) then t.hidden=true end
-	group.args[strlower(label)]=t
-	lib.toggles[self][method]=t
-	return t
-end
-
-function lib:AddPrivateAction(method,name,description)
-	return self:AddAction(method,name,description,true)
-end
-function lib:AddKeyBinding(flag,name,description)
-	name=name or strlower(name)
-	description=description or name
-	local group=getgroup(self)
-	local t={
-		name=name,
-		type="keybinding",
-		get="OptToggleGet",
-		set="OptToggleSet",
-		desc=description,
-		arg=flag,
-		order=getorder(self,group)
-	}
-	group.args[flag]=t
-	lib.toggles[self][flag]=t
-	return t
-end
-function lib:AddTable(flag,table)
-	local group=getgroup(self)
-	group.args[flag]=table
-	lib.toggles[self][flag]=table
-end
-local function OpenCmd(self,info,args)
-	return self[info.arg](self,args,strsplit(' ',args))
-end
-function lib:AddOpenCmd(command,method,description,arguments,private)
-	method=method or command
-	description=description or command
-	local group=getgroup(self)
-	if (not private) then
-		local command=C('/' .. lib.options[self].ID .. ' ' .. command .. " (" .. description .. ")" ,'orange')
-		local t={
-			name=command,
-			type="description",
-			order=getorder(self,group),
-			fontSize='medium',
-			width='full'
-		}
-		group.args[command .. 'title']=t
-	end
-	local t={
-		name=command,
-		type="input",
-		arg=method,
-		get=function(...) end,
-		set=function(...) return OpenCmd(self,...) end,
-		desc=description,
-		order=getorder(self,group),
-		guiHidden=true,
-		hidden=private
-	}
-	if (type(arguments)=="table") then
-		local validate={}
-		for _,v in pairs(arguments) do
-			validate[v]=v
-		end
-		t.values=validate
-		t.type="select"
-	end
-	self.OptionsTable.args[command]=t
-
-	return t
-end
-function lib:AddPrivateOpenCmd(command,method,description,arguments)
-	return self:AddOpenCmd(command,method,description,arguments,true)
-end
-function lib:GetVarInfo(flag)
-	return lib.toggles[self][flag]
-end
-
---self:AddSubCmd(flagname,method,label,description)
-function lib:AddSubCmd(flag,method,name,description,input)
-	method=method or flag
-	name=name or flag
-	description=description or name
-	local group=getgroup(self)
-	debug("AddSubCmd " .. flag .. " for " .. method)
-	local t={
-		func=method,
-		name=name,
-		type="execute",
-		input=input,
-		desc=description,
-		confirm=true,
-		order=getorder(self,group),
-		guiHidden=true,
-	}
-	group.args[flag]=t
-	return t
-end
-
-
-
---self:AddChatCmd(method,label,description)
-function lib:AddChatCmd(method,label,description)
-	if (not self.RegisterChatCommand) then
-		LibStub("AceConsole-3.0"):Embed(self)
-	end
-	label=label or method
-	self:RegisterChatCommand(label,method)
-	description=description or label
-
-	local group=getgroup(self)
-	local t={
-			name=C('/' .. label ..  " (" .. description .. ")",'orange'),
-			type="description",
-			order=getorder(self,group),
-			fontSize="medium",
-			width="full"
-	}
-	group.args[label .. 'title']=t
-	return t
-end
-
---self:AddSeparator(text)
-
-function lib:AddSeparator(text)
-	local group=getgroup(self)
-	local i=getorder(self,group)
-	local flag=group.name .. i
-	flag=flag:gsub('%W','')
-	local t={
-			name=text,
-			type="header",
-			order=i,
-	}
-	group.args[flag]=t
-	return t
-end
-
-function lib:OnEmbedEnable(first)
-end
-
-function lib:OnEmbedDisable()
-end
-
-
-function lib:OnEnable()
-	if (self.OnEnabled) then
-		if (not self.db.global.silent) then
-			self:Print(C(VIDEO_OPTIONS_ENABLED,"green"))
-		end
-		pcall(self.OnEnabled,self,lib.options[self].first)
-		lib.options[self].first=nil
-	end
-end
-function lib:OnDisable(...)
-	if (self.OnDisabled) then
-		if (not self.db.global.silent) then
-			self.print(C(VIDEO_OPTIONS_DISABLED,'red'))
-		end
-		pcall(self.OnDisabled,self,...)
-	end
-end
-local function _GetMethod(target,prefix,func)
-	if (func == 'Start' or func == 'Stop') then return end
-	local method=prefix .. func
-	if (type(target[method])== "function") then
-			return method
-	elseif (type(target["_" .. prefix])) then
-			return "_" .. prefix
-	end
-end
-function lib:StartAutomaticEvents()
-	for k,v in pairs(self) do
-		if (type(v)=='function') then
-			if (k:sub(1,3)=='Evt') then
-				self:RegisterEvent(k:sub(4),k)
-			end
-		end
-	end
-end
-function lib:StopAutomaticEvents(ignore)
-	for k,v in pairs(self) do
-		if (type(v)=='function') then
-			if (k:sub(1,3)=='Evt') then
-				if (ignore and k==ignore or k:sub(4)==ignore) then
-					--a kickstart event not to be disabled
-				else
-					self:UnregisterEvent(k:sub(4))
-				end
-			end
-		end
-	end
-end
-function lib:Dprint(...)
-end
-function lib:Notify(...)
-	return self:CustomPrint(C.orange.r,C.orange.g,C.orange.b, nil, nil, ' ', ...)
-end
-function lib:Debug()
-	self.DebugOn=not self.DebugOn
-	self:Print("Debug:",self.DebugOn and on or off)
-	if self.DebugOn then
-		self.Dprint=dprint
-	else
-		self.Dprint=nop
-	end
-end
-
-function lib:Colorize(stringa,colore)
-	return C(stringa,colore) .. "|r"
-end
-function lib:GetTocVersion()
-	return select(4,GetBuildInfo())
-end
-function lib:Toggle()
-	if (self:IsEnabled()) then
-		self:Disable()
-	else
-		self:Enable()
-	end
-end
-function lib:Vars()
-	return pairs(self.db.profile.toggles)
-end
-function lib:SetBoolean(flag,value)
-	if (value) then
-		value=true
-	else
-		value=false
-	end
-	self.db.profile.toggles[flag]=value
-	return not value
-end
-function lib:GetBoolean(flag)
-	if (self.db.profile.toggles[flag]) then
-		return true
-	else
-		return false
-	end
-end
-lib.GetToggle=lib.GetBoolean -- alias
-function lib:GetNumber(flag,default)
-	return tonumber(self:GetSet(flag) or default or 0)
-end
-function lib:GetString(flag,default)
-	return tostring(self:GetSet(flag) or default or '')
-end
-
-function lib:PrintBoolean(flag)
-	if (type(flag) == "string") then
-		flag=self:GetBoolean(flag)
-	end
-	if (flag) then
-		return on
-	else
-		return off
-	end
-end
-function lib:GetSet(...)
-	local flag,value=select(1,...)
-	if (select('#',...) == 2) then
-		self.db.profile.toggles[flag]=value
-	else
-		return self.db.profile.toggles[flag]
-	end
-end
-function lib:GetIndexedVar(flag,index)
-	local rc=GetVar(flag)
-	if index and type(rc)=="table" then
-		return rc[index]
-	else
-		return rc
-	end
-
-end
-function lib:GetVar(flag)
-	return self:GetSet(flag)
-end
-function lib:SetVar(flag,value)
-	return self:GetSet(flag,value)
-end
---- Simulates a configuration  variable change.
---
--- Generates Apply* events if needed
--- @tparam string flag Variable name
-function lib:Trigger(flag)
-	local info=self:GetVarInfo(flag)
-	if (info) then
-		local value=info.type=="toggle" and self:GetBoolean(flag) or self:GetVar(flag)
-		self._Apply[flag](self,flag,value)
-	end
-
-end
-function lib:OptToggleSet(info,value,extra)
-	return self:ToggleSet(info.option.arg,info.option.type,value,extra)
-end
-function lib:ToggleSet(flag,tipo,value,extra)
-	if (tipo=="toggle") then
-		self:SetBoolean(flag,value)
-	elseif (tipo=="multiselect") then
-		self.db.profile.toggles[flag][value]=extra
-	else
-		self:GetSet(flag,value)
-	end
-	if (self:IsEnabled()) then
-		self._Apply[flag](self,flag,value)
-	end
-end
-function lib:OptToggleGet(info,extra)
-	return self:ToggleGet(info.option.arg,info.option.type,extra)
-end
-function lib:ToggleGet(flag,tipo,extra)
-	if (tipo=="toggle") then
-		return self:GetBoolean(flag)
-	elseif (tipo=="multiselect") then
-		if type(self.db.profile.toggles[flag])~="table" then
-			self.db.profile.toggles[flag]={}
-		end
-		return self.db.profile.toggles[flag][extra]
-	else
-		return self:GetSet(flag)
-	end
-end
-function lib:ApplySettings()
-	if (type(self.ApplyAll)=="function") then
-		self:ApplyAll()
-	else
-		for i,v in self:Vars() do
-			self._Apply[i](self,i,v)
-		end
-	end
-end
-local neveropened=true
-function lib:Gui(info)
-	if (AceConfigDialog and AceGUI) then
-		if (neveropened) then
-			InterfaceAddOnsList_Update()
-			neveropened=false
-		end
-		InterfaceOptionsFrame_OpenToCategory(self.CfgDlg)
-	else
-		self:Print("No GUI available")
-	end
-end
-
-function lib:Help(info)
-	if (AceConfigDialog and AceGUI) then
-		if (neveropened) then
-			InterfaceAddOnsList_Update()
-			neveropened=false
-		end
-		InterfaceOptionsFrame_OpenToCategory(self.CfgRel)
-	else
-		self:Print("No GUI available")
-	end
-end
-function lib:Long(msg) C:OnScreen('Yellow',msg,20) end
-function lib:Onscreen_Orange(msg) C:OnScreen('Orange',msg,2) end
-function lib:Onscreen_Purple(msg) C:OnScreen('Purple',msg,8) end
-function lib:Onscreen_Yellow(msg) C:OnScreen('Yellow',msg,1) end
-function lib:Onscreen_Azure(msg) C:OnScreen('Azure',msg,1) end
-function lib:Onscreen_Red(msg) C:OnScreen('Red',msg,1) end
-function lib:Onscreen_Green(msg) C:OnScreen('Green',msg,1) end
-function lib:OnScreen(color,...) C:OnScreen(color,strjoin(' ',tostringall(...))) end
-function lib:TimeToStr(time) -- Converts time data to a string format
-	local p,s,m,h;
-	if (not time) then
-		return ("0:00")
-	end
-	if (time < 0) then
-		time=abs(time)
-		p='-'
-	else
-		p=''
-	end
-	s = floor(mod(time, 60));
-	m = floor(time/ 60);
-	if (m > 59) then
-		h=floor(m/60)
-		m=floor(mod(m,60))
-	end
-	if (h) then
-		return format("%s%d:%02d:%02d",p,h,m,s)
-	else
-		return format("%s%d:%02d",p,m,s)
-	end
-end
-
-function lib:GetColorTable()
-	return C
-end
--- In case of upgrade, we need to redo embed for ALL Addons
--- This function get called on addon creation
--- Anything I define here is immediately available to newAddon method and in addon right after creation
-function lib:Embed(target)
-	-- All methods are pulled in via metatable in order to not pollute addon table
-	local mt=getmetatable(target)
-	if not mt then mt={__tostring=function(me) return me.name end} end
-	mt.__index=lib.mixins
-	setmetatable(target,mt)
-	target._Apply=target._Apply or {}
-	target._Apply._handler=target
-	for k,v in pairs(self) do
-		if type(v)=="string" or type(v)=="number" then pp (self,k,v) end
-	end
-	setmetatable(target._Apply,varmeta)
-	lib.mixinTargets[target] = true
-	if type(lib.options[target])=="table" then -- Updating library version if needed
-		lib.options[target].libinit=MAJOR_VERSION .. ' ' .. MINOR_VERSION
-	end
-end
-local function fsort(a,b)
-	if type(a)=="number" then
-		a=format("%07d",a)
-	end
-	if type(b)=="number" then
-		b=format("%07d",b)
-	end
-	return b>a
-end
-local function kpairs(t,f)
-	local a = new()
-	f=f or fsort
-	for n in pairs(t) do table.insert(a, n) end
-	table.sort(a, f)
-	local i = 0      -- iterator variable
-	local iter = function ()   -- iterator function
-		i = i + 1
-		if a[i] == nil then
-				del(a)
-				return nil
-		else
-				local k=a[i]
-				a[i]=nil -- Should optimize memory usage
-				return k, t[k]
-		end
-	end
-	return iter
-end
-function lib:GetKpairs()
-	return kpairs
-end
-lib.getKpairs=lib.GetKpairs
--- This metatable is used to generate a sorted proxy to an hashed table.
--- It should not used directly
-lib.mt={__metatable=true,__version=MINOR_VERSION}
-local mt=lib.mt
-function mt:__index(k)
-	if k=="n" then
-		return #mt.keys[self.__source]
-	end
-	return self.__source[k]
-end
-function mt:__len()
-	return #self.__keys
-end
-function mt:__newindex(k,v)
-	local pos=#self.__keys+1
-	for i,x in ipairs(self.__keys) do
-		if x>k then
-			pos=i
-			break;
-		end
-	end
-	if (k:sub(1,2)~="__") then
-		table.insert(self.__keys,pos,k)
-	end
-	self.__source[k]=v -- We want to trigger metamethods on original table
-end
-function mt:__call()
-	do
-		local current=0
-		return function(unsorted,i)
-			current=current+1
-			local k=self.__keys[current]
-			if k then return k,self.__source[k] end
-		end,self,0
-	end
-end
-function lib:GetSortedProxy(table)
-	local proxy=setmetatable({__keys={},__source=table,__metatable=true},mt)
-	for k,v in pairs(table) do
-		proxy[k]=v
-	end
-	return proxy
-end
-
-function lib:ScheduleLeaveCombatAction(method, ...)
-	return self:OnLeaveCombat(method,...)
-end
-
-lib.coroutines=lib.coroutines or setmetatable({},{__index=function(t,k) rawset(t,k,{}) return t[k] end})
-if not lib.CoroutineScheduler then
-	lib.CoroutineScheduler = CallbackHandler:New(lib,"_OnCoroutineEnd","_CancelOnCoroutine")
-end
----
-local coroutines=lib.coroutines --#Coroutines
-
---- Executes an action as soon as a coroutine exit
--- Action can be executed immediately if coroutine is already dead
--- @tparam string|function action To be executed, Can be a function or a method name
--- @tparam[opt] mixed ... More parameters will be directly passed to action
---
-function lib:coroutineOnEnd(signature,action,...)
-	if type(action)~="string" and type(action)~="function" then
-		error("Usage: OnCoroutineEnd (\"action\", ...): 'action' - string or function expected.", 2)
-	end
-	if type(action)=="string" and type(self[action]) ~= "function" then
-		error("Usage: OnCoroutineEnd (\"action\", ...): 'action' - method '"..tostring(action).."' not found on self.", 2)
-	end
-	if type(action) =="string" then
-		dprint("onend",self,signature,action,...)
-		lib._OnCoroutineEnd(self,signature,Run,{self[action],self,...})
-	else
-		lib._OnCoroutineEnd(self,signature,Run,{action,...})
-	end
-end
-
-
---- Generates and executes a coroutine with configurable interval and combat status
--- If called for already running coroutine changes the interval and the combat status
--- @tparam number interval between steps
--- @tparam string|function action To be executed, Can be a function or a method name
--- @tparam[opt] bool keep running in combat
--- @tparam[opt] mixed more parameter are passed to function
-function lib:coroutineExecute(interval,func,combatSafe,...)
-	local signature=strjoin(':',tostringall(self,func,...))
-	if type(func)=="string" then
-		func=self[func]
-	end
-	assert(type(func) =="function","coroutineExecute arg1 was not convertible to a function " .. tostring(func))
-	local c=lib.coroutines[signature]
-	c.signature=signature
-	c.interval=interval
-	c.combatSafe=combatSafe
-	if c.running then
-	--[===[@debug@
-		print("")
-	--@end-debug@]===] 
-		return 
-	end
-	if type(c.co)=="thread" and coroutine.status(c.co)=="suspended" then return signature end
-	c.co=coroutine.create(func)
-	c.running=true
-	c.paused=false
-	do 
-		local args={...}
-		local obj=self
-		local c=c
-		c.repeater=function()
-			if not c.combatSafe and InCombatLockdown() then
-				c.waiting=true
-				return
-			end
-			if c.paused then return end
-			local rc,res=pcall(coroutine.resume,c.co,obj,unpack(args))
-			if rc and res then
-				C_Timer.After(c.interval,c.repeater)
-			else
-				if not rc then error(res,2) end
-				lib.coroutines[signature]=nil
-				lib.CoroutineScheduler:Fire(c.signature)
-			end
-		end
-	end
-	c.repeater()
-	return signature
-end
-lib.coroutineStart=lib.coroutineExecute -- alias
-function lib:coroutineGet(signature)
-	return coroutines[signature]
-end
-function lib:coroutinePause(signature)
-	local co=coroutines[signature]
-	if co then
-		co.paused=true
-	end
-end
-function lib:coroutineRestart(signature)
-	local c=coroutines[signature]
-	if c then
-		if c.paused then 
-			c.paused=false
-			local rc,res=pcall(c.repeater)
-			if not rc then error(res,2) end
-		end
-	end
-end
-if not lib.secureframe then
-	lib.secureframe=CreateFrame("Button",nil,nil,"StaticPopupButtonTemplate,SecureActionButtonTemplate")
-	lib.secureframe:Hide()
-end
-local function StopSpellCasting(this)
-	local b2=_G[this:GetName().."Button2"]
-	local AC=lib.secureframe
-	AC:SetParent(b2)
-	AC:SetAllPoints()
-	AC:SetText(b2:GetText())
-	AC:SetAttribute("type","stop")
-	AC:SetScript("PostClick",function() b2:Click() end)
-	AC:Show()
-end
-local function StopSpellCastingCleanup(this)
-	local AC=lib.secureframe
-	AC:SetParent(nil)
-	AC:Hide()
-
-end
-local StaticPopupDialogs=StaticPopupDialogs
-local StaticPopup_Show=StaticPopup_Show
---- Show a popup
--- Display a popup message with Accept and optionally Cancel button
--- @tparam string msg Message to be shown
--- @tparam[opt] number timeout In seconds, if omitted assumes 60
--- @tparam[opt] func OnAccept Executed when clicked on Accept
--- @tparam[opt] func OnCancel Executed when clicked on Cancel (if nill, Cancel button is not shown)
--- @tparam[opt] mixed data Passed to the callback function
--- @tparam[opt] bool StopCasting If true, when the popup appear will stop any running casting.
--- Useful to ask confirmation before performing a programmatic initiated spellcasting
-function lib:Popup(msg,timeout,OnAccept,OnCancel,data,StopCasting)
-	if InCombatLockdown() then
-		return self:ScheduleLeaveCombatAction("Popup",msg,timeout,OnAccept,OnCancel,data,StopCasting)
-	end
-	msg=msg or "Something strange happened"
-	if type(timeout)=="function" then
-		StopCasting=data
-		data=OnCancel
-		OnAccept=timeout
-		timeout=60
-	end
-	StaticPopupDialogs["LIBINIT_POPUP"] = StaticPopupDialogs["LIBINIT_POPUP"] or
-	{
-	text = msg,
-	showAlert = true,
-	timeout = timeout or 60,
-	exclusive = true,
-	whileDead = true,
-	interruptCinematic = true
-	};
-	local popup=StaticPopupDialogs["LIBINIT_POPUP"]
-	if StopCasting then
-		popup.OnShow=StopSpellCasting
-		popup.OnHide=StopSpellCastingCleanup
-	else
-		popup.OnShow=nil
-		popup.OnHide=nil
-	end
-	popup.text=msg
-	popup.OnCancel=nil
-	popup.OnAccept=OnAccept
-	popup.button1=ACCEPT
-	popup.button2=nil
-	if (OnCancel) then
-		if (type(OnCancel)=="function") then
-			popup.OnCancel=OnCancel
-		end
-		popup.button2 = CANCEL
-	else
-		popup.button1=OKAY
-	end
-	StaticPopup_Show("LIBINIT_POPUP",nil,nil,data);
-end
--- Interface widgets
-local factory={} --#factory
-do
-	local nonce=0
-	local GetTime=GetTime
-	local function GetUniqueName(type,father)
-		if father then 
-			local name=father:GetName()
-			if name then 
-				type=type..name 
-			else
-				type=type..father:GetObjectType()
-			end
-		end
-		nonce=nonce+1
-		return type .. tostring(GetTime()*1000) ..nonce
-	end
-	local function SetScript(this,...)
-		this.child:SetScript(...)
-	end
-	local function SetStep(this,value)
-		this:SetObeyStepOnDrag(true)
-		this:SetValueStep(value)
-		this:SetStepsPerPage(1)
-	end
-	function factory:Slider(father,min,max,current,message,tooltip)
-		if type(message)=="table" then
-			tooltip=message.desc
-			message=message.name
-		end
-		local name=GetUniqueName("slider",father)
-		local sl = CreateFrame('Slider',name, father, 'OptionsSliderTemplate')
-		sl:SetWidth(128)
-		sl:SetHeight(20)
-		sl:SetOrientation('HORIZONTAL')
-		sl:SetMinMaxValues(min, max)
-		sl:SetValue(current or -1)
-		sl.SetStep=SetStep
-		sl.Low=_G[name ..'Low']
-		sl.Low:SetText(min)
-		sl.High=_G[name .. 'High']
-		sl.High:SetText(max)
-		sl.Text=_G[name.. 'Text']
-		sl.Text:SetText(message)
-		sl.Value=sl:CreateFontString(name..'Value','ARTWORK','GameFontHighlightSmall')
-		sl.Value:SetPoint("TOP",sl,"BOTTOM")
-		sl.Value:SetJustifyH("CENTER")
-		sl.SetText=function(this,value) this.Text:SetText(value) end
-		sl.SetFormattedText=function(this,...) this.Text:SetFormattedText(...) end
-		sl.SetTextColor=function(this,...) this.Text:SetTextColor(...) end
-		sl.tooltipText=tooltip
-		function sl:OnValueChanged(value)
-			if (not self.unrounded) then
-				value = math.floor(value)
-			end
-			if (self.isPercent) then
-				self.Value:SetFormattedText('%d%%',value)
-			else
-				self.Value:SetText(value)
-			end
-			self:OnChange(value)
-		end
-		function sl:OnChange(value) end
-		function sl:SetOnChange(func) self.OnChange=func end
-		sl:SetScript("OnValueChanged",sl.OnValueChanged)
-		sl:OnValueChanged(current)
-		return sl
-	end
-	function factory:Checkbox(father,current,message,tooltip)
-		if type(message)=="table" then
-			tooltip=message.desc
-			message=message.name
-		end
-		local frame=CreateFrame("Frame",nil,father)
-		local name=GetUniqueName("checkbox",father)
-		local ck=CreateFrame("CheckButton",name,frame,"ChatConfigCheckButtonTemplate")
-		ck.OnClick=function(this)
-			this.frame:OnChange(this:GetChecked())
-		end		
-		frame.SetScript=SetScript
-		frame.child=ck
-		ck.frame=frame
-		ck:SetPoint('TOPLEFT')
-		ck:SetScript("OnClick",ck.OnClick)
-		ck.Text=_G[name..'Text']
-		ck.Text:SetText(message)
-		ck:SetChecked(current)
-		ck.tooltip=tooltip
-		frame:SetWidth(ck:GetWidth()+ck.Text:GetWidth()+2)
-		frame:SetHeight(ck:GetHeight())
-		function frame:OnChange(value) end
-		function frame:SetOnChange(func) self.OnChange=func end
-		return frame
-	end
---- Creates a dropdown menu
--- @tparam frame father Parent frame to use
--- @tparam mixed current Initial value
--- @tparam array list Option list 
-	function factory:DropDown(father,current,list,message,tooltip)
-		if type(message)=="table" then
-			tooltip=message.desc
-			message=message.name
-		end
-		local dd=CreateFrame("Frame",GetUniqueName("dropdown",father),father,"UIDropDownMenuTemplate")
-	   dd:SetBackdropColor(1,0,0,1)		
-		if (tooltip) then
-			dd.tooltip=tooltip
-			dd:SetScript("OnEnter",function(self)
-					GameTooltip:SetOwner(self, "ANCHOR_RIGHT");
-					GameTooltip:SetText(self.tooltip, nil, nil, nil, nil, (self.tooltipStyle or true));
-				end
-			)
-		end
-		dd:SetScript("OnLeave",function() GameTooltip:Hide() end)
-		dd.text=dd:CreateFontString(nil,"ARTWORK","GameFontHighlight")
-		function dd:SetText(...)
-			self.text:SetText(...)
-		end
-		function dd:SetFormattedText(...)
-			self.text:SetFormattedText(...)
-		end
-		function dd:SetTextColor(...)
-			self.text:SetTextColor(...)
-		end
-		dd.list=list
-		local name=tostring(GetTime()*1000) ..nonce
-		--dd.dropdown=CreateFrame('Frame',name,father,"UIDropDownMenuTemplate")
-		UIDropDownMenu_Initialize(dd, function(...)
-			local i=0
-			for k,v in pairs(dd.list) do
-				i=i+1
-				local info=UIDropDownMenu_CreateInfo()
-				info.text=v
-				info.value=k
-				info.func=function(...) return dd:OnValueChanged(...) end
-				info.arg1=i
-				info.arg2=k
-				--info.notCheckable=true
-				UIDropDownMenu_AddButton(info)
-			end
-		end)
-		UIDropDownMenu_SetSelectedValue(dd, current)
-		UIDropDownMenu_JustifyText(dd, "LEFT")
-		function dd:OnValueChanged(this,index,value,...)
-			value=value or index
-			UIDropDownMenu_SetSelectedID(dd,index)
-			return self:OnChange(value)
-		end
-		function dd:OnChange(value) end
-		function dd:SetOnChange(func) self.OnChange=func end
-		return dd
-	end
-	-- These functions directly map to variables
-	local function ToggleSet(this,value)
-		this.obj:ToggleSet(this.flag,this.tipo,value)
-	end
-	function factory:Option(addon,father,flag)
-		if not addon or not addon.GetVarInfo or not father or not flag then
-			error("Usage factory:Option(addon,father,flag",2)
-		end
-		local info=addon:GetVarInfo(flag)
-		if not info then error("factory:Option() Not existent " ..flag,2) end
-		local f=father
-		local w
-		local tipo=info.type
-		if (tipo=="toggle") then
-			w=self:Checkbox(f,addon:ToggleGet(flag,tipo),info)
-		elseif( info.type=="select") then
-			w=self:DropDown(f,addon:ToggleGet(flag,tipo),info.values,info)			
-		elseif (info.type=="range") then
-			w=self:Slider(f,info.min,info.max,addon:ToggleGet(flag,info.type),info)
-		else
-		end
-		w:SetOnChange(ToggleSet)
-		w.flag=flag
-		w.tipo=tipo
-		w.obj=addon
-		return w		
-	end
-	factory.Dropdown=factory.DropDown -- compatibility
-end
-function lib:GetFactory()
-	return factory
-end
-local meta={__index=_G,
-__newindex=function(t,k,v)
-	assert(type(_G[k]) == 'nil',"Attempting to override global " ..k)
-	return rawset(t,k,v)
-end
-}
-function lib:SetCustomEnvironment(new_env)
-	local old_env = getfenv(2)
-	if old_env==new_env then return end
-	if getmetatable(new_env)==meta then return end
-	if not getmetatable(new_env) then
-		if not new_env.print then new_env.print=dprint end
-		setmetatable(new_env,meta)
-		new_env.dprint=dprint
-	else
-		assert(false,"new_env already has metatable")
-	end
-	setfenv(2, new_env)
-end
---- reembed routine
--- Prepares the mixins table
-lib.mixins=lib.mixins or {}
-wipe(lib.mixins)
-for name,method in pairs(lib) do
-	if type(method)=="function" and name~="NewAddon" and name~="GetAddon" and name:sub(1,1)~="_" then
-		lib.mixins[name] = method
-	end
-end
-for target,_ in pairs(lib.mixinTargets) do
-	lib:Embed(target)
-end
-local l=AceLocale
-if not l then
-	L=setmetatable({},{
-		__index=function(t,k) return k end
-	})
-	return
-end
--- To avoid clash between versions, localization is versioned on major and minor
--- Lua strings are immutable so having more copies of the same string does not waist a noticeable slice of memory
-local me=MAJOR_VERSION .. MINOR_VERSION
--- Actual translations for test purpose
-
-do
-	local L=l:NewLocale(me,"enUS",true,true)
-	L["Configuration"] = "Configuration"
-	L["Description"] = "Description"
-	L["Libraries"] = "Libraries"
-	L["Purge1"] = "Delete unused profiles"
-	L["Purge2"] = "Deletes all profiles that are not used by a character"
-	L["Purge_Desc"] = "You can delete all unused profiles with just one click"
-	L["Release Notes"] = "Release Notes"
-	L["Toggles"] = "Toggles"
-	L["UseDefault1"] = "Switch all characters to \"%s\" profile"
-	L["UseDefault2"] = "Uses the \"%s\" profiles for all your toons"
-	L["UseDefault_Desc"] = "You can force all your characters to use the \"%s\" profile in order to manage a single configuration"
-	L=l:NewLocale(me,"ptBR")
-	if (L) then
-	L["Configuration"] = "configura\195\167\195\163o"
-	L["Description"] = "Descri\195\167\195\163o"
-	L["Libraries"] = "bibliotecas"
-	L["Release Notes"] = "Notas de Lan\195\167amento"
-	L["Toggles"] = "Alterna"
-	end
-	L=l:NewLocale(me,"frFR")
-	if (L) then
-	L["Configuration"] = "configuration"
-	L["Description"] = "description"
-	L["Libraries"] = "biblioth\195\168ques"
-	L["Release Notes"] = "notes de version"
-	L["Toggles"] = "Bascule"
-	end
-	L=l:NewLocale(me,"deDE")
-	if (L) then
-	L["Configuration"] = "Konfiguration"
-	L["Description"] = "Beschreibung"
-	L["Libraries"] = "Bibliotheken"
-	L["Release Notes"] = "Release Notes"
-	L["Toggles"] = "Schaltet"
-	end
-	L=l:NewLocale(me,"koKR")
-	if (L) then
-	L["Configuration"] = "\234\181\172\236\132\177"
-	L["Description"] = "\236\132\164\235\170\133"
-	L["Libraries"] = "\235\157\188\236\157\180\235\184\140\235\159\172\235\166\172"
-	L["Release Notes"] = "\235\166\180\235\166\172\236\138\164 \235\133\184\237\138\184"
-	L["Toggles"] = "\236\160\132\237\153\152"
-	end
-	L=l:NewLocale(me,"esMX")
-	if (L) then
-	L["Configuration"] = "Configuraci\195\179n"
-	L["Description"] = "Descripci\195\179n"
-	L["Libraries"] = "Bibliotecas"
-	L["Release Notes"] = "Notas de la versi\195\179n"
-	L["Toggles"] = "Alterna"
-	end
-	L=l:NewLocale(me,"ruRU")
-	if (L) then
-	L["Configuration"] = "\208\154\208\190\208\189\209\132\208\184\208\179\209\131\209\128\208\176\209\134\208\184\209\143"
-	L["Description"] = "\208\158\208\191\208\184\209\129\208\176\208\189\208\184\208\181"
-	L["Libraries"] = "\208\145\208\184\208\177\208\187\208\184\208\190\209\130\208\181\208\186\208\184"
-	L["Release Notes"] = "\208\159\209\128\208\184\208\188\208\181\209\135\208\176\208\189\208\184\209\143 \208\186 \208\178\209\139\208\191\209\131\209\129\208\186\209\131"
-	L["Toggles"] = "\208\159\208\181\209\128\208\181\208\186\208\187\209\142\209\135\208\181\208\189\208\184\208\181"
-	end
-	L=l:NewLocale(me,"zhCN")
-	if (L) then
-	L["Configuration"] = "\233\133\141\231\189\174"
-	L["Description"] = "\232\175\180\230\152\142"
-	L["Libraries"] = "\229\155\190\228\185\166\233\166\134"
-	L["Release Notes"] = "\229\143\145\232\161\140\232\175\180\230\152\142"
-	L["Toggles"] = "\229\136\135\230\141\162"
-	end
-	L=l:NewLocale(me,"esES")
-	if (L) then
-	L["Configuration"] = "Configuraci\195\179n"
-	L["Description"] = "Descripci\195\179n"
-	L["Libraries"] = "Bibliotecas"
-	L["Release Notes"] = "Notas de la versi\195\179n"
-	L["Toggles"] = "Alterna"
-	end
-	L=l:NewLocale(me,"zhTW")
-	if (L) then
-	L["Configuration"] = "\233\133\141\231\189\174"
-	L["Description"] = "\232\175\180\230\152\142"
-	L["Libraries"] = "\229\155\190\228\185\166\233\166\134"
-	L["Release Notes"] = "\229\143\145\232\161\140\232\175\180\230\152\142"
-	L["Toggles"] = "\229\136\135\230\141\162"
-	end
-	L=l:NewLocale(me,"itIT")
-	if (L) then
-	L["Configuration"] = "Configurazione"
-	L["Description"] = "Descrizione"
-	L["Libraries"] = "Librerie"
-	L["Purge1"] = "Cancella i profili inutilizzati"
-	L["Purge2"] = "Cancella tutti i profili che non sono usati da un personaggio"
-	L["Purge_Desc"] = "Puoi cancellare tutti i profili inutilizzati con un singolo click"
-	L["Release Notes"] = "Note di rilascio"
-	L["Toggles"] = "Interruttori"
-	L["UseDefault1"] = "Imposta il profilo \"%s\" su tutti i personaggi"
-	L["UseDefault2"] = "Usa il profilo '%s\" per tutti i personaggi"
-	L["UseDefault_Desc"] = "Puoi far usare a tutti i tuoi personaggi il profilo \"%s\""
-	end
-end
-L=LibStub("AceLocale-3.0"):GetLocale(me,true)
---@do-not-package@
--- Packager stil not honoring this tag
---@end-do-not-package@
diff --git a/OrderHallCommander/libs/LibInit/LibInit.xml b/OrderHallCommander/libs/LibInit/LibInit.xml
deleted file mode 100644
index b0ce24c..0000000
--- a/OrderHallCommander/libs/LibInit/LibInit.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Ui xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.blizzard.com/wow/ui/" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
-..\FrameXML\UI.xsd">
-	<Include file="libs.xml"/>
-	<Script file="LibDataBroker-1.1.lua"/>
-	<Script file="colorize.lua"/>
-	<Script file="LibInit.lua"/>
-</Ui>
\ No newline at end of file
diff --git a/OrderHallCommander/libs/LibInit/colorize.lua b/OrderHallCommander/libs/LibInit/colorize.lua
deleted file mode 100644
index eb8804b..0000000
--- a/OrderHallCommander/libs/LibInit/colorize.lua
+++ /dev/null
@@ -1,209 +0,0 @@
----------------------------------------------------------------------------------------------------------------------
--- A minimal Crayon like implementation for managing color.
--- @name Colorize
--- @class module
--- @author Alar of Daggerspine
--- @release 2
--- @usage
--- local C=LibStub("LibInit"):GetColorTable()
--- C.Azure.c --returns a string "rrggbb"
--- C.Azure.r --returns red value as a number
--- C.Azure.g --returns green value as a number
--- C.Azure.b --returns blue value as a number
--- tostring(C.Azure) -- returns a string "rrggbb"
--- "aa" .. C.Azure -- returns "aarrggbb"
--- C.Azure() -- returns r,g,b as float list
--- C.Azure.r -- returns r as float
--- C("testo","azure") -- returns "|cff" .. >color code for azure> .. "test" .. "|r"
--- -- For a list of available color check Colors
--- -- Each color became the name of a method
---
-
-local C
--- Color system related function
-local lib=LibStub:NewLibrary("LibInit-Colorize",5)
-if (not lib) then return end
-local setmetatable=setmetatable
-local tonumber=tonumber
-local tostring=tostring
-local rawget=rawget
-local rawset=rawset
-local pairs=pairs
-local format=format
-local strlower=strlower
-local type=type
-local unpack=unpack
-local _G=_G
-local UIERRORS_HOLD_TIME=UIERRORS_HOLD_TIME or 1
-local UIErrorsFrame=UIErrorsFrame
-local ChatTypeInfo=ChatTypeInfo
-local GetItemQualityColor=GetItemQualityColor
-lib.colors={
-azure                   ="0c92dc"
-,aqua					="00ffff"
-,black                  ="000000"
-,blue                   ="0000ff"
-,brightgrey             ="d0d0d0"
-,connection_color       ="33ff66"
-,copper                 ="cc9900"
-,cyan					="00ffff"
-,debug_color            ="00ff00"
-,fuchsia				="ff00ff"
-,gold                   ="ffff66"
-,gray                   ="808080"
-,green                  ="20ff20"
-,green2                 ="00c000"
-,green3					="008000"
-,grey                   ="909090"
-,guildchat              ="269926"
-,highlight_color_code   ="ffffff"
-,lightblue              ="515179"
-,lightyellow            ="ffff9a"
-,lightgrey              ="d0d0d0"
-,lime					="00FF00"
-,maroon					="800000"
-,money_color            ="ffcc33"
-,olive					="808000"
-,navy					="000080"
-,teal					="008080"
-,orange                 ="ff9900"
-,partychat              ="515179"
-,purple                 ="800080"
-,raidchat               ="66331a"
-,red                    ="ff2020"
-,red2                   ="f41400"
-,silver                 ="c0c0c0"
-,status_color           ="0066ff"
-,white                  ="ffffff"
-,yellow                 ="ffd200"
-,yellow2                ="ffed1a"
-,druid  			    ="ff7d0a"
-,hunter					="abd473"
-,mage        			="69ccf0"
-,deathknight			="ff0000"
-,paladin     			="f58cba"
-,priest     			="ffffff"
-,rogue       			="fff569"
-,shaman      			="0000FF"
-,warlock     			="9482ca"
-,warrior     			="c79c6e"
-,default				="ffd200"
-}
-if (_G.RAID_CLASS_COLORS) then
-	for class,c in pairs (_G.RAID_CLASS_COLORS) do
-		local color=format("%02X%02X%02X", 255*c.r, 255*c.g, 255*c.b)
-		lib.colors[strlower(class)]=color
-	end
-end
-local numqualities=_G.NUM_ITEM_QUALITIES or 8
-for i=1,numqualities do
-	local _,_,_,hex=GetItemQualityColor(i)
-	local c=strlower(_G["ITEM_QUALITY"..i.."_DESC"])
-	lib.colors[tostring(i)]=hex:sub(3)
-	if (c) then
-		lib.colors[c]=hex:sub(3)
-	end
-end
-
-local ChatTypeInfo=ChatTypeInfo or {}
-local format=format
-setmetatable(lib.colors,
-{__index=
-	function(table,key)
-		local color
-		local okey=key
-		if (key=='horde' or key== "chat_msg_bg_system_horde") then
-			color = ChatTypeInfo["BG_SYSTEM_HORDE"]
-			if type(color) == "table" and color.r and color.g and color.b then
-				local r, g, b = color.r, color.g, color.b
-				color=format("%02X%02X%02X", 255*r, 255*g, 255*b)
-			else
-				key='azure'
-			end
-		end
-		if (key=='alliance' or key=='ally' or key== "chat_msg_bg_system_alliance") then
-			color = ChatTypeInfo["BG_SYSTEM_ALLIANCE"]
-			if type(color) == "table" and color.r and color.g and color.b then
-				local r, g, b = color.r, color.g, color.b
-				color=format("%02X%02X%02X", 255*r, 255*g, 255*b)
-			else
-				key='red'
-			end
-		end
-		if (key=='neutral' or key== "chat_msg_bg_system_neutral") then
-			color = ChatTypeInfo["BG_SYSTEM_NEUTRAL"]
-			if type(color) == "table" and color.r and color.g and color.b then
-				local r, g, b = color.r, color.g, color.b
-				color=format("%02X%02X%02X", 255*r, 255*g, 255*b)
-			else
-				key='yellow'
-			end
-		end
-		if (not color) then color=rawget(table,key) or table.default end
-		rawset(table,okey,color)
-		return color
-	end
-}
-)
-local function colorize(stringa,colore,dummy)
-		-- Crayon compatibility
-		if (type(stringa)=="table") then
-				stringa=dummy
-		end
-		if (type(colore)~="string") then colore="Yellow" end
-		if (colore:len()== 6 and colore:match("^%x%x%x%x%x%x$")) then
-				return "|cff" .. colore .. tostring(stringa) .. "|r"
-		else
-				return "|cff" .. C[colore] .. tostring(stringa) .. "|r"
-		end
-end
-local colors=lib.colors
-local map={r=1,g=2,b=3,c=4}
-local mt={
-		__index=function(table,key)
-				return rawget(table,map[key])
-		end,
-		__tostring=function(table)
-				return rawget(table,4)
-		end,
-		__concat=function(t1,t2)
-				return tostring(t1) .. tostring(t2)
-		end,
-		__call=function(table,...)
-				return unpack(table)
-		end
-
-}
-C=setmetatable({},{
-		__index=function(table,key)
-			key=strlower(tostring(key))
-				local c=colors[key]
-				local r,g,b=tonumber(c:sub(1,2),16)/255,tonumber(c:sub(3,4),16)/255,tonumber(c:sub(5,6),16)/255
-				rawset(table,key,setmetatable({r,g,b,c},mt))
-				return  rawget(table,key)
-		end,
-		__call = function(table,...)
-						return colorize(...)
-		end
-	}
-)
-function lib:OnScreen(color,msg,hold)
-	color=color or "Yellow"
-	msg=msg or "Test message"
-	local r,g,b=C[color]()
-	hold=hold or 4
-	UIErrorsFrame:AddMessage(tostring(msg), r,g,b, 1.0, UIERRORS_HOLD_TIME * hold);
-end
-setmetatable(lib,{
-	__call=function(table,...) return C end
-	}
-)
-function lib:example()
-	for k,v in pairs(lib.colors) do
-		print(C(k,k))
-	end
-	print("----------------")
-	for k,v in pairs(ITEM_QUALITY_COLORS) do
-		print(format("%s Quality: %2d|r",v.hex,k))
-	end
-end
\ No newline at end of file
diff --git a/OrderHallCommander/libs/LibInit/libs.xml b/OrderHallCommander/libs/LibInit/libs.xml
deleted file mode 100644
index 9828ead..0000000
--- a/OrderHallCommander/libs/LibInit/libs.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Ui xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.blizzard.com/wow/ui/" xsi:schemaLocation="http://www.blizzard.com/wow/ui/..\FrameXML\UI.xsd">
-<Script file="Ace3\LibStub\LibStub.lua" />
-<Include file="Ace3\CallbackHandler-1.0\CallbackHandler-1.0.xml" />
-<Include file="Ace3\AceAddon-3.0\AceAddon-3.0.xml" />
-<Include file="Ace3\AceGUI-3.0\AceGUI-3.0.xml" />
-<Include file="Ace3\AceConfig-3.0\AceConfig-3.0.xml" />
-<Include file="Ace3\AceConsole-3.0\AceConsole-3.0.xml" />
-<Include file="Ace3\AceDB-3.0\AceDB-3.0.xml" />
-<Include file="Ace3\AceDBOptions-3.0\AceDBOptions-3.0.xml" />
-<Include file="Ace3\AceEvent-3.0\AceEvent-3.0.xml" />
-<Include file="Ace3\AceHook-3.0\AceHook-3.0.xml" />
-<Include file="Ace3\AceLocale-3.0\AceLocale-3.0.xml" />
-<Include file="Ace3\AceTimer-3.0\AceTimer-3.0.xml" />
-</Ui>
diff --git a/OrderHallCommander/libs/LibItemUpgradeInfo-1.0/Core.lua b/OrderHallCommander/libs/LibItemUpgradeInfo-1.0/Core.lua
deleted file mode 100644
index 9d153b9..0000000
--- a/OrderHallCommander/libs/LibItemUpgradeInfo-1.0/Core.lua
+++ /dev/null
@@ -1,654 +0,0 @@
-local MAJOR, MINOR = "LibItemUpgradeInfo-1.0", 28
-local type,tonumber,select,strsplit,GetItemInfoFromHyperlink=type,tonumber,select,strsplit,GetItemInfoFromHyperlink
-local library,previous = _G.LibStub:NewLibrary(MAJOR, MINOR)
-local lib=library --#lib Needed to keep Eclipse LDT happy
-if not lib then return end
-local pp=print
---@debug@
-LoadAddOn("Blizzard_DebugTools")
-LoadAddOn("LibDebug")
-if LibDebug then LibDebug() end
---@end-debug@
---[===[@non-debug@
-local print=function() end
---@end-non-debug@]===]
---[[
-Caching system
-1	itemName	String	The name of the item.
-2	itemLink	String	The item link of the item.
-3	itemRarity	Number	The quality of the item. The value is 0 to 7, which represents Poor to Heirloom. This appears to include gains from upgrades/bonuses.
-4	itemLevel	Number	The item level of this item, not including item levels gained from upgrades. There is currently no API to get the item level including upgrades/bonuses.
-5	itemMinLevel	Number	The minimum level required to use the item, 0 meaning no level requirement.
-6	itemType	String	The type of the item: Armor, Weapon, Quest, Key, etc. (localized)
-7	itemSubType	String	The sub-type of the item: Enchanting, Cloth, Sword, etc. See itemType. (localized)
-8	itemStackCount	Number	How many of the item per stack: 20 for Runecloth, 1 for weapon, 100 for Alterac Ram Hide, etc.
-9	itemEquipLoc	String	The type of inventory equipment location in which the item may be equipped, or "" if it can't be equippable. The string returned is also the name of a global string variable e.g. if "INVTYPE_WEAPONMAINHAND" is returned, _G["INVTYPE_WEAPONMAINHAND"] will be the localized, displayable name of the location.
-10	iconFileDataID	Number	The FileDataID for the icon texture for the item.
-11	itemSellPrice	Number	The price, in copper, a vendor is willing to pay for this item, 0 for items that cannot be sold.
-12	itemClassID	Number	This is the numerical value that determines the string to display for 'itemType'.
-13	itemSubClassID	Number	This is the numerical value that determines the string to display for 'itemSubType'
-14 ? number
-15 expansionId
-16 ? ?
-17 ? boolean
---]]
--- ItemLink Constants
-local i_Name=1
-local i_Link=2
-local i_Rarity=3
-local i_Quality=3
-local i_Level=4
-local i_MinLevel =5
-local i_ClassName=6
-local i_SubClassName=7
-local i_StackCount=8
-local i_EquipLoc=9
-local i_TextureId=10
-local i_SellPrice=11
-local i_ClassID=12
-local i_SubClass_ID=13
-local i_unk1=14
-local i_unk2=15
-local i_unk3=16
-local i_unk4=17
-
-
-do
-local oGetItemInfo=GetItemInfo
-lib.itemcache=lib.itemcache or
-	setmetatable({miss=0,tot=0},{
-		__index=function(table,key)
-			if (not key) then return "" end
-			if (key=="miss") then return 0 end
-			if (key=="tot") then return 0 end
-			local cached={oGetItemInfo(key)}
-			if #cached==0 then return nil end
-			local itemLink=cached[2]
-			if not itemLink then return nil end
-			local itemID=lib:GetItemID(itemLink)
-			local quality=cached[3]
-			local cacheIt=true
-			if quality==LE_ITEM_QUALITY_ARTIFACT then 
-				local relic1, relic2, relic3 = select(4,strsplit(':', itemLink))
-				if relic1 and relic1 ~= '' and not oGetItemInfo(relic1) then cacheIt = false end
-				if relic2 and relic2 ~= '' and not oGetItemInfo(relic2) then cacheIt = false end
-				if relic3 and relic3 ~= '' and not oGetItemInfo(relic3) then cacheIt = false end
-			end
-			cached.englishClass=GetItemClassInfo(cached[12])
-			cached.englishSubClass=GetItemSubClassInfo(cached[12],cached[13])
-			if cacheIt then
-				rawset(table,key,cached)
-			end
-			table.miss=table.miss+1
-			return cached
-		end
-
-	})
-end
-local cache,select,unpack=lib.itemcache,select,unpack
-local	function CachedGetItemInfo(key,index)
-	if not key then return nil end
-	index=index or 1
-	cache.tot=cache.tot+1
-	local cached=cache[key]
-	if cached and type(cached)=='table' then
-		return select(index,unpack(cached))
-	else
-		rawset(cache,key,nil) -- voiding broken cache entry
-	end
-end
-
-local upgradeTable = {
-	[  1] = { upgrade = 1, max = 1, ilevel = 8 },
-	[373] = { upgrade = 1, max = 3, ilevel = 4 },
-	[374] = { upgrade = 2, max = 3, ilevel = 8 },
-	[375] = { upgrade = 1, max = 3, ilevel = 4 },
-	[376] = { upgrade = 2, max = 3, ilevel = 4 },
-	[377] = { upgrade = 3, max = 3, ilevel = 4 },
-	[378] = {                       ilevel = 7 },
-	[379] = { upgrade = 1, max = 2, ilevel = 4 },
-	[380] = { upgrade = 2, max = 2, ilevel = 4 },
-	[445] = { upgrade = 0, max = 2, ilevel = 0 },
-	[446] = { upgrade = 1, max = 2, ilevel = 4 },
-	[447] = { upgrade = 2, max = 2, ilevel = 8 },
-	[451] = { upgrade = 0, max = 1, ilevel = 0 },
-	[452] = { upgrade = 1, max = 1, ilevel = 8 },
-	[453] = { upgrade = 0, max = 2, ilevel = 0 },
-	[454] = { upgrade = 1, max = 2, ilevel = 4 },
-	[455] = { upgrade = 2, max = 2, ilevel = 8 },
-	[456] = { upgrade = 0, max = 1, ilevel = 0 },
-	[457] = { upgrade = 1, max = 1, ilevel = 8 },
-	[458] = { upgrade = 0, max = 4, ilevel = 0 },
-	[459] = { upgrade = 1, max = 4, ilevel = 4 },
-	[460] = { upgrade = 2, max = 4, ilevel = 8 },
-	[461] = { upgrade = 3, max = 4, ilevel = 12 },
-	[462] = { upgrade = 4, max = 4, ilevel = 16 },
-	[465] = { upgrade = 0, max = 2, ilevel = 0 },
-	[466] = { upgrade = 1, max = 2, ilevel = 4 },
-	[467] = { upgrade = 2, max = 2, ilevel = 8 },
-	[468] = { upgrade = 0, max = 4, ilevel = 0 },
-	[469] = { upgrade = 1, max = 4, ilevel = 4 },
-	[470] = { upgrade = 2, max = 4, ilevel = 8 },
-	[471] = { upgrade = 3, max = 4, ilevel = 12 },
-	[472] = { upgrade = 4, max = 4, ilevel = 16 },
-	[491] = { upgrade = 0, max = 4, ilevel = 0 },
-	[492] = { upgrade = 1, max = 4, ilevel = 4 },
-	[493] = { upgrade = 2, max = 4, ilevel = 8 },
-	[494] = { upgrade = 0, max = 6, ilevel = 0 },
-	[495] = { upgrade = 1, max = 6, ilevel = 4 },
-	[496] = { upgrade = 2, max = 6, ilevel = 8 },
-	[497] = { upgrade = 3, max = 6, ilevel = 12 },
-	[498] = { upgrade = 4, max = 6, ilevel = 16 },
-	[503] = { upgrade = 3, max = 3, ilevel = 1 },
-	[504] = { upgrade = 3, max = 4, ilevel = 12 },
-	[505] = { upgrade = 4, max = 4, ilevel = 16 },
-	[506] = { upgrade = 5, max = 6, ilevel = 20 },
-	[507] = { upgrade = 6, max = 6, ilevel = 24 },
-	[529] = { upgrade = 0, max = 2, ilevel = 0 },
-	[530] = { upgrade = 1, max = 2, ilevel = 5 },
-	[531] = { upgrade = 2, max = 2, ilevel = 10 },
-	[535] = { upgrade = 1, max = 3, ilevel = 15 },
-	[536] = { upgrade = 2, max = 3, ilevel = 30 },
-	[537] = { upgrade = 3, max = 3, ilevel = 45 },
-	[538] = { upgrade = 0, max = 3, ilevel = 0 },
-
-}
-do
-	local stub = { ilevel = 0 }
-	setmetatable(upgradeTable, { __index = function(t, key)
-		return stub
-	end})
-end
--- Tooltip Scanning stuff
-local itemLevelPattern = _G.ITEM_LEVEL:gsub("%%d", "(%%d+)")
-local soulboundPattern = _G.ITEM_SOULBOUND
-local boePattern=_G.ITEM_BIND_ON_EQUIP
-local bopPattern=_G.ITEM_BIND_ON_PICKUP
-local boaPattern1=_G.ITEM_BIND_TO_BNETACCOUNT
-local boaPattern2=_G.ITEM_BNETACCOUNTBOUND
-
-local scanningTooltip
-local anchor
-local tipCache = lib.tipCache or setmetatable({},{__index=function(table,key) return {} end})
-local emptytable={}
-
-local function ScanTip(itemLink,itemLevel,show)
-	if type(itemLink)=="number" then
-		itemLink=CachedGetItemInfo(itemLink,2)
-		if not itemLink then return emptytable end
-	end
-	if type(tipCache[itemLink].ilevel)=="nil"then -- or not tipCache[itemLink].cached then
-		local cacheIt=true
-		if not scanningTooltip then
-			anchor=CreateFrame("Frame")
-			anchor:Hide()
-			scanningTooltip = _G.CreateFrame("GameTooltip", "LibItemUpgradeInfoTooltip", nil, "GameTooltipTemplate")
-		end
-		--scanningTooltip:ClearLines()
-		GameTooltip_SetDefaultAnchor(scanningTooltip,anchor)
-		local itemString=itemLink:match("|H(.-)|h")
-		local rc,message=pcall(scanningTooltip.SetHyperlink,scanningTooltip,itemString)
-		if (not rc) then
-			return emptytable
-		end
-		scanningTooltip:Show()
-		local quality,_,_,class,subclass,_,_,_,_,classIndex,subclassIndex=CachedGetItemInfo(itemLink,3)
-		
-		-- line 1 is the item name
-		-- line 2 may be the item level, or it may be a modifier like "Heroic"
-		-- check up to line 6 just in case
-		local ilevel,soulbound,bop,boe,boa,heirloom
-		if quality==LE_ITEM_QUALITY_ARTIFACT and itemLevel then 
-			local relic1, relic2, relic3 = select(4,strsplit(':', itemLink))
-			if relic1 and relic1 ~= '' and not CachedGetItemInfo(relic1) then cacheIt = false end
-			if relic2 and relic2 ~= '' and not CachedGetItemInfo(relic2) then cacheIt = false end
-			if relic3 and relic3 ~= '' and not CachedGetItemInfo(relic3) then cacheIt = false end
-			ilevel=itemLevel 
-		end
-		if show then
-			for i=1,12 do
-				local l, ltext = _G["LibItemUpgradeInfoTooltipTextLeft"..i], nil		
-				local r, rtext  = _G["LibItemUpgradeInfoTooltipTextRight"..i], nil
-				ltext=l:GetText()
-				rtext=r:GetText()
-				pp(i,ltext,' - ',rtext)		
-			end
-		end
-		for i = 2, 6 do
-			local label, text = _G["LibItemUpgradeInfoTooltipTextLeft"..i], nil
-			if label then text=label:GetText() end
-			if text then
-				if ilevel==nil then ilevel = tonumber(text:match(itemLevelPattern)) end
-				if soulbound==nil then soulbound = text:find(soulboundPattern) end
-				if bop==nil then bop = text:find(bopPattern) end
-				if boe==nil then boe = text:find(boePattern) end
-				if boa==nil then boa = text:find(boaPattern1) end
-				if boa==nil then boa = text:find(boaPattern2) end
-			end
-		end
-		tipCache[itemLink]={
-			ilevel=ilevel or itemLevel,
-			soulbound=soulbound,
-			bop=bop,
-			boe=boe,
-			cached=cacheIt
-		}
-		scanningTooltip:Hide()
-	end
-	return tipCache[itemLink]
-end
-
-
--- GetUpgradeID(itemString)
---
--- Arguments:
---   itemString - String - An itemLink or itemString denoting the item
---
--- Returns:
---   Number - The upgrade ID (possibly 0), or nil if the input is invalid or
---            does not contain upgrade info
-function lib:GetUpgradeID(itemString)
-	if type(itemString)~="string" then return end
-	local itemString = itemString:match("item[%-?%d:]+") or ""-- Standardize itemlink to itemstring
-	local instaid, _, numBonuses, affixes = select(12, strsplit(":", itemString, 15))
-	instaid=tonumber(instaid) or 7
-	numBonuses=tonumber(numBonuses) or 0
-	if instaid >0 and (instaid-4)%8==0 then
-		return tonumber((select(numBonuses + 1, strsplit(":", affixes))))
-	end
-end
-
--- GetCurrentUpgrade(id)
---
--- Returns the current upgrade level of the item, e.g. 1 for a 1/2 item.
---
--- Arguments:
---   id - Number - The upgrade ID of the item (obtained via GetUpgradeID())
---
--- Returns:
---   Number - The current upgrade level of the item. Returns nil if the item
---            cannot be upgraded
-function lib:GetCurrentUpgrade(id)
-	return upgradeTable[id].upgrade
-end
-
--- GetMaximumUpgrade(id)
---
--- Returns the maximum upgrade level of the item, e.g. 2 for a 1/2 item.
---
--- Arguments:
---   id - Number - The upgrade ID of the item (obtained via GetUpgradeID())
---
--- Returns:
---   Number - The maximum upgrade level of the item. Returns nil if the item
---            cannot be upgraded
-function lib:GetMaximumUpgrade(id)
-	return upgradeTable[id].max
-end
-
--- GetItemLevelUpgrade(id)
---
--- Returns the item level increase that this upgrade is worth, e.g. 4 for a
--- 1/2 item or 8 for a 2/2 item.
---
--- Arguments:
---   id - Number - The upgrade ID of the item (obtained via GetUpgradeID())
---
--- Returns:
---   Number - The item level increase of the item. Returns 0 if the item
---            cannot be or has not been upgraded
-function lib:GetItemLevelUpgrade(id)
-	return upgradeTable[id].ilevel
-end
-
--- GetItemUpgradeInfo(itemString)
---
--- Returns the current upgrade level, maximum upgrade level, and item level
--- increase for an item.
---
--- Arguments:
---   itemString - String - An itemLink or itemString denoting the item
---
--- Returns if the item can be upgraded:
---   Number - The current upgrade level of the item
---   Number - The maximum upgrade level of the item
---   Number - The item level increase of the item
--- or if the item cannot be upgraded:
---   nil
---   nil
---   0
--- or if the item is invalid or does not contain upgrade info:
---   nil
-function lib:GetItemUpgradeInfo(itemString)
-	local id = self:GetUpgradeID(itemString)
-	if id then
-		local cur = self:GetCurrentUpgrade(id)
-		local max = self:GetMaximumUpgrade(id)
-		local delta = self:GetItemLevelUpgrade(id)
-		return cur, max, delta
-	end
-	return nil
-end
-
--- GetHeirloomTrueLevel(itemString)
---
--- Returns the true item level for an heirloom (actually, returns the true level for any adapting item)
---
--- Arguments:
---   itemString - String - An itemLink or itemString denoting the item
---
--- Returns:
---   Number, Boolean - The true item level of the item. If the item is not
---                     an heirloom, or an error occurs when trying to scan the
---                     item tooltip, the second return value is false. Otherwise
---                     the second return value is true. If the input is invalid,
---                     (nil, false) is returned.
--- Convert the ITEM_LEVEL constant into a pattern for our use
-function lib:GetHeirloomTrueLevel(itemString)
-	if type(itemString) ~= "string" then return nil,false end
-	local _, itemLink, rarity, itemLevel = CachedGetItemInfo(itemString)
-	if (not itemLink) then
-		return nil,false
-	end
-	local rc=ScanTip(itemLink,itemLevel)
-	if rc.ilevel then
-		return rc.ilevel,true
-	end
-	return itemLevel, false
-end
-
--- GetUpgradedItemLevel(itemString)
---
--- Returns the true item level of the item, including upgrades and heirlooms.
---
--- Arguments:
---   itemString - String - An itemLink or itemString denoting the item
---
--- Returns:
---   Number - The true item level of the item, or nil if the input is invalid
-function lib:GetUpgradedItemLevel(itemString)
-	-- check for heirlooms first
-	local ilvl, isTrue = self:GetHeirloomTrueLevel(itemString)
-	if isTrue then
-		return ilvl
-	end
-	-- not an heirloom? fall back to the regular item logic
-	local id = self:GetUpgradeID(itemString)
-	if ilvl and id then
-		ilvl = ilvl + self:GetItemLevelUpgrade(id)
-	end
-	return ilvl
-end
-
--- IsBop(itemString)
---
--- Check an item for  Bind On Pickup.
---
--- Arguments:
---   itemString - String - An itemLink or itemString denoting the item
---
--- Returns:
---   Boolean - True if Bind On Pickup
-
-function lib:IsBop(itemString)
-	local rc=ScanTip(itemString)
-	return rc.bop
-end
--- IsBoe(itemString)
---
--- Check an item for  Bind On Equip.
---
--- Arguments:
---   itemString - String - An itemLink or itemString denoting the item
---
--- Returns:
---   Boolean - True if Bind On Equip
-
-function lib:IsBoe(itemString)
-	local rc=ScanTip(itemString)
-	return rc.boe
-end
--- IsBoa(itemString)
---
--- Check an item for  Bind On Aaccount
---
--- Arguments:
---   itemString - String - An itemLink or itemString denoting the item
---
--- Returns:
---   Boolean - True if Bind On Equip
-
-function lib:IsBoa(itemString)
-	local rc=ScanTip(itemString)
-	return rc.boa
-end
-
--- IsArtifact(itemString)
---
--- Check an item for  Heirloom
---
--- Arguments:
---   itemString - String - An itemLink or itemString denoting the item
---
--- Returns:
---   Boolean - True if Artifact
-
-function lib:IsArtifact(itemString)
-	return CachedGetItemInfo(itemString,i_Quality)==LE_ITEM_QUALITY_ARTIFACT
-end
-
--- GetClassInfoIsHeirloom(itemString)
---
--- Retrieve class and subclass
---
--- Arguments:
---   itemString - String - An itemLink or itemString denoting the item
---
--- Returns:
---   class,subclass
-
-
-function lib:GetClassInfo(itemString)
-	local rc=ScantTip(itemString)
-	return rc.class,rc.subclass
-end
-
-
--- IsHeirloom(itemString)
---
--- Check an item for  Heirloom
---
--- Arguments:
---   itemString - String - An itemLink or itemString denoting the item
---
--- Returns:
---   Boolean - True if Heirloom
-
-function lib:IsHeirloom(itemString)
-	return CachedGetItemInfo(itemString,i_Quality) ==LE_ITEM_QUALITY_HEIRLOOM
-end
----
--- Parses an itemlink and returns itemId without calling API again
--- @param #lib self
--- @param #string itemlink
--- @return #number itemId or 0
-function lib:GetItemID(itemlink)
-	if (type(itemlink)=="string") then
-			local itemid,context=GetItemInfoFromHyperlink(itemlink)
-			return tonumber(itemid) or 0
-			--return tonumber(itemlink:match("Hitem:(%d+):")) or 0
-	else
-			return 0
-	end
-end
-
----
---
--- Returns a caching version of GetItemInfo. Can be used to override the original one.
--- Adds a second parameter to directly retrieving a specific value
--- (Note: internally uses select so it's actually like calling select(n,GetItemInfo(itemID))
---
--- Arguments:
---   self #lib self
---
--- Returns:
---   #function The new function
-
---@do-not-package--
-function lib:ScanTip(itemLink)
-	local GameTooltip=LibItemUpgradeInfoTooltip
-	if GameTooltip then
-		GameTooltip_SetDefaultAnchor(GameTooltip, UIParent)
-		GameTooltip:SetHyperlink(itemLink)
-		GameTooltip:Show()
-	end
-	return ScanTip(itemLink,100,true)
-end
-function lib:GetCachingGetItemInfo()
-	return CachedGetItemInfo
-end
-function lib:GetCacheStats()
-	local c=lib.itemcache
-	local h=c.tot-c.miss
-	local perc=( h>0) and h/c.tot*100 or 0
-	return c.miss,h,perc
-end
-function lib:GetCache()
-	return lib.itemcache
-end
-function lib:CleanCache()
-	return wipe(lib.itemcache)
-end
-
---[===========[ ]===========]
---[===[ Debug utilities ]===]
---[===========[ ]===========]
-
-local function compareTables(t1, t2)
-	local seen = {}
-	for k, v1 in pairs(t1) do
-		seen[k] = true
-		local v2 = rawget(t2, k)
-		if not v2 then return false end
-		if type(v1) ~= type(v2) then return false end
-		if type(v1) == "table" then
-			if not compareTables(v1, v2) then return false end
-		elseif v1 ~= v2 then return false end
-	end
-	for k in pairs(t2) do
-		if not seen[k] then return false end
-	end
-	return true
-end
-
--- prints the table rows in red and green
--- omits the lead { and the trailing }
-local function printDiffTable(t1, t2)
-	local keys, seen = {}, {}
-	for k in pairs(t1) do
-		keys[#keys+1] = k
-		seen[k] = true
-	end
-	for k in pairs(t2) do
-		if not seen[k] then
-			keys[#keys+1] = k
-		end
-	end
-	table.sort(keys)
-	local function formatTable(t)
-		local comps = {}
-		for k, v in pairs(t) do
-			comps[#comps+1] = ("%s = %d"):format(k, v)
-		end
-		return "{ " .. table.concat(comps, ", ") .. " }"
-	end
-	for _, k in ipairs(keys) do
-		local v1, v2 = rawget(t1, k), rawget(t2, k)
-		local equal
-		if type(v1) == "table" and type(v2) == "table" then equal = compareTables(v1, v2)
-		else equal = v1 == v2 end
-		if not equal then
-			if v1 then
-				pp(("|cffff0000    [%d] = %s,|r"):format(k, formatTable(v1)))
-			end
-			if v2 then
-				pp(("|cff00ff00    [%d] = %s,|r"):format(k, formatTable(v2)))
-			end
-		end
-	end
-end
-
--- Scans the first 10000 upgrade IDs
--- Run this with /run LibStub:GetLibrary("LibItemUpgradeInfo-1.0"):_CheckUpgradeTable()
--- If you don't have Aspirant's Staff of Harmony cached it may error out, just try again.
-do
-	local debugFrame
-	local worker
-	local newTable
-	local debugTooltip
-	function lib:_CheckUpgradeTable(itemLink)
-		if worker then
-			pp("|cffff0000LibItemUpgradeInfo-1.0: upgrade check already in progress")
-			return
-		end
-		if not debugFrame then
-			debugFrame = _G.CreateFrame("frame")
-			debugFrame:Hide()
-			debugFrame:SetScript("OnUpdate", function()
-				local ok, result, count, max = pcall(worker)
-				if not ok or result then
-					debugFrame:Hide()
-					worker = nil
-				end
-				if not ok then
-					pp("|cffff0000LibItemUpgradeInfo-1.0 error: " .. result .. "|r")
-				elseif result then
-					pp("LibItemUpgradeInfo-1.0: scan complete")
-					if compareTables(upgradeTable, newTable) then
-						pp("LibItemUpgradeInfo-1.0: |cff00ff00No changes|r")
-					else
-						pp("LibItemUpgradeInfo-1.0: |cffff0000New table:|r {")
-						printDiffTable(upgradeTable, newTable)
-						pp("}")
-					end
-				else
-					pp("LibItemUpgradeInfo-1.0: scanning " .. count .. "/" .. max)
-				end
-			end)
-		end
-		if not debugTooltip then
-			debugTooltip = _G.CreateFrame("GameTooltip", "LibItemUpgradeInfoDebugTooltip", nil, "GameTooltipTemplate")
-			debugTooltip:SetOwner(_G.WorldFrame, "ANCHOR_NONE")
-		end
-		newTable = {}
-		--local itemLink = "|cff0070dd|Hitem:89551:0:0:0:0:0:0:0:90:253:0:0:1:0|h[Aspirant's Staff of Harmony]|h|r"
-		local itemLink = itemLink or "|cff0070dd|Hitem:89551:0:0:0:0:0:0:0:100:253:4:0:0:0|h[Aspirant's Staff of Harmony]|h|r"
--- Livello è il 9,upgradeid il 14. Al decimo posto, un valore che deve essere 4 o 4+n *8) per far scattare l'uso dell'upgradeid
-		local itemLevel = select(4, _G.GetItemInfo(itemLink))
-		assert(itemLevel, "Can't find item level for itemLink")
-		local count, max, batchsize = 0, 10000, 200
-		worker = function()
-			for i = count, math.min(max, count+batchsize) do
-				local link = itemLink:gsub("%d+|h", i.."|h")
-				debugTooltip:ClearLines()
-				debugTooltip:SetHyperlink(link)
-				local upgrade, max
-				local curLevel, maxLevel = _G.LibItemUpgradeInfoDebugTooltipTextLeft3:GetText():match("^Upgrade Level: (%d+)/(%d+)")
-				local ilvl = tonumber(_G.LibItemUpgradeInfoDebugTooltipTextLeft2:GetText():match("Item Level (%d+)"))
-				if not ilvl then
-					ilvl = tonumber(_G.LibItemUpgradeInfoDebugTooltipTextLeft3:GetText():match("Item Level (%d+)"))
-				end
-				assert(ilvl ~= nil, "Can't find ItemLevel in tooltip: " .. _G.LibItemUpgradeInfoDebugTooltipTextLeft2:GetText())
-				if curLevel or maxLevel or ilvl ~= itemLevel then
-					newTable[i] = { upgrade = tonumber(curLevel), max = tonumber(maxLevel), ilevel = ilvl - itemLevel }
-				end
-			end
-			count = count + batchsize
-			return (count > max), count, max
-		end
-		debugFrame:Show()
-	end
-end
---@end-do-not-package--
-
--- vim: set noet sw=4 ts=4:
diff --git a/OrderHallCommander/libs/LibItemUpgradeInfo-1.0/LibItemUpgradeInfo-1.0.toc b/OrderHallCommander/libs/LibItemUpgradeInfo-1.0/LibItemUpgradeInfo-1.0.toc
deleted file mode 100644
index e5e75d0..0000000
--- a/OrderHallCommander/libs/LibItemUpgradeInfo-1.0/LibItemUpgradeInfo-1.0.toc
+++ /dev/null
@@ -1,9 +0,0 @@
-## Interface: 70100
-## Title: Lib: ItemUpgradeInfo-1.0
-## Notes: Database of item upgrade IDs
-## Author: eridius
-## Version: @project-version@ 7.1.0
-## X-Revision: @project-abbreviated-hash@
-## X-Category: Library
-
-LibItemUpgradeInfo-1.0.xml
diff --git a/OrderHallCommander/libs/LibItemUpgradeInfo-1.0/LibItemUpgradeInfo-1.0.xml b/OrderHallCommander/libs/LibItemUpgradeInfo-1.0/LibItemUpgradeInfo-1.0.xml
deleted file mode 100644
index 49934ad..0000000
--- a/OrderHallCommander/libs/LibItemUpgradeInfo-1.0/LibItemUpgradeInfo-1.0.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/..\FrameXML\UI.xsd">
-	<Script file="LibStub\LibStub.lua"/>
-	<Script file="Core.lua"/>
-</Ui>
diff --git a/OrderHallCommander/libs/LibItemUpgradeInfo-1.0/LibStub/LibStub.lua b/OrderHallCommander/libs/LibItemUpgradeInfo-1.0/LibStub/LibStub.lua
deleted file mode 100644
index ae1900e..0000000
--- a/OrderHallCommander/libs/LibItemUpgradeInfo-1.0/LibStub/LibStub.lua
+++ /dev/null
@@ -1,51 +0,0 @@
--- $Id: LibStub.lua 76 2007-09-03 01:50:17Z mikk $
--- LibStub is a simple versioning stub meant for use in Libraries.  http://www.wowace.com/wiki/LibStub for more info
--- LibStub is hereby placed in the Public Domain
--- Credits: Kaelten, Cladhaire, ckknight, Mikk, Ammo, Nevcairiel, joshborke
-local LIBSTUB_MAJOR, LIBSTUB_MINOR = "LibStub", 2  -- NEVER MAKE THIS AN SVN REVISION! IT NEEDS TO BE USABLE IN ALL REPOS!
-local LibStub = _G[LIBSTUB_MAJOR]
-
--- Check to see is this version of the stub is obsolete
-if not LibStub or LibStub.minor < LIBSTUB_MINOR then
-	LibStub = LibStub or {libs = {}, minors = {} }
-	_G[LIBSTUB_MAJOR] = LibStub
-	LibStub.minor = LIBSTUB_MINOR
-	
-	-- LibStub:NewLibrary(major, minor)
-	-- major (string) - the major version of the library
-	-- minor (string or number ) - the minor version of the library
-	-- 
-	-- returns nil if a newer or same version of the lib is already present
-	-- returns empty library object or old library object if upgrade is needed
-	function LibStub:NewLibrary(major, minor)
-		assert(type(major) == "string", "Bad argument #2 to `NewLibrary' (string expected)")
-		minor = assert(tonumber(strmatch(minor, "%d+")), "Minor version must either be a number or contain a number.")
-		
-		local oldminor = self.minors[major]
-		if oldminor and oldminor >= minor then return nil end
-		self.minors[major], self.libs[major] = minor, self.libs[major] or {}
-		return self.libs[major], oldminor
-	end
-	
-	-- LibStub:GetLibrary(major, [silent])
-	-- major (string) - the major version of the library
-	-- silent (boolean) - if true, library is optional, silently return nil if its not found
-	--
-	-- throws an error if the library can not be found (except silent is set)
-	-- returns the library object if found
-	function LibStub:GetLibrary(major, silent)
-		if not self.libs[major] and not silent then
-			error(("Cannot find a library instance of %q."):format(tostring(major)), 2)
-		end
-		return self.libs[major], self.minors[major]
-	end
-	
-	-- LibStub:IterateLibraries()
-	-- 
-	-- Returns an iterator for the currently registered libraries
-	function LibStub:IterateLibraries() 
-		return pairs(self.libs) 
-	end
-	
-	setmetatable(LibStub, { __call = LibStub.GetLibrary })
-end
diff --git a/OrderHallCommander/libs/LibItemUpgradeInfo-1.0/LibStub/LibStub.toc b/OrderHallCommander/libs/LibItemUpgradeInfo-1.0/LibStub/LibStub.toc
deleted file mode 100644
index bade6ff..0000000
--- a/OrderHallCommander/libs/LibItemUpgradeInfo-1.0/LibStub/LibStub.toc
+++ /dev/null
@@ -1,9 +0,0 @@
-## Interface: 50001
-## Title: Lib: LibStub
-## Notes: Universal Library Stub
-## Credits: Kaelten, Cladhaire, ckknight, Mikk, Ammo, Nevcairiel
-## X-Website: http://www.wowace.com/addons/libstub/
-## X-Category: Library
-## X-License: Public Domain	
-
-LibStub.lua
diff --git a/OrderHallCommander/localization.lua b/OrderHallCommander/localization.lua
index f318f08..54061b0 100644
--- a/OrderHallCommander/localization.lua
+++ b/OrderHallCommander/localization.lua
@@ -2,537 +2,54 @@ local me,ns=...
 local lang=GetLocale()
 local l=LibStub("AceLocale-3.0")
 local L=l:NewLocale(me,"enUS",true,true)
-L["Always counter increased resource cost"] = true
-L["Always counter increased time"] = true
-L["Always counter kill troops (ignored if we can only use troops with just 1 durability left)"] = true
-L["Always counter no bonus loot threat"] = true
-L["Better parties available in next future"] = true
-L["Building Final report"] = true
-L["Capped %1$s. Spend at least %2$d of them"] = true
-L["Changes the sort order of missions in Mission panel"] = true
-L["Combat ally is proposed for missions so you can consider unassigning him"] = true
-L["Complete all missions without confirmation"] = true
-L["Configuration for mission party builder"] = true
-L["Dont kill Troops"] = true
-L["Duration reduced"] = true
-L["Duration Time"] = true
-L["Expiration Time"] = true
-L["Favours leveling follower for xp missions"] = true
-L["General"] = true
-L["Global approx. xp reward"] = true
-L["HallComander Quick Mission Completion"] = true
-L[ [=[If you %s,  you will lose them
-Click on %s to abort]=] ] = [=[If you %s, you will lose them
-Click on %s to abort]=]
-L[ [=[If you %s, you will lose them
-Click on %s to abort]=] ] = true
-L["Keep cost low"] = true
-L["Keep extra bonus"] = true
-L["Keep time short"] = true
-L["Keep time VERY short"] = true
-L["Level"] = true
-L["Make Order Hall Mission Panel movable"] = true
-L["Maximize xp gain"] = true
-L["Missions"] = true
-L["No follower gained xp"] = true
-L["Nothing to report"] = true
-L["Notifies you when you have troops ready to be collected"] = true
-L["Only accept missions with time improved"] = true
-L[ [=[OrderHallCommander overrides GarrisonCommander for Order Hall Management.
- You can revert to GarrisonCommander simpy disabling OrderhallCommander]=] ] = true
-L["Original method"] = true
-L["Position is not saved on logout"] = true
-L["Resurrect troops effect"] = true
-L["Reward type"] = true
-L["Show/hide OrderHallCommander mission menu"] = true
-L["Sort missions by:"] = true
-L["Success Chance"] = true
-L["Troop ready alert"] = true
-L["Upgrading to |cff00ff00%d|r"] = true
-L["Use combat ally"] = true
-L["You are wasting |cffff0000%d|cffffd200 point(s)!!!"] = true
+--@localization(locale="enUS", format="lua_additive_table" , same-key-is-true=true, handle-unlocalized="blank" )@
 L=l:NewLocale(me,"ptBR")
 if (L) then
-L["Always counter increased resource cost"] = "Sempre contra o aumento do custo de recursos"
-L["Always counter increased time"] = "Sempre contra o aumento do tempo"
-L["Always counter kill troops (ignored if we can only use troops with just 1 durability left)"] = "Sempre counter kill tropas (ignorado se podemos apenas usar tropas com apenas 1 durabilidade à esquerda)"
-L["Better parties available in next future"] = "Festas melhores disponíveis no próximo futuro"
-L["Building Final report"] = "Relatório final do edifício"
-L["Capped %1$s. Spend at least %2$d of them"] = "Capped% 1 $ s. Gaste pelo menos% 2 $ d deles"
-L["Changes the sort order of missions in Mission panel"] = "Altera a ordem de classificação das missões no painel da Missão"
-L["Complete all missions without confirmation"] = "Complete todas as missões sem confirmação"
-L["Configuration for mission party builder"] = "Configuração para o construtor de parte da missão"
-L["Dont kill Troops"] = "Não mate tropas"
-L["Duration reduced"] = "Duração reduzida"
-L["Duration Time"] = "Tempo de duração"
-L["Expiration Time"] = "Data de validade"
-L["Favours leveling follower for xp missions"] = "Favors leveling follower para missões xp"
-L["General"] = "Geral"
-L["Global approx. xp reward"] = "Global aprox. Recompensa xp"
-L["HallComander Quick Mission Completion"] = "Conclusão Rápida da Missão HallComander"
-L[ [=[If you %s,  you will lose them
-Click on %s to abort]=] ] = "Se você% s, você os perderá  nClique em% s para abortar"
-L["Keep cost low"] = "Mantenha o custo baixo"
-L["Keep time short"] = "Mantenha o tempo curto"
-L["Keep time VERY short"] = "Mantenha o tempo MUITO curto"
-L["Level"] = "Nível"
-L["Make Order Hall Mission Panel movable"] = "Faça a encomenda Hall Missão Painel móvel"
-L["Maximize xp gain"] = "Maximize o ganho de xp"
-L["Missions"] = "Missões"
-L["No follower gained xp"] = "Nenhum seguidor ganhou xp"
-L["Nothing to report"] = "Nada a declarar"
-L["Notifies you when you have troops ready to be collected"] = "Notifica você quando você tem tropas prontas para serem coletadas"
-L["Only accept missions with time improved"] = "Aceitar apenas missões com o tempo melhorado"
-L[ [=[OrderHallCommander overrides GarrisonCommander for Order Hall Management.
- You can revert to GarrisonCommander simpy disabling OrderhallCommander]=] ] = "OrderHallCommander substitui o GarrisonCommander para a Gestão de Hall de Ordem.  N Você pode reverter para GarrisonCommander simplesmente desativando o OrderhallCommander"
-L["Original method"] = "Método original"
-L["Position is not saved on logout"] = "A posição não é salva no logout"
-L["Resurrect troops effect"] = "Resurrect efeito tropas"
-L["Reward type"] = "Tipo de recompensa"
-L["Show/hide OrderHallCommander mission menu"] = "Mostrar / ocultar o menu da missão OrderHallCommander"
-L["Sort missions by:"] = "Classifique missões por:"
-L["Success Chance"] = "Chance de sucesso"
-L["Troop ready alert"] = "Alerta de tropas"
-L["Upgrading to |cff00ff00%d|r"] = "Atualizando para | cff00ff00% d | r"
-L["You are wasting |cffff0000%d|cffffd200 point(s)!!!"] = "Você está desperdiçando | cffff0000% d | cffffd200 point (s) !!!"
+--@localization(locale="ptBR", format="lua_additive_table" , same-key-is-true=true, handle-unlocalized="blank" )@
 return
 end
 L=l:NewLocale(me,"frFR")
 if (L) then
-L["Always counter increased resource cost"] = "Toujours contrer les coûts accrus des ressources"
-L["Always counter increased time"] = "Toujours contrer le temps accru"
-L["Always counter kill troops (ignored if we can only use troops with just 1 durability left)"] = "Toujours contre tuer les troupes (ignoré si nous ne pouvons utiliser des troupes avec une seule durabilité à gauche)"
-L["Better parties available in next future"] = "De meilleures parties disponibles au prochain avenir"
-L["Building Final report"] = "Rapport final du bâtiment"
-L["Capped %1$s. Spend at least %2$d of them"] = "Plafonné% 1 $ s. Dépenser au moins% 2 $ d d'entre eux"
-L["Changes the sort order of missions in Mission panel"] = "Modifie l'ordre de tri des missions dans le panneau Mission"
-L["Complete all missions without confirmation"] = "Terminer toutes les missions sans confirmation"
-L["Configuration for mission party builder"] = "Configuration pour le constructeur de mission"
-L["Dont kill Troops"] = "Ne tuez pas les troupes"
-L["Duration reduced"] = "Durée réduite"
-L["Duration Time"] = "Durée"
-L["Expiration Time"] = "Date d'expiration"
-L["Favours leveling follower for xp missions"] = "Favors level follower pour les missions xp"
-L["General"] = "Général"
-L["Global approx. xp reward"] = "Global env. Xp récompense"
-L["HallComander Quick Mission Completion"] = "Achèvement rapide de mission HallComander"
-L[ [=[If you %s,  you will lose them
-Click on %s to abort]=] ] = "Si vous% s, vous les perdrez  nCliquez sur% s pour annuler"
-L["Keep cost low"] = "Garder le coût bas"
-L["Keep time short"] = "Garde le temps court"
-L["Keep time VERY short"] = "Gardez le temps très court"
-L["Level"] = "Niveau"
-L["Make Order Hall Mission Panel movable"] = "Commande Hall Mission Panneau mobile"
-L["Maximize xp gain"] = "Maximiser le gain de xp"
-L["Missions"] = true
-L["No follower gained xp"] = "Aucun adepte n'a gagné xp"
-L["Nothing to report"] = "Rien à signaler"
-L["Notifies you when you have troops ready to be collected"] = "Vous avertit lorsque vous avez des troupes prêtes à être recueillies"
-L["Only accept missions with time improved"] = "N'acceptez que les missions avec le temps améliorées"
-L[ [=[OrderHallCommander overrides GarrisonCommander for Order Hall Management.
- You can revert to GarrisonCommander simpy disabling OrderhallCommander]=] ] = "OrderHallCommander annule GarrisonCommander pour la gestion des commandes Hall.  N Vous pouvez revenir à GarrisonCommander simpy désactiver OrderhallCommander"
-L["Original method"] = "Méthode originale"
-L["Position is not saved on logout"] = "La position n'est pas enregistrée lors de la déconnexion"
-L["Resurrect troops effect"] = "Effet Résurrection des troupes"
-L["Reward type"] = "Type de récompense"
-L["Show/hide OrderHallCommander mission menu"] = "Afficher / masquer le menu de mission OrderHallCommander"
-L["Sort missions by:"] = "Missions de tri par:"
-L["Success Chance"] = "Chance de succès"
-L["Troop ready alert"] = "Alerte prêt des troupes"
-L["Upgrading to |cff00ff00%d|r"] = "Mise à niveau vers | cff00ff00% d | r"
-L["You are wasting |cffff0000%d|cffffd200 point(s)!!!"] = "Vous perdez | cffff0000% d | cffffd200 point (s) !!!"
+--@localization(locale="frFR", format="lua_additive_table" , same-key-is-true=true, handle-unlocalized="blank" )@
 return
 end
 L=l:NewLocale(me,"deDE")
 if (L) then
-L["Always counter increased resource cost"] = "Immer erhöhte Ressourcenkosten kontern"
-L["Always counter increased time"] = "Immer erhöhte Missionsdauer kontern"
-L["Always counter kill troops (ignored if we can only use troops with just 1 durability left)"] = "Töten der Trupps immer kontern (dies wird ignoriert, falls nur Truppen mit 1 Haltbarkeit benutzt werden können)"
-L["Always counter no bonus loot threat"] = "Kontert immer Bedrohungen, die Bonusbeute verhindern"
-L["Better parties available in next future"] = "Bessere Gruppen sind in absehbarer Zeit verfügbar"
-L["Building Final report"] = "Erstelle Abschlussbericht"
-L["Capped %1$s. Spend at least %2$d of them"] = "Maximal %1$ s. Gib mindestens %2$d davon aus"
-L["Changes the sort order of missions in Mission panel"] = "Verändert die Sortierreihenfolge der Missionen in der Missionsübersicht"
-L["Combat ally is proposed for missions so you can consider unassigning him"] = "Der Kampfgefährte wird für Missionen vorgeschlagen, du kannst dann entscheiden, ob du ihn abziehen möchtest"
-L["Complete all missions without confirmation"] = "Alle Missionen ohne Bestätigung abschließen"
-L["Configuration for mission party builder"] = "Konfiguration des Gruppenerstellers für Missionen"
-L["Dont kill Troops"] = "Trupps nicht töten"
-L["Duration reduced"] = "Dauer reduziert"
-L["Duration Time"] = "Dauer"
-L["Expiration Time"] = "Ablaufzeit"
-L["Favours leveling follower for xp missions"] = "Bevorzugt niedrigstufige Anhänger für EP-Missionen"
-L["General"] = "Allgemein"
-L["Global approx. xp reward"] = "Ca. Insgesamte EP-Belohnung"
-L["HallComander Quick Mission Completion"] = "HallComander Schneller Missionsabschluss"
-L[ [=[If you %s,  you will lose them
-Click on %s to abort]=] ] = [=[Wenn du %s, wirst du sie verlieren.
-Klicke auf %s, um abzubrechen]=]
-L[ [=[If you %s, you will lose them
-Click on %s to abort]=] ] = [=[Wenn du %s, wirst du sie verlieren.
-Klicke auf %s, um abzubrechen]=]
-L["Keep cost low"] = "Kosten niedrig halten"
-L["Keep extra bonus"] = "Bonusbeute behalten"
-L["Keep time short"] = "Zeit kurz halten"
-L["Keep time VERY short"] = "Zeit SEHR kurz halten"
-L["Level"] = "Stufe"
-L["Make Order Hall Mission Panel movable"] = "Ordenshallen-Missionsfenster beweglich machen"
-L["Maximize xp gain"] = "Erfahrungszunahme maximieren"
-L["Missions"] = "Missionen"
-L["No follower gained xp"] = "Kein Anhänger erhielt EP"
-L["Nothing to report"] = "Nichts zu berichten"
-L["Notifies you when you have troops ready to be collected"] = "Benachrichtigt, wenn Truppen bereit sind, gesammelt zu werden"
-L["Only accept missions with time improved"] = "Nur Missionen mit verkürzter Dauer annehmen"
-L[ [=[OrderHallCommander overrides GarrisonCommander for Order Hall Management.
- You can revert to GarrisonCommander simpy disabling OrderhallCommander]=] ] = "OrderHallCommander überschreibt GarrisonCommander für die Verwaltung der Ordenshalle. Sie können GarrisonCommander wiederherstellen, indem Sie OrderhallCommander deaktivieren"
-L["Original method"] = "Ursprüngliche Methode"
-L["Position is not saved on logout"] = "Die Position wird beim Ausloggen nicht gespeichert"
-L["Resurrect troops effect"] = "Truppen wiederbeleben"
-L["Reward type"] = "Belohnungsart"
-L["Show/hide OrderHallCommander mission menu"] = "OrderHallCommander-Missionsmenü zeigen/ausblenden"
-L["Sort missions by:"] = "Sortieren nach:"
-L["Success Chance"] = "Erfolgschance"
-L["Troop ready alert"] = "Warnung Trupp bereit"
-L["Upgrading to |cff00ff00%d|r"] = "Aktualisieren auf | cff00ff00% d | r"
-L["Use combat ally"] = "Kampfgefährten verwenden"
-L["You are wasting |cffff0000%d|cffffd200 point(s)!!!"] = "Sie verschwenden | cffff0000% d | cffffd200 Punkt (e) !!!"
+--@localization(locale="deDE", format="lua_additive_table" , same-key-is-true=true, handle-unlocalized="blank" )@
 return
 end
 L=l:NewLocale(me,"itIT")
 if (L) then
-L["Always counter increased resource cost"] = "Contrasta sempre incremento risorse"
-L["Always counter increased time"] = "Contrasta sempre incremento durata"
-L["Always counter kill troops (ignored if we can only use troops with just 1 durability left)"] = "Contrasta sempre morte milizie (ignorato tutte le milizie hanno solo una vita rimanente)"
-L["Always counter no bonus loot threat"] = "Contrasta sempre il \"no bonus\""
-L["Better parties available in next future"] = "Ci sono combinazioni migliori nel futuro"
-L["Building Final report"] = "Sto preparando il rapporto finale"
-L["Capped %1$s. Spend at least %2$d of them"] = "%1$s ha un limite. Spendine almeno %2%d"
-L["Changes the sort order of missions in Mission panel"] = "Cambia l'ordine delle mission nel Pannello Missioni"
-L["Combat ally is proposed for missions so you can consider unassigning him"] = "Viene proposto l'alleato, per poter valutare se rimuoverlo dalla missione di scorta"
-L["Complete all missions without confirmation"] = "Completa tutte le missioni senza chiedere conferma"
-L["Configuration for mission party builder"] = "Configurazioni per il generatore di gruppi"
-L["Dont kill Troops"] = "Non uccidere le truppe"
-L["Duration reduced"] = "Durata"
-L["Duration Time"] = "Scadenza"
-L["Expiration Time"] = "Scadenza"
-L["Favours leveling follower for xp missions"] = "Preferisci i campioni che devono livellare"
-L["General"] = "Generale"
-L["Global approx. xp reward"] = "Approssimativi PE globali"
-L["HallComander Quick Mission Completion"] = "OrderHallCommander Completamento rapido"
-L["Keep cost low"] = "Mantieni il costo basso"
-L["Keep extra bonus"] = "Ottieni il bonus aggiuntivo"
-L["Keep time short"] = "Riduci la durata"
-L["Keep time VERY short"] = "Riduci MOLTO la durata"
-L["Level"] = "Livello"
-L["Make Order Hall Mission Panel movable"] = "Rendi spostabile il pannello missioni"
-L["Maximize xp gain"] = "Massimizza il guadagno di PE"
-L["Missions"] = "Missioni"
-L["No follower gained xp"] = "Nessun campione ha guaagnato PE"
-L["Nothing to report"] = "Niente da segnalare"
-L["Notifies you when you have troops ready to be collected"] = "Notificami quando ho truppe pronte per essere raccolte"
-L["Only accept missions with time improved"] = "Accetta solo missioni con bonus durata ridotta"
-L[ [=[OrderHallCommander overrides GarrisonCommander for Order Hall Management.
- You can revert to GarrisonCommander simpy disabling OrderhallCommander]=] ] = [=[OrderHallCommander sostituisce l'interfaccia di GarrisonComamnder per le missioni di classe
-Disabilitalo se preferisci GarrisonCommander]=]
-L["Position is not saved on logout"] = "La posizione non è salvata alla disconnessione"
-L["Resurrect troops effect"] = "Resurrezione truppe possibile"
-L["Reward type"] = "Tipo ricompensa"
-L["Show/hide OrderHallCommander mission menu"] = "Mostra/ascondi il menu di missione di OrderHallCommander"
-L["Troop ready alert"] = "Avviso truppe pronte"
-L["Use combat ally"] = "Usa l'alleato"
+--@localization(locale="itIT", format="lua_additive_table", same-key-is-true=true, handle-unlocalized="blank" )@
 return
 end
 L=l:NewLocale(me,"koKR")
 if (L) then
-L["Always counter increased resource cost"] = "자원 비용 증가 항상 대응"
-L["Always counter increased time"] = "소요 시간 증가 항상 대응"
-L["Always counter kill troops (ignored if we can only use troops with just 1 durability left)"] = "병력 죽이기 항상 대응 (활력이 1만 남은 병력만 있을 땐 무시)"
-L["Always counter no bonus loot threat"] = "추가 전리품 획득 불가 항상 대응"
-L["Better parties available in next future"] = "다음 시간 후엔 더 나은 파티가 가능합니다"
-L["Building Final report"] = "최종 보고서 작성"
-L["Capped %1$s. Spend at least %2$d of them"] = "%1$s 상한선에 도달했습니다. 최소 %2$d개를 소모하세요"
-L["Changes the sort order of missions in Mission panel"] = "임무 창 내 임무의 정렬 방법을 변경합니다"
-L["Combat ally is proposed for missions so you can consider unassigning him"] = "전투 동료가 임무에 제안되며 전투 동료 지정 해제를 해야 할 수 있습니다"
-L["Complete all missions without confirmation"] = "확인 없이 모든 임무를 완료합니다"
-L["Configuration for mission party builder"] = "임무 파티 구성 설정"
-L["Dont kill Troops"] = "병력 죽이지 않기"
-L["Duration reduced"] = "수행 시간 감소됨"
-L["Duration Time"] = "수행 시간"
-L["Expiration Time"] = "만료 시간"
-L["Favours leveling follower for xp missions"] = "레벨 육성 중인 추종자를 경험치 임무에 우선 지정합니다"
-L["General"] = "일반"
-L["Global approx. xp reward"] = "전체 경험치 보상 추정치"
-L["HallComander Quick Mission Completion"] = "HallCommander 빠른 임무 완료"
-L[ [=[If you %s,  you will lose them
-Click on %s to abort]=] ] = [=[만약 %s\1241이라면;라면;, 그들을 잃게 됩니다
-취소하려면 %s\1241을;를; 클릭하세요]=]
-L[ [=[If you %s, you will lose them
-Click on %s to abort]=] ] = [=[만약 %s\1241이라면;라면;, 그들을 잃게 됩니다
-취소하려면 %s\1241을;를; 클릭하세요]=]
-L["Keep cost low"] = "비용 절감 유지"
-L["Keep extra bonus"] = "추가 전리품 유지"
-L["Keep time short"] = "시간 절약 유지"
-L["Keep time VERY short"] = "시간 매우 절약 유지"
-L["Level"] = "레벨"
-L["Make Order Hall Mission Panel movable"] = "직업 전당 임무 창 이동 가능 설정"
-L["Maximize xp gain"] = "경험치 획득 최대화"
-L["Missions"] = "임무"
-L["No follower gained xp"] = "경험치를 획득한 추종자 없음"
-L["Nothing to report"] = "보고할 내용 없음"
-L["Notifies you when you have troops ready to be collected"] = "병력을 회수할 준비가 되면 당신에게 알립니다"
-L["Only accept missions with time improved"] = "소요 시간이 감소한 임무만 수락합니다"
-L[ [=[OrderHallCommander overrides GarrisonCommander for Order Hall Management.
- You can revert to GarrisonCommander simpy disabling OrderhallCommander]=] ] = [=[OrderHallCommander는 직업 전당 관리를 위해 GarrisonCommander보다 우선됩니다.
-OrderHallCommander를 사용 하지 않으면 GarrisonCommander로 전환할 수 있습니다.]=]
-L["Original method"] = "원래의 방법"
-L["Position is not saved on logout"] = "접속 종료시 위치는 저장되지 않습니다"
-L["Resurrect troops effect"] = "병력 부활 효과"
-L["Reward type"] = "보상 유형"
-L["Show/hide OrderHallCommander mission menu"] = "OrderHallCommander 임무 메뉴 표시/숨기기"
-L["Sort missions by:"] = "임무 정렬 방법:"
-L["Success Chance"] = "성공 확률"
-L["Troop ready alert"] = "병력 준비 경보"
-L["Upgrading to |cff00ff00%d|r"] = "|cff00ff00%d|r\\1241으로;로; 향상시키기"
-L["Use combat ally"] = "전투 동료 사용"
-L["You are wasting |cffff0000%d|cffffd200 point(s)!!!"] = "|cffff0000%d|cffffd200점을 낭비하고 있습니다!!!"
+--@localization(locale="koKR", format="lua_additive_table", same-key-is-true=true, handle-unlocalized="blank" )@
 return
 end
 L=l:NewLocale(me,"esMX")
 if (L) then
-L["Always counter increased resource cost"] = "Siempre contrarreste el mayor costo de recursos"
-L["Always counter increased time"] = "Siempre contrarreste el tiempo incrementado"
-L["Always counter kill troops (ignored if we can only use troops with just 1 durability left)"] = "Siempre contra las tropas de matar (ignorado si sólo podemos utilizar tropas con sólo 1 durabilidad a la izquierda)"
-L["Better parties available in next future"] = "Mejores fiestas disponibles en el próximo futuro"
-L["Building Final report"] = "Informe final del edificio"
-L["Capped %1$s. Spend at least %2$d of them"] = "% 1 $ s cubierto. Gasta al menos% 2 $ d de ellos"
-L["Changes the sort order of missions in Mission panel"] = "Cambia el orden de las misiones en el panel de la Misión"
-L["Complete all missions without confirmation"] = "Completa todas las misiones sin confirmación"
-L["Configuration for mission party builder"] = "Configuración para el constructor de la misión"
-L["Dont kill Troops"] = "No matar a las tropas"
-L["Duration reduced"] = "Duración reducida"
-L["Duration Time"] = "Duración"
-L["Expiration Time"] = "Tiempo de expiración"
-L["Favours leveling follower for xp missions"] = "Favors nivelando seguidor para las misiones xp"
-L["General"] = true
-L["Global approx. xp reward"] = "Global aprox. Recompensa xp"
-L["HallComander Quick Mission Completion"] = "Conclusión de la misión rápida de HallComander"
-L[ [=[If you %s,  you will lose them
-Click on %s to abort]=] ] = "Si% s, los perderá  nHaga clic en% s para abortar"
-L["Keep cost low"] = "Mantenga el costo bajo"
-L["Keep time short"] = "Mantenga el tiempo corto"
-L["Keep time VERY short"] = "Mantener el tiempo muy corto"
-L["Level"] = "Nivel"
-L["Make Order Hall Mission Panel movable"] = "Hacer pedido Hall Misión Panel móvil"
-L["Maximize xp gain"] = "Maximizar la ganancia de xp"
-L["Missions"] = "Misiones"
-L["No follower gained xp"] = "Ningún seguidor ganó xp"
-L["Nothing to report"] = "Nada que reportar"
-L["Notifies you when you have troops ready to be collected"] = "Notifica cuando hay tropas listas para ser recolectadas"
-L["Only accept missions with time improved"] = "Sólo aceptar misiones mejoradas con el tiempo"
-L[ [=[OrderHallCommander overrides GarrisonCommander for Order Hall Management.
- You can revert to GarrisonCommander simpy disabling OrderhallCommander]=] ] = "OrderHallCommander reemplaza a GarrisonCommander para la Gestión de Hall de Orden.  N Puede volver a GarneyCommander simplemente inhabilitando OrderhallCommander"
-L["Original method"] = "Método original"
-L["Position is not saved on logout"] = "La posición no se guarda al cerrar la sesión"
-L["Resurrect troops effect"] = "Efecto de las tropas de resurrección"
-L["Reward type"] = "Tipo de recompensa"
-L["Show/hide OrderHallCommander mission menu"] = "Mostrar / ocultar el menú de la misión OrderHallCommander"
-L["Sort missions by:"] = "Ordenar misiones por:"
-L["Success Chance"] = "Éxito"
-L["Troop ready alert"] = "Alerta lista de tropas"
-L["Upgrading to |cff00ff00%d|r"] = "Actualizando a | cff00ff00% d | r"
-L["You are wasting |cffff0000%d|cffffd200 point(s)!!!"] = "Está perdiendo | cffff0000% d | cffffd200 punto (s)!"
+--@localization(locale="esMX", format="lua_additive_table", same-key-is-true=true, handle-unlocalized="blank" )@
 return
 end
 L=l:NewLocale(me,"ruRU")
 if (L) then
-L["Always counter increased resource cost"] = "Всегда счетчик увеличение стоимости ресурсов"
-L["Always counter increased time"] = "Всегда счетчик увеличение времени"
-L["Always counter kill troops (ignored if we can only use troops with just 1 durability left)"] = "Всегда счетчик убить войск (игнорируется, если мы можем использовать только войска только с 1 долговечностью слева)"
-L["Always counter no bonus loot threat"] = "Всегда противостоять не бонусную лута угрозы"
-L["Better parties available in next future"] = "Лучше стороны доступны в ближайшем будущем"
-L["Building Final report"] = "Создание Окончательный отчет"
-L["Capped %1$s. Spend at least %2$d of them"] = "Ограничено% 1 $ s. Проведите по крайней мере 2% $ D из них"
-L["Changes the sort order of missions in Mission panel"] = "Изменение порядка сортировки миссий в панели Миссии"
-L["Complete all missions without confirmation"] = "Завершите все миссии без подтверждения"
-L["Configuration for mission party builder"] = "Конфигурация для миссии партийного строителя"
-L["Dont kill Troops"] = "Не убить войск"
-L["Duration reduced"] = "Длительность уменьшена"
-L["Duration Time"] = "Продолжительность"
-L["Expiration Time"] = "Время истечения"
-L["Favours leveling follower for xp missions"] = "Милости выравнивания повторитель для Xp миссий"
-L["General"] = "Основные"
-L["Global approx. xp reward"] = "Максимум прибл. хр награда'"
-L["HallComander Quick Mission Completion"] = "HallComander Быстрое завершение миссий"
-L[ [=[If you %s,  you will lose them
-Click on %s to abort]=] ] = "Если вы % с, вы потеряете их. Нажмите на % S, чтобы прервать"
-L[ [=[If you %s, you will lose them
-Click on %s to abort]=] ] = "Если вы % с, вы потеряете их. Нажмите на % S, чтобы прервать"
-L["Keep cost low"] = "Учитывать низкую стоимость"
-L["Keep extra bonus"] = "Сохранить доп. добычу"
-L["Keep time short"] = "Сохранить уменьшение времени"
-L["Keep time VERY short"] = "Сохранить время очень коротким"
-L["Level"] = "Уровень"
-L["Make Order Hall Mission Panel movable"] = "  Разрешить перемещать панель Order Hall"
-L["Maximize xp gain"] = "Максимальное усиление хр"
-L["Missions"] = "Миссии"
-L["No follower gained xp"] = "Нет соратников получивших опыт"
-L["Nothing to report"] = "Нечего докладывать"
-L["Notifies you when you have troops ready to be collected"] = "Уведомляет, когда войска готовы для сбора"
-L["Only accept missions with time improved"] = "Разрешать миссии только с ускоренным выполнением"
-L[ [=[OrderHallCommander overrides GarrisonCommander for Order Hall Management.
- You can revert to GarrisonCommander simpy disabling OrderhallCommander]=] ] = "OrderHallCommander переопределяет GarrisonCommander для управления оплотом. Вы можете вернуться к GarrisonCommander отключив OrderhallCommander"
-L["Original method"] = "Обычный метод"
-L["Position is not saved on logout"] = "Позиция не сохранится при выходе из системы"
-L["Resurrect troops effect"] = "Эффект воскрешения войск"
-L["Reward type"] = "Тип Награда"
-L["Show/hide OrderHallCommander mission menu"] = "Показать/скрыть меню OrderHallCommander"
-L["Sort missions by:"] = "Сортировать миссии по:"
-L["Success Chance"] = "Шанс успеха"
-L["Troop ready alert"] = "Предупреждать о готовности войск"
-L["Upgrading to |cff00ff00%d|r"] = "Обновление до | cff00ff00% d |"
-L["Use combat ally"] = "Использовать боевого соратника"
-L["You are wasting |cffff0000%d|cffffd200 point(s)!!!"] = "Вы тратите | cffff0000% d | cffffd200 очков !!!'"
+--@localization(locale="ruRU", format="lua_additive_table", same-key-is-true=true, handle-unlocalized="blank" )@
 return
 end
 L=l:NewLocale(me,"zhCN")
 if (L) then
-L["Always counter increased resource cost"] = "總是反制增加資源花費"
-L["Always counter increased time"] = "總是反制增加任務時間"
-L["Always counter kill troops (ignored if we can only use troops with just 1 durability left)"] = "總是反制殺死部隊(如果我們用只剩一次耐久的部隊則忽略)"
-L["Better parties available in next future"] = "在將來有更好的隊伍"
-L["Building Final report"] = "構建最終報告"
-L["Capped %1$s. Spend at least %2$d of them"] = "%1$s封頂了。花費至少%2$d在它身上"
-L["Changes the sort order of missions in Mission panel"] = "改變任務面板上的任務排列順序"
-L["Complete all missions without confirmation"] = "完成所有任務不須確認"
-L["Configuration for mission party builder"] = "任務隊伍構建設置"
-L["Dont kill Troops"] = "別讓部隊被殺死"
-L["Duration reduced"] = "持續時間已縮短"
-L["Duration Time"] = "持續時間"
-L["Expiration Time"] = "到期時間"
-L["Favours leveling follower for xp missions"] = "傾向於使用升級中追隨者在經驗值任務"
-L["General"] = "一般"
-L["Global approx. xp reward"] = "整體大約經驗值獎勵"
-L["HallComander Quick Mission Completion"] = "大廳指揮官快速任務完成"
-L["Keep cost low"] = "保持低花費"
-L["Keep time short"] = "保持短時間"
-L["Keep time VERY short"] = "保持非常短的時間"
-L["Level"] = "等級"
-L["Make Order Hall Mission Panel movable"] = "讓大廳任務面板可移動"
-L["Maximize xp gain"] = "最大化經驗獲取"
-L["Missions"] = "任務"
-L["No follower gained xp"] = "沒有追隨者獲得經驗"
-L["Nothing to report"] = "沒什麼可報告"
-L["Notifies you when you have troops ready to be collected"] = "當部隊已準備好獲取時提醒你"
-L["Only accept missions with time improved"] = "只允許有時間改善的任務"
-L["Original method"] = "原始方法"
-L["Position is not saved on logout"] = "位置不會在登出後儲存"
-L["Resurrect troops effect"] = "復活部隊效果"
-L["Reward type"] = "獎勵類型"
-L["Show/hide OrderHallCommander mission menu"] = "顯示/隱藏大廳指揮官任務選單"
-L["Sort missions by:"] = "排列任務根據："
-L["Success Chance"] = "成功機率"
-L["Troop ready alert"] = "部隊整備提醒"
-L["Upgrading to |cff00ff00%d|r"] = "升級到|cff00ff00%d|r"
-L["You are wasting |cffff0000%d|cffffd200 point(s)!!!"] = "你浪費了|cffff0000%d|cffffd200 點數!!!"
+--@localization(locale="zhCN", format="lua_additive_table", same-key-is-true=true, handle-unlocalized="blank" )@
 return
 end
 L=l:NewLocale(me,"esES")
 if (L) then
-L["Always counter increased resource cost"] = "Siempre contrarreste el mayor costo de recursos"
-L["Always counter increased time"] = "Siempre contrarreste el tiempo incrementado"
-L["Always counter kill troops (ignored if we can only use troops with just 1 durability left)"] = "Siempre contra las tropas de matar (ignorado si sólo podemos utilizar tropas con sólo 1 durabilidad a la izquierda)"
-L["Better parties available in next future"] = "Mejores fiestas disponibles en el próximo futuro"
-L["Building Final report"] = "Informe final del edificio"
-L["Capped %1$s. Spend at least %2$d of them"] = "% 1 $ s cubierto. Gasta al menos% 2 $ d de ellos"
-L["Changes the sort order of missions in Mission panel"] = "Cambia el orden de las misiones en el panel de la Misión"
-L["Complete all missions without confirmation"] = "Completa todas las misiones sin confirmación"
-L["Configuration for mission party builder"] = "Configuración para el constructor de la misión"
-L["Dont kill Troops"] = "No matar a las tropas"
-L["Duration reduced"] = "Duración reducida"
-L["Duration Time"] = "Duración"
-L["Expiration Time"] = "Tiempo de expiración"
-L["Favours leveling follower for xp missions"] = "Favors nivelando seguidor para las misiones xp"
-L["General"] = true
-L["Global approx. xp reward"] = "Global aprox. Recompensa xp"
-L["HallComander Quick Mission Completion"] = "Conclusión de la misión rápida de HallComander"
-L[ [=[If you %s,  you will lose them
-Click on %s to abort]=] ] = "Si% s, los perderá  nHaga clic en% s para abortar"
-L["Keep cost low"] = "Mantenga el costo bajo"
-L["Keep time short"] = "Mantenga el tiempo corto"
-L["Keep time VERY short"] = "Mantener el tiempo muy corto"
-L["Level"] = "Nivel"
-L["Make Order Hall Mission Panel movable"] = "Hacer pedido Hall Misión Panel móvil"
-L["Maximize xp gain"] = "Maximizar la ganancia de xp"
-L["Missions"] = "Misiones"
-L["No follower gained xp"] = "Ningún seguidor ganó xp"
-L["Nothing to report"] = "Nada que reportar"
-L["Notifies you when you have troops ready to be collected"] = "Notifica cuando hay tropas listas para ser recolectadas"
-L["Only accept missions with time improved"] = "Sólo aceptar misiones mejoradas con el tiempo"
-L[ [=[OrderHallCommander overrides GarrisonCommander for Order Hall Management.
- You can revert to GarrisonCommander simpy disabling OrderhallCommander]=] ] = "OrderHallCommander reemplaza a GarrisonCommander para la Gestión de Hall de Orden.  N Puede volver a GarneyCommander simplemente inhabilitando OrderhallCommander"
-L["Original method"] = "Método original"
-L["Position is not saved on logout"] = "La posición no se guarda al cerrar la sesión"
-L["Resurrect troops effect"] = "Efecto de las tropas de resurrección"
-L["Reward type"] = "Tipo de recompensa"
-L["Show/hide OrderHallCommander mission menu"] = "Mostrar / ocultar el menú de la misión OrderHallCommander"
-L["Sort missions by:"] = "Ordenar misiones por:"
-L["Success Chance"] = "Éxito"
-L["Troop ready alert"] = "Alerta lista de tropas"
-L["Upgrading to |cff00ff00%d|r"] = "Actualizando a | cff00ff00% d | r"
-L["You are wasting |cffff0000%d|cffffd200 point(s)!!!"] = "Está perdiendo | cffff0000% d | cffffd200 punto (s)!"
+--@localization(locale="esES", format="lua_additive_table", same-key-is-true=true, handle-unlocalized="blank" )@
 return
 end
 L=l:NewLocale(me,"zhTW")
 if (L) then
-L["Always counter increased resource cost"] = "總是反制增加資源花費"
-L["Always counter increased time"] = "總是反制增加任務時間"
-L["Always counter kill troops (ignored if we can only use troops with just 1 durability left)"] = "總是反制殺死部隊(如果我們用只剩一次耐久的部隊則忽略)"
-L["Always counter no bonus loot threat"] = "總是反制沒有額外獎勵的威脅"
-L["Better parties available in next future"] = "在將來有更好的隊伍"
-L["Building Final report"] = "構建最終報告"
-L["Capped %1$s. Spend at least %2$d of them"] = "%1$s封頂了。花費至少%2$d在它身上"
-L["Changes the sort order of missions in Mission panel"] = "改變任務面板上的任務排列順序"
-L["Combat ally is proposed for missions so you can consider unassigning him"] = "戰鬥盟友被建議到任務，所以你可以考慮取消指派他"
-L["Complete all missions without confirmation"] = "完成所有任務不須確認"
-L["Configuration for mission party builder"] = "任務隊伍構建設置"
-L["Dont kill Troops"] = "別讓部隊被殺死"
-L["Duration reduced"] = "持續時間已縮短"
-L["Duration Time"] = "持續時間"
-L["Expiration Time"] = "到期時間"
-L["Favours leveling follower for xp missions"] = "傾向於使用升級中追隨者在經驗值任務"
-L["General"] = "(G) 一般"
-L["Global approx. xp reward"] = "整體大約經驗值獎勵"
-L["HallComander Quick Mission Completion"] = "大廳指揮官快速任務完成"
-L[ [=[If you %s,  you will lose them
-Click on %s to abort]=] ] = [=[如果您繼續，您會失去它們
-點擊%s來取消]=]
-L[ [=[If you %s, you will lose them
-Click on %s to abort]=] ] = [=[如果您繼續，您會失去它們
-點擊%s來取消]=]
-L["Keep cost low"] = "保持低花費"
-L["Keep extra bonus"] = "保持額外獎勵"
-L["Keep time short"] = "保持短時間"
-L["Keep time VERY short"] = "保持非常短的時間"
-L["Level"] = "等級"
-L["Make Order Hall Mission Panel movable"] = "讓大廳任務面板可移動"
-L["Maximize xp gain"] = "最大化經驗獲取"
-L["Missions"] = "(M) 任務"
-L["No follower gained xp"] = "沒有追隨者獲得經驗"
-L["Nothing to report"] = "沒什麼可報告"
-L["Notifies you when you have troops ready to be collected"] = "當部隊已準備好獲取時提醒你"
-L["Only accept missions with time improved"] = "只允許有時間改善的任務"
-L[ [=[OrderHallCommander overrides GarrisonCommander for Order Hall Management.
- You can revert to GarrisonCommander simpy disabling OrderhallCommander]=] ] = [=[大廳指揮官會覆蓋要塞指揮官為大廳管理。
-你可以返回使用要塞指揮官只要簡單的停用大廳指揮官]=]
-L["Original method"] = "原始方法"
-L["Position is not saved on logout"] = "位置不會在登出後儲存"
-L["Resurrect troops effect"] = "復活部隊效果"
-L["Reward type"] = "獎勵類型"
-L["Show/hide OrderHallCommander mission menu"] = "顯示/隱藏大廳指揮官任務選單"
-L["Sort missions by:"] = "排列任務根據："
-L["Success Chance"] = "成功機率"
-L["Troop ready alert"] = "部隊整備提醒"
-L["Upgrading to |cff00ff00%d|r"] = "升級到|cff00ff00%d|r"
-L["Use combat ally"] = "使用戰鬥盟友"
-L["You are wasting |cffff0000%d|cffffd200 point(s)!!!"] = "你浪費了|cffff0000%d|cffffd200 點數!!!"
+--@localization(locale="zhTW", format="lua_additive_table", same-key-is-true=true, handle-unlocalized="blank" )@
 return
-end
+end
\ No newline at end of file
diff --git a/OrderHallCommander/matchmaker.lua b/OrderHallCommander/matchmaker.lua
index a158dbc..b8d04aa 100644
--- a/OrderHallCommander/matchmaker.lua
+++ b/OrderHallCommander/matchmaker.lua
@@ -4,7 +4,7 @@ local function pp(...) print(GetTime(),"|cff009900",__FILE__:sub(-15),strjoin(",
 --*CONFIG noswitch=false,profile=true,enhancedProfile=true
 --*MIXINS "AceHook-3.0","AceEvent-3.0","AceTimer-3.0","AceSerializer-3.0","AceConsole-3.0"
 --*MINOR 35
--- Generated on 11/12/2016 23:26:42
+-- Generated on 20/01/2017 08:15:04
 local me,ns=...
 local addon=ns --#Addon (to keep eclipse happy)
 ns=nil
@@ -19,6 +19,7 @@ local L=addon:GetLocale()
 local new=addon.NewTable
 local del=addon.DelTable
 local kpairs=addon:GetKpairs()
+local empty=addon:GetEmpty()
 local OHF=OrderHallMissionFrame
 local OHFMissionTab=OrderHallMissionFrame.MissionTab --Container for mission list and single mission
 local OHFMissions=OrderHallMissionFrame.MissionTab.MissionList -- same as OrderHallMissionFrameMissions Call Update on this to refresh Mission Listing
@@ -37,7 +38,7 @@ local HideTT=OrderHallCommanderMixin.HideTT
 
 local dprint=print
 local ddump
---[===[@debug@
+--@debug@
 LoadAddOn("Blizzard_DebugTools")
 ddump=DevTools_Dump
 LoadAddOn("LibDebug")
@@ -45,12 +46,12 @@ LoadAddOn("LibDebug")
 if LibDebug then LibDebug() dprint=print end
 local safeG=addon.safeG
 
---@end-debug@]===]
---@non-debug@
+--@end-debug@
+--[===[@non-debug@
 dprint=function() end
 ddump=function() end
 local print=function() end
---@end-non-debug@
+--@end-non-debug@]===]
 
 -- End Template - DO NOT MODIFY ANYTHING BEFORE THIS LINE
 --*BEGIN 
@@ -63,9 +64,9 @@ local function parse(default,rc,...)
 	if rc then 
 		return ... 
 	else
-	--[===[@debug@
+	--@debug@
 		error(message,2) 
-	--@end-debug@]===]
+	--@end-debug@
 		return default
 	end
 end
@@ -145,21 +146,18 @@ local function IsHigher(cur,base)
 end
 
 --	addon:RegisterForMenu("mission","SAVETROOPS","SPARE","MAKEITQUICK","MAXIMIZEXP")
-	 
-function partyManager:Fail(...)
---[===[@debug@
-	local rc,name=false,''
-	if self.lastChecked then rc,name =pcall(G.GetFollowerName,self.lastChecked) end 
-	print('fail',name,...)
---@end-debug@]===]
-	return false
+function partyManager:Fail(reason,...)
+--@debug@
+	reason=strjoin(' ',tostringall(reason,...))
+--@end-debug@
+	return false,reason
 end	 
 local keys={
 'f1',
 'f2',
 'f3'
 }
-function partyManager:FillRealFollowers(candidate)
+function partyManager:FillRealFollowers(candidate,dbg)
 	candidate.busyUntil=GetTime()
 	local troops=new()
 	addon:GetAllTroops(troops)			
@@ -174,7 +172,7 @@ function partyManager:FillRealFollowers(candidate)
 				local better=(candidate.hasKillTroopsEffect and IsLower or IsHigher)
 				local base=better()
 				local baseBusy=base
-				local found,foundBusy
+				local found,foundBusy,foundFree
 				for t,troop in pairs(troops) do
 					local ignore=false
 					if troop.classSpec==classSpec then
@@ -184,16 +182,21 @@ function partyManager:FillRealFollowers(candidate)
 						if i>2 and troop.followerID==candidate[i-2] then
 							ignore=true
 						end
+						troop.status=G.GetFollowerStatus(troop.followerID)
 						if troop.status then
 							if better(troop.durability,baseBusy) and not ignore then
 								foundBusy=t
 								baseBusy=troop.durability
 							end
 						else
+							troop.busyUntil=0
 							if better(troop.durability,base) and not ignore then
 								found=t
 								base=troop.durability
 							end
+							if not ignore and not foundFree then
+								foundFree=t
+							end
 						end
 					end
 				end
@@ -203,6 +206,8 @@ function partyManager:FillRealFollowers(candidate)
 				else
 					if found then
 						followerID=troops[found].followerID
+					elseif foundFree then
+						followerID=troops[foundFree].followerID
 					elseif foundBusy then
 						followerID=troops[foundBusy].followerID
 					else
@@ -231,51 +236,74 @@ function partyManager:SatisfyCondition(candidate,key,table)
 	if addon:GetBoolean("BONUS") and candidate.hasBonusLootNegativeEffect then return self:Fail("BONUS") end
 	local ready=addon:GetFollowerData(followerID,"busyUntil")
 	if not ready then return self:Fail("No ready data") end
-	if ready > GetTime() then
-		return self:Fail("BUSY",ready - GetTime())
-	else
-		local status=G.GetFollowerStatus(followerID)
-		if status then 
-			if addon:GetBoolean("USEALLY") and status==GARRISON_FOLLOWER_COMBAT_ALLY then
-				return true
-			end
-			return self:Fail("BUSY",status)
-		end 
-	end
-	return true
+	local status=G.GetFollowerStatus(followerID)
+	if status then 
+		if addon:GetBoolean("USEALLY") and status==GARRISON_FOLLOWER_COMBAT_ALLY then
+			return true
+		end
+		return self:Fail("BUSY",status,'G.GetFollowerStatus("' ..followerID..'")')
+	end 
+	return true,'OK'
 end
 function partyManager:IterateIndex()
 	self:GenerateIndex()
 	return ipairs(self.candidatesIndex)
 end
-local function GetSelectedParty(self)
+local function GetSelectedParty(self,dbg)
 	local lastkey
 	local bestkey
 	local xpkey
+	local absolutebestkey
+	local busybestkey
 	local xpperc=0
 	local xpgainers=0
 	self:GenerateIndex()
+	local maxChamps=addon:GetNumber("MAXCHAMP")
 	for i,key in ipairs(self.candidatesIndex) do
 		local candidate=self.candidates[key]
-		if candidate then
-			self:FillRealFollowers(candidate)
-			--[===[@debug@
-			local rc,f1=pcall(G.GetFollowerName,candidate[1])
-			local rc,f2=pcall(G.GetFollowerName,candidate[2])
-			local rc,f3=pcall(G.GetFollowerName,candidate[3])
-			print(key,"Examining",candidate.f1,candidate.f2,candidate.f3)
-			print(key,"Filled",f1,f2,f3)
-			--@end-debug@]===]
+		if dbg then
+			local a={'f1','f2','f3'}
+			local message="key "
+			for i=1,#a do
+				local f=candidate[a[i]]
+				if f then
+					local id,troop,name=strsplit(',',f)
+					key=key.. id:sub(11) .. C(name,troop==0 and 'orange' or 'cyan') .. ' '
+				end
+			end
+			addon:Print(key)
+		end
+		if candidate and candidate.champions <=maxChamps  then
+			self:FillRealFollowers(candidate,dbg)
+			if not absolutebestkey then absolutebestkey=key end
 			lastkey=key
 			local got=true
+			local reason=''
 			if type(self.numFollowers) ~= "number" then
 				
 			end
 			for i=1,self.numFollowers do
-				got = got and self:SatisfyCondition(candidate,i)
-				if not got then break end
+				local rc,reason = self:SatisfyCondition(candidate,i)
+				got=got and rc
+				if not got then
+--@debug@
+					if dbg then
+						if reason=="NOTABLE" then
+							addon:Print("Received a non table as candidate",type(candidate),candidate)
+						else
+							addon:Print(candidate['f'..i],C(reason,'RED'))
+						end 
+					end 
+--@end-debug@				
+					break 
+				end
 			end
 			if got then
+--@debug@
+				if dbg then
+					addon:Print(C("Satisfy ok","green"))
+				end 
+--@end-debug@				
 				if not bestkey then bestkey=key end
 				if addon:GetBoolean("MAXIMIZEXP") then
 					if candidate.perc >= 100 and candidate.xpGainers >xpgainers then
@@ -289,30 +317,42 @@ local function GetSelectedParty(self)
 					return candidate,key
 				end
 			end
+--@debug@
+		else
+			if dbg then addon:Print("Too many champions:",candidate.champions) end
+--@end-debug@			
 		end
+		
+	end
+	--@debug@
+	if dbg then addon:Print(
+		format("Best: %s, Xp: %s, Absolute: %s, Last:%s",tostringall(bestkey,xpkey,absolutebestkey,lastkey))
+		)
 	end
-	--[===[@debug@
 	print("XPKey,Bestkey,Lastkey",self.missionID,xpkey,bestkey,lastkey)
-	--@end-debug@]===]
+	--@end-debug@
 	if xpkey then 
 		return self.candidates[xpkey],xpkey
 	end
 	if bestkey then 
 		return self.candidates[bestkey],bestkey
 	end
+	if absolutebestkey then 
+		return self.candidates[absolutebestkey],absolutebestkey
+	end
 	if lastkey then 
-		if self.candidates[lastkey].busyUntil <= GetTime() then
+		--if self.candidates[lastkey].busyUntil <= GetTime() then
 			return self.candidates[lastkey],lastkey -- should not return busy followers
-		end
+		--end
 	end
 	return setmetatable(self:GetEffects(),CandidateMeta)
 end
 function partyManager:GetSelectedParty(mission)
 	wipe(debug[self.missionID])
 	if type(mission)=="table" and mission.inProgress then
---[===[@debug@
+--@debug@
 		print("inProgress")
---@end-debug@]===]
+--@end-debug@
 		if not self.candidates or not self.candidates.progress then
 			local candidate=self:GetEffects()
 			local followers=mission.followers
@@ -326,17 +366,18 @@ function partyManager:GetSelectedParty(mission)
 		return self.candidates.progress,"progress"	
 	end
 	if type(mission)=="string" and self.candidates[mission] then
---[===[@debug@
+--@debug@
 		print("Returning explicity set key ",mission)
---@end-debug@]===]
+--@end-debug@
 		return self.candidates[mission],mission
 	end
 	if not self.ready then
---[===[@debug@
+--@debug@
 		print("Rebuilding list")
---@end-debug@		]===]
+--@end-debug@		
 		self:Match()
 	end
+
 	local candidate=GetSelectedParty(self)
 	self.bestChance=candidate.perc or 0
 	self.bestTimeseconds=candidate.timeseconds or 0
@@ -349,20 +390,20 @@ function partyManager:Remove(...)
 		for _,id in ipairs(tbl) do
 			if type(id)=="table" then id=id.followerID end
 			local rc,message=pcall(G.RemoveFollowerFromMission,self.missionID,id)
---[===[@debug@
+--@debug@
 			if not rc then	
 				print("Remove failed",message,self.missionID,...) 
 			end
---@end-debug@]===]
+--@end-debug@
 		end
 	else
 		for i=1,select('#',...) do
 			local rc,message=pcall(G.RemoveFollowerFromMission,self.missionID,(select(i,...)))
---[===[@debug@
+--@debug@
 			if not rc then	
 				print("Remove failed",message,self.missionID,...) 
 			end
---@end-debug@]===]
+--@end-debug@
 		end
 	end	
 end
@@ -392,10 +433,9 @@ function partyManager:GetEffects()
 
 end
 function partyManager:Build(...)
---[===[@debug@
+--@debug@
 	print("Build",self.numFollowers,...)
---@end-debug@]===]
-
+--@end-debug@
 	local followers=new()
 	if select('#',...)>0 then
 		for i=1,self.numFollowers or 3 do
@@ -404,11 +444,6 @@ function partyManager:Build(...)
 			local followerID=follower.followerID
 			local rc,res = pcall(G.AddFollowerToMission,self.missionID,followerID)
 			if not rc or not res then
---[===[@debug@
-				local rc,name=pcall(G.GetFollowerName,followerID)
-				print("Unable to add",followerID,name)
-				pp("Unable to add ",name,"to",G.GetMissionName(self.missionID))
---@end-debug@			]===]
 				self:Remove(followers)
 				del(followers)
 				return
@@ -430,9 +465,9 @@ function partyManager:Build(...)
 			end 
 		end
 		missionEffects[k]=format("%s,%s",tostringall(followerID,followers[i].isTroop and followers[i].classSpec or "0"))
-	--[===[@debug@
+	--@debug@
 		missionEffects[k]=missionEffects [k]..','..addon:GetFollowerData(followerID,'name')
-	--@end-debug@]===]
+	--@end-debug@
 	end
 	self.unique=self.unique+1	
 	local index=format("%03d:%1d:%1d:%1d:%2d",900-missionEffects.perc,missionEffects.improvements,missionEffects.champions,3-missionEffects.xpGainers,self.unique)
@@ -444,9 +479,8 @@ end
 
 function partyManager:Match()
 
-	local champs=new()
+	local champs=addon:GetPermutations()
 	wipe(self.candidates)
-	addon:GetAllChampions(champs)
 	local totChamps=#champs
 	local mission=addon:GetMissionData(self.missionID)
 	if not mission then
@@ -454,10 +488,10 @@ function partyManager:Match()
 	 	mission=addon:GetMissionData(self.missionID)
 	 end
 	if not mission then return false end
---[===[@debug@
+--@debug@
 	OHCDebug:Bump("Parties")
 	print("Match started for mission",mission.name)
---@end-debug@]===]
+--@end-debug@
 	self.unique=0
 	self.numFollowers=mission.numFollowers
 	self.missionSort=addon:Reward2Class(mission)
@@ -469,46 +503,48 @@ function partyManager:Match()
 	local t=addon:GetTroopTypes()
 	local t1_1,t1_2=addon:GetTroop(t[1],2)
 	local t2_1,t2_2=addon:GetTroop(t[2],2)
+	local t3_1,t3_2=addon:GetTroop(t[3],2)
 	local async=coroutine.running()
 	if not async then holdEvents() end
---[===[@debug@
-	print("TotChamp",#champs)
---@end-debug@]===]
-
-	for i,champ in ipairs(champs) do
-		if async then holdEvents() end
-		for n=i+1,totChamps do
-			local f1,f2,f3=champ,champs[n],champs[n+1]
-			if f2 and f3 then
+	local n=self.numFollowers or 3
+	for i=1,n do
+		for _,tuple in pairs(champs[i]) do
+			if async then holdEvents() end
+			local f1,f2,f3=strsplit(',',tuple)
+			f1=empty(f1) and nil or addon:GetFollowerData(f1)
+			f2=empty(f1) and nil or addon:GetFollowerData(f2)
+			f3=empty(f1) and nil or addon:GetFollowerData(f3)
+			print("Match",tuple,f1,f2,f3)
+			if i < n then
+				if n==3 then
+					if i==1 then -- single champ group, adding double follower
+						if t1_1 and t1_2 then self:Build(f1,t1_1,t1_2) end -- 2
+						if t1_1 and t2_1 then self:Build(f1,t1_1,t2_1) end -- 1 1
+						if t1_1 and t3_1 then self:Build(f1,t1_1,t3_1) end -- 1   1
+						if t2_1 and t2_2 then self:Build(f1,t2_1,t2_2) end --   2
+						if t2_1 and t3_1 then self:Build(f1,t2_1,t3_1) end --   1 1
+						if t3_1 and t3_2 then self:Build(f1,t3_1,t3_2) end --     2
+					elseif i==2 then -- 2 champ group, adding single follower
+						if t1_1 then self:Build(f1,f2,t1_1) end
+						if t2_1 then self:Build(f1,f2,t2_1) end
+						if t3_1 then self:Build(f1,f2,t3_1) end
+					end
+				elseif n==2 then
+					if t1_1 then self:Build(f1,t1_1) end
+					if t2_1 then self:Build(f1,t2_1) end
+					if t3_1 then self:Build(f1,t2_1) end
+				end
+			else
 				self:Build(f1,f2,f3) -- Full Champions group
 			end
-			if f2 then
-				if t1_1 then self:Build(f1,f2,t1_1) end
-				if t2_1 then self:Build(f1,f2,t2_1) end
-			end
-		end
-		if t1_1 and t2_1 then
-			self:Build(champ,t1_1,t2_1)
-		end
-		if t1_1 and t1_2 then
-			self:Build(champ,t1_1,t1_2)
-		end
-		if t2_1 and t2_2 then
-			self:Build(champ,t2_1,t2_2)
 		end
 		if async then
 			releaseEvents()
 			coroutine.yield()
 		end
 	end
-	if self.numFollowers == 1 then
-		for i,champ in ipairs(champs) do
-			self:Build(champ)
-		end
-	end 
 	self:Build()
 	if not async then releaseEvents() end
-	del(champs)
 	self.ready=true
 	return true
 end
@@ -527,8 +563,10 @@ function module:OnInitialized()
 	addon:AddBoolean("MAKEITQUICK",true,L["Keep time short"],L["Always counter increased time"])
 	addon:AddBoolean("MAKEITVERYQUICK",false,L["Keep time VERY short"],L["Only accept missions with time improved"])
 	addon:AddBoolean("MAXIMIZEXP",false,L["Maximize xp gain"],L["Favours leveling follower for xp missions"])
+	--addon:AddBoolean("MAXIMIZEMISSIONS",false,L["Maximize filled missions"],L["Attempts to use less champions for missions, in order to fill more missions"])
+	addon:AddRange("MAXCHAMP",2,1,3,L["Max champions"],L["Use at most this many champions"])
 	addon:AddBoolean("USEALLY",false,L["Use combat ally"],L["Combat ally is proposed for missions so you can consider unassigning him"])
-	addon:RegisterForMenu("mission","SAVETROOPS","BONUS","SPARE","MAKEITQUICK","MAKEITVERYQUICK","MAXIMIZEXP",'USEALLY')
+	addon:RegisterForMenu("mission","SAVETROOPS","BONUS","SPARE","MAKEITQUICK","MAKEITVERYQUICK","MAXIMIZEXP",'MAXCHAMP','USEALLY')
 	self:RegisterEvent("GARRISON_FOLLOWER_XP_CHANGED","Refresh")
 	self:RegisterEvent("GARRISON_FOLLOWER_UPGRADED","Refresh")
 	self:RegisterEvent("GARRISON_FOLLOWER_ADDED","Refresh")
@@ -538,6 +576,7 @@ function module:OnInitialized()
 end
 function module:Refresh(event)
 	self:ResetParties()
+	addon:GetMissionlistModule():SortMissions()
 	return addon:RefreshMissions()
 end
 function module:ResetParties()
@@ -558,6 +597,12 @@ end
 function addon:ApplyUSEALLY(value)
 	return addon:RefreshMissions()
 end
+function addon:ApplyMAXIMIZEMISSIONS(value)
+	return addon:RefreshMissions()
+end
+function addon:ApplyMAXCHAMP(value)
+	return addon:RefreshMissions()
+end
 function addon:ApplyBONUS(value)
 	return addon:RefreshMissions()
 end
@@ -579,19 +624,30 @@ end
 function addon:ResetParties()
 	return module:ResetParties()
 end
+--@debug@
+function addon:TestParty(missionID)
+	local parties=self:GetParties(missionID)
+	self:Print("Debug for ", missionID,G.GetMissionName(missionID))
+	local choosen,choosenkey=GetSelectedParty(parties,true)
+	self:Print(choosenkey)
+	DevTools_Dump(choosen)
+	
+	
+end
+--@end-debug@
 function addon:GetParties(missionID)
 	if not parties[missionID] then
 		parties[missionID]=newParty()
 		parties[missionID].missionID=missionID
 		parties[missionID].candidates=new()
 	end
---[===[@debug@
+--@debug@
 	local n=0
 	for _,_ in pairs(parties) do
 		n=n+1
 	end
 	OHCDebug:Set("NumParties",n)
---@end-debug@	]===]
+--@end-debug@	
 	return parties[missionID]
 end
 function addon:GetAllParties()
@@ -602,8 +658,8 @@ function addon:ReFillParties()
 		self:GetParties(missionID):Match()
 	end
 end
---[===[@debug@
+--@debug@
 function addon:SetDebug(id)
 	debugMission=id
 end
---@end-debug@]===]
+--@end-debug@
diff --git a/OrderHallCommander/missionlist.lua b/OrderHallCommander/missionlist.lua
index 9a33e9d..632b3c5 100644
--- a/OrderHallCommander/missionlist.lua
+++ b/OrderHallCommander/missionlist.lua
@@ -4,7 +4,7 @@ local function pp(...) print(GetTime(),"|cff009900",__FILE__:sub(-15),strjoin(",
 --*CONFIG noswitch=false,profile=true,enhancedProfile=true
 --*MIXINS "AceHook-3.0","AceEvent-3.0","AceTimer-3.0"
 --*MINOR 35
--- Generated on 04/01/2017 22:31:44
+-- Generated on 20/01/2017 08:15:04
 local me,ns=...
 local addon=ns --#Addon (to keep eclipse happy)
 ns=nil
@@ -19,6 +19,7 @@ local L=addon:GetLocale()
 local new=addon.NewTable
 local del=addon.DelTable
 local kpairs=addon:GetKpairs()
+local empty=addon:GetEmpty()
 local OHF=OrderHallMissionFrame
 local OHFMissionTab=OrderHallMissionFrame.MissionTab --Container for mission list and single mission
 local OHFMissions=OrderHallMissionFrame.MissionTab.MissionList -- same as OrderHallMissionFrameMissions Call Update on this to refresh Mission Listing
@@ -37,7 +38,7 @@ local HideTT=OrderHallCommanderMixin.HideTT
 
 local dprint=print
 local ddump
---[===[@debug@
+--@debug@
 LoadAddOn("Blizzard_DebugTools")
 ddump=DevTools_Dump
 LoadAddOn("LibDebug")
@@ -45,12 +46,12 @@ LoadAddOn("LibDebug")
 if LibDebug then LibDebug() dprint=print end
 local safeG=addon.safeG
 
---@end-debug@]===]
---@non-debug@
+--@end-debug@
+--[===[@non-debug@
 dprint=function() end
 ddump=function() end
 local print=function() end
---@end-non-debug@
+--@end-non-debug@]===]
 
 -- End Template - DO NOT MODIFY ANYTHING BEFORE THIS LINE
 --*BEGIN 
@@ -89,15 +90,15 @@ local sorters={
 		Garrison_SortMissions_Class=function(a,b)
 			local a=addon:GetMissionData(a.missionID) 
 			local b=addon:GetMissionData(b.missionID)
-			return a.missionSort>b.missionSort
+			return (a.missionSort or 0)>(b.missionSort or 0)
 		end,
 }
---[===[@debug@
+--@debug@
 local function Garrison_SortMissions_PostHook()
    print("Riordino le missioni")
    table.sort(OrderHallMissionFrame.MissionTab.MissionList.availableMissions,function(a,b) return a.name < b.name end)
 end
---@end-debug@]===]
+--@end-debug@
 function module:OnInitialized()
 -- Dunno why but every attempt of changing sort starts a memory leak
 	local sorters={
@@ -110,14 +111,15 @@ function module:OnInitialized()
 		Garrison_SortMissions_Class=L["Reward type"],
 	}
 	addon:AddSelect("SORTMISSION","Garrison_SortMissions_Original",sorters,	L["Sort missions by:"],L["Changes the sort order of missions in Mission panel"])
-	addon:RegisterForMenu("mission","SORTMISSION")
+	addon:AddPrivateAction("HardRefreshMissions","Recalculate",L["Recalculate all parties"])
+	addon:RegisterForMenu("mission","SORTMISSION","HardRefreshMissions")
 	self:LoadButtons()
 	self:RegisterEvent("GARRISON_MISSION_STARTED",function() wipe(missionIDS) wipe(parties) end)	
 	Current_Sorter=addon:GetString("SORTMISSION")
 	self:SecureHookScript(OHF--[[MissionTab--]],"OnShow","InitialSetup")
-	--[===[@debug@
+	--@debug@
 	pp("Current sorter",Current_Sorter)
-	--@end-debug@]===]
+	--@end-debug@
 	--hooksecurefunc("Garrison_SortMissions",Garrison_SortMissions_PostHook)--function(missions) module:SortMissions(missions) end)
 	--self:SecureHook("Garrison_SortMissions",function(missionlist) print("Sorting",#missionlist,"missions") end)
 	--function(missions) module:SortMissions(missions) end)
@@ -133,6 +135,7 @@ function module:LoadButtons(...)
 		local b=buttonlist[i]	
 		self:SecureHookScript(b,"OnEnter","AdjustMissionTooltip")
 		self:SecureHookScript(b,"OnClick","PostMissionClick")
+		b:RegisterForClicks("AnyDown")
 		local scale=0.8
 		local f,h,s=b.Title:GetFont()
 		b.Title:SetFont(f,h*scale,s)
@@ -146,9 +149,9 @@ function module:OnUpdate()
 	local tipOwner=GameTooltip:GetOwner()
 	tipOwner=tipOwner and tipOwner:GetName() or "none"
 	local skipDataRefresh=tipOwner:find("OrderHallMissionFrameMissionsListScrollFrameButto")==1
---[===[@debug@
+--@debug@
 	print("OnUpdate")
---@end-debug@	]===]
+--@end-debug@	
 	for _,frame in pairs(buttonlist) do
 		if frame:IsVisible() then
 			self:AdjustPosition(frame)
@@ -163,9 +166,6 @@ end
 function module:OnUpdateMissions(...)
 	if OHFMissions:IsVisible() then
 		addon:ResetParties()
---[===[@debug@
-		print("OnUpdateMissions")
---@end-debug@	]===]
 		--self:SortMissions()
 		--OHFMissions:Update()
 		--for _,frame in pairs(buttonlist) do
@@ -198,18 +198,21 @@ function addon:ApplySORTMISSION(value)
 	Current_Sorter=value
 	module:SortMissions()
 end
+function addon:HardRefreshMissions()
+	self:RebuildAllCaches()
+	collectgarbage()
+	self:RefreshMissions()
+end
 local timer
 function addon:RefreshMissions()
 	if OHFMissionPage:IsVisible() then
 		module:PostMissionClick(OHFMissionPage)
 	else	
 		if timer then self:CancelTimer(timer) end 
-		print("Scheduling refresh in",0.1)
 		timer=self:ScheduleTimer("EffectiveRefresh",0.1)
 	end
 end
 function addon:EffectiveRefresh()
-	print("Effective refresh in",0.1)
 	timer=nil
 	wipe(parties)
 	wipe(missionIDS)
@@ -239,6 +242,24 @@ local function CloseMenu()
 	button:Show()
 	menu:Hide()		
 end
+function module:Menu()
+	local previous
+	local factory=addon:GetFactory()
+	for _,v in pairs(addon:GetRegisteredForMenu("mission")) do
+		local flag,icon=strsplit(',',v)
+		local f=factory:Option(addon,menu,flag)
+		if type(f)=="table" and f.GetObjectType then
+			if flag=="MAXCHAMP" then f:SetStep(1) end
+			if previous then 
+				f:SetPoint("TOPLEFT",previous,"BOTTOMLEFT",0,-10)
+			else
+				f:SetPoint("TOPLEFT",menu,"TOPLEFT",32,-30)
+			end
+			previous=f
+		end
+	end 
+end
+
 function module:InitialSetup(this)
 	if type(addon.db.global.warn01_seen)~="number" then	addon.db.global.warn01_seen =0 end
 	if GetAddOnEnableState(UnitName("player"),"GarrisonCommander") > 0 then
@@ -247,7 +268,6 @@ function module:InitialSetup(this)
 			addon:Popup(L["OrderHallCommander overrides GarrisonCommander for Order Hall Management.\n You can revert to GarrisonCommander simply disabling OrderhallCommander.\nIf instead you like OrderHallCommander remember to add it to Curse client and keep it updated"],20)
 		end
 	end 
-	local previous
 	menu=CreateFrame("Frame",nil,OHFMissionTab,"OHCMenu")
 	menu.Title:SetText(me .. ' ' .. addon.version)
 	menu.Title:SetTextColor(C:Yellow())
@@ -258,27 +278,17 @@ function module:InitialSetup(this)
 	button:SetScript("OnClick",OpenMenu)
 	button:GetNormalTexture():SetRotation(math.rad(270))
 	button:GetHighlightTexture():SetRotation(math.rad(270))
+	self:Menu()
 	if addon.db.profile.showmenu then OpenMenu() else CloseMenu() end
-	local factory=addon:GetFactory()
-	for _,v in pairs(addon:GetRegisteredForMenu("mission")) do
-		local flag,icon=strsplit(',',v)
-		--local f=addon:CreateOption(flag,menu)
-		local f=factory:Option(addon,menu,flag)
-		if type(f)=="table" and f.GetObjectType then
-			if previous then 
-				f:SetPoint("TOPLEFT",previous,"BOTTOMLEFT",0,-15)
-			else
-				f:SetPoint("TOPLEFT",menu,"TOPLEFT",32,-30)
-			end
-			previous=f
-		end
-	end 
 	addon.MAXLEVEL=OHF.followerMaxLevel
 	addon.MAXQUALITY=OHF.followerMaxQuality
 	addon.MAXQLEVEL=addon.MAXLEVEL+addon.MAXQUALITY
 	self:Unhook(this,"OnShow")
 	self:SecureHookScript(this,"OnShow","MainOnShow")	
 	self:SecureHookScript(this,"OnHide","MainOnHide")	
+	OHF.FollowerStatusInfo=OHF:CreateFontString(nil,"OVERLAY","GameFontNormalSmall")
+	OHF.FollowerStatusInfo:SetPoint("TOPRIGHT",-45,-5)
+	OHF.FollowerStatusInfo:SetText("")
 	self:MainOnShow()
 end
 function module:MainOnShow()
@@ -287,6 +297,8 @@ function module:MainOnShow()
 	--self:SecureHook(OHFMissions,"UpdateCombatAllyMission",function() pp("Called inside updatemissions") pp("\n",debugstack(1)) end)
 	self:OnUpdate()
 	addon:ApplySORTMISSION(addon:GetString("SORTMISSION"))
+	addon:RefreshFollowerStatus()
+	addon:ParseFollowers()
 end
 function module:MainOnHide()
 	self:Unhook(OHFMissions,"UpdateCombatAllyMission")
@@ -333,9 +345,9 @@ function module:AdjustMissionButton(frame)
 	-- Adding stats frame (expiration date and chance)
 	if not missionstats[frame] then
 		missionstats[frame]=CreateFrame("Frame",nil,frame,"OHCStats")
---[===[@debug@
+--@debug@
 		self:RawHookScript(missionstats[frame],"OnEnter","MissionTip")
---@end-debug@		]===]
+--@end-debug@		
 	end
 	local stats=missionstats[frame]
 	local aLevel,aIlevel=addon:GetAverageLevels()
@@ -349,6 +361,7 @@ function module:AdjustMissionButton(frame)
 	if mission.inProgress then
 		stats:SetPoint("LEFT",48,14)
 		stats.Expire:Hide()
+		addon:GetCacheModule():SetMissionStatus(missionID,'inProgress')
 	else
 		stats.Expire:SetFormattedText("%s\n%s",GARRISON_MISSION_AVAILABILITY,mission.offerTimeRemaining)
 		stats.Expire:SetTextColor(addon:GetAgeColor(mission.offerEndTime))		
@@ -370,26 +383,27 @@ function module:AddMembers(frame)
 	local nrewards=#mission.rewards
 	local missionID=mission and mission.missionID
 	local followers=mission.followers
-	local key=parties[missionID]
+	local key
 	local party
 	if not key then
 		party,key=addon:GetSelectedParty(missionID,mission)
 		parties[missionID]=key
---[===[@debug@
+--@debug@
 		print("Party recalculated",party)
---@end-debug@		]===]
+--@end-debug@		
 	else
---[===[@debug@
+--@debug@
 		print(key,"Party retrieved",party)
---@end-debug@		]===]
+--@end-debug@		
 		party=addon:GetSelectedParty(missionID,key)
 	end
 	local members=missionmembers[frame]
+	members:SetNotReady()
 	local stats=missionstats[frame]
 	members:SetPoint("RIGHT",frame.Rewards[nrewards],"LEFT",-5,0)
 	for i=1,mission.numFollowers do
 		if party:Follower(i) then
-			members.Champions[i]:SetFollower(party:Follower(i))
+			members.Champions[i]:SetFollower(party:Follower(i),not mission.inProgress)
 		else
 			members.Champions[i]:SetEmpty()
 		end
@@ -477,7 +491,7 @@ function module:MissionTip(this)
 	tip:SetOwner(this,"ANCHOR_CURSOR")	
 	tip:AddLine(me)
 	tip:AddDoubleLine(addon:GetAverageLevels())
---[===[@debug@
+--@debug@
 	local info=this:GetParent().info
 	OrderHallCommanderMixin.DumpData(tip,info)
 	tip:AddLine("Followers")
@@ -500,7 +514,7 @@ function module:MissionTip(this)
 	tip:AddDoubleLine("MissionValue",mission.missionValue)
 	tip:AddDoubleLine("MissionSort",mission.missionSort)
 	
---@end-debug@	]===]
+--@end-debug@	
 	tip:Show()
 end
 local bestTimes={}
@@ -517,9 +531,9 @@ function module:AdjustMissionTooltip(this,...)
 		GameTooltip:AddLine(GARRISON_MISSION_AVAILABILITY);
 		GameTooltip:AddLine(this.info.offerTimeRemaining, 1, 1, 1);
 	end
---[===[@debug@
+--@debug@
 	tip:AddDoubleLine("MissionID",missionID)
---@end-debug@	]===]
+--@end-debug@	
 	local party=addon:GetParties(missionID)
 	local key=parties[missionID]
 	if party then
@@ -580,16 +594,60 @@ function module:AdjustMissionTooltip(this,...)
 				end
 			end
 		end
---[===[@debug@
+--@debug@
 		tip:AddLine("-----------------------------------------------")
 		OrderHallCommanderMixin.DumpData(tip,addon:GetParties(this.info.missionID):GetSelectedParty(key))
---@end-debug@]===]
+--@end-debug@
 	end
 	tip:Show()
 	
 end
-function module:PostMissionClick(this,...)
+function module:PostMissionClick(this,button)
+	addon:Print(button)
 	local mission=this.info or this.missionInfo -- callable also from mission page
+	if button=="MiddleButton" then
+		addon:TestParty(mission.missionID)
+		return
+	end
 	addon:GetMissionpageModule():FillMissionPage(mission,parties[mission.missionID])
 end
+do
+	local s=setmetatable({},{__index=function(t,k) return 0 end})
+	local FOLLOWER_STATUS_FORMAT= L["Followers status "] ..
+								C(AVAILABLE..':%d ','green') ..
+								C(GARRISON_FOLLOWER_COMBAT_ALLY .. ":%d ",'cyan') ..
+								C(GARRISON_FOLLOWER_ON_MISSION .. ":%d ",'red') ..
+								C(GARRISON_FOLLOWER_INACTIVE .. ":%d","silver")
+	function addon:RefreshFollowerStatus()
+		if not OHF:IsVisible() then return end
+		if empty(addon:GetFollowerData()) then return end
+		wipe(s)
+		for followerID,_ in pairs(addon:GetFollowerData()) do
+			local rc,status=pcall(G.GetFollowerStatus,followerID) -- Follower could have been exhasted and still present in cache
+			if rc then
+				status=status or AVAILABLE
+				s[status]=s[status]+1
+			end
+		end
+		if (OHF.FollowerStatusInfo) then
+			OHF.FollowerStatusInfo:SetWidth(0)
+			OHF.FollowerStatusInfo:SetFormattedText(
+				FOLLOWER_STATUS_FORMAT,
+				s[AVAILABLE],
+				s[GARRISON_FOLLOWER_COMBAT_ALLY],
+				s[GARRISON_FOLLOWER_ON_MISSION],
+				s[GARRISON_FOLLOWER_INACTIVE]
+				)
+		end
+	end
+	function addon:GetTotFollowers(status)
+		if not status then
+			return s[AVAILABLE]+
+				s[GARRISON_FOLLOWER_WORKING]+
+				s[GARRISON_FOLLOWER_ON_MISSION]
+		else
+			return s[status] or 0
+		end
+	end
+end
 
diff --git a/OrderHallCommander/missionpage.lua b/OrderHallCommander/missionpage.lua
index 351481a..3c86c35 100644
--- a/OrderHallCommander/missionpage.lua
+++ b/OrderHallCommander/missionpage.lua
@@ -4,7 +4,7 @@ local function pp(...) print(GetTime(),"|cff009900",__FILE__:sub(-15),strjoin(",
 --*CONFIG noswitch=false,profile=true,enhancedProfile=true
 --*MIXINS "AceHook-3.0","AceEvent-3.0","AceTimer-3.0"
 --*MINOR 35
--- Generated on 11/12/2016 23:26:42
+-- Generated on 20/01/2017 08:15:04
 local me,ns=...
 local addon=ns --#Addon (to keep eclipse happy)
 ns=nil
@@ -19,6 +19,7 @@ local L=addon:GetLocale()
 local new=addon.NewTable
 local del=addon.DelTable
 local kpairs=addon:GetKpairs()
+local empty=addon:GetEmpty()
 local OHF=OrderHallMissionFrame
 local OHFMissionTab=OrderHallMissionFrame.MissionTab --Container for mission list and single mission
 local OHFMissions=OrderHallMissionFrame.MissionTab.MissionList -- same as OrderHallMissionFrameMissions Call Update on this to refresh Mission Listing
@@ -37,7 +38,7 @@ local HideTT=OrderHallCommanderMixin.HideTT
 
 local dprint=print
 local ddump
---[===[@debug@
+--@debug@
 LoadAddOn("Blizzard_DebugTools")
 ddump=DevTools_Dump
 LoadAddOn("LibDebug")
@@ -45,12 +46,12 @@ LoadAddOn("LibDebug")
 if LibDebug then LibDebug() dprint=print end
 local safeG=addon.safeG
 
---@end-debug@]===]
---@non-debug@
+--@end-debug@
+--[===[@non-debug@
 dprint=function() end
 ddump=function() end
 local print=function() end
---@end-non-debug@
+--@end-non-debug@]===]
 
 -- End Template - DO NOT MODIFY ANYTHING BEFORE THIS LINE
 --*BEGIN 
@@ -75,7 +76,7 @@ function module:FillMissionPage(missionInfo)
 	stage.expires:SetFormattedText(GARRISON_MISSION_AVAILABILITY2,missionInfo.offerTimeRemaining or "")
 	stage.expires:SetTextColor(addon:GetAgeColor(missionInfo.offerEndTime))
 	stage.expires:SetPoint("TOPLEFT",stage.MissionInfo,"BOTTOMLEFT")
---[===[@debug@
+--@debug@
 	if not stage.missionid then
 		stage.missionid=stage:CreateFontString()
 		stage.missionid:SetFontObject(model:GetFontObject())
@@ -83,7 +84,7 @@ function module:FillMissionPage(missionInfo)
 		stage.missionid:SetPoint("TOPLEFT",stage.expires,"BOTTOMLEFT")
 	end
 	stage.missionid:SetFormattedText(GARRISON_MISSION_ID,missionInfo.missionID)
---@end-debug@]===]
+--@end-debug@
 	if( IsControlKeyDown()) then self:Print("Ctrl key, ignoring mission prefill") return end
 	if (addon:GetBoolean("NOFILL")) then return end
 	self:FillParty(missionInfo.missionID)
diff --git a/OrderHallCommander/widgets.lua b/OrderHallCommander/widgets.lua
index 2461a2a..c139662 100644
--- a/OrderHallCommander/widgets.lua
+++ b/OrderHallCommander/widgets.lua
@@ -4,7 +4,7 @@ local function pp(...) print(GetTime(),"|cff009900",__FILE__:sub(-15),strjoin(",
 --*CONFIG noswitch=false,profile=true,enhancedProfile=true
 --*MIXINS "AceHook-3.0","AceEvent-3.0","AceTimer-3.0"
 --*MINOR 35
--- Generated on 11/12/2016 23:26:42
+-- Generated on 20/01/2017 08:15:04
 local me,ns=...
 local addon=ns --#Addon (to keep eclipse happy)
 ns=nil
@@ -19,6 +19,7 @@ local L=addon:GetLocale()
 local new=addon.NewTable
 local del=addon.DelTable
 local kpairs=addon:GetKpairs()
+local empty=addon:GetEmpty()
 local OHF=OrderHallMissionFrame
 local OHFMissionTab=OrderHallMissionFrame.MissionTab --Container for mission list and single mission
 local OHFMissions=OrderHallMissionFrame.MissionTab.MissionList -- same as OrderHallMissionFrameMissions Call Update on this to refresh Mission Listing
@@ -37,7 +38,7 @@ local HideTT=OrderHallCommanderMixin.HideTT
 
 local dprint=print
 local ddump
---[===[@debug@
+--@debug@
 LoadAddOn("Blizzard_DebugTools")
 ddump=DevTools_Dump
 LoadAddOn("LibDebug")
@@ -45,12 +46,12 @@ LoadAddOn("LibDebug")
 if LibDebug then LibDebug() dprint=print end
 local safeG=addon.safeG
 
---@end-debug@]===]
---@non-debug@
+--@end-debug@
+--[===[@non-debug@
 dprint=function() end
 ddump=function() end
 local print=function() end
---@end-non-debug@
+--@end-non-debug@]===]
 
 -- End Template - DO NOT MODIFY ANYTHING BEFORE THIS LINE
 --*BEGIN 
diff --git a/OrderHallCommander/widgets.xml b/OrderHallCommander/widgets.xml
index 473d049..8ddee4b 100644
--- a/OrderHallCommander/widgets.xml
+++ b/OrderHallCommander/widgets.xml
@@ -13,4 +13,4 @@
 			</OnLoad>
 		</Scripts>
 	</Frame>
-</Ui>
+</Ui>
\ No newline at end of file
diff --git a/OrderHallCommander/widgets/Follower.lua b/OrderHallCommander/widgets/Follower.lua
deleted file mode 100644
index e69de29..0000000
diff --git a/OrderHallCommander/widgets/GUIContainer.lua b/OrderHallCommander/widgets/GUIContainer.lua
deleted file mode 100644
index 3649e70..0000000
--- a/OrderHallCommander/widgets/GUIContainer.lua
+++ /dev/null
@@ -1,53 +0,0 @@
-local me,addon=...
-local C=addon:GetColorTable()
-local module=addon:GetWidgetsModule()
-local Type,Version="OHCGUIContainer",1
-local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
-if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
-local m={} --#Widget
-function m:Close()
-	self.frame.CloseButton:Click()
-end
-function m:OnAcquire()
-	self.frame:EnableMouse(true)
-	self:SetTitleColor(C.Yellow())
-	self.frame:SetFrameStrata("HIGH")
-	self.frame:SetFrameLevel(999)
-end
-function m:SetContentWidth(x)
-	self.content:SetWidth(x)
-end
-function m:SetTitle(...)
-	self.frame.TitleText:SetText(...)
-end
-function m:SetTitleColor(...)
-	self.frame.TitleText:SetTextColor(...)
-end
-function m._Constructor()
-	local frame=CreateFrame("Frame",Type..AceGUI:GetNextWidgetNum(Type),nil,"GarrisonUITemplate")
-	frame.Top:SetAtlas("_StoneFrameTile-Top", true);
-	frame.Bottom:SetAtlas("_StoneFrameTile-Bottom", true);
-	frame.Left:SetAtlas("!StoneFrameTile-Left", true);
-	frame.Right:SetAtlas("!StoneFrameTile-Left", true);
-	frame.GarrCorners.TopLeftGarrCorner:SetAtlas("StoneFrameCorner-TopLeft", true);
-	frame.GarrCorners.TopRightGarrCorner:SetAtlas("StoneFrameCorner-TopLeft", true);
-	frame.GarrCorners.BottomLeftGarrCorner:SetAtlas("StoneFrameCorner-TopLeft", true);
-	frame.GarrCorners.BottomRightGarrCorner:SetAtlas("StoneFrameCorner-TopLeft", true);	
-	local widget={frame=frame,missions={}}
-	widget.type=Type
-	for k,v in pairs(m) do widget[k]=v end
-	widget._Constructor=nil
-	frame:SetScript("OnHide",function(self) self.obj:Fire('OnClose') end)
-	frame.obj=widget
-	--Container Support
-	local content = CreateFrame("Frame",nil,frame)
-	widget.content = content
-	--addBackdrop(content,'Green')
-	content.obj = widget
-	content:SetPoint("TOPLEFT",25,-25)
-	content:SetPoint("BOTTOMRIGHT",-25,25)
-	AceGUI:RegisterAsContainer(widget)
-	return widget
-end
-AceGUI:RegisterWidgetType(Type,m._Constructor,Version)
-print("Caricati widgets nuovi")
diff --git a/OrderHallCommander/widgets/MissionButton.lua b/OrderHallCommander/widgets/MissionButton.lua
deleted file mode 100644
index 5dc4790..0000000
--- a/OrderHallCommander/widgets/MissionButton.lua
+++ /dev/null
@@ -1,129 +0,0 @@
-local me,addon=...
-local C=addon:GetColorTable()
-local module=addon:GetWidgetsModule()
-local Type,Version="OHCMissionButton",1
-local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
-if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
-local m={} --#Widget
-function m:OnAcquire()
-	local frame=self.frame
-	frame.info=nil
-	frame:SetAlpha(1)
-	frame:SetScale(1.0)
-	frame:Enable()
-	for i=1,#self.scripts do
-		frame:SetScript(self.scripts[i],nil)
-	end
-	for i=1,#frame.Rewards do
-		frame.Rewards[i].Icon:SetDesaturated(false)
-	end
-	wipe(self.scripts)
-	return
-end
-function m:Show()
-	return self.frame:Show()
-end
-function m:RunSpinner(start)
-	if start then
-		self.Spinner:Start()
-	else
-		self.Spinner:Stop()
-	end
-end
-function m:SetHeight(h)
-	return self.frame:SetHeight(h)
-end
-function m:Hide()
-	self.frame:SetHeight(1)
-	self.frame:SetAlpha(0)
-	return self.frame:Disable()
-end
-function m:SetScript(name,method)
-	tinsert(self.scripts,name)
-	return self.frame:SetScript(name,method)
-end
-function m:SetScale(s)
-	return self.frame:SetScale(s)
-end
-function m:Blacklist(blacklisted)
-	local mb=self.frame
-	if blacklisted then
---[===[@debug@
-		print("Blacklisting",mb:GetName())
---@end-debug@]===]
-		mb.Overlay:Show()
-		mb.Overlay.Overlay:SetAlpha(1)
-		for i,v in pairs(mb.gcPANEL.Party) do
-			v.PortraitFrame.Portrait:SetDesaturated(true)
-			v.PortraitFrame.PortraitRingQuality:Hide()
-			v.PortraitFrame.LevelBorder:Hide()
-		end
-		for i,v in pairs(mb.Rewards) do
-			v.Icon:SetDesaturated(true)
-			v.Quantity:Hide()
-		end
-		return true
-	else
-		mb.Overlay:Hide()
-		mb.Overlay.Overlay:SetAlpha(0.4)
-		for i,v in pairs(mb.gcPANEL.Party) do
-			v.PortraitFrame.Portrait:SetDesaturated(false)
-			v.PortraitFrame.PortraitRingQuality:Show()
-			v.PortraitFrame.LevelBorder:Show()
-		end
-		for i,v in pairs(mb.Rewards) do
-			v.Icon:SetDesaturated(false)
-			v.Quantity:Show()
-		end
-		return false
-	end
-end
-function m:SetMission(mission,followers,perc,source)
-	local frame=self.frame
-	frame.info=mission
-	if not mission.followers or #mission.followers==0 then
-		frame.info.followers=followers
-	end
-	frame:EnableMouse(true)
-	frame.Title:SetText(mission.name)
-	local nrewards=type(mission.rewards)=="table" and #mission.rewards or 0
-	local rc,message =pcall(GarrisonMissionButton_SetRewards,frame,mission.rewards,nrewards)
-	addon:GetMissionlistModule():AdjustMissionButton(frame,mission.rewards)
---	if #frame.Rewards > 0 then
---		local Reward=frame.Rewards[1]
---		Reward:ClearAllPoints()
---		Reward:SetPoint("RIGHT")
---	end
-	--[===[@debug@
-	if not rc then frame.Title:SetText(message) end
-	--@end-debug@]===]
-end
-function m._Constructor()
-	local frame=CreateFrame("Button",Type..AceGUI:GetNextWidgetNum(Type),nil,"OHCMissionButton")
-	--frame.Title:SetFontObject("QuestFont_Shadow_Small")
-	--frame.Summary:SetFontObject("QuestFont_Shadow_Small")
-	frame:SetScript("OnEnter",function(self) self.obj:Fire("OnEnter") end)
-	frame:SetScript("OnLeave",function(self)self.obj:Fire("OnLeave") end)
-	frame:RegisterForClicks("LeftButtonUp","RightButtonUp")
-	frame:SetScript("OnClick",function(self,button) print(button) return button=="RightButton" and self.obj:Fire("OnRightClick",self,button) or  self.obj:Fire("OnClick",self,button) end)
-	frame.LocBG:SetPoint("LEFT")
-	frame.MissionType:SetPoint("TOPLEFT",5,-2)
-	frame.isResult=true
-	local widget={}
-	setmetatable(widget,{__index=frame})
-	widget.frame=frame
-	widget.scripts={}
-	frame.obj=widget
-	for k,v in pairs(m) do widget[k]=v end
-	widget._Constructor=nil
-	-- Spinner
-	widget.Spinner=CreateFrame("Frame",nil,frame,"OHCSpinner")
-	-- Failed text string
-	widget.Spinner:SetPoint("CENTER")
-	widget.Result=frame:CreateFontString(nil,"OVERLAY","GameFontNormalHuge")
-	widget.Result:SetPoint("TOPLEFT",frame.Title,"BOTTOMLEFT",0,-10)
-	widget.Result:Hide()
-	return AceGUI:RegisterAsWidget(widget)
-end
-AceGUI:RegisterWidgetType(Type,m._Constructor,Version)
-	
diff --git a/OrderHallCommander/widgets/MissionsList.lua b/OrderHallCommander/widgets/MissionsList.lua
deleted file mode 100644
index 634a3e8..0000000
--- a/OrderHallCommander/widgets/MissionsList.lua
+++ /dev/null
@@ -1,180 +0,0 @@
-local me,addon=...
-local C=addon:GetColorTable()
-local module=addon:GetWidgetsModule()
-local Type,Version,unique="OHCMissionsList",1,0
-local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
-if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
-local C=addon:GetColorTable()
-local G=C_Garrison
-local GARRISON_FOLLOWER_XP_ADDED_ZONE_SUPPORT=GARRISON_FOLLOWER_XP_ADDED_ZONE_SUPPORT:gsub('%%d',C('%%d','Yellow'))
-local GARRISON_FOLLOWER_XP_ADDED_ZONE_SUPPORT_LEVEL_UP=GARRISON_FOLLOWER_XP_ADDED_ZONE_SUPPORT_LEVEL_UP:gsub('%%d',C('%%d','Green'))
-local	GARRISON_FOLLOWER_XP_LEFT=GARRISON_FOLLOWER_XP_LEFT:gsub('%%d',C('%%d','Orange'))
-local COMBATLOG_XPGAIN_FIRSTPERSON_UNNAMED=COMBATLOG_XPGAIN_FIRSTPERSON_UNNAMED:gsub('%%d',C('%%d','Green'))
-local GARRISON_FOLLOWER_XP_UPGRADE_STRING=GARRISON_FOLLOWER_XP_UPGRADE_STRING
-local GARRISON_FOLLOWER_XP_STRING=GARRISON_FOLLOWER_XP_STRING
-local GARRISON_FOLLOWER_DISBANDED=GARRISON_FOLLOWER_DISBANDED
-local BONUS_LOOT_LABEL=C(" (".. BONUS_LOOT_LABEL .. ")","Green")
-local m={} --#Widget
-function m:ScrollDown()
-	local obj=self.scroll
-	if (#self.missions >1 and obj.scrollbar and obj.scrollbar:IsShown()) then
-		obj:SetScroll(80)
-		obj.scrollbar.ScrollDownButton:Click()
-	end
-end
-function m:OnAcquire()
-	wipe(self.missions)
-end
-function m:Show()
-	self.frame:Show()
-end
-function m:Hide()
-	self.frame:Hide()
-	self:Release()
-end
-function m:AddButton(text,action)
-	local obj=self.scroll
-	local b=AceGUI:Create("Label")
-	b:SetFullWidth(true)
-	b:SetText(text)
-	b:SetColor(C.yellow.r,C.yellow.g,C.yellow.b)
-	--b:SetCallback("OnClick",action)
-	obj:AddChild(b)
-end
-function m:AddMissionButton(mission,followers,perc,source)
-	if not self.missions[mission.missionID] then
-		local obj=self.scroll
-		local b=AceGUI:Create("OHCMissionButton")
-		b:SetMission(mission,followers,perc,source)
-		b:SetScale(0.7)
-		b:SetFullWidth(true)
-		b:RunSpinner(true)
-		self.missions[mission.missionID]=b
-		obj:AddChild(b)
-	end
-
-end
-function m:AddMissionResult(missionID,success)
-	local mission=self.missions[missionID]
-	if mission then
-		local frame=mission.frame
-		mission:RunSpinner(false)
-		if success then
-			if success > 3 then
-				mission.Result:SetText(GARRISON_MISSION_SUCCESS .. ' ' .. BONUS_LOOT_LABEL)
-			else
-				mission.Result:SetText(GARRISON_MISSION_SUCCESS)
-			end			
-			mission.Result:SetTextColor(C:Green())
-			for i=1,#frame.Rewards do
-				frame.Rewards[i].Icon:SetDesaturated(false)
-				frame.Rewards[i].Quantity:Show()
-			end
-		else
-			mission.Result:SetText(GARRISON_MISSION_FAILED)
-			mission.Result:SetTextColor(C:Red())
-			
-			for i=1,#frame.Rewards do
-				frame.Rewards[i].Icon:SetDesaturated(true)
-				frame.Rewards[i].Quantity:Hide()
-			end
-		end
-		frame.Title:ClearAllPoints()
-		frame.Title:SetPoint("TOPLEFT",165,-7)
-		mission.Result:Show()
-	end
-end
-function m:AddRow(data,...)
-	local obj=self.scroll
-	local l=AceGUI:Create("InteractiveLabel")
-	l:SetFontObject(GameFontNormalSmall)
-	l:SetText(data)
-	l:SetColor(...)
-	l:SetFullWidth(true)
-	obj:AddChild(l)
-
-end
-function m:AddPlayerXP(xpgain)
-	if xpgain>0 then
-		self:AddRow(COMBATLOG_XPGAIN_FIRSTPERSON_UNNAMED:format(xpgain))
-	end
-
-end
-function m:AddFollower(followerID,xp,levelup,portrait,fullname)
-	if xp < 0 then
-		return self:AddFollowerIcon(portrait,format(GARRISON_FOLLOWER_DISBANDED,fullname))
-	end
-	local isMaxLevel=addon:GetFollowerData(followerID,'isMaxLevel',false)
-	if isMaxLevel and not levelup then
-		return
---			return self:AddFollowerIcon(followerType,follower.portraitIconID,format("%s is already at maximum xp",follower.fullname))
-	end
-	if levelup then
-		PlaySound("UI_Garrison_CommandTable_Follower_LevelUp");
-	end
-	
-	local message=GARRISON_FOLLOWER_XP_ADDED_ZONE_SUPPORT:format(fullname,xp)
-	local quality=addon:GetFollowerData(followerID,'quality')
-	local level=addon:GetFollowerData(followerID,'level')
-	local XP=addon:GetFollowerData(followerID,'xp',0) 
-	local levelXP=addon:GetFollowerData(followerID,'levelXP',0)
-	if levelup then
-		message=message..' ' .. GARRISON_FOLLOWER_XP_ADDED_ZONE_SUPPORT_LEVEL_UP:format(fullname,level)
-	end
-	if levelXP > 0 then
-		message=message .. ' ' ..
-			GARRISON_FOLLOWER_XP_LEFT:format(levelXP-addon:GetFollowerData(followerID,'xp',levelXP)) ..
-			' ' ..
-			(isMaxLevel and GARRISON_FOLLOWER_XP_UPGRADE_STRING or GARRISON_FOLLOWER_XP_STRING)
-	end		
-	return self:AddFollowerIcon(portrait,message)
-end
-function m:AddFollowerIcon(icon,text)
-	local l=self:AddIconText(icon,text)
-end
-function m:AddIconText(icon,text,qt,isBonus)
-	local obj=self.scroll
-	local l=AceGUI:Create("Label")
-	l:SetFontObject(GameFontNormalSmall)
-	if (qt) then
-		l:SetText(format("%s x %s %s",text,qt,isBonus and BONUS_LOOT_LABEL or ''))
-	else
-		l:SetText(text)
-	end
-	l:SetImage(icon)
-	l:SetImageSize(24,24)
-	l:SetHeight(26)
-	l:SetFullWidth(true)
-	obj:AddChild(l)
-	if (obj.scrollbar and obj.scrollbar:IsShown()) then
-		obj:SetScroll(80)
-		obj.scrollbar.ScrollDownButton:Click()
-	end
-	return l
-end
-function m:AddItem(itemID,qt,isBonus)
-	local obj=self.scroll
-	local _,itemlink,itemquality,_,_,_,_,_,_,itemtexture=GetItemInfo(itemID)
-	if not itemlink then
-		self:AddIconText(itemtexture,itemID,qt,isBonus)
-	else
-		self:AddIconText(itemtexture,itemlink,qt,isBonus)
-	end
-end
-function m._Constructor()
-	local widget=AceGUI:Create("OHCGUIContainer")
-	widget:SetLayout("Fill")
-	widget.missions={}
-	local scroll = AceGUI:Create("ScrollFrame")
-	scroll:SetLayout("List") -- probably?
-	scroll:SetFullWidth(true)
-	scroll:SetFullHeight(true)
-	widget:AddChild(scroll)
-	for k,v in pairs(m) do widget[k]=v end
-	widget._Constructor=nil
-	widget:Show()
-	widget.scroll=scroll
-	widget.type=Type
-	return widget
-end
-AceGUI:RegisterWidgetType(Type,m._Constructor,Version)
diff --git a/OrderHallCommander/widgets/Reward.lua b/OrderHallCommander/widgets/Reward.lua
deleted file mode 100644
index e69de29..0000000
-- 
1.7.9.5