Merge branch 'main' into ptr

tukui-org · Apr 25, 2024 · ffab021 · ffab021
2 parents cd745ba + 462703a
commit ffab021
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/ElvUI/Core/Modules/Bags/Bags.lua b/ElvUI/Core/Modules/Bags/Bags.lua
@@ -1468,7 +1468,7 @@ function B:VendorGrayCheck()
 	local value = B:GetGraysValue()
 	if value == 0 then
 		E:Print(L["No gray items to delete."])
-	elseif not _G.MerchantFrame:IsShown() and not E.Retail then
+	elseif not _G.MerchantFrame:IsShown() and E.Wrath then
 		E.PopupDialogs.DELETE_GRAYS.Money = value
 		E:StaticPopup_Show('DELETE_GRAYS')
 	else

diff --git a/ElvUI/Mainline/Modules/DataTexts/Crests.lua b/ElvUI/Mainline/Modules/DataTexts/Crests.lua
@@ -14,20 +14,20 @@ local crests = {
 		id = 2245,
 		color = _G.HEIRLOOM_BLUE_COLOR:GenerateHexColor()
 	},
-	{ -- Whelpling's Dreaming Crest
-		id = 2706,
+	{ -- Whelpling's Awakened Crest
+		id = 2806,
 		color = _G.UNCOMMON_GREEN_COLOR:GenerateHexColor()
 	},
-	{ -- Drake's Dreaming Crest
-		id = 2707,
+	{ -- Drake's Awakened Crest
+		id = 2807,
 		color = _G.RARE_BLUE_COLOR:GenerateHexColor()
 	},
-	{ -- Wyrm's Dreaming Crest
-		id = 2708,
+	{ -- Wyrm's Awakened Crest
+		id = 2809,
 		color = _G.EPIC_PURPLE_COLOR:GenerateHexColor()
 	},
-	{ -- Aspect's Dreaming Crest
-		id = 2709,
+	{ -- Aspect's Awakened Crest
+		id = 2812,
 		color = _G.LEGENDARY_ORANGE_COLOR:GenerateHexColor()
 	}
 }