Mercurial > wow > askmrrobot

changeset 106:e635cd648e01 v49

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7.2 update
author yellowfive
date Tue, 28 Mar 2017 16:10:00 -0700
parents 3ce266c86bd3
children 8b8a5b768d18
files AskMrRobot-Serializer/AskMrRobot-Serializer.lua AskMrRobot.toc Export.lua Libs/AceAddon-3.0/AceAddon-3.0.xml Libs/AceComm-3.0/AceComm-3.0.xml Libs/AceConsole-3.0/AceConsole-3.0.lua Libs/AceConsole-3.0/AceConsole-3.0.xml Libs/AceDB-3.0/AceDB-3.0.lua Libs/AceDB-3.0/AceDB-3.0.xml Libs/AceEvent-3.0/AceEvent-3.0.xml Libs/AceGUI-3.0/widgets/AceGUIContainer-Frame.lua Libs/AceGUI-3.0/widgets/AceGUIContainer-ScrollFrame.lua Libs/AceGUI-3.0/widgets/AceGUIContainer-TreeGroup.lua Libs/AceGUI-3.0/widgets/AceGUIContainer-Window.lua Libs/AceGUI-3.0/widgets/AceGUIWidget-Button.lua Libs/AceGUI-3.0/widgets/AceGUIWidget-ColorPicker.lua Libs/AceGUI-3.0/widgets/AceGUIWidget-DropDown-Items.lua Libs/AceGUI-3.0/widgets/AceGUIWidget-EditBox.lua Libs/AceGUI-3.0/widgets/AceGUIWidget-Icon.lua Libs/AceGUI-3.0/widgets/AceGUIWidget-InteractiveLabel.lua Libs/AceGUI-3.0/widgets/AceGUIWidget-Keybinding.lua Libs/AceGUI-3.0/widgets/AceGUIWidget-Label.lua Libs/AceGUI-3.0/widgets/AceGUIWidget-MultiLineEditBox.lua Libs/AceLocale-3.0/AceLocale-3.0.xml Libs/AceSerializer-3.0/AceSerializer-3.0.lua Libs/AceSerializer-3.0/AceSerializer-3.0.xml Libs/CallbackHandler-1.0/CallbackHandler-1.0.lua Libs/CallbackHandler-1.0/CallbackHandler-1.0.xml
diffstat 28 files changed, 102 insertions(+), 73 deletions(-) [+]
line wrap: on
line diff
--- a/AskMrRobot-Serializer/AskMrRobot-Serializer.lua	Wed Nov 16 00:03:40 2016 -0800
+++ b/AskMrRobot-Serializer/AskMrRobot-Serializer.lua	Tue Mar 28 16:10:00 2017 -0700
@@ -1,7 +1,7 @@
 -- AskMrRobot-Serializer will serialize and communicate character data between users.
 -- This is used primarily to associate character information to logs uploaded to askmrrobot.com.
 
-local MAJOR, MINOR = "AskMrRobot-Serializer", 48
+local MAJOR, MINOR = "AskMrRobot-Serializer", 49
 local Amr, oldminor = LibStub:NewLibrary(MAJOR, MINOR)
 
 if not Amr then return end -- already loaded by something else
--- a/AskMrRobot.toc	Wed Nov 16 00:03:40 2016 -0800
+++ b/AskMrRobot.toc	Tue Mar 28 16:10:00 2017 -0700
@@ -1,7 +1,7 @@
-## Interface: 70100
+## Interface: 70200
 ## Title: Ask Mr. Robot
 ## Author: Team Robot, Inc.
-## Version: 48
+## Version: 49
 ## Notes: Gear import/export, combat logging, and more.
 ## URL: www.askmrrobot.com
 ## SavedVariables: AskMrRobotDb3
--- a/Export.lua	Wed Nov 16 00:03:40 2016 -0800
+++ b/Export.lua	Tue Mar 28 16:10:00 2017 -0700
@@ -277,9 +277,9 @@
 	
 	local powerRanks = {}
 	for k,v in pairs(powers) do
