Merge branch 'development'

Luckyone961 · Nov 21, 2024 · c16e5c1 · c16e5c1
2 parents ae0e0c8 + 3e923eb
commit c16e5c1
Show file tree

Hide file tree

Showing 10 changed files with 48 additions and 39 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,14 @@
+### Version 3.11 [21-11-2024]
+**All WoW Versions:**  
+ElvUI 13.81+ compatibility  
+Fixed Details install error  
+**Retail:**  
+Fixed OmniCD statusbar width  
+Removed LuckyoneUI Dragonriding Edit WeakAura (Glider AddOn is recommended)  
+Updated LuckyoneUI Externals WeakAura  
+**Classic:**  
+Updated TOC for 1.15.5  
+___
 ### Version 3.10 [07-11-2024]
 **All WoW Versions:**  
 ElvUI 13.80+ compatibility  

diff --git a/CURRENT.md b/CURRENT.md
@@ -1,10 +1,10 @@
-### Version 3.10 [07-11-2024]
+### Version 3.11 [21-11-2024]
 **All WoW Versions:**  
-ElvUI 13.80+ compatibility  
-Updated BigWigs installer (Error fixes & new import API)  
-Updated Themes code to respect my recent player castbar color change  
+ElvUI 13.81+ compatibility  
+Fixed Details install error  
 **Retail:**  
-Updated LuckyoneUI Druid WeakAura  
-Updated LuckyoneUI Evoker WeakAura  
-**Cataclysm Classic:**  
-Updated TOC for patch 4.4.1  
+Fixed OmniCD statusbar width  
+Removed LuckyoneUI Dragonriding Edit WeakAura (Glider AddOn is recommended)  
+Updated LuckyoneUI Externals WeakAura  
+**Classic:**  
+Updated TOC for 1.15.5  
diff --git a/ElvUI_LuckyoneUI/Core/Config.lua b/ElvUI_LuckyoneUI/Core/Config.lua
@@ -309,16 +309,15 @@ function L1UI:Config()
 	L1UI.Options.args.weakauras.args.misc = ACH:Group(L["WeakAuras - General"], nil, 3)
 	L1UI.Options.args.weakauras.args.misc.inline = true
 	L1UI.Options.args.weakauras.args.misc.args.keys = ACH:Execute('!keys command', nil, 1, function() Private:WeakAurasImport('keys') end)
-	L1UI.Options.args.weakauras.args.misc.args.dragonriding = ACH:Execute('Dragonriding', nil, 2, function() Private:WeakAurasImport('dragonriding') end)
-	L1UI.Options.args.weakauras.args.misc.args.elvuiMythicVisibility = ACH:Execute('ElvUI Mythic Handler', nil, 3, function() Private:WeakAurasImport('elvuiMythicVisibility') end)
-	L1UI.Options.args.weakauras.args.misc.args.spacerOne = ACH:Spacer(4, 'full')
-	L1UI.Options.args.weakauras.args.misc.args.externals = ACH:Execute('Externals on You', nil, 5, function() Private:WeakAurasImport('externals') end)
-	L1UI.Options.args.weakauras.args.misc.args.groupfinderAppTextHide = ACH:Execute('Groupfinder AppText Hide', nil, 6, function() Private:WeakAurasImport('groupfinderAppTextHide') end)
-	L1UI.Options.args.weakauras.args.misc.args.handleFriendlyNamePlates = ACH:Execute('Handle Friendly Plates', nil, 7, function() Private:WeakAurasImport('handleFriendlyNamePlates') end)
-	L1UI.Options.args.weakauras.args.misc.args.spacerTwo = ACH:Spacer(8, 'full')
-	L1UI.Options.args.weakauras.args.misc.args.handleNamePlatesFont = ACH:Execute('Handle Plates Font ', nil, 9, function() Private:WeakAurasImport('handleNamePlatesFont') end)
-	L1UI.Options.args.weakauras.args.misc.args.playerFrameUtilities = ACH:Execute('Player Frame Utility', nil, 10, function() Private:WeakAurasImport('playerFrameUtilities') end)
-	L1UI.Options.args.weakauras.args.misc.args.trinket = ACH:Execute('Trinket Tracker', nil, 11, function() Private:WeakAurasImport('trinket') end)
+	L1UI.Options.args.weakauras.args.misc.args.elvuiMythicVisibility = ACH:Execute('ElvUI Mythic Handler', nil, 2, function() Private:WeakAurasImport('elvuiMythicVisibility') end)
+	L1UI.Options.args.weakauras.args.misc.args.spacerOne = ACH:Spacer(3, 'full')
+	L1UI.Options.args.weakauras.args.misc.args.externals = ACH:Execute('Externals on You', nil, 4, function() Private:WeakAurasImport('externals') end)
+	L1UI.Options.args.weakauras.args.misc.args.groupfinderAppTextHide = ACH:Execute('Groupfinder AppText Hide', nil, 5, function() Private:WeakAurasImport('groupfinderAppTextHide') end)
+	L1UI.Options.args.weakauras.args.misc.args.handleFriendlyNamePlates = ACH:Execute('Handle Friendly Plates', nil, 6, function() Private:WeakAurasImport('handleFriendlyNamePlates') end)
+	L1UI.Options.args.weakauras.args.misc.args.spacerTwo = ACH:Spacer(7, 'full')
+	L1UI.Options.args.weakauras.args.misc.args.handleNamePlatesFont = ACH:Execute('Handle Plates Font ', nil, 8, function() Private:WeakAurasImport('handleNamePlatesFont') end)
+	L1UI.Options.args.weakauras.args.misc.args.playerFrameUtilities = ACH:Execute('Player Frame Utility', nil, 9, function() Private:WeakAurasImport('playerFrameUtilities') end)
+	L1UI.Options.args.weakauras.args.misc.args.trinket = ACH:Execute('Trinket Tracker', nil, 10, function() Private:WeakAurasImport('trinket') end)
 	L1UI.Options.args.weakauras.args.dungeons = ACH:Group(L["WeakAuras - Dungeons"], nil, 4)
 	L1UI.Options.args.weakauras.args.dungeons.inline = true
 	L1UI.Options.args.weakauras.args.dungeons.args.affixes = ACH:Execute('Affixes', nil, 1, function() Private:WeakAurasImport('affixes') end)

