Merge branch 'development'

CHANGELOG.md

@@ -1,9 +1,10 @@
 ### Changes ###
 
-  * Added Superbloom Timer on the Event Tracker
-  * Added a check on the Mail Module to update Alts on login
+  * Shorten the Event Names on the WorldMap
+  * Added the Weekly lockout check on the SuperBloom Event
   * Added new Openables to the AutoButtons. thx @mcc1
-  * Take account of some new Font Settings from ElvUI
-  * Removed the Media Section, cause now in stock ElvUI
-  * Fixed some issues on the Chat Text
-  * Fixed shadow on my AFK-Screen
+  * Updated PremadeGroupsFilter Skin
+  * Updated PetBattle IDs on the Tooltip
+  * Initialize the Alt table before trying to use it on the Mail Frame
+  * Added own Pawn Skin
+  * AutoButtons: Fixed a Taint in Combat

ElvUI_MerathilisUI/Core/Changelog.lua

@@ -12,13 +12,14 @@ local DISABLED_FONT_COLOR = DISABLED_FONT_COLOR
 
 local ChangeLogData = {
 	"Changes:",
-		"• Added Superbloom Timer on the Event Tracker",
-		"• Added a check on the Mail Module to update Alts on login",
+		"• Shorten the Event Names on the WorldMap",
+		"• Added the Weekly lockout check on the SuperBloom Event",
+		"• Updated PremadeGroupsFilter Skin",
 		"• Added new Openables to the AutoButtons. thx @mcc1",
-		"• Take account of some new Font Settings from ElvUI",
-		"• Removed the Media Section, cause now in stock ElvUI",
-		"• Fixed some issues on the Chat Text",
-		"• Fixed shadow on my AFK-Screen",
+		"• Updated PetBattle IDs on the Tooltip",
+		"• Initialize the Alt table before trying to use it on the Mail Frame",
+		"• Added own Pawn Skin",
+		"• AutoButtons: Fixed a Taint in Combat",
 
 		-- "• ''",
 

ElvUI_MerathilisUI/Core/Compatibility.lua

@@ -8,8 +8,8 @@ local gsub, ipairs, type = gsub, ipairs, type
 local strlen, strsplit = strlen, strsplit
 
 local CreateFrame = CreateFrame
-local IsAddOnLoaded = IsAddOnLoaded
-local GetAddOnEnableState = GetAddOnEnableState
+
+local C_AddOns_IsAddOnLoaded = C_AddOns.IsAddOnLoaded
 
 local newSignIgnored = [[|TInterface\OptionsFrame\UI-OptionsFrame-NewFeatureIcon:14:14|t]]
 
@@ -175,7 +175,7 @@ local function GetDatabaseRealValue(path)
 end
 
 local function GetCheckCompatibilityFunction(targetAddonName, targetAddonLocales)
-	if not IsAddOnLoaded(targetAddonName) then
+	if not C_AddOns_IsAddOnLoaded(targetAddonName) then
 		return E.noop
 	end
 

ElvUI_MerathilisUI/Core/Install.lua

@@ -22,9 +22,10 @@ local VoiceTranscriptionFrame_UpdateEditBox = VoiceTranscriptionFrame_UpdateEdit
 local VoiceTranscriptionFrame_UpdateVisibility = VoiceTranscriptionFrame_UpdateVisibility
 local VoiceTranscriptionFrame_UpdateVoiceTab = VoiceTranscriptionFrame_UpdateVoiceTab
 local LOOT = LOOT
+
+local C_AddOns_IsAddOnLoaded = C_AddOns.IsAddOnLoaded
 local C_UI_Reload = C_UI.Reload
 local C_CVar_SetCVar = C_CVar.SetCVar
-local IsAddOnLoaded = IsAddOnLoaded
 
 local MAX_WOW_CHAT_CHANNELS = MAX_WOW_CHAT_CHANNELS or 20
 
@@ -100,7 +101,7 @@ local function SetupCVars()
 		C_CVar_SetCVar('showNPETutorials', 0)
 		C_CVar_SetCVar('hideAdventureJournalAlerts', 1)
 	else
-		SetCVar('taintLog', 0)
+		C_CVar.SetCVar('taintLog', 0)
 	end
 
 	PluginInstallStepComplete.message = MER.Title..L["CVars Set"]
@@ -261,8 +262,10 @@ function MER:SetupLayout()
 	--[[----------------------------------
 	--	PrivateDB - General
 	--]]----------------------------------
-	SetCVar('uiScale', 0.71111111111111)
-	E.global["general"]["UIScale"] = 0.71111111111111
+	if F.IsDeveloper() then
+		C_CVar.SetCVar('uiScale', 0.71111111111111)
+		E.global["general"]["UIScale"] = 0.71111111111111
+	end
 	E.private["general"]["pixelPerfect"] = true
 	E.private["general"]["chatBubbles"] = "backdrop_noborder"
 	E.private["general"]["chatBubbleFont"] = "Expressway"
@@ -277,7 +280,7 @@ function MER:SetupLayout()
 	E.private["general"]["nameplateFont"] = "Expressway"
 	E.private["general"]["nameplateLargeFont"] = "Expressway"
 
-	if IsAddOnLoaded("XLoot") then
+	if C_AddOns_IsAddOnLoaded("XLoot") then
 		E.private["general"]["loot"] = false
 		E.private["general"]["lootRoll"] = false
 	else
@@ -307,10 +310,10 @@ function MER:SetupLayout()
 	E.db["general"]["fonts"]["worldsubzone"]["size"] = 28
 	E.db["general"]["fonts"]["worldsubzone"]["outline"] = "SHADOWOUTLINE"
 	E.db["general"]["fonts"]["talkingtitle"]["enable"] = true
-	E.db["general"]["fonts"]["talkingtitle"]["size"] = 24
+	E.db["general"]["fonts"]["talkingtitle"]["size"] = 20
 	E.db["general"]["fonts"]["talkingtitle"]["outline"] = "SHADOWOUTLINE"
 	E.db["general"]["fonts"]["talkingtext"]["enable"] = true
-	E.db["general"]["fonts"]["talkingtext"]["size"] = 18
+	E.db["general"]["fonts"]["talkingtext"]["size"] = 14
 	E.db["general"]["fonts"]["talkingtext"]["outline"] = "SHADOWOUTLINE"
 	E.db["general"]["fonts"]["errortext"]["enable"] = true
 	E.db["general"]["fonts"]["errortext"]["size"] = 16
@@ -378,10 +381,10 @@ function MER:SetupLayout()
 	E.db["auras"]["buffs"]["timeXOffset"] = 0
 	E.db["auras"]["buffs"]["horizontalSpacing"] = 4
 	E.db["auras"]["buffs"]["verticalSpacing"] = 10
-	if IsAddOnLoaded("ElvUI_RatioMinimapAuras") then
+	if C_AddOns_IsAddOnLoaded("ElvUI_RatioMinimapAuras") then
 		E.db["auras"]["buffs"]["keepSizeRatio"] = false
 		E.db["auras"]["buffs"]["height"] = 28
-		E.db["auras"]["buffs"]["size"] = 32
+		E.db["auras"]["buffs"]["size"] = 36
 		E.db["movers"]["BuffsMover"] = "TOPRIGHT,ElvUIParent,TOPRIGHT,-189,-18"
 	else
 		E.db["auras"]["buffs"]["size"] = 32
@@ -393,7 +396,7 @@ function MER:SetupLayout()
 	E.db["auras"]["buffs"]["wrapAfter"] = 10
 	E.db["auras"]["debuffs"]["horizontalSpacing"] = 4
 	E.db["auras"]["debuffs"]["verticalSpacing"] = 10
-	if IsAddOnLoaded("ElvUI_RatioMinimapAuras") then
+	if C_AddOns_IsAddOnLoaded("ElvUI_RatioMinimapAuras") then
 		E.db["auras"]["debuffs"]["keepSizeRatio"] = false
 		E.db["auras"]["debuffs"]["height"] = 30
 		E.db["auras"]["debuffs"]["size"] = 34
@@ -508,7 +511,7 @@ function MER:SetupLayout()
 	--]] ----------------------------------
 	E.private["skins"]["parchmentRemoverEnable"] = true
 