-		local spellId, cost, rank, maxRank, relicRank = C_ArtifactUI.GetPowerInfo(v)
-		if rank - relicRank > 0 then
-			powerRanks[v] = rank - relicRank
+		local powerInfo = C_ArtifactUI.GetPowerInfo(v)
+		if powerInfo.currentRank - powerInfo.bonusRanks > 0 then
+			powerRanks[v] = powerInfo.currentRank - powerInfo.bonusRanks
 		end
 	end
 	
--- a/Libs/AceAddon-3.0/AceAddon-3.0.xml	Wed Nov 16 00:03:40 2016 -0800
+++ b/Libs/AceAddon-3.0/AceAddon-3.0.xml	Tue Mar 28 16:10:00 2017 -0700
@@ -1,4 +1,4 @@
 <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
+</Ui>
--- a/Libs/AceComm-3.0/AceComm-3.0.xml	Wed Nov 16 00:03:40 2016 -0800
+++ b/Libs/AceComm-3.0/AceComm-3.0.xml	Tue Mar 28 16:10:00 2017 -0700
@@ -2,4 +2,4 @@
 ..\FrameXML\UI.xsd">
 	<Script file="ChatThrottleLib.lua"/>
 	<Script file="AceComm-3.0.lua"/>
-</Ui>
\ No newline at end of file
+</Ui>
--- a/Libs/AceConsole-3.0/AceConsole-3.0.lua	Wed Nov 16 00:03:40 2016 -0800
+++ b/Libs/AceConsole-3.0/AceConsole-3.0.lua	Tue Mar 28 16:10:00 2017 -0700
@@ -9,7 +9,7 @@
 -- make into AceConsole.
 -- @class file
 -- @name AceConsole-3.0
--- @release $Id: AceConsole-3.0.lua 878 2009-11-02 18:51:58Z nevcairiel $
+-- @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)
@@ -136,7 +136,7 @@
 
 --- Retreive one or more space-separated arguments from a string. 
 -- Treats quoted strings and itemlinks as non-spaced.
--- @param string The raw argument string
+-- @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\\
--- a/Libs/AceConsole-3.0/AceConsole-3.0.xml	Wed Nov 16 00:03:40 2016 -0800
+++ b/Libs/AceConsole-3.0/AceConsole-3.0.xml	Tue Mar 28 16:10:00 2017 -0700
@@ -1,4 +1,4 @@
 <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
+</Ui>
--- a/Libs/AceDB-3.0/AceDB-3.0.lua	Wed Nov 16 00:03:40 2016 -0800
+++ b/Libs/AceDB-3.0/AceDB-3.0.lua	Tue Mar 28 16:10:00 2017 -0700
@@ -10,6 +10,7 @@
 -- * **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.
 --
@@ -39,7 +40,7 @@
 -- end
 -- @class file
 -- @name AceDB-3.0.lua
--- @release $Id: AceDB-3.0.lua 1124 2014-10-27 21:00:07Z funkydude $
+-- @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)
 
--- a/Libs/AceDB-3.0/AceDB-3.0.xml	Wed Nov 16 00:03:40 2016 -0800
+++ b/Libs/AceDB-3.0/AceDB-3.0.xml	Tue Mar 28 16:10:00 2017 -0700
@@ -1,4 +1,4 @@
 <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
+</Ui>
--- a/Libs/AceEvent-3.0/AceEvent-3.0.xml	Wed Nov 16 00:03:40 2016 -0800
+++ b/Libs/AceEvent-3.0/AceEvent-3.0.xml	Tue Mar 28 16:10:00 2017 -0700
@@ -1,4 +1,4 @@
 <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
+</Ui>
--- a/Libs/AceGUI-3.0/widgets/AceGUIContainer-Frame.lua	Wed Nov 16 00:03:40 2016 -0800
+++ b/Libs/AceGUI-3.0/widgets/AceGUIContainer-Frame.lua	Tue Mar 28 16:10:00 2017 -0700
@@ -1,7 +1,7 @@
 --[[-----------------------------------------------------------------------------
 Frame Container
 -------------------------------------------------------------------------------]]
