Merge branch 'dev'

.luacheckrc

@@ -160,9 +160,6 @@ read_globals = {
 	"GetInventoryItemDurability",
 	"GetInventoryItemLink",
 	"GetInventoryItemTexture",
-	"GetItemCount",
-	"GetItemInfo",
-	"GetItemInfoInstant",
 	"GetLFGDungeonShortageRewardInfo",
 	"GetLFGRandomDungeonInfo",
 	"GetLFGRoles",
@@ -204,7 +201,6 @@ read_globals = {
 	"GetWatchedFactionInfo",
 	"GetWeaponEnchantInfo",
 	"GetXPExhaustion",
-	"GetZonePVPInfo",
 	"GUILD_AND_COMMUNITIES",
 	"HELP_BUTTON",
 	"HelpTip",

CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## Version 100206.01
+
+- Added 10.2.6 support.
+
 ## Version 100205.03
 
 ### Action Bars

ls_UI/core/changelog.lua

@@ -6,8 +6,5 @@ local _G = getfenv(0)
 
 -- Mine
 E.CHANGELOG = [[
-### Action Bars
-
-- Reworked the instance lockout tooltip. Instances and world bosses are now grouped by the lockout expiration time. 
-  Instance names and difficulties are also properly sorted. This should greatly increase its readability.
+- Added 10.2.6 support.
 ]]

ls_UI/ls_UI.toc

@@ -1,6 +1,6 @@
-## Interface: 100205
+## Interface: 100206
 ## Author: lightspark
-## Version: 100205.03
+## Version: 100206.01
 ## Title: LS: |cff1a9fc0UI|r
 ## Notes: Yet another UI, but this one is a bit special...
 ## IconTexture: Interface\AddOns\ls_UI\assets\logo-64

ls_UI/modules/bars/bag.lua

@@ -16,7 +16,7 @@ local button_proto = {}
 do
 	local CURRENCY_TEMPLATE = "%s |T%s:0|t"
 	local CURRENCY_DETAILED_TEMPLATE = "%s / %s|T%s:0|t"
-	local _, TOKEN_NAME = GetItemInfoInstant(WOW_TOKEN_ITEM_ID) -- technically it's its item class
+	local _, TOKEN_NAME = C_Item.GetItemInfoInstant(WOW_TOKEN_ITEM_ID)
 	local TOKEN_COLOR = ITEM_QUALITY_COLORS[8]
 
 	local function sorter(a, b)

ls_UI/modules/minimap/minimap.lua

@@ -28,7 +28,7 @@ do
 
 	function minimap_proto:UpdateBorderColor()
 		if self._config.color.border then
-			self.Border:SetVertexColor((C.db.global.colors.zone[zoneTypeToColor[GetZonePVPInfo() or "contested"]]):GetRGB())
+			self.Border:SetVertexColor((C.db.global.colors.zone[zoneTypeToColor[C_PvP.GetZonePVPInfo() or "contested"]]):GetRGB())
 		else
 			self.Border:SetVertexColor(C.db.global.colors.light_gray:GetRGB())
 		end
@@ -176,7 +176,7 @@ do
 			MinimapCluster.BorderTop:SetPoint("BOTTOM", MinimapCluster, "BOTTOM", 0, 1)
 
 			MinimapCluster.IndicatorFrame:ClearAllPoints()
-			MinimapCluster.IndicatorFrame:SetPoint("BOTTOMLEFT", MinimapCluster.Tracking, "TOPLEFT", -1, 2)
+			MinimapCluster.IndicatorFrame:SetPoint("BOTTOMLEFT", MinimapCluster.TrackingFrame, "TOPLEFT", -1, 2)
 
 			Minimap.DifficultyFlag:SetPoint("TOPRIGHT", MinimapCluster, "TOPRIGHT", -23, -16)
 		else
@@ -185,7 +185,7 @@ do
 			MinimapCluster.BorderTop:SetPoint("TOP", MinimapCluster, "TOP", 0, -1)
 
 			MinimapCluster.IndicatorFrame:ClearAllPoints()
-			MinimapCluster.IndicatorFrame:SetPoint("TOPLEFT", MinimapCluster.Tracking, "BOTTOMLEFT", -1, -2)
+			MinimapCluster.IndicatorFrame:SetPoint("TOPLEFT", MinimapCluster.TrackingFrame, "BOTTOMLEFT", -1, -2)
 
 			Minimap.DifficultyFlag:SetPoint("TOPRIGHT", MinimapCluster, "TOPRIGHT", -23, -32)
 		end
@@ -577,10 +577,10 @@ function MODULE:Init()
 		MinimapCluster.BorderTop:SetWidth(0)
 		MinimapCluster.BorderTop:SetHeight(17)
 
-		MinimapCluster.Tracking:SetSize(18, 17)
-		MinimapCluster.Tracking.Button:SetSize(14, 14)
-		MinimapCluster.Tracking.Button:ClearAllPoints()
-		MinimapCluster.Tracking.Button:SetPoint("TOPLEFT", 1, -1)
+		MinimapCluster.TrackingFrame:SetSize(18, 17)
+		MinimapCluster.TrackingFrame.Button:SetSize(14, 14)
+		MinimapCluster.TrackingFrame.Button:ClearAllPoints()
+		MinimapCluster.TrackingFrame.Button:SetPoint("TOPLEFT", 1, -1)
 
 		MinimapCluster.ZoneTextButton:SetSize(0, 16)
 		MinimapCluster.ZoneTextButton:ClearAllPoints()

ls_UI/modules/tooltips/tooltips.lua

@@ -137,13 +137,13 @@ function MODULE:Init()
 			if id then
 				local textRight
 				if C.db.profile.tooltips.count then
-					textRight = TOTAL:format(GetItemCount(id, true))
+					textRight = TOTAL:format(C_Item.GetItemCount(id, true))
 				end
 
 				tooltip:AddLine(" ")
 				tooltip:AddDoubleLine(ID:format(id), textRight or "", 1, 1, 1, 1, 1, 1)
 
-				local _, _, _, _, _, _, _, _, _, _, _, _, _, _, expacID = GetItemInfo(id)
+				local _, _, _, _, _, _, _, _, _, _, _, _, _, _, expacID = C_Item.GetItemInfo(id)
 				if expacID and expacID > 0 then
 					tooltip:AddLine(EXPANSION:format(_G["EXPANSION_NAME" .. expacID]), 1, 1, 1)
 				end

ls_UI_Options/ls_UI_Options.toc

@@ -1,4 +1,4 @@
-## Interface: 100205
+## Interface: 100206
 ## Author: lightspark
 ## Title: LS: |cff1a9fc0UI|r |cff888987OptionsUI|r
 ## Notes: Options for LS: |cff1a9fc0UI|r.