-	if IsAddOnLoaded("ls_Toasts") then
+	if C_AddOns_IsAddOnLoaded("ls_Toasts") then
 		E.private["skins"]["blizzard"]["alertframes"] = false
 	else
 		E.private["skins"]["blizzard"]["alertframes"] = true
@@ -656,9 +659,6 @@ function MER:SetupLayout()
 		E.db["mui"]["smb"]["buttonsPerRow"] = 9
 		E.db["general"]["minimap"]["icons"]["classHall"]["xOffset"] = 0
 		E.db["general"]["minimap"]["icons"]["classHall"]["yOffset"] = -60
-		E.db["general"]["minimap"]["icons"]["queueStatus"]["position"] = "BOTTOMRIGHT"
-		E.db["general"]["minimap"]["icons"]["queueStatus"]["xOffset"] = 0
-		E.db["general"]["minimap"]["icons"]["queueStatus"]["yOffset"] = 42
 		E.db["movers"]["MinimapMover"] = "TOPRIGHT,ElvUIParent,TOPRIGHT,-4,-25"
 		E.db["movers"]["BuffsMover"] = "TOPRIGHT,ElvUIParent,TOPRIGHT,-235,-17"
 		E.db["movers"]["DebuffsMover"] = "TOPRIGHT,ElvUIParent,TOPRIGHT,-229,-167"

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.48
+## X-ElvUIVersion: 13.52
 ## X-Curse-Project-Name: MerathilisUI
 ## X-Curse-Project-ID: 97589
 ## X-WoWI-ID: 24117

