From b39f4af7f23a8267e75670f218d5870f916f39b3 Mon Sep 17 00:00:00 2001 From: Merathilis Date: Mon, 1 Apr 2024 12:34:10 +0200 Subject: [PATCH 01/33] Updated the Monthly Activities on the EncounterJournal Skin --- ElvUI/Mainline/Modules/Skins/EncounterJournal.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/ElvUI/Mainline/Modules/Skins/EncounterJournal.lua b/ElvUI/Mainline/Modules/Skins/EncounterJournal.lua index 4fd392185f..5879c1cd64 100644 --- a/ElvUI/Mainline/Modules/Skins/EncounterJournal.lua +++ b/ElvUI/Mainline/Modules/Skins/EncounterJournal.lua @@ -381,6 +381,7 @@ function S:Blizzard_EncounterJournal() if E.private.skins.parchmentRemoverEnable then EJ.MonthlyActivitiesFrame.Bg:SetAlpha(0) + EJ.MonthlyActivitiesFrame.ThemeContainer:SetAlpha(0) _G.EncounterJournalInstanceSelectBG:SetAlpha(0) local suggestFrame = EJ.suggestFrame From fc756918a7f217697997816e7eef1832a460af09 Mon Sep 17 00:00:00 2001 From: Luckyone Date: Mon, 1 Apr 2024 16:09:51 +0200 Subject: [PATCH 02/33] Updated Skins\PerksProgram --- ElvUI/Mainline/Modules/Skins/PerksProgram.lua | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ElvUI/Mainline/Modules/Skins/PerksProgram.lua b/ElvUI/Mainline/Modules/Skins/PerksProgram.lua index dc9b29f3ed..5aa4fbfb5f 100644 --- a/ElvUI/Mainline/Modules/Skins/PerksProgram.lua +++ b/ElvUI/Mainline/Modules/Skins/PerksProgram.lua @@ -102,6 +102,11 @@ function S:Blizzard_PerksProgram() local frame = _G.PerksProgramFrame local products = frame.ProductsFrame + + if E.private.skins.parchmentRemoverEnable then + frame.ThemeContainer:SetAlpha(0) + end + if products then S:HandleButton(products.PerksProgramFilter.FilterDropDownButton) From 17dd243f82e549d92117e61819c17e95603d2f74 Mon Sep 17 00:00:00 2001 From: Simpy Date: Mon, 1 Apr 2024 16:01:16 -0400 Subject: [PATCH 03/33] fix afk/dnd on chat --- ElvUI/Core/Modules/Chat/Chat.lua | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/ElvUI/Core/Modules/Chat/Chat.lua b/ElvUI/Core/Modules/Chat/Chat.lua index 1464a4c771..107bcf0eef 100644 --- a/ElvUI/Core/Modules/Chat/Chat.lua +++ b/ElvUI/Core/Modules/Chat/Chat.lua @@ -1763,25 +1763,18 @@ function CH:ChatFrame_ReplaceIconAndGroupExpressions(message, noIconReplacement, end -- copied from ChatFrame.lua -local function GetPFlag(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14, arg15, arg16, arg17) - -- Renaming for clarity: - local specialFlag = arg6 - local zoneChannelID = arg7 - --local localChannelID = arg8 - +local function GetPFlag(specialFlag, zoneChannelID, localChannelID) if specialFlag ~= '' then if specialFlag == 'GM' or specialFlag == 'DEV' then -- Add Blizzard Icon if this was sent by a GM/DEV return [[|TInterface\ChatFrame\UI-ChatIcon-Blizz:12:20:0:0:32:16:4:28:0:16|t ]] - elseif E.Retail then - if specialFlag == 'GUIDE' then - if _G.ChatFrame_GetMentorChannelStatus(CHATCHANNELRULESET_MENTOR, GetChannelRulesetForChannelID(zoneChannelID)) == CHATCHANNELRULESET_MENTOR then - return NPEV2_CHAT_USER_TAG_GUIDE - end - elseif specialFlag == 'NEWCOMER' then - if _G.ChatFrame_GetMentorChannelStatus(PLAYERMENTORSHIPSTATUS_NEWCOMER, GetChannelRulesetForChannelID(zoneChannelID)) == PLAYERMENTORSHIPSTATUS_NEWCOMER then - return _G.NPEV2_CHAT_USER_TAG_NEWCOMER - end + elseif specialFlag == 'GUIDE' and E.Retail then + if _G.ChatFrame_GetMentorChannelStatus(CHATCHANNELRULESET_MENTOR, GetChannelRulesetForChannelID(zoneChannelID)) == CHATCHANNELRULESET_MENTOR then + return NPEV2_CHAT_USER_TAG_GUIDE + end + elseif specialFlag == 'NEWCOMER' and E.Retail then + if _G.ChatFrame_GetMentorChannelStatus(PLAYERMENTORSHIPSTATUS_NEWCOMER, GetChannelRulesetForChannelID(zoneChannelID)) == PLAYERMENTORSHIPSTATUS_NEWCOMER then + return _G.NPEV2_CHAT_USER_TAG_NEWCOMER end else return _G['CHAT_FLAG_'..specialFlag] @@ -1920,7 +1913,7 @@ function CH:MessageFormatter(frame, info, chatType, chatGroup, chatTarget, chann end -- Player Flags - local pflag = GetPFlag(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14, arg15, arg16, arg17) + local pflag = GetPFlag(arg6, arg7, arg8) if not bossMonster then local chatIcon, pluginChatIcon = specialChatIcons[arg12] or specialChatIcons[playerName], CH:GetPluginIcon(arg12, playerName) if type(chatIcon) == 'function' then From c5dbf4c9d2ad37d11e776547c481305955c9f883 Mon Sep 17 00:00:00 2001 From: Merathilis Date: Tue, 2 Apr 2024 12:23:11 +0200 Subject: [PATCH 04/33] Updated some of my toon --- ElvUI/Core/Modules/Chat/Chat.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ElvUI/Core/Modules/Chat/Chat.lua b/ElvUI/Core/Modules/Chat/Chat.lua index 107bcf0eef..50ab07d6e0 100644 --- a/ElvUI/Core/Modules/Chat/Chat.lua +++ b/ElvUI/Core/Modules/Chat/Chat.lua @@ -383,7 +383,7 @@ do --this can save some main file locals z['Player-1401-0421EB9F'] = ElvBlue -- [Alliance] Warrior: Brìtt z['Player-1401-0421F909'] = ElvRed -- [Alliance] Paladin: Damará z['Player-1401-0421EC36'] = ElvBlue -- [Alliance] Priest: Jazira - z['Player-1401-041CD0A6'] = ElvYellow -- [Alliance] Rogue: Jústice + z['Player-1401-0A9B0131'] = ElvYellow -- [Alliance] Rogue: Anonia z['Player-1401-041E4D64'] = ElvGreen -- [Alliance] Monk: Maithilis z['Player-1401-0648F4AD'] = ElvPurple -- [Alliance] DH: Mattdemôn z['Player-1401-0421F27B'] = ElvBlue -- [Alliance] Mage: Melisendra From f29d02c7ab8cd7d3c82c61079963206f8da3a2f8 Mon Sep 17 00:00:00 2001 From: Luckyone Date: Tue, 2 Apr 2024 14:47:14 +0200 Subject: [PATCH 05/33] Updated Seasonal Toons --- ElvUI/Core/Modules/Chat/Chat.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ElvUI/Core/Modules/Chat/Chat.lua b/ElvUI/Core/Modules/Chat/Chat.lua index 50ab07d6e0..b3ae133e34 100644 --- a/ElvUI/Core/Modules/Chat/Chat.lua +++ b/ElvUI/Core/Modules/Chat/Chat.lua @@ -327,7 +327,7 @@ do --this can save some main file locals if E.Classic then -- Simpy (5099: Myzrael) z['Player-5099-01947A77'] = itsSimpy -- Warlock: Simpy - -- Luckyone Seasonal (5826: Lone Wolf EU) + -- Luckyone Seasonal (5826: Lone Wolf EU, 5827: Living Flame EU) z['Player-5826-0202765F'] = ElvBlue -- [Alliance] Hunter z['Player-5826-020F7F10'] = ElvBlue -- [Alliance] Paladin z['Player-5826-02172E79'] = ElvBlue -- [Alliance] Warlock @@ -336,6 +336,7 @@ do --this can save some main file locals z['Player-5826-023424EF'] = ElvBlue -- [Alliance] Druid z['Player-5826-02342520'] = ElvBlue -- [Alliance] Rogue z['Player-5826-02342556'] = ElvBlue -- [Alliance] Warrior + z['Player-5827-02331C4B'] = ElvBlue -- [Horde] Shaman -- Luckyone Hardcore z["Lucky-Nek'Rosh"] = ElvBlue -- [Horde] Rogue z["Luckyone-Nek'Rosh"] = ElvBlue -- [Horde] Hunter From f2ed2ca6f6b4ac8218400b5016f51f5576f2737a Mon Sep 17 00:00:00 2001 From: Simpy Date: Tue, 2 Apr 2024 11:44:10 -0400 Subject: [PATCH 06/33] dual spec for SOD --- ElvUI/Core/General/Core.lua | 2 +- ElvUI_Options/Core/Core.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ElvUI/Core/General/Core.lua b/ElvUI/Core/General/Core.lua index 1cf6cf70f0..f7285af42e 100644 --- a/ElvUI/Core/General/Core.lua +++ b/ElvUI/Core/General/Core.lua @@ -1993,7 +1993,7 @@ function E:Initialize() E:Tutorials() end - if E.Retail or E.Wrath then + if E.Retail or E.Wrath or E.ClassicSOD then E.Libs.DualSpec:EnhanceDatabase(E.data, 'ElvUI') end diff --git a/ElvUI_Options/Core/Core.lua b/ElvUI_Options/Core/Core.lua index 3dfe894bf2..20d132612f 100644 --- a/ElvUI_Options/Core/Core.lua +++ b/ElvUI_Options/Core/Core.lua @@ -312,7 +312,7 @@ E.Options.args.profiles.args.private.order = 2 E.Libs.AceConfig:RegisterOptionsTable('ElvProfiles', E.Options.args.profiles.args.profile) -if E.Retail or E.Wrath then +if E.Retail or E.Wrath or E.ClassicSOD then E.Libs.DualSpec:EnhanceOptions(E.Options.args.profiles.args.profile, E.data) end From 83c4b6a0193df648130e995edb5bad4fad980a0a Mon Sep 17 00:00:00 2001 From: Luckyone Date: Tue, 2 Apr 2024 21:48:31 +0200 Subject: [PATCH 07/33] Updated STV Event Auras --- ElvUI/Classic/Filters/Filters.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/ElvUI/Classic/Filters/Filters.lua b/ElvUI/Classic/Filters/Filters.lua index 6209b84f31..c99b862069 100644 --- a/ElvUI/Classic/Filters/Filters.lua +++ b/ElvUI/Classic/Filters/Filters.lua @@ -448,6 +448,7 @@ if E.ClassicSOD then -- Whitelist World Event Auras Whitelist[433804] = List(6) -- Blood for the Blood Loa Whitelist[441785] = List(6) -- Drained of Blood + Whitelist[437751] = List(6) -- Bruised Whitelist[436351] = List(6) -- Zandalari Ward Whitelist[429959] = List(2) -- Well-Rested -- Priest Rune Meditations From 0e4878547694b0c29ff472879ba854824480f3f0 Mon Sep 17 00:00:00 2001 From: Luckyone Date: Tue, 2 Apr 2024 21:48:49 +0200 Subject: [PATCH 08/33] Added Mind Sear ChannelTicks --- ElvUI/Classic/Filters/Filters.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/ElvUI/Classic/Filters/Filters.lua b/ElvUI/Classic/Filters/Filters.lua index c99b862069..d31466a18c 100644 --- a/ElvUI/Classic/Filters/Filters.lua +++ b/ElvUI/Classic/Filters/Filters.lua @@ -903,6 +903,7 @@ G.unitframe.ChannelTicks = { if E.ClassicSOD then G.unitframe.ChannelTicks[402261] = 3 -- Penance (DPS) G.unitframe.ChannelTicks[402277] = 3 -- Penance (Healing) + G.unitframe.ChannelTicks[413259] = 5 -- Mind Sear (Rune) end -- Spells that chain, second step From 179e613206456a4892bb36dd7494dc168a3685e9 Mon Sep 17 00:00:00 2001 From: Simpy Date: Tue, 2 Apr 2024 21:28:17 -0400 Subject: [PATCH 09/33] cant do this with the lib outdated --- ElvUI/Core/General/Core.lua | 2 +- ElvUI_Options/Core/Core.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ElvUI/Core/General/Core.lua b/ElvUI/Core/General/Core.lua index f7285af42e..1cf6cf70f0 100644 --- a/ElvUI/Core/General/Core.lua +++ b/ElvUI/Core/General/Core.lua @@ -1993,7 +1993,7 @@ function E:Initialize() E:Tutorials() end - if E.Retail or E.Wrath or E.ClassicSOD then + if E.Retail or E.Wrath then E.Libs.DualSpec:EnhanceDatabase(E.data, 'ElvUI') end diff --git a/ElvUI_Options/Core/Core.lua b/ElvUI_Options/Core/Core.lua index 20d132612f..3dfe894bf2 100644 --- a/ElvUI_Options/Core/Core.lua +++ b/ElvUI_Options/Core/Core.lua @@ -312,7 +312,7 @@ E.Options.args.profiles.args.private.order = 2 E.Libs.AceConfig:RegisterOptionsTable('ElvProfiles', E.Options.args.profiles.args.profile) -if E.Retail or E.Wrath or E.ClassicSOD then +if E.Retail or E.Wrath then E.Libs.DualSpec:EnhanceOptions(E.Options.args.profiles.args.profile, E.data) end From 24022eeb3e3622f06ffd2051b219bd9221e2ae3f Mon Sep 17 00:00:00 2001 From: Simpy Date: Tue, 2 Apr 2024 21:55:08 -0400 Subject: [PATCH 10/33] 13.61 --- CHANGELOG.md | 11 +++++++++++ ElvUI/Core/Modules/ActionBars/MicroBar.lua | 1 - ElvUI/Core/init.lua | 2 +- ElvUI/ElvUI_Classic.toc | 4 ++-- ElvUI_Libraries/ElvUI_Libraries_Classic.toc | 2 +- ElvUI_Options/Core/Core.lua | 1 - ElvUI_Options/ElvUI_Options_Classic.toc | 2 +- 7 files changed, 16 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1152226761..42132082f6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,14 @@ +### Version 13.61 [ April 4th 2024 ] +* Microbar Support Ticket button in middle of screen. +* Minimap Icons not hiding when using the keybind for Toggle Minimap. +* No Label, Decimal Length, Custom Label options for the Leech Datatext. +* Minimap Difficulty icon not respecting offsets on Wrath. +* Party and RaidPets not spawning until after combat. +* SoD Mage at low level having incorrect range on friendly NPCs. +* Wrath Nightelf Shadowmeld causing a taint during combat. +* LibDispel Bleed list updated again. +* Chat AFK and DND not displaying on Retail. + ### Version 13.60 [ March 19th 2024 ] * Difficulty Icon on Minimap improved, resolving an issue with the mouseover tooltip. * Pet Battle XP bar overlapped Pass button. diff --git a/ElvUI/Core/Modules/ActionBars/MicroBar.lua b/ElvUI/Core/Modules/ActionBars/MicroBar.lua index b138632eb9..1731e0a792 100644 --- a/ElvUI/Core/Modules/ActionBars/MicroBar.lua +++ b/ElvUI/Core/Modules/ActionBars/MicroBar.lua @@ -8,7 +8,6 @@ local gsub = gsub local assert = assert local unpack = unpack local tinsert = tinsert -local strfind = strfind local CreateFrame = CreateFrame local UpdateMicroButtonsParent = UpdateMicroButtonsParent local RegisterStateDriver = RegisterStateDriver diff --git a/ElvUI/Core/init.lua b/ElvUI/Core/init.lua index 1d43100946..040fbe0fce 100644 --- a/ElvUI/Core/init.lua +++ b/ElvUI/Core/init.lua @@ -116,7 +116,7 @@ end function E:ParseVersionString(addon) local version = GetAddOnMetadata(addon, 'Version') if strfind(version, 'project%-version') then - return 13.60, '13.60-git', nil, true + return 13.61, '13.61-git', nil, true else local release, extra = strmatch(version, '^v?([%d.]+)(.*)') return tonumber(release), release..extra, extra ~= '' diff --git a/ElvUI/ElvUI_Classic.toc b/ElvUI/ElvUI_Classic.toc index e2dd131d53..06d56a1794 100644 --- a/ElvUI/ElvUI_Classic.toc +++ b/ElvUI/ElvUI_Classic.toc @@ -6,8 +6,8 @@ ## SavedVariablesPerCharacter: ElvCharacterDB ## OptionalDeps: SharedMedia, Tukui, Masque ## RequiredDeps: ElvUI_Libraries -## Interface: 11501 -## X-Interface: 11501 +## Interface: 11502 +## X-Interface: 11502 ## X-Tukui-ProjectID: -2 ## X-Tukui-ProjectFolders: ElvUI, ElvUI_Libraries, ElvUI_Options diff --git a/ElvUI_Libraries/ElvUI_Libraries_Classic.toc b/ElvUI_Libraries/ElvUI_Libraries_Classic.toc index 02ef374817..703d93fde3 100644 --- a/ElvUI_Libraries/ElvUI_Libraries_Classic.toc +++ b/ElvUI_Libraries/ElvUI_Libraries_Classic.toc @@ -2,7 +2,7 @@ ## Notes: Libraries that power ElvUI ## Author: Elv, Simpy ## Version: @project-version@ -## Interface: 11501 +## Interface: 11502 ## OptionalDeps: LibHealComm-4.0 ## X-oUF: ElvUF diff --git a/ElvUI_Options/Core/Core.lua b/ElvUI_Options/Core/Core.lua index 3dfe894bf2..aee42d2c56 100644 --- a/ElvUI_Options/Core/Core.lua +++ b/ElvUI_Options/Core/Core.lua @@ -4,7 +4,6 @@ local MC = E:GetModule('ModuleCopy') local D = E:GetModule('Distributor') local S = E:GetModule('Skins') -local GetAddOnMetadata = (C_AddOns and C_AddOns.GetAddOnMetadata) or GetAddOnMetadata -- GLOBALS: ElvDB local ACH = E.Libs.ACH diff --git a/ElvUI_Options/ElvUI_Options_Classic.toc b/ElvUI_Options/ElvUI_Options_Classic.toc index 9663afbab0..005fcdfaa1 100644 --- a/ElvUI_Options/ElvUI_Options_Classic.toc +++ b/ElvUI_Options/ElvUI_Options_Classic.toc @@ -2,7 +2,7 @@ ## Notes: Powers the configuration window.|n|cffff3333Does not store any profile data.|r ## Author: Elv, Simpy ## Version: @project-version@ -## Interface: 11501 +## Interface: 11502 ## RequiredDeps: ElvUI ## LoadOnDemand: 1 From df463ad9fbdb18ea1d273ae5488d1a991ae5d816 Mon Sep 17 00:00:00 2001 From: Simpy Date: Tue, 2 Apr 2024 22:05:43 -0400 Subject: [PATCH 11/33] hUh --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 42132082f6..22e168a25f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -### Version 13.61 [ April 4th 2024 ] +### Version 13.61 [ April 2nd 2024 ] * Microbar Support Ticket button in middle of screen. * Minimap Icons not hiding when using the keybind for Toggle Minimap. * No Label, Decimal Length, Custom Label options for the Leech Datatext. From 588e2467a0243f188bed0a3756f3acd0c4598907 Mon Sep 17 00:00:00 2001 From: Luckyone Date: Wed, 3 Apr 2024 12:33:59 +0200 Subject: [PATCH 12/33] Lib is updated, testing now --- ElvUI/Core/General/Core.lua | 2 +- ElvUI_Options/Core/Core.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ElvUI/Core/General/Core.lua b/ElvUI/Core/General/Core.lua index 1cf6cf70f0..f7285af42e 100644 --- a/ElvUI/Core/General/Core.lua +++ b/ElvUI/Core/General/Core.lua @@ -1993,7 +1993,7 @@ function E:Initialize() E:Tutorials() end - if E.Retail or E.Wrath then + if E.Retail or E.Wrath or E.ClassicSOD then E.Libs.DualSpec:EnhanceDatabase(E.data, 'ElvUI') end diff --git a/ElvUI_Options/Core/Core.lua b/ElvUI_Options/Core/Core.lua index aee42d2c56..b457250481 100644 --- a/ElvUI_Options/Core/Core.lua +++ b/ElvUI_Options/Core/Core.lua @@ -311,7 +311,7 @@ E.Options.args.profiles.args.private.order = 2 E.Libs.AceConfig:RegisterOptionsTable('ElvProfiles', E.Options.args.profiles.args.profile) -if E.Retail or E.Wrath then +if E.Retail or E.Wrath or E.ClassicSOD then E.Libs.DualSpec:EnhanceOptions(E.Options.args.profiles.args.profile, E.data) end From 7e93f36e91c7b07c7893faa622b8b70592fb76c4 Mon Sep 17 00:00:00 2001 From: Luckyone Date: Wed, 3 Apr 2024 12:53:06 +0200 Subject: [PATCH 13/33] Fix lib not loading --- ElvUI/Core/init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ElvUI/Core/init.lua b/ElvUI/Core/init.lua index 040fbe0fce..0e94bce07e 100644 --- a/ElvUI/Core/init.lua +++ b/ElvUI/Core/init.lua @@ -160,7 +160,7 @@ do E:AddLib('AceConfigRegistry', 'AceConfigRegistry-3.0-ElvUI') E:AddLib('AceDBOptions', 'AceDBOptions-3.0') - if E.Retail or E.Wrath then + if E.Retail or E.Wrath or E.ClassicSOD then E:AddLib('DualSpec', 'LibDualSpec-1.0') end From a9d61987564473680c6f6dac4a564c49841a6335 Mon Sep 17 00:00:00 2001 From: Simpy Date: Wed, 3 Apr 2024 14:53:33 -0400 Subject: [PATCH 14/33] priest paging on classic --- ElvUI/Core/Defaults/Profile.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ElvUI/Core/Defaults/Profile.lua b/ElvUI/Core/Defaults/Profile.lua index cfe30f89cc..bc87c03ae3 100644 --- a/ElvUI/Core/Defaults/Profile.lua +++ b/ElvUI/Core/Defaults/Profile.lua @@ -2813,7 +2813,7 @@ P.actionbar.bar1.paging.ROGUE = '[bonusbar:1] 7;'..(E.Wrath and ' [bonusbar:2] 8 P.actionbar.bar1.paging.WARLOCK = E.Wrath and '[form:1] 7;' or nil P.actionbar.bar1.paging.DRUID = '[bonusbar:1,nostealth] 7; [bonusbar:1,stealth] 8; [bonusbar:2] 10; [bonusbar:3] 9; [bonusbar:4] 10;' P.actionbar.bar1.paging.EVOKER = '[bonusbar:1] 7;' -P.actionbar.bar1.paging.PRIEST = '[bonusbar:1] 7;'..(E.Classic and ' [possessbar] 16;' or '') +P.actionbar.bar1.paging.PRIEST = E.Classic and '[form:1] 7;' or '[bonusbar:1] 7;' P.actionbar.bar1.paging.WARRIOR = '[bonusbar:1] 7; [bonusbar:2] 8; [bonusbar:3] 9;' P.actionbar.bar3.enabled = true From ffff65f65920722f036c768a584088ffb3ffa6d0 Mon Sep 17 00:00:00 2001 From: Simpy Date: Wed, 3 Apr 2024 15:51:54 -0400 Subject: [PATCH 15/33] CHAT_MSG_GUILD_DEATHS was removed --- ElvUI/Core/General/Install.lua | 2 +- ElvUI/Core/Modules/Chat/Chat.lua | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/ElvUI/Core/General/Install.lua b/ElvUI/Core/General/Install.lua index c0f8ed525e..59a2dbf815 100644 --- a/ElvUI/Core/General/Install.lua +++ b/ElvUI/Core/General/Install.lua @@ -108,7 +108,7 @@ function E:SetupChat(noDisplayMsg) end -- keys taken from `ChatTypeGroup` but doesnt add: 'OPENING', 'TRADESKILLS', 'PET_INFO', 'COMBAT_MISC_INFO', 'COMMUNITIES_CHANNEL', 'PET_BATTLE_COMBAT_LOG', 'PET_BATTLE_INFO', 'TARGETICONS' - local chatGroup = { 'SYSTEM', 'CHANNEL', 'SAY', 'EMOTE', 'YELL', 'WHISPER', 'PARTY', 'PARTY_LEADER', 'RAID', 'RAID_LEADER', 'RAID_WARNING', 'INSTANCE_CHAT', 'INSTANCE_CHAT_LEADER', 'GUILD', E.ClassicHC and 'GUILD_DEATHS' or nil, 'OFFICER', 'MONSTER_SAY', 'MONSTER_YELL', 'MONSTER_EMOTE', 'MONSTER_WHISPER', 'MONSTER_BOSS_EMOTE', 'MONSTER_BOSS_WHISPER', 'ERRORS', 'AFK', 'DND', 'IGNORED', 'BG_HORDE', 'BG_ALLIANCE', 'BG_NEUTRAL', 'ACHIEVEMENT', 'GUILD_ACHIEVEMENT', 'BN_WHISPER', 'BN_INLINE_TOAST_ALERT' } + local chatGroup = { 'SYSTEM', 'CHANNEL', 'SAY', 'EMOTE', 'YELL', 'WHISPER', 'PARTY', 'PARTY_LEADER', 'RAID', 'RAID_LEADER', 'RAID_WARNING', 'INSTANCE_CHAT', 'INSTANCE_CHAT_LEADER', 'GUILD', 'OFFICER', 'MONSTER_SAY', 'MONSTER_YELL', 'MONSTER_EMOTE', 'MONSTER_WHISPER', 'MONSTER_BOSS_EMOTE', 'MONSTER_BOSS_WHISPER', 'ERRORS', 'AFK', 'DND', 'IGNORED', 'BG_HORDE', 'BG_ALLIANCE', 'BG_NEUTRAL', 'ACHIEVEMENT', 'GUILD_ACHIEVEMENT', 'BN_WHISPER', 'BN_INLINE_TOAST_ALERT' } ChatFrame_RemoveAllMessageGroups(_G.ChatFrame1) for _, v in next, chatGroup do ChatFrame_AddMessageGroup(_G.ChatFrame1, v) diff --git a/ElvUI/Core/Modules/Chat/Chat.lua b/ElvUI/Core/Modules/Chat/Chat.lua index b3ae133e34..e0bcfda3d4 100644 --- a/ElvUI/Core/Modules/Chat/Chat.lua +++ b/ElvUI/Core/Modules/Chat/Chat.lua @@ -150,7 +150,6 @@ local historyTypes = { -- most of these events are set in FindURL_Events, this i CHAT_MSG_BN_WHISPER_INFORM = 'WHISPER', CHAT_MSG_GUILD = 'GUILD', CHAT_MSG_GUILD_ACHIEVEMENT = 'GUILD', - CHAT_MSG_GUILD_DEATHS = E.ClassicHC and 'GUILD' or nil, CHAT_MSG_PARTY = 'PARTY', CHAT_MSG_PARTY_LEADER = 'PARTY', CHAT_MSG_RAID = 'RAID', @@ -1961,7 +1960,7 @@ function CH:MessageFormatter(frame, info, chatType, chatGroup, chatTarget, chann end else if not showLink or arg2 == '' then - if chatType == 'TEXT_EMOTE' or chatType == 'GUILD_DEATHS' then + if chatType == 'TEXT_EMOTE' then body = message else body = format(_G['CHAT_'..chatType..'_GET']..message, pflag..arg2, arg2) @@ -2953,7 +2952,6 @@ local FindURL_Events = { 'CHAT_MSG_BN_WHISPER_INFORM', 'CHAT_MSG_BN_INLINE_TOAST_BROADCAST', 'CHAT_MSG_GUILD_ACHIEVEMENT', - E.ClassicHC and 'CHAT_MSG_GUILD_DEATHS' or nil, 'CHAT_MSG_GUILD', 'CHAT_MSG_PARTY', 'CHAT_MSG_PARTY_LEADER', From 1ea2165899ace1047aa094f29d4b696ee35992f9 Mon Sep 17 00:00:00 2001 From: Luckyone Date: Thu, 4 Apr 2024 14:49:21 +0200 Subject: [PATCH 16/33] Load DualSpec DT for SoD --- ElvUI/Classic/Modules/DataTexts/Load_DataTexts.xml | 1 + ElvUI/Wrath/Modules/DataTexts/DualSpec.lua | 2 ++ 2 files changed, 3 insertions(+) diff --git a/ElvUI/Classic/Modules/DataTexts/Load_DataTexts.xml b/ElvUI/Classic/Modules/DataTexts/Load_DataTexts.xml index 5eaea5a3b6..da5e3dd4a4 100644 --- a/ElvUI/Classic/Modules/DataTexts/Load_DataTexts.xml +++ b/ElvUI/Classic/Modules/DataTexts/Load_DataTexts.xml @@ -12,4 +12,5 @@