Integrate Shadowlands and Dragonflight modules

nanderson11 · Jan 9, 2025 · a9779bb · a9779bb
1 parent 0f423da
commit a9779bb
Show file tree

Hide file tree

Showing 17 changed files with 14,814 additions and 15,515 deletions.
diff --git a/.pkgmeta b/.pkgmeta
@@ -26,6 +26,6 @@ move-folders:
 # Ignore takes place before folder's moving takes place
 ignore:
   - RECENT_CHANGES.md
-  - Images/PSD
-  - DEVTOOLS.lua
+  - AtlasLoot/Images/PSD
+  - AtlasLoot/DEVTOOLS.lua
 
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -112,7 +112,8 @@
         "EXPANSION_NAME10",
         "COMPANIONS",
         "TOY",
-        "EXPANSION_NAME8"
+        "EXPANSION_NAME8",
+        "EXPANSION_NAME9"
     ],
     "Lua.diagnostics.disable": [
         "need-check-nil"

diff --git a/AtlasLoot/AtlasLoot.lua b/AtlasLoot/AtlasLoot.lua
@@ -100,6 +100,20 @@ ATLASLOOT_INSTANCE_MODULE_LIST = {}
 
 -- A list of officiel AtlasLoot modules
 ATLASLOOT_MODULE_LIST = {
+	{
+		addonName = "AtlasLoot_Dragonflight",
+		icon = "Interface\\ICONS\\ability_dragonriding_athomealoft01",
+		name = EXPANSION_NAME9,
+		tt_title = nil, -- ToolTip title
+		tt_text = nil, -- ToolTip text
+	},
+	{
+		addonName = "AtlasLoot_Shadowlands",
+		icon = "Interface\\ICONS\\achievement_mythicdungeons_shadowlands",
+		name = EXPANSION_NAME8,
+		tt_title = nil, -- ToolTip title
+		tt_text = nil, -- ToolTip text
+	},
 	{
 		addonName = "AtlasLoot_BattleforAzeroth",
 		icon = "Interface\\ICONS\\Inv_ChampionsOfAzeroth",

diff --git a/AtlasLoot/CHANGELOG.md b/AtlasLoot/CHANGELOG.md
@@ -1,10 +1,12 @@
 # Changelog
 
-## 8.14.0 - January 7, 2024
+## 8.14.0 - January 9, 2024
 
 ### Added
 
 - Added Shadowlands and Dragonflight modules that were previously separate
+- Added the Atlas button to Shadowlands and Dragonflight instance maps provided by Atlas (fork)
+- Added icon textures in addon list
 
 ### Changed
 

diff --git a/AtlasLoot_Collections/data.lua b/AtlasLoot_Collections/data.lua
diff --git a/AtlasLoot_Dragonflight/AtlasLoot_Dragonflight.toc b/AtlasLoot_Dragonflight/AtlasLoot_Dragonflight.toc
@@ -15,9 +15,5 @@
 ## X-License: GPL v2
 ## X-Website: https://github.com/nanderson11/AtlasLootEnhanced
 ## X-AtlasLoot-LootModule: 1
-## X-AtlasLoot-ModuleName: Dragonflight
 
-Core\Core.lua
-Core\Instance.lua
-Core\Collections.lua
-Core\PvP.lua
+data.lua
diff --git a/AtlasLoot_Dragonflight/Core/Collections.lua b/AtlasLoot_Dragonflight/Core/Collections.lua
diff --git a/AtlasLoot_Dragonflight/Core/Core.lua b/AtlasLoot_Dragonflight/Core/Core.lua