ElvUI_MerathilisUI/Locales/deDE.lua

@@ -48,6 +48,7 @@ L["Log Level"] = "Loglevel"
 L["Only display log message that the level is higher than you choose."] = "Zeigt nur die Log Nachrichten an über dem Level dass du ausgewählt hast"
 L["Set to 2 if you do not understand the meaning of log level."] = "Setze auf 2 wenn du keine Ahnung vom Log Level hast. :)"
 L["Open the changelog window."] = "Öffne das Changelog Fenster."
+L["This will overwrite most of the ElvUI Options for the colors, so please keep that in mind."] = "Diese Option wird die meisten ElvUI Farboptionen überschreiben, bitte bedenkt das."
 
 -- Bags
 
@@ -730,7 +731,7 @@ L["Number of Players"] = "Anzahl der Spieler"
 L["Placeholders"] = "Platzhalter"
 L["Use Default"] = "Benutze Standard"
 L["Researchers Under Fire"] = "Forscher unter Feuer"
-L["Time Rift Thaldraszus"] = "Zeitriss Thaldraszus"
+L["Time Rift"] = "Zeitriss"
 L["Superbloom"] = "Superblüte"
 
 -- SMB

ElvUI_MerathilisUI/Locales/enUS.lua

@@ -51,6 +51,7 @@ L["Log Level"] = true
 L["Only display log message that the level is higher than you choose."] = true
 L["Set to 2 if you do not understand the meaning of log level."] = true
 L["Open the changelog window."] = true
+L["This will overwrite most of the ElvUI Options for the colors, so please keep that in mind."] = true
 
 -- Bags
 
@@ -733,7 +734,7 @@ L["Number of Players"] = true
 L["Placeholders"] = true
 L["Use Default"] = true
 L["Researchers Under Fire"] = true
-L["Time Rift Thaldraszus"] = true
+L["Time Rift"] = true
 L["Superbloom"] = true
 
 -- SMB

ElvUI_MerathilisUI/Locales/esMX.lua

@@ -48,6 +48,7 @@ L["Log Level"] = true
 L["Only display log message that the level is higher than you choose."] = true
 L["Set to 2 if you do not understand the meaning of log level."] = true
 L["Open the changelog window."] = true
+L["This will overwrite most of the ElvUI Options for the colors, so please keep that in mind."] = true
 
 -- Bags
 
@@ -725,7 +726,7 @@ L["Number of Players"] = true
 L["Placeholders"] = true
 L["Use Default"] = true
 L["Researchers Under Fire"] = "Investigadores bajo el fuego"
-L["Time Rift Thaldraszus"] = "Falla temporal Thaldraszus"
+L["Time Rift"] = "Falla temporal"
 L["Superbloom"] = true
 
 -- SMB

ElvUI_MerathilisUI/Locales/frFR.lua

@@ -48,6 +48,7 @@ L["Log Level"] = true
 L["Only display log message that the level is higher than you choose."] = true
 L["Set to 2 if you do not understand the meaning of log level."] = true
 L["Open the changelog window."] = true
+L["This will overwrite most of the ElvUI Options for the colors, so please keep that in mind."] = true
 
 -- Bags
 
@@ -740,7 +741,7 @@ L["Number of Players"] = true
 L["Placeholders"] = true
 L["Use Default"] = true
 L["Researchers Under Fire"] = "Des chercheurs sous le feu"
-L["Time Rift Thaldraszus"] = "Faille dans le temps Thaldraszus"
+L["Time Rift"] = "Faille dans le temps"
 L["Superbloom"] = true
 
 -- SMB

ElvUI_MerathilisUI/Locales/itIT.lua

@@ -48,6 +48,7 @@ L["Log Level"] = true
 L["Only display log message that the level is higher than you choose."] = true
 L["Set to 2 if you do not understand the meaning of log level."] = true
 L["Open the changelog window."] = true
+L["This will overwrite most of the ElvUI Options for the colors, so please keep that in mind."] = true
 
 -- Bags
 
@@ -725,7 +726,7 @@ L["Number of Players"] = true
 L["Placeholders"] = true
 L["Use Default"] = true
 L["Researchers Under Fire"] = "Ricercatori Sotto Attacco"