-local Type, Version = "Frame", 24
+local Type, Version = "Frame", 25
 local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
 if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
 
@@ -25,6 +25,10 @@
 	frame.obj:Hide()
 end
 
+local function Frame_OnShow(frame)
+	frame.obj:Fire("OnShow")
+end
+
 local function Frame_OnClose(frame)
 	frame.obj:Fire("OnClose")
 end
@@ -186,6 +190,7 @@
 	frame:SetBackdropColor(0, 0, 0, 1)
 	frame:SetMinResize(400, 200)
 	frame:SetToplevel(true)
+	frame:SetScript("OnShow", Frame_OnShow)
 	frame:SetScript("OnHide", Frame_OnClose)
 	frame:SetScript("OnMouseDown", Frame_OnMouseDown)
 
--- a/Libs/AceGUI-3.0/widgets/AceGUIContainer-ScrollFrame.lua	Wed Nov 16 00:03:40 2016 -0800
+++ b/Libs/AceGUI-3.0/widgets/AceGUIContainer-ScrollFrame.lua	Tue Mar 28 16:10:00 2017 -0700
@@ -2,7 +2,7 @@
 ScrollFrame Container
 Plain container that scrolls its content and doesn't grow in height.
 -------------------------------------------------------------------------------]]
-local Type, Version = "ScrollFrame", 23
+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
 
@@ -176,7 +176,7 @@
 
 	local scrollbg = scrollbar:CreateTexture(nil, "BACKGROUND")
 	scrollbg:SetAllPoints(scrollbar)
-	scrollbg:SetTexture(0, 0, 0, 0.4)
+	scrollbg:SetColorTexture(0, 0, 0, 0.4)
 
 	--Container Support
 	local content = CreateFrame("Frame", nil, scrollframe)
--- a/Libs/AceGUI-3.0/widgets/AceGUIContainer-TreeGroup.lua	Wed Nov 16 00:03:40 2016 -0800
+++ b/Libs/AceGUI-3.0/widgets/AceGUIContainer-TreeGroup.lua	Tue Mar 28 16:10:00 2017 -0700
@@ -2,7 +2,7 @@
 TreeGroup Container
 Container that uses a tree control to switch between groups.
 -------------------------------------------------------------------------------]]
-local Type, Version = "TreeGroup", 37
+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
 
@@ -295,6 +295,7 @@
 	["OnAcquire"] = function(self)
 		self:SetTreeWidth(DEFAULT_TREE_WIDTH, DEFAULT_TREE_SIZABLE)
 		self:EnableButtonTooltips(true)
+		self.frame:SetScript("OnUpdate", FirstFrameUpdate)
 	end,
 
 	["OnRelease"] = function(self)
@@ -335,6 +336,8 @@
 		button.toggle.button = button
 		button.toggle:SetScript("OnClick",Expand_OnClick)
 
+		button.text:SetHeight(14) -- Prevents text wrapping
+
 		return button
 	end,
 
@@ -667,7 +670,7 @@
 
 	local scrollbg = scrollbar:CreateTexture(nil, "BACKGROUND")
 	scrollbg:SetAllPoints(scrollbar)
-	scrollbg:SetTexture(0,0,0,0.4)
+	scrollbg:SetColorTexture(0,0,0,0.4)
 
 	local border = CreateFrame("Frame",nil,frame)
 	border:SetPoint("TOPLEFT", treeframe, "TOPRIGHT")
--- a/Libs/AceGUI-3.0/widgets/AceGUIContainer-Window.lua	Wed Nov 16 00:03:40 2016 -0800
+++ b/Libs/AceGUI-3.0/widgets/AceGUIContainer-Window.lua	Tue Mar 28 16:10:00 2017 -0700
@@ -21,7 +21,11 @@
 ]]
 do
 	local Type = "Window"
