Merge branch 'development'

Merathilis · Apr 25, 2024 · 2167d35 · 2167d35
2 parents 6e022fb + 9aeba6f
commit 2167d35
Show file tree

Hide file tree

Showing 23 changed files with 517 additions and 459 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
 ### Changes ###
 
-  * [Core]: Fix an issue with WindTools enabled
+  * [Raid Manager]: Some code improvements to RaidManager
+  * [ChatText]: Here also some code improvements
+  * [RaiderIO Skin]: Updated a new SearchFrame
+  * [Details Skin]: Fix gradient Names and enable it by default
+  * [TalentLoadoutEx]: Remove skin
+  * [Event Tracker]: Change the defaults on the Map Event Tracker
+  * [AutoButtons]: Added S4 openable boxes
diff --git a/ElvUI_MerathilisUI/Core/Changelog/6.12.lua b/ElvUI_MerathilisUI/Core/Changelog/6.12.lua
@@ -0,0 +1,18 @@
+local MER = unpack(ElvUI_MerathilisUI)
+
+MER.Changelog[612] = {
+	RELEASE_DATE = "25.04.2024",
+	FIXES = {
+		"[TalentLoadoutEx]: Remove skin",
+		"[Details Skin]: Fix gradient names and enable it by default",
+	},
+	NEW = {
+		"[AutoButtons]: Added S4 openable boxes",
+	},
+	IMPROVEMENTS = {
+		"[Raid Manager]: Some code improvements to RaidManager",
+		"[ChatText]: Here also some code improvements",
+		"[RaiderIO Skin]: Updated a new SearchFrame",
+		"[Event Tracker]: Change the defaults on the Map Event Tracker",
+	},
+}
diff --git a/ElvUI_MerathilisUI/Core/Changelog/Load_Changelog.xml b/ElvUI_MerathilisUI/Core/Changelog/Load_Changelog.xml
@@ -2,5 +2,6 @@
 	<Script file="Previous\6.08.lua"/>
 	<Script file="Previous\6.09.lua"/>
 	<Script file="Previous\6.10.lua"/>
-	<Script file="6.11.lua"/>
+	<Script file="Previous\6.11.lua"/>
+	<Script file="6.12.lua"/>
 </Ui>
diff --git a/ElvUI_MerathilisUI/Core/Changelog/Previous/6.08.lua b/ElvUI_MerathilisUI/Core/Changelog/Previous/6.08.lua
@@ -1,4 +1,4 @@
-local MER, F, E, I, V, P, G, L = unpack(ElvUI_MerathilisUI)
+local MER = unpack(ElvUI_MerathilisUI)
 
 MER.Changelog[608] = {
 	RELEASE_DATE = "04.04.2024",

diff --git a/ElvUI_MerathilisUI/Core/Changelog/Previous/6.09.lua b/ElvUI_MerathilisUI/Core/Changelog/Previous/6.09.lua
@@ -1,4 +1,4 @@
-local MER, F, E, I, V, P, G, L = unpack(ElvUI_MerathilisUI)
+local MER = unpack(ElvUI_MerathilisUI)
 
 MER.Changelog[609] = {
 	RELEASE_DATE = "09.04.2024",

diff --git a/ElvUI_MerathilisUI/Core/Changelog/Previous/6.10.lua b/ElvUI_MerathilisUI/Core/Changelog/Previous/6.10.lua
@@ -1,4 +1,4 @@
-local MER, F, E, I, V, P, G, L = unpack(ElvUI_MerathilisUI)
+local MER = unpack(ElvUI_MerathilisUI)
 
 MER.Changelog[610] = {
 	RELEASE_DATE = "10.04.2024",

diff --git a/ElvUI_MerathilisUI/Core/Changelog/6.11.lua → ...thilisUI/Core/Changelog/Previous/6.11.lua b/ElvUI_MerathilisUI/Core/Changelog/6.11.lua → ...thilisUI/Core/Changelog/Previous/6.11.lua
@@ -1,4 +1,4 @@
-local MER, F, E, I, V, P, G, L = unpack(ElvUI_MerathilisUI)
+local MER = unpack(ElvUI_MerathilisUI)
 
 MER.Changelog[611] = {
 	RELEASE_DATE = "13.04.2004",

diff --git a/ElvUI_MerathilisUI/Core/Changelog/_template.lua b/ElvUI_MerathilisUI/Core/Changelog/_template.lua
@@ -1,4 +1,4 @@
-local MER, F, E, I, V, P, G, L = unpack(ElvUI_MerathilisUI)
+local MER = unpack(ElvUI_MerathilisUI)
 
 MER.Changelog[999] = {
 	RELEASE_DATE = "TBD",

diff --git a/ElvUI_MerathilisUI/Core/Functions/Core.lua b/ElvUI_MerathilisUI/Core/Functions/Core.lua
@@ -8,6 +8,7 @@ local format, gsub, match, split, strfind = string.format, string.gsub, string.m
 local strmatch, strlen, strsub = strmatch, strlen, strsub
 local tconcat, tinsert, tremove, twipe = table.concat, table.insert, table.remove, table.wipe
 local max, min, modf = math.max, math.min, math.modf
+local len, utf8sub = string.len, string.utf8sub
 
 local CreateFrame = CreateFrame
 local GetAchievementInfo = GetAchievementInfo
@@ -1120,6 +1121,32 @@ function F.SplitString(delimiter, subject)
 	return unpack(results)
 end
 
+do
+	local shortenReplace = function(t)
+		return t:utf8sub(1, 1) .. ". "
+	end
+
+	function F:ShortenString(text, length, cut, firstname)
+		if text and len(text) > length then
+			if cut then
+				text = E:ShortenString(text, length)
+			else
+				if firstname then
+					local first, last = text:match("^(%a*)(.*)$")
+					if first and last then
+						text = first .. " " .. last:gsub("(%S+)", shortenReplace)
+					else
+						text = text:gsub("(%S+) ", shortenReplace)
+					end
+				else
+					text = text:gsub("(%S+) ", shortenReplace)
+				end
+			end
+		end
+		return text
+	end
+end
+
 function F.SetCallback(callback, target, times, ...)
 	times = times or 0
 	if times >= 10 then

diff --git a/ElvUI_MerathilisUI/Media/Media.lua b/ElvUI_MerathilisUI/Media/Media.lua
@@ -81,6 +81,8 @@ F.AddMedia("icon", "Warning")
 F.AddMedia("icon", "Flash")
 F.AddMedia("icon", "New")
 
+F.AddMedia("icon", "m2")
+
 F.AddMedia("texture", "arrow")
 F.AddMedia("texture", "arrowUp")
 F.AddMedia("texture", "pepeSmall")

diff --git a/ElvUI_MerathilisUI/Media/Textures/m2.tga b/ElvUI_MerathilisUI/Media/Textures/m2.tga
diff --git a/ElvUI_MerathilisUI/Modules/AutoButtons/AutoButtons.lua b/ElvUI_MerathilisUI/Modules/AutoButtons/AutoButtons.lua
@@ -924,6 +924,9 @@ local openableItems = {
 	211411,
 	211413,
 	211414,
+	215362,
+	217109,
+	217728,
 }
 
 local bigDig = {
-Original file line number
+Diff line change
@@ Expand Up / @@ -924,6 +924,9 @@ local openableItems = { @@
 ,
 ,
 ,
+,
+,
+,
     }
     local bigDig = {
@@ Expand Down @@