Merge branch 'main' into ptr

tukui-org · Jan 21, 2025 · db5eeba · db5eeba
2 parents dab590a + 8fe3cb0
commit db5eeba
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 10 deletions.
diff --git a/ElvUI/Core/Modules/Chat/Chat.lua b/ElvUI/Core/Modules/Chat/Chat.lua
@@ -345,15 +345,29 @@ do --this can save some main file locals
 			z['Alysneaks-Cenarius']		= itsMel -- [Horde] Rogue
 			z['Alytotes-Cenarius']		= itsMel -- [Horde] Shaman
 			-- Thradex (Simpys Buddy)
-			z['Foam-Area52']			= itsThradex -- Horde
-			z['Gur-Area52']				= itsThradex -- Horde
-			z['Archmage-Area52']		= itsThradex -- Horde
-			z['Counselor-Area52']		= itsThradex -- Horde
-			z['Psychiatrist-Area52']	= itsThradex -- Horde
-			z['Monk-CenarionCircle']	= itsThradex
-			z['Thradex-Stormrage']		= itsThradex
-			z['Wrecked-Stormrage']		= itsThradex
-			z['Tb-Stormrage']			= itsThradex
+			z['Player-3676-0982798A']	= itsThradex -- Foam-Area52
+			z['Player-3676-0E6FC676']	= itsThradex -- Gur-Area52
+			z['Player-3676-0D834080']	= itsThradex -- Counselor-Area52
+			z['Player-3676-0E77A90A']	= itsThradex -- Archmage-Area52
+			z['Player-3676-0EA34C00']	= itsThradex -- Benito-Area52
+			z['Player-3676-0E0547CE']	= itsThradex -- Ahmir-Area52
+			z['Player-3676-0AFA7773']	= itsThradex -- Lifelink-Area52
+			z['Player-3676-0D829A31']	= itsThradex -- Psychiatrist-Area52
+			z['Player-3676-0A5800F2']	= itsThradex -- Italian-Area52
+			z['Player-125-0AA52CD1']	= itsThradex -- Monk-CenarionCircle
+			z['Player-3675-0AB731AC']	= itsThradex -- Jonesy-MoonGuard
+			z['Player-3675-0AD64DD0']	= itsThradex -- PuertoRican-MoonGuard
+			z['Player-3675-0AD64EA1']	= itsThradex -- Rainao-MoonGuard
+			z['Player-60-0A5E33DE']		= itsThradex -- Tb-Stormrage
+			z['Player-60-0A58F3D2']		= itsThradex -- Thradex-Stormrage
+			z['Player-60-0A4E0A3E']		= itsThradex -- Wrecked-Stormrage
+			z['Player-60-0F65AEC4']		= itsThradex -- Puertorican-Stormrage
+			z['Player-60-0AADFA03']		= itsThradex -- Quickscoper-Stormrage
+			z['Player-1168-0AE46826']	= itsThradex -- Daddy-Cairne
+			z['Player-115-0883DF8B']	= itsThradex -- Daddy-EchoIsles
+			z['Player-53-0D463E51']		= itsThradex -- Badbunny-Wildhammer
+			z['Player-113-0A9F78FF']	= itsThradex -- Vanessa-Darrowmere
+			z['Player-127-0AD64E79']	= itsThradex -- Christopher-Firetree
 			-- Affinity
 			z['Affinichi-Illidan']		= Bathrobe
 			z['Affinitii-Illidan']		= Bathrobe

diff --git a/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua b/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua
@@ -286,7 +286,7 @@ function lib:CreateButton(id, name, header, config)
 		KeyBound = LibStub("LibKeyBound-1.0", true)
 	end
 
-	local button = setmetatable(CreateFrame("CheckButton", name, header, "ActionButtonTemplate, SecureActionButtonTemplate"), Generic_MT) -- FlyoutPopupButtonTemplate
+	local button = setmetatable(CreateFrame("CheckButton", name, header, "ActionButtonTemplate, SecureActionButtonTemplate"), Generic_MT)
 	button:RegisterForDrag("LeftButton", "RightButton")
 	if WoWRetail then
 		button:RegisterForClicks("AnyDown", "AnyUp")