Merge branch 'classic/dev' into classic/master

.compressor.ps1

@@ -1,5 +1,13 @@
 Set-Location $PSScriptRoot
 
+if (-Not (Test-Path "$env:ProgramFiles\7-Zip\7z.exe")) {
+	Write-Host "7z.exe not found"
+
+	return Read-Host
+}
+
+Set-Alias 7z "$env:ProgramFiles\7-Zip\7z.exe"
+
 $name = (Get-Item .).Name
 
 if (-Not (Test-Path (".\" + $name + "\" + $name + ".toc"))) {
@@ -39,5 +47,5 @@ if (Test-Path $temp) {
 
 New-Item -Path $temp -ItemType Directory | Out-Null
 Copy-Item $foldersToInclude -Destination $temp -Exclude $filesToExclude -Recurse
-Get-ChildItem $temp | Compress-Archive -DestinationPath "..\$name-$version.zip" -Force
+7z a -tzip -mx9 "..\$name-$version.zip" (Get-ChildItem $temp)
 Remove-Item $temp -Recurse -Force

.luacheckrc

@@ -39,6 +39,7 @@ read_globals = {
 	"AchievementFrame_LoadUI",
 	"AchievementFrame_SelectAchievement",
 	"AlertFrame",
+	"C_AddOns",
 	"C_Container",
 	"C_CurrencyInfo",
 	"C_Item",
@@ -62,14 +63,10 @@ read_globals = {
 	"GameTooltip",
 	"GameTooltip_ShowCompareItem",
 	"GetAchievementInfo",
-	"GetAddOnMetadata",
 	"GetArchaeologyRaceInfoByID",
 	"GetCurrencyListInfo",
 	"GetCurrencyListSize",
 	"GetCVarBool",
-	"GetDetailedItemLevelInfo",
-	"GetItemInfo",
-	"GetItemInfoInstant",
 	"GetLocale",
 	"GetMoney",
 	"GetMoneyString",

CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## Version 40400.02
+
+- Added "Profession Materials" filter to item toasts. It should catch most mats, if it doesn't, use the ID filter.
+- Fixed an issue where currency toasts would display bogus values. It primarily affected honour, valour, justice, and
+  conquest points.
+
 ## Version 40400.01
 
 - Added 4.4.0 support.

ls_Toasts/core/changelog.lua

@@ -6,10 +6,7 @@ local _G = getfenv(0)
 
 -- Mine
 E.CHANGELOG = [[
-- Added 4.4.0 support.
-- Added archaeology toasts.
-- Added collection toasts.
-- Added Blizz store toasts.
-- Added transmog toasts.
-- Updated Simplified Chinese translation. Translated by kuaishan@Curse.
+- Added "Profession Materials" filter to item toasts. It should catch most mats, if it doesn't, use the ID filter.
+- Fixed an issue where currency toasts would display bogus values. It primarily affected honour, valour, justice, and
+  conquest points.
 ]]

ls_Toasts/core/core.lua

@@ -202,11 +202,11 @@ do
 	}
 
 	function E:GetItemLevel(itemLink)
-		local _, _, _, _, _, _, _, _, itemEquipLoc, _, _, itemClassID, itemSubClassID = GetItemInfo(itemLink)
+		local _, _, _, _, _, _, _, _, itemEquipLoc, _, _, itemClassID, itemSubClassID = C_Item.GetItemInfo(itemLink)
 
 		-- 3:11 is artefact relic
 		if (itemClassID == 3 and itemSubClassID == 11) or slots[itemEquipLoc] then
-			return GetDetailedItemLevelInfo(itemLink) or 0
+			return C_Item.GetDetailedItemLevelInfo(itemLink) or 0
 		end
 
 		return 0

ls_Toasts/embeds/AceGUI-3.0-LSWidgets/EditBox.lua

@@ -297,7 +297,7 @@ do
 		local id = tonumber(value)
 		if id then
 			id = "item:" .. id
-			local info = GetItemInfoInstant(id)
+			local info = C_Item.GetItemInfoInstant(id)
 			if info then
 				self.preview:SetOwner(self.frame, "ANCHOR_NONE")
 				self.preview:SetPoint("TOPLEFT", self.frame, "BOTTOMLEFT", 1, 1)

ls_Toasts/init.lua

@@ -11,7 +11,7 @@ local tonumber = _G.tonumber
 
 -- Mine
 E.VER = {}
-E.VER.string = GetAddOnMetadata(addonName, "Version")
+E.VER.string = C_AddOns.GetAddOnMetadata(addonName, "Version")
 E.VER.number = tonumber(E.VER.string:gsub("%D", ""), nil)
 
 local STRATAS = {
@@ -409,7 +409,7 @@ E:RegisterEvent("ADDON_LOADED", function(arg1)
 								type = "execute",
 								name = L["CHANGELOG_FULL"],
 								func = function()
-									showLinkCopyPopup("https://github.com/ls-/ls_Toasts/blob/wotlk/master/CHANGELOG.md")
+									showLinkCopyPopup("https://github.com/ls-/ls_Toasts/blob/classic/master/CHANGELOG.md")
 								end,
 							},
 						},

ls_Toasts/locales/enUS.lua

@@ -27,6 +27,7 @@ L["GUILD_ACHIEVEMENT_UNLOCKED"] = _G.GUILD_ACHIEVEMENT_UNLOCKED
 L["ID"] = _G.ID
 L["ITEM_LEGENDARY"] = _G.LEGENDARY_ITEM_LOOT_LABEL
 L["LOOT_THRESHOLD"] = _G.LOOT_THRESHOLD
+L["MATERIALS"] = _G.WORLD_QUEST_REWARD_FILTERS_PROFESSION_MATERIALS
 L["NEW"] = _G.NEW
 L["OKAY"] = _G.OKAY
 L["PETS"] = _G.PETS

ls_Toasts/ls_Toasts.toc

@@ -1,6 +1,6 @@
 ## Interface: 40400
 ## Author: lightspark
-## Version: 40400.01
+## Version: 40400.02
 ## Title: LS: |cff00cc99Toasts|r
 ## Notes: Better toasts, cheers!
 ## SavedVariables: LS_TOASTS_GLOBAL_CONFIG

ls_Toasts/skins/elv.lua

@@ -56,6 +56,18 @@ E:RegisterSkin("elv-legacy", {
 	name = "ElvUI (Legacy)",
 	template = "elv",
 	bg = {
+		archaeology = {
+			color = {1, 1, 1},
+			texture = "Interface\\AddOns\\ls_Toasts\\assets\\legacy\\toast-bg-archaeology",
+			tex_coords = {1 / 256, 225 / 256, 1 / 64, 49 / 64},
+			tile = false,
+		},
+		collection = {
+			color = {1, 1, 1},
+			texture = "Interface\\AddOns\\ls_Toasts\\assets\\legacy\\toast-bg-collection",
+			tex_coords = {1 / 256, 225 / 256, 1 / 64, 49 / 64},
+			tile = false,
+		},
 		default = {
 			color = {1, 1, 1},
 			texture = "Interface\\AddOns\\ls_Toasts\\assets\\legacy\\toast-bg-default",
@@ -68,6 +80,18 @@ E:RegisterSkin("elv-legacy", {
 			tex_coords = {1 / 256, 225 / 256, 1 / 64, 49 / 64},
 			tile = false,
 		},
+		store = {
+			color = {1, 1, 1},
+			texture = "Interface\\AddOns\\ls_Toasts\\assets\\legacy\\toast-bg-store",
+			tex_coords = {1 / 256, 225 / 256, 1 / 64, 49 / 64},
+			tile = false,
+		},
+		transmog = {
+			color = {1, 1, 1},
+			texture = "Interface\\AddOns\\ls_Toasts\\assets\\legacy\\toast-bg-transmog",
+			tex_coords = {1 / 256, 225 / 256, 1 / 64, 49 / 64},
+			tile = false,
+		},
 	},
 })