Merge branch 'development'

Merathilis · Nov 19, 2021 · 69bf2ef · 69bf2ef
2 parents a159eef + 8aa2183
commit 69bf2ef
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,13 +1,12 @@
-## [4.85] ##
 ### Changes ###
 
 ## Retail: ##
-  * Only load my Announce Module on Retail
+  * nothing changed
 
 
 ## Classic: ##
-  * nothing changed
+  * Fixed an error in Alerts
 
 
 ## TBC: ##
-  * nothing changed
+  * Fixed an error in Alerts
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,10 +1,10 @@
-[b][color=orange]Retail: v4.85[/color], 19.11.2021[/b][list]
+[b][color=orange]Retail: v4.86[/color], 19.11.2021[/b][list]
 [*][b][color=orange]Retail:[/color][/b]
-[*]Only load my Announce Module on Retail
+[*]nothing changed
 
 [*][b][color=orange]Classic:[/color][/b]
-[*]nothing changed
+[*]Fixed an error in Alerts
 
 [*][b][color=orange]TBC:[/color][/b]
-[*]nothing changed[/list]
+[*]Fixed an error in Alerts[/list]
 
diff --git a/Core/General/Changelog.lua b/Core/General/Changelog.lua
@@ -16,15 +16,15 @@ local DISABLED_FONT_COLOR = DISABLED_FONT_COLOR
 
 local ChangeLogData = {
 	"Retail:",
-		"• Only load my Announce Module on Retail",
+		"• nothing changed",
 
 	" ",
 	"Classic:",
-		"• nothing changed",
+		"• Fixed an error in Alerts",
 
 	" ",
 	"TBC:",
-		"• nothing changed",
+		"• Fixed an error in Alerts",
 
 	" ",
 	"Notes:",

diff --git a/Core/Modules/Misc/Misc.lua b/Core/Modules/Misc/Misc.lua
@@ -214,6 +214,7 @@ function module:Initialize()
 		module:ItemLevel()
 		module:CreateMawWidgetFrame()
 		module:WowHeadLinks()
+		module:AddAlerts()
 
 		hooksecurefunc('WhoList_Update', UpdateWhoList)
 		hooksecurefunc(_G.WhoListScrollFrame, 'update', UpdateWhoList)
@@ -222,7 +223,6 @@ function module:Initialize()
 	module:LoadGMOTD()
 	module:LoadQuest()
 	module:LoadnameHover()
-	module:AddAlerts()
 	module:ReputationInit()
 	module:SplashScreen()
 end

diff --git a/ElvUI_MerathilisUI.toc b/ElvUI_MerathilisUI.toc
@@ -2,7 +2,7 @@
 ## Interface-Classic: 11307
 ## Interface-BCC: 20502
 ## Author: Merathilis
-## Version: 4.85
+## Version: 4.86
 ## Title: |cFF1784d1ElvUI|r |cffffffffMerathilis|r|cffff7d0aUI|r
 ## Notes: A decorative edit for ElvUI + additional features.
 ## Notes-deDE: Eine dekorative Erweiterung für ElvUI + einige zusätzliche Funktionen.

diff --git a/ElvUI_MerathilisUI_Classic.toc b/ElvUI_MerathilisUI_Classic.toc
@@ -1,6 +1,6 @@
 ## Interface: 11307
 ## Author: Merathilis
-## Version: 4.85
+## Version: 4.86
 ## Title: |cFF1784d1ElvUI|r |cffffffffMerathilis|r|cffff7d0aUI|r
 ## Notes: A decorative edit for ElvUI + additional features.
 ## Notes-deDE: Eine dekorative Erweiterung für ElvUI + einige zusätzliche Funktionen.

diff --git a/ElvUI_MerathilisUI_TBC.toc b/ElvUI_MerathilisUI_TBC.toc
@@ -1,6 +1,6 @@
 ## Interface: 20502
 ## Author: Merathilis
-## Version: 4.85
+## Version: 4.86
 ## Title: |cFF1784d1ElvUI|r |cffffffffMerathilis|r|cffff7d0aUI|r
 ## Notes: A decorative edit for ElvUI + additional features.
 ## Notes-deDE: Eine dekorative Erweiterung für ElvUI + einige zusätzliche Funktionen.

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 <div align="center">
 <img src="m4.png"/><br>
-<img src="https://img.shields.io/badge/ElvUI-12.55-blue.svg?longCache=true&style=for-the-badge"/>
-<img src="https://img.shields.io/badge/Version-4.84-orange.svg?longCache=true&style=for-the-badge"/>
+<img src="https://img.shields.io/badge/ElvUI-12.56-blue.svg?longCache=true&style=for-the-badge"/>
+<img src="https://img.shields.io/badge/Version-4.85-orange.svg?longCache=true&style=for-the-badge"/>
 </div>
 
 -----