Merge branch 'development'

CHANGELOG.md

@@ -1,7 +1,8 @@
 ### Changes ###
 
-  * Added an AddOn Profile for mMedia Tags
-  * Small color adjustments on the AFK Screen
-  * Fixed shadow on the ls_Toast skin
-  * Added Hearthstone of the Flames to LocPanel & MicroBar
+  * Fix some Itemlevel related things i broke by accident
+  * Take account to time/date changes in ElvUI
+  * Fix a potential error on Quest Skin
+  * Added more openables to the AutoButtons
+  * 🎄
 

ElvUI_MerathilisUI/Core/Changelog.lua

@@ -12,10 +12,11 @@ local DISABLED_FONT_COLOR = DISABLED_FONT_COLOR
 
 local ChangeLogData = {
 	"Changes:",
-		"• Added an AddOn Profile for mMedia Tags",
-		"• Small color adjustments on the AFK Screen",
-		"• Fixed shadow on the ls_Toast skin",
-		"• Added Hearthstone of the Flames to LocPanel & MicroBar",
+		"• Fix some Itemlevel related things i broke by accident",
+		"• Take account to time/date changes in ElvUI",
+		"• Fix a potential error on Quest Skin",
+		"• Added more openables to the AutoButtons",
+		"• 🎄",
 
 		-- "• ''",
 

ElvUI_MerathilisUI/Core/Functions/Core.lua

@@ -43,6 +43,18 @@ local baseMulti = 0.64 / baseScale
 local perfectScale = baseScale / F.PixelPerfect()
 local perfectMulti = baseMulti * perfectScale
 
+function F.HiDpi()
+	return E.physicalHeight / 1440 >= 1
+end
+
+function F.Dpi(value, frac)
+	return F.Round(value * perfectMulti, frac)
+end
+
+function F.DpiRaw(value)
+	return value * perfectMulti
+end
+
 function F.SetFontDB(text, db)
 	if not text or not text.GetFont then
 		F.Developer.LogDebug("Functions.SetFontDB: text not found")

ElvUI_MerathilisUI/Core/Install.lua

@@ -279,14 +279,8 @@ function MER:SetupLayout()
 	E.private["general"]["glossTex"] = "MER_Stripes"
 	E.private["general"]["nameplateFont"] = "Expressway"
 	E.private["general"]["nameplateLargeFont"] = "Expressway"
-
-	if C_AddOns_IsAddOnLoaded("XLoot") then
-		E.private["general"]["loot"] = false
-		E.private["general"]["lootRoll"] = false
-	else
-		E.private["general"]["loot"] = true
-		E.private["general"]["lootRoll"] = true
-	end
+	E.private["general"]["loot"] = true
+	E.private["general"]["lootRoll"] = true
 
 	--[[----------------------------------
 	--	GlobalDB - General
@@ -2349,7 +2343,6 @@ function MER:SetupUnitframes()
 	E.db["movers"]["ClassBarMover"] = "BOTTOM,ElvUIParent,BOTTOM,0,230"
 	E.db["movers"]["ElvUF_TargetMover"] = "BOTTOM,ElvUIParent,BOTTOM,244,209"
 	E.db["movers"]["ElvUF_TargetCastbarMover"] = "BOTTOM,ElvUIParent,BOTTOM,244,188"
-	E.db["movers"]["ElvUF_TargetTargetMover"] = "BOTTOMRIGHT,ElvUIParent,BOTTOMRIGHT,-540,209"
 	E.db["movers"]["ElvUF_FocusMover"] = "BOTTOMRIGHT,ElvUIParent,BOTTOMRIGHT,-518,293"
 	E.db["movers"]["ElvUF_FocusCastbarMover"] = "BOTTOMRIGHT,ElvUIParent,BOTTOMRIGHT,-518,273"
 	E.db["movers"]["ElvUF_FocusTargetMover"] = "BOTTOMRIGHT,ElvUIParent,BOTTOMRIGHT,-513,277"
@@ -2359,12 +2352,19 @@ function MER:SetupUnitframes()
 	E.db["movers"]["ElvUF_PartyMover"] = "BOTTOMLEFT,ElvUIParent,BOTTOMLEFT,268,326"
 	E.db["movers"]["ElvUF_AssistMover"] = "TOPLEFT,ElvUIParent,BOTTOMLEFT,2,571"
 	E.db["movers"]["ElvUF_TankMover"] = "TOPLEFT,ElvUIParent,BOTTOMLEFT,2,626"
-	E.db["movers"]["ElvUF_PetMover"] = "BOTTOMLEFT,ElvUIParent,BOTTOMLEFT,540,209"
-	E.db["movers"]["ElvUF_PetCastbarMover"] = "BOTTOMLEFT,ElvUIParent,BOTTOMLEFT,540,200"
 	E.db["movers"]["ArenaHeaderMover"] = "TOPRIGHT,ElvUIParent,TOPRIGHT,-305,-305"
 	E.db["movers"]["BossHeaderMover"] = "TOPRIGHT,ElvUIParent,TOPRIGHT,-305,-305"
 	E.db["movers"]["ElvUF_RaidpetMover"] = "TOPLEFT,ElvUIParent,BOTTOMLEFT,0,808"
 
+	if C_AddOns_IsAddOnLoaded("ElvUI_mMediaTag") then
+		E.db["movers"]["ElvUF_TargetTargetMover"] = "BOTTOMRIGHT,ElvUIParent,BOTTOMRIGHT,-510,188"
+		E.db["movers"]["ElvUF_PetMover"] = "BOTTOMLEFT,ElvUIParent,BOTTOMLEFT,540,209"
+		E.db["movers"]["ElvUF_PetCastbarMover"] = "BOTTOMLEFT,ElvUIParent,BOTTOMLEFT,540,200"
+	else
+		E.db["movers"]["ElvUF_TargetTargetMover"] = "BOTTOMRIGHT,ElvUIParent,BOTTOMRIGHT,-540,209"
+		E.db["movers"]["ElvUF_PetMover"] = "BOTTOMLEFT,ElvUIParent,BOTTOMLEFT,510,188"
+		E.db["movers"]["ElvUF_PetCastbarMover"] = "BOTTOMLEFT,ElvUIParent,BOTTOMLEFT,510,177"
+	end
 
 	if F.IsDeveloper() then
 		if E.myclass == "WARRIOR" then
@@ -2397,7 +2397,7 @@ function MER:SetupDts()
 		border = true,
 		panelTransparency = true,
 		numPoints = 2,
-		"Durability",
+		"DurabilityItemLevel",
 		"Gold",
 	}
 	E.db["datatexts"]["panels"]["RightChatDataPanel"]["enable"] = false

ElvUI_MerathilisUI/ElvUI_MerathilisUI.toc

@@ -12,7 +12,7 @@
 ## SavedVariablesPerCharacter: MERDataPerChar
 ## OptionalDeps: SharedMedia, BigWigs, ls_Toasts, WeakAuras, WeakAurasOptions
 ## X-Credits: Simpy, Benik, Azilroka, Darth Predator, fang2hou, fgprodigal, siweia, Solor, Elv, Blazeflack & all AddOn Authors who inspired me.
-## X-ElvUIVersion: 13.52
+## X-ElvUIVersion: 13.54
 ## X-Curse-Project-Name: MerathilisUI
 ## X-Curse-Project-ID: 97589
 ## X-WoWI-ID: 24117

ElvUI_MerathilisUI/Init.lua

@@ -1,4 +1,4 @@
-local E, _, V, P, G = unpack(ElvUI)
+local E, _, V, P, G = unpack(ElvUI) 
 local addon, Engine = ...
 
 local EP = E.Libs.EP

ElvUI_MerathilisUI/Locales/deDE.lua

@@ -1088,6 +1088,7 @@ L["Smooth the bar animation with ElvUI."] = "Flüssige Animation der Leiste mit
 L["Spark"] = "Funke"
 L["The options below are only for BigWigs %s bar style."] = "Die Einstellungen unten sind nur für BigWigs %s Leisten Stil."
 L["You need to manually set the bar style to %s in BigWigs first."] = "Du musst zuerst den BigWigs Stile zu %s setzen."
+L["The options below is only for the Details look, NOT the Embeded."] = "Die nachfolgende Option ist nur für das Aussehen von Details, NICHT die Einbettung."
 
 -- Panels
 L["Panels"] = "Leisten"

ElvUI_MerathilisUI/Locales/enUS.lua

@@ -1091,6 +1091,7 @@ L["Smooth the bar animation with ElvUI."] = true
 L["Spark"] = true
 L["The options below are only for BigWigs %s bar style."] = true
 L["You need to manually set the bar style to %s in BigWigs first."] = true
+L["The options below is only for the Details look, NOT the Embeded."] = true
 
 -- Panels
 L["Panels"] = true

ElvUI_MerathilisUI/Locales/esMX.lua

@@ -1083,6 +1083,7 @@ L["Smooth the bar animation with ElvUI."] = true
 L["Spark"] = true
 L["The options below are only for BigWigs %s bar style."] = true
 L["You need to manually set the bar style to %s in BigWigs first."] = true
+L["The options below is only for the Details look, NOT the Embeded."] = true
 
 -- Panels
 L["Panels"] = true

ElvUI_MerathilisUI/Locales/frFR.lua

@@ -1098,6 +1098,7 @@ L["Smooth the bar animation with ElvUI."] = true
 L["Spark"] = true
 L["The options below are only for BigWigs %s bar style."] = true
 L["You need to manually set the bar style to %s in BigWigs first."] = true
+L["The options below is only for the Details look, NOT the Embeded."] = true
 
 -- Panels
 L["Panels"] = true

ElvUI_MerathilisUI/Locales/itIT.lua

@@ -1083,6 +1083,7 @@ L["Smooth the bar animation with ElvUI."] = true
 L["Spark"] = true
 L["The options below are only for BigWigs %s bar style."] = true
 L["You need to manually set the bar style to %s in BigWigs first."] = true
+L["The options below is only for the Details look, NOT the Embeded."] = true
 
 -- Panels
 L["Panels"] = true

ElvUI_MerathilisUI/Locales/koKR.lua

@@ -1086,6 +1086,7 @@ L["Smooth the bar animation with ElvUI."] = true
 L["Spark"] = true
 L["The options below are only for BigWigs %s bar style."] = true
 L["You need to manually set the bar style to %s in BigWigs first."] = true
+L["The options below is only for the Details look, NOT the Embeded."] = true
 
 -- Panels
 L["Panels"] = true

ElvUI_MerathilisUI/Locales/ptBR.lua

@@ -1092,6 +1092,7 @@ L["Smooth the bar animation with ElvUI."] = true
 L["Spark"] = true
 L["The options below are only for BigWigs %s bar style."] = true
 L["You need to manually set the bar style to %s in BigWigs first."] = true
+L["The options below is only for the Details look, NOT the Embeded."] = true
 
 -- Panels
 L["Panels"] = true

ElvUI_MerathilisUI/Locales/ruRU.lua

@@ -1091,6 +1091,7 @@ L["Smooth the bar animation with ElvUI."] = "Плавная анимация п
 L["Spark"] = "Искра"
 L["The options below are only for BigWigs %s bar style."] = "Приведенные ниже параметры относятся только к стилю полос BigWigs %s."
 L["You need to manually set the bar style to %s in BigWigs first."] = "Сначала вам нужно вручную установить стиль полосы на %s в BigWigs."
+L["The options below is only for the Details look, NOT the Embeded."] = true
 
 -- Panels
 L["Panels"] = "Панели"

ElvUI_MerathilisUI/Locales/zhCN.lua

@@ -1107,6 +1107,7 @@ L["Smooth the bar animation with ElvUI."] = true
 L["Spark"] = true
 L["The options below are only for BigWigs %s bar style."] = true
 L["You need to manually set the bar style to %s in BigWigs first."] = true
+L["The options below is only for the Details look, NOT the Embeded."] = true
 
 -- Panels
 L["Panels"] = true

ElvUI_MerathilisUI/Locales/zhTW.lua

@@ -1086,6 +1086,7 @@ L["Smooth the bar animation with ElvUI."] = true
 L["Spark"] = true
 L["The options below are only for BigWigs %s bar style."] = true
 L["You need to manually set the bar style to %s in BigWigs first."] = true
+L["The options below is only for the Details look, NOT the Embeded."] = true
 
 -- Panels
 L["Panels"] = true

ElvUI_MerathilisUI/Modules/AutoButtons/AutoButtons.lua

@@ -383,6 +383,7 @@ local runes = {
 	204971,
 	204972,
 	204973,
+	211495
 }
 
 -- Runes added in Dragonflight
@@ -403,6 +404,7 @@ local runesDragonflight = {
 	204971,
 	204972,
 	204973,
+	211495
 }
 
 -- Foods (Crafted by cooking)
@@ -899,6 +901,7 @@ local openableItems = {
 	209833,
 	209837,
 	209839,
+	209037,
 	210180,
 	210549,
 	210872,
@@ -909,8 +912,11 @@ local openableItems = {
 	210762,
 	210768,
 	210770,
+	210780,
+	210871,
 	210917,
 	210923,
+	210992,
 	211303,
 	211389,
 	211394,

ElvUI_MerathilisUI/Modules/Chat/ChatText.lua

@@ -28,7 +28,6 @@ local utf8sub = string.utf8sub
 local wipe = wipe
 
 local Ambiguate = Ambiguate
-local BetterDate = BetterDate
 local BNet_GetClientEmbeddedTexture = BNet_GetClientEmbeddedTexture
 local BNGetNumFriends = BNGetNumFriends
 local BNGetNumFriendInvites = BNGetNumFriendInvites
@@ -71,7 +70,6 @@ local C_Club_GetClubInfo = C_Club.GetClubInfo
 local C_Club_GetInfoFromLastCommunityChatLine = C_Club.GetInfoFromLastCommunityChatLine
 local C_PartyInfo_InviteUnit = C_PartyInfo and C_PartyInfo.InviteUnit
 local C_Texture_GetTitleIconTexture = C_Texture and C_Texture.GetTitleIconTexture
-local GetClientTexture = _G.BNet_GetClientEmbeddedAtlas or _G.BNet_GetClientEmbeddedTexture
 local C_Timer_After = C_Timer.After
 
 local CHATCHANNELRULESET_MENTOR = Enum.ChatChannelRuleset.Mentor
@@ -764,9 +762,34 @@ function CT:HandleShortChannels(msg)
 	return msg
 end
 
-function CT:AddMessage(msg, infoR, infoG, infoB, infoID, accessID, typeID, event, eventArgs, msgFormatter, isHistory, historyTime)
-	local body = CH:AddMessageEdits(self, msg, isHistory, historyTime)
-	self.OldAddMessage(self, body, infoR, infoG, infoB, infoID, accessID, typeID, event, eventArgs, msgFormatter)
+function CT:AddMessage(msg, infoR, infoG, infoB, infoID, accessID, typeID, isHistory, historyTime)
+	if not strmatch(msg, "^|Helvtime|h") and not strmatch(msg, "^|Hcpl:") then
+		local historyTimestamp --we need to extend the arguments on AddMessage so we can properly handle times without overriding
+		if isHistory == "ElvUI_ChatHistory" then
+			historyTimestamp = historyTime
+		end
+
+		if CH.db.timeStampFormat and CH.db.timeStampFormat ~= "NONE" then
+			local timeStamp = BetterDate(CH.db.timeStampFormat, historyTimestamp or E:GetDateTime(CH.db.timeStampLocalTime, true))
+			timeStamp = gsub(timeStamp, " ", "")
+			timeStamp = gsub(timeStamp, "AM", " AM")
+			timeStamp = gsub(timeStamp, "PM", " PM")
+
+			if CH.db.useCustomTimeColor then
+				local color = CH.db.customTimeColor
+				local hexColor = E:RGBToHex(color.r, color.g, color.b)
+				msg = format("|Helvtime|h%s[%s]|r|h %s", hexColor, timeStamp, msg)
+			else
+				msg = format("|Helvtime|h[%s]|h %s", timeStamp, msg)
+			end
+		end
+
+		if CH.db.copyChatLines then
+			msg = format("|Hcpl:%s|h%s|h %s", self:GetID(), E:TextureString(E.Media.Textures.ArrowRight, ":14"), msg)
+		end
+	end
+
+	self.OldAddMessage(self, msg, infoR, infoG, infoB, infoID, accessID, typeID)
 end
 
 function CT:CheckLFGRoles()

ElvUI_MerathilisUI/Modules/CombatAlert/CombatAlert.lua

@@ -13,7 +13,6 @@ function module:CreateAlert()
 	alert:SetClampedToScreen(true)
 	alert:SetSize(300, 65)
 	alert:Point('TOP', 0, -280)
-	alert:Hide()
 
 	alert.Bg = alert:CreateTexture(nil, "BACKGROUND")
 	alert.Bg:SetTexture('Interface\\LevelUp\\MinorTalents')
@@ -148,7 +147,7 @@ function module:Initialize()
 	self:RegisterEvent('PLAYER_REGEN_ENABLED')
 	self:RegisterEvent('PLAYER_REGEN_DISABLED')
 
-	E:CreateMover(self.alert, 'alertFrameMover', L["Enter Combat Alert"], nil, nil, nil, 'ALL,SOLO,MERATHILISUI', function() return EnterCombatAlert.db.enable; end, 'mui,modules,CombatAlert')
+	E:CreateMover(self.alert, 'alertFrameMover', L["Enter Combat Alert"], nil, nil, nil, 'ALL,SOLO,MERATHILISUI', function() return self.db.enable; end, 'mui,modules,CombatAlert')
 end
 
 MER:RegisterModule(module:GetName())

ElvUI_MerathilisUI/Modules/Datatexts/DataTexts.lua

@@ -8,7 +8,7 @@ local CreateFrame = CreateFrame
 local hooksecurefunc = hooksecurefunc
 
 function module:LoadDataTexts()
-	if not E.db.mui.datatexts.RightChatDataText then return end
+	if not E.db.mui.datatexts then return end
 
 end