Merge branch 'main' into ptr

kodewdle · kodewdle · commit 169c61e5aaf2 · 2025-03-04T14:24:46.000-05:00
diff --git a/ElvUI/Classic/Modules/Skins/LFG.lua b/ElvUI/Classic/Modules/Skins/LFG.lua
@@ -57,7 +57,7 @@ function S:Blizzard_GroupFinder_VanillaStyle()
 	LFGListingFrame:HookScript('OnShow', LFGTabs)
 
 	local LFGBrowseFrame = _G.LFGBrowseFrame
-	S:HandleTrimScrollBar(_G.LFGListingFrameActivityViewScrollBar)
+	--S:HandleTrimScrollBar(_G.LFGListingFrameActivityViewScrollBar) -- Testing, cause it can cause a Taint
 	S:HandleTrimScrollBar(_G.LFGBrowseFrameScrollBar)
 	S:HandleFrame(LFGBrowseFrame, true, nil, 11, -12, -30, 72)
 	LFGBrowseFrame:HookScript('OnShow', LFGTabs)
diff --git a/ElvUI/Mainline/Filters/Filters.lua b/ElvUI/Mainline/Filters/Filters.lua
@@ -365,6 +365,7 @@ G.unitframe.aurafilters.Blacklist = {
 		[426790]	= List(), -- Call of the Elder Druid
 		[430191]	= List(), -- Warband Mentored Leveling
 		[455020]	= List(), -- WoW's Anniversary
+		[1219312]	= List(), -- Mmm, Tacos...
 	},
 }
 

Original file line number	Diff line number	Diff line change
`@@ -365,6 +365,7 @@ G.unitframe.aurafilters.Blacklist = {`
`365`	`365`	`[426790] = List(), -- Call of the Elder Druid`
`366`	`366`	`[430191] = List(), -- Warband Mentored Leveling`
`367`	`367`	`[455020] = List(), -- WoW's Anniversary`
	`368`	`+ [1219312] = List(), -- Mmm, Tacos...`
`368`	`369`	`},`
`369`	`370`	`}`
`370`	`371`