diff --git a/ElvUI_LuckyoneUI/Core/Layouts.lua b/ElvUI_LuckyoneUI/Core/Layouts.lua
@@ -1265,7 +1265,7 @@ function Private:Layout_TheWarWithin(layout)
 	E.db.movers.PlayerChoiceToggle = 'BOTTOM,UIParent,BOTTOM,0,369'
 	E.db.movers.PrivateRaidWarningMover = 'TOP,ElvUIParent,TOP,0,-420'
 	E.db.movers.QuestWatchFrameMover = 'TOPRIGHT,ElvUIParent,TOPRIGHT,-120,-230'
-	E.db.movers.QueueStatusMover = 'TOPRIGHT,ElvUIParent,TOPRIGHT,-6,-152'
+	E.db.movers.QueueStatusMover = E.Retail and 'TOPRIGHT,ElvUIParent,TOPRIGHT,-6,-152' or 'TOPRIGHT,ElvUIParent,TOPRIGHT,-6,-150'
 	E.db.movers.ReputationBarMover = (scaled and 'BOTTOMRIGHT,ElvUIParent,BOTTOMRIGHT,-402,1') or 'BOTTOMRIGHT,ElvUIParent,BOTTOMRIGHT,-466,1'
 	E.db.movers.RightChatMover = 'BOTTOMRIGHT,ElvUIParent,BOTTOMRIGHT,-1,1'
 	E.db.movers.ShiftAB = 'TOPLEFT,ElvUIParent,TOPLEFT,232,-1'

diff --git a/ElvUI_LuckyoneUI/ElvUI_LuckyoneUI_Cata.toc b/ElvUI_LuckyoneUI/ElvUI_LuckyoneUI_Cata.toc
@@ -4,10 +4,10 @@
 
 ## DefaultState: enabled
 ## Author: Luckyone
-## Version: 3.10
+## Version: 3.11
 
 ## Interface: 40401
-## X-Required-ElvUI: 13.80
+## X-Required-ElvUI: 13.81
 
 ## X-Curse-Project-ID: 363472
 ## X-Wago-ID: Rn6VLGdB

diff --git a/ElvUI_LuckyoneUI/ElvUI_LuckyoneUI_Mainline.toc b/ElvUI_LuckyoneUI/ElvUI_LuckyoneUI_Mainline.toc
@@ -4,10 +4,10 @@
 
 ## DefaultState: enabled
 ## Author: Luckyone
-## Version: 3.10
+## Version: 3.11
 
 ## Interface: 110005
-## X-Required-ElvUI: 13.80
+## X-Required-ElvUI: 13.81
 
 ## X-Curse-Project-ID: 363472
 ## X-Wago-ID: Rn6VLGdB

diff --git a/ElvUI_LuckyoneUI/ElvUI_LuckyoneUI_Vanilla.toc b/ElvUI_LuckyoneUI/ElvUI_LuckyoneUI_Vanilla.toc
@@ -4,10 +4,10 @@
 
 ## DefaultState: enabled
 ## Author: Luckyone
-## Version: 3.10
+## Version: 3.11
 
-## Interface: 11504
-## X-Required-ElvUI: 13.80
+## Interface: 11505
+## X-Required-ElvUI: 13.81
 
 ## X-Curse-Project-ID: 363472
 ## X-Wago-ID: Rn6VLGdB

diff --git a/ElvUI_LuckyoneUI/Profiles/Details.lua b/ElvUI_LuckyoneUI/Profiles/Details.lua
diff --git a/ElvUI_LuckyoneUI/Profiles/OmniCD.lua b/ElvUI_LuckyoneUI/Profiles/OmniCD.lua
@@ -45,7 +45,7 @@ function Private:Setup_OmniCD(layout, installer)
 		['party'] = {
 			['extraBars'] = {
 				['raidBar1'] = {
-					['statusBarWidth'] = 314,
+					['statusBarWidth'] = 324,
 					['barColors'] = {
 						['activeColor'] = {
 							['a'] = 0.90,
@@ -135,7 +135,7 @@ function Private:Setup_OmniCD(layout, installer)
 		['arena'] = {
 			['extraBars'] = {
 				['raidBar1'] = {
-					['statusBarWidth'] = 314,
+					['statusBarWidth'] = 324,
 					['barColors'] = {
 						['activeColor'] = {
 							['a'] = 0.90,
@@ -289,7 +289,7 @@ function Private:Setup_OmniCD(layout, installer)
 							['x'] = 382.66,
 						},
 					},
-					['statusBarWidth'] = 396,
+					['statusBarWidth'] = 406,
 				},
 			},
 			['highlight'] = {
@@ -382,7 +382,7 @@ function Private:Setup_OmniCD(layout, installer)
 							['x'] = 382.66,
 						},
 					},
-					['statusBarWidth'] = 396,
+					['statusBarWidth'] = 406,
 				},
 			},
 			['highlight'] = {