-	local Version = 4
+	local Version = 5
+
+	local function frameOnShow(this)
+		this.obj:Fire("OnShow")
+	end
 
 	local function frameOnClose(this)
 		this.obj:Fire("OnClose")
@@ -180,6 +184,7 @@
 		frame:SetFrameStrata("FULLSCREEN_DIALOG")
 		frame:SetScript("OnMouseDown", frameOnMouseDown)
 		
+		frame:SetScript("OnShow",frameOnShow)
 		frame:SetScript("OnHide",frameOnClose)
 		frame:SetMinResize(240,240)
 		frame:SetToplevel(true)
--- a/Libs/AceGUI-3.0/widgets/AceGUIWidget-Button.lua	Wed Nov 16 00:03:40 2016 -0800
+++ b/Libs/AceGUI-3.0/widgets/AceGUIWidget-Button.lua	Tue Mar 28 16:10:00 2017 -0700
@@ -13,12 +13,6 @@
 local _G = _G
 local PlaySound, CreateFrame, UIParent = PlaySound, CreateFrame, UIParent
 
-local wowMoP
-do
-	local _, _, _, interface = GetBuildInfo()
-	wowMoP = (interface >= 50000)
-end
-
 --[[-----------------------------------------------------------------------------
 Scripts
 -------------------------------------------------------------------------------]]
@@ -80,7 +74,7 @@
 -------------------------------------------------------------------------------]]
 local function Constructor()
 	local name = "AceGUI30Button" .. AceGUI:GetNextWidgetNum(Type)
-	local frame = CreateFrame("Button", name, UIParent, wowMoP and "UIPanelButtonTemplate" or "UIPanelButtonTemplate2")
+	local frame = CreateFrame("Button", name, UIParent, "UIPanelButtonTemplate")
 	frame:Hide()
 
 	frame:EnableMouse(true)
--- a/Libs/AceGUI-3.0/widgets/AceGUIWidget-ColorPicker.lua	Wed Nov 16 00:03:40 2016 -0800
+++ b/Libs/AceGUI-3.0/widgets/AceGUIWidget-ColorPicker.lua	Tue Mar 28 16:10:00 2017 -0700
@@ -1,7 +1,7 @@
 --[[-----------------------------------------------------------------------------
 ColorPicker Widget
 -------------------------------------------------------------------------------]]
-local Type, Version = "ColorPicker", 22
+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
 
@@ -146,7 +146,7 @@
 	local texture = frame:CreateTexture(nil, "BACKGROUND")
 	texture:SetWidth(16)
 	texture:SetHeight(16)
-	texture:SetTexture(1, 1, 1)
+	texture:SetColorTexture(1, 1, 1)
 	texture:SetPoint("CENTER", colorSwatch)
 	texture:Show()
 
--- a/Libs/AceGUI-3.0/widgets/AceGUIWidget-DropDown-Items.lua	Wed Nov 16 00:03:40 2016 -0800
+++ b/Libs/AceGUI-3.0/widgets/AceGUIWidget-DropDown-Items.lua	Tue Mar 28 16:10:00 2017 -0700
@@ -1,4 +1,4 @@
---[[ $Id: AceGUIWidget-DropDown-Items.lua 996 2010-12-01 18:34:17Z nevcairiel $ ]]--
+--[[ $Id: AceGUIWidget-DropDown-Items.lua 1153 2016-11-20 09:57:15Z nevcairiel $ ]]--
 
 local AceGUI = LibStub("AceGUI-3.0")
 
@@ -440,7 +440,7 @@
 -- A single line to separate items
 do
 	local widgetType = "Dropdown-Item-Separator"
-	local widgetVersion = 1
+	local widgetVersion = 2
 	
 	-- exported, override
 	local function SetDisabled(self, disabled)
@@ -455,7 +455,7 @@
 		
 		local line = self.frame:CreateTexture(nil, "OVERLAY")
 		line:SetHeight(1)