-L["Time Rift Thaldraszus"] = "Fenditura del Tempo Thaldraszus"
+L["Time Rift"] = "Fenditura del Tempo"
 L["Superbloom"] = true
 
 -- SMB

ElvUI_MerathilisUI/Locales/koKR.lua

@@ -48,6 +48,7 @@ L["Log Level"] = "로그 레벨"
 L["Only display log message that the level is higher than you choose."] = "선택한 수준 이상의 로그 메시지만 표시합니다."
 L["Set to 2 if you do not understand the meaning of log level."] = "로그 레벨의 의미를 잘 모를 경우 2로 설정하세요."
 L["Open the changelog window."] = true
+L["This will overwrite most of the ElvUI Options for the colors, so please keep that in mind."] = true
 
 -- Bags
 
@@ -727,7 +728,7 @@ L["Number of Players"] = true
 L["Placeholders"] = true
 L["Use Default"] = true
 L["Researchers Under Fire"] = true
-L["Time Rift Thaldraszus"] = true
+L["Time Rift"] = true
 L["Superbloom"] = true
 
 -- SMB

ElvUI_MerathilisUI/Locales/ptBR.lua

@@ -50,6 +50,7 @@ L["Log Level"] = true
 L["Only display log message that the level is higher than you choose."] = true
 L["Set to 2 if you do not understand the meaning of log level."] = true
 L["Open the changelog window."] = true
+L["This will overwrite most of the ElvUI Options for the colors, so please keep that in mind."] = true
 
 -- Bags
 
@@ -734,7 +735,7 @@ L["Number of Players"] = true
 L["Placeholders"] = true
 L["Use Default"] = true
 L["Researchers Under Fire"] = "Pesquisadores sob fogo"
-L["Time Rift Thaldraszus"] = "Fenda Temporal Thaldraszus"
+L["Time Rift"] = "Fenda Temporal"
 L["Superbloom"] = true
 
 -- SMB

ElvUI_MerathilisUI/Locales/ruRU.lua

@@ -48,6 +48,7 @@ L["Log Level"] = "Уровень журнала"
 L["Only display log message that the level is higher than you choose."] = "Отображать только сообщение журнала о том, что уровень выше, чем вы выбрали."
 L["Set to 2 if you do not understand the meaning of log level."] = "Установите на 2, если вы не понимаете значение уровня журнала."
 L["Open the changelog window."] = "Откройте окно журнала изменений."
+L["This will overwrite most of the ElvUI Options for the colors, so please keep that in mind."] = true
 
 -- Bags
 
@@ -732,7 +733,7 @@ L["Number of Players"] = "Количество игроков"
 L["Placeholders"] = "Заполнители"
 L["Use Default"] = "Использовать по умолчанию"
 L["Researchers Under Fire"] = "Исследователи под огнем"
-L["Time Rift Thaldraszus"] = "Разлом во времени Талдрасус"
+L["Time Rift"] = "Разлом во времени"
 L["Superbloom"] = true
 
 -- SMB

ElvUI_MerathilisUI/Locales/zhCN.lua

@@ -48,6 +48,7 @@ L["Log Level"] = "日志等级"
 L["Only display log message that the level is higher than you choose."] = "只显示高于选择等级的日志信息."
 L["Set to 2 if you do not understand the meaning of log level."] = "如果你不理解什么是日志级别, 设置为 2 就行."
 L["Open the changelog window."] = true
+L["This will overwrite most of the ElvUI Options for the colors, so please keep that in mind."] = true
 
 -- Bags
 
@@ -746,7 +747,7 @@ L["Number of Players"] = "玩家数量"
 L["Placeholders"] = "占位符"
 L["Use Default"] = "使用默认"
 L["Researchers Under Fire"] = true
-L["Time Rift Thaldraszus"] = true
+L["Time Rift"] = true
 L["Superbloom"] = true
 
 -- SMB

ElvUI_MerathilisUI/Locales/zhTW.lua

@@ -48,6 +48,7 @@ L["Log Level"] = "日誌等級"
 L["Only display log message that the level is higher than you choose."] = "只顯示高於所選等級的日志訊息."
 L["Set to 2 if you do not understand the meaning of log level."] = "如果你不理解日志等級的意思, 設置為 2 就好."
 L["Open the changelog window."] = true
+L["This will overwrite most of the ElvUI Options for the colors, so please keep that in mind."] = true
 
 -- Bags
 
@@ -727,7 +728,7 @@ L["Number of Players"] = "玩家數量"
 L["Placeholders"] = "占位符"
 L["Use Default"] = "使用預設"
 L["Researchers Under Fire"] = true
-L["Time Rift Thaldraszus"] = true
+L["Time Rift"] = true
 L["Superbloom"] = true
 
 -- SMB