-		line:SetTexture(.5, .5, .5)
+		line:SetColorTexture(.5, .5, .5)
 		line:SetPoint("LEFT", self.frame, "LEFT", 10, 0)
 		line:SetPoint("RIGHT", self.frame, "RIGHT", -10, 0)
 		
--- a/Libs/AceGUI-3.0/widgets/AceGUIWidget-EditBox.lua	Wed Nov 16 00:03:40 2016 -0800
+++ b/Libs/AceGUI-3.0/widgets/AceGUIWidget-EditBox.lua	Tue Mar 28 16:10:00 2017 -0700
@@ -1,7 +1,7 @@
 --[[-----------------------------------------------------------------------------
 EditBox Widget
 -------------------------------------------------------------------------------]]
-local Type, Version = "EditBox", 25
+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
 
@@ -200,6 +200,10 @@
 		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
 }
 
--- a/Libs/AceGUI-3.0/widgets/AceGUIWidget-Icon.lua	Wed Nov 16 00:03:40 2016 -0800
+++ b/Libs/AceGUI-3.0/widgets/AceGUIWidget-Icon.lua	Tue Mar 28 16:10:00 2017 -0700
@@ -9,7 +9,7 @@
 local select, pairs, print = select, pairs, print
 
 -- WoW APIs
-local CreateFrame, UIParent, GetBuildInfo = CreateFrame, UIParent, GetBuildInfo
+local CreateFrame, UIParent = CreateFrame, UIParent
 
 --[[-----------------------------------------------------------------------------
 Scripts
@@ -131,12 +131,8 @@
 	for method, func in pairs(methods) do
 		widget[method] = func
 	end
-	-- SetText is deprecated, but keep it around for a while. (say, to WoW 4.0)
-	if (select(4, GetBuildInfo()) < 40000) then
-		widget.SetText = widget.SetLabel
-	else
-		widget.SetText = function(self, ...) print("AceGUI-3.0-Icon: SetText is deprecated! Use SetLabel instead!"); self:SetLabel(...) end
-	end
+
+	widget.SetText = function(self, ...) print("AceGUI-3.0-Icon: SetText is deprecated! Use SetLabel instead!"); self:SetLabel(...) end
 
 	return AceGUI:RegisterAsWidget(widget)
 end
--- a/Libs/AceGUI-3.0/widgets/AceGUIWidget-InteractiveLabel.lua	Wed Nov 16 00:03:40 2016 -0800
+++ b/Libs/AceGUI-3.0/widgets/AceGUIWidget-InteractiveLabel.lua	Tue Mar 28 16:10:00 2017 -0700
@@ -1,7 +1,7 @@
 --[[-----------------------------------------------------------------------------
 InteractiveLabel Widget
 -------------------------------------------------------------------------------]]
-local Type, Version = "InteractiveLabel", 20
+local Type, Version = "InteractiveLabel", 21
 local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
 if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
 
--- a/Libs/AceGUI-3.0/widgets/AceGUIWidget-Keybinding.lua	Wed Nov 16 00:03:40 2016 -0800
+++ b/Libs/AceGUI-3.0/widgets/AceGUIWidget-Keybinding.lua	Tue Mar 28 16:10:00 2017 -0700
@@ -2,7 +2,7 @@
 Keybinding Widget
 Set Keybindings in the Config UI.
 -------------------------------------------------------------------------------]]
-local Type, Version = "Keybinding", 24
+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
 
@@ -17,12 +17,6 @@
 -- List them here for Mikk's FindGlobals script
 -- GLOBALS: NOT_BOUND
 
-local wowMoP
-do
-	local _, _, _, interface = GetBuildInfo()
-	wowMoP = (interface >= 50000)
-end
-
 --[[-----------------------------------------------------------------------------
 Scripts
 -------------------------------------------------------------------------------]]
@@ -40,11 +34,13 @@
 		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
@@ -79,6 +75,7 @@
 		end
 
 		frame:EnableKeyboard(false)
+		frame:EnableMouseWheel(false)
 		self.msgframe:Hide()
 		frame:UnlockHighlight()
 		self.waitingForKey = nil
@@ -103,6 +100,16 @@
 	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
 -------------------------------------------------------------------------------]]
@@ -115,6 +122,7 @@
 		self.msgframe:Hide()
 		self:SetDisabled(false)
 		self.button:EnableKeyboard(false)
+		self.button:EnableMouseWheel(false)
 	end,
 
 	-- ["OnRelease"] = nil,
@@ -180,15 +188,17 @@
 	local name = "AceGUI30KeybindingButton" .. AceGUI:GetNextWidgetNum(Type)
 
 	local frame = CreateFrame("Frame", nil, UIParent)
-	local button = CreateFrame("Button", name, frame, wowMoP and "UIPanelButtonTemplate" or "UIPanelButtonTemplate2")
+	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)
--- a/Libs/AceGUI-3.0/widgets/AceGUIWidget-Label.lua	Wed Nov 16 00:03:40 2016 -0800
+++ b/Libs/AceGUI-3.0/widgets/AceGUIWidget-Label.lua	Tue Mar 28 16:10:00 2017 -0700
@@ -2,7 +2,7 @@
 Label Widget
 Displays text and optionally an icon.
 -------------------------------------------------------------------------------]]
-local Type, Version = "Label", 23
+local Type, Version = "Label", 24
 local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
 if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
 
@@ -78,6 +78,8 @@
 		self:SetImageSize(16, 16)
 		self:SetColor()
 		self:SetFontObject()
+		self:SetJustifyH("LEFT")
+		self:SetJustifyV("TOP")
 
 		-- reset the flag
 		self.resizing = nil
@@ -134,6 +136,14 @@
 		self.image:SetHeight(height)
 		UpdateImageAnchor(self)
 	end,
+
+	["SetJustifyH"] = function(self, justifyH)
+		self.label:SetJustifyH(justifyH)
+	end,
+
+	["SetJustifyV"] = function(self, justifyV)
+		self.label:SetJustifyV(justifyV)
+	end,
 }
 
 --[[-----------------------------------------------------------------------------
@@ -144,9 +154,6 @@
 	frame:Hide()
 
 	local label = frame:CreateFontString(nil, "BACKGROUND", "GameFontHighlightSmall")
-	label:SetJustifyH("LEFT")
-	label:SetJustifyV("TOP")
-
 	local image = frame:CreateTexture(nil, "BACKGROUND")
 
 	-- create widget
--- a/Libs/AceGUI-3.0/widgets/AceGUIWidget-MultiLineEditBox.lua	Wed Nov 16 00:03:40 2016 -0800
+++ b/Libs/AceGUI-3.0/widgets/AceGUIWidget-MultiLineEditBox.lua	Tue Mar 28 16:10:00 2017 -0700
@@ -1,4 +1,4 @@
-local Type, Version = "MultiLineEditBox", 27
+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
 
@@ -14,12 +14,6 @@
 -- List them here for Mikk's FindGlobals script
 -- GLOBALS: ACCEPT, ChatFontNormal
 
-local wowMoP
-do
-	local _, _, _, interface = GetBuildInfo()
-	wowMoP = (interface >= 50000)
-end
-
 --[[-----------------------------------------------------------------------------
 Support functions
 -------------------------------------------------------------------------------]]
@@ -251,7 +245,11 @@
 			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,
@@ -285,7 +283,7 @@
 	label:SetText(ACCEPT)
 	label:SetHeight(10)
 
-	local button = CreateFrame("Button", ("%s%dButton"):format(Type, widgetNum), frame, wowMoP and "UIPanelButtonTemplate" or "UIPanelButtonTemplate2")
+	local button = CreateFrame("Button", ("%s%dButton"):format(Type, widgetNum), frame, "UIPanelButtonTemplate")
 	button:SetPoint("BOTTOMLEFT", 0, 4)
 	button:SetHeight(22)
 	button:SetWidth(label:GetStringWidth() + 24)
--- a/Libs/AceLocale-3.0/AceLocale-3.0.xml	Wed Nov 16 00:03:40 2016 -0800
+++ b/Libs/AceLocale-3.0/AceLocale-3.0.xml	Tue Mar 28 16:10:00 2017 -0700
@@ -1,4 +1,4 @@
 <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
+</Ui>
--- a/Libs/AceSerializer-3.0/AceSerializer-3.0.lua	Wed Nov 16 00:03:40 2016 -0800
+++ b/Libs/AceSerializer-3.0/AceSerializer-3.0.lua	Tue Mar 28 16:10:00 2017 -0700
@@ -10,8 +10,8 @@
 -- make into AceSerializer.
 -- @class file
 -- @name AceSerializer-3.0
--- @release $Id: AceSerializer-3.0.lua 1038 2011-10-03 01:39:58Z mikk $
-local MAJOR,MINOR = "AceSerializer-3.0", 4
+-- @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
@@ -27,8 +27,8 @@
 local inf = math.huge
 
 local serNaN  -- can't do this in 4.3, see ace3 ticket 268
-local serInf = tostring(inf)
-local serNegInf = tostring(-inf)
+local serInf, serInfMac = "1.#INF", "inf"
+local serNegInf, serNegInfMac = "-1.#INF", "-inf"
 
 
 -- Serialization functions
@@ -62,11 +62,15 @@
 	
 	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]] or str==serInf or str==serNegInf then
+		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"
@@ -147,9 +151,9 @@
 local function DeserializeNumberHelper(number)
 	--[[ not in 4.3 if number == serNaN then
 		return 0/0
-	else]]if number == serNegInf then
+	else]]if number == serNegInf or number == serNegInfMac then
 		return -inf
-	elseif number == serInf then
+	elseif number == serInf or number == serInfMac then
 		return inf
 	else
 		return tonumber(number)
@@ -280,4 +284,4 @@
 -- Update embeds
 for target, v in pairs(AceSerializer.embeds) do
 	AceSerializer:Embed(target)
-end
\ No newline at end of file
+end
--- a/Libs/AceSerializer-3.0/AceSerializer-3.0.xml	Wed Nov 16 00:03:40 2016 -0800
+++ b/Libs/AceSerializer-3.0/AceSerializer-3.0.xml	Tue Mar 28 16:10:00 2017 -0700
@@ -1,4 +1,4 @@
 <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
+</Ui>
--- a/Libs/CallbackHandler-1.0/CallbackHandler-1.0.lua	Wed Nov 16 00:03:40 2016 -0800
+++ b/Libs/CallbackHandler-1.0/CallbackHandler-1.0.lua	Tue Mar 28 16:10:00 2017 -0700
@@ -1,4 +1,4 @@
---[[ $Id: CallbackHandler-1.0.lua 965 2010-08-09 00:47:52Z mikk $ ]]
+--[[ $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)
 
@@ -65,9 +65,7 @@
 --   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, OnUsed, OnUnused)
-	-- TODO: Remove this after beta has gone out
-	assert(not OnUsed and not OnUnused, "ACE-80: OnUsed/OnUnused are deprecated. Callbacks are now done to registry.OnUsed and registry.OnUnused")
+function CallbackHandler:New(target, RegisterName, UnregisterName, UnregisterAllName)
 
 	RegisterName = RegisterName or "RegisterCallback"
 	UnregisterName = UnregisterName or "UnregisterCallback"
--- a/Libs/CallbackHandler-1.0/CallbackHandler-1.0.xml	Wed Nov 16 00:03:40 2016 -0800
+++ b/Libs/CallbackHandler-1.0/CallbackHandler-1.0.xml	Tue Mar 28 16:10:00 2017 -0700
@@ -1,4 +1,4 @@
 <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
+</Ui>