resolve merge

Gogo1951 · Feb 6, 2023 · 4d1e508 · 4d1e508
2 parents 669dd1d + 7678c65
commit 4d1e508
Show file tree

Hide file tree

Showing 6 changed files with 1,552 additions and 5 deletions.
diff --git a/DBs/InstanceData.lua b/DBs/InstanceData.lua
@@ -33,7 +33,7 @@ addon.groupieInstanceData = {
     ["Trial of the Crusader - 25"] = { Active = false, Expac = "Wrath of the Lich King",
         InstanceType = "Wrath of the Lich King Raids - 25", InstanceID = 649, MinLevel = 80, MaxLevel = 80,
         GroupSize = 25, Order = 3470, ActivityID = 1104, Icon = "TOC Raid.tga" },
-    ["Ulduar - 25"] = { Active = false, Expac = "Wrath of the Lich King",
+    ["Ulduar - 25"] = { Active = true, Expac = "Wrath of the Lich King",
         InstanceType = "Wrath of the Lich King Raids - 25", InstanceID = 603, MinLevel = 80, MaxLevel = 80,
         GroupSize = 25, Order = 3460, ActivityID = 1107, Icon = "ULD.tga" },
     ["Onyxia's Lair - 25"] = { Active = false, Expac = "Wrath of the Lich King",
@@ -60,7 +60,7 @@ addon.groupieInstanceData = {
     ["Trial of the Crusader - 10"] = { Active = false, Expac = "Wrath of the Lich King",
         InstanceType = "Wrath of the Lich King Raids - 10", InstanceID = 649, MinLevel = 80, MaxLevel = 80,
         GroupSize = 10, Order = 3380, ActivityID = 1100, Icon = "TOC Raid.tga" },
-    ["Ulduar - 10"] = { Active = false, Expac = "Wrath of the Lich King",
+    ["Ulduar - 10"] = { Active = true, Expac = "Wrath of the Lich King",
         InstanceType = "Wrath of the Lich King Raids - 10", InstanceID = 603, MinLevel = 80, MaxLevel = 80,
         GroupSize = 10, Order = 3370, ActivityID = 1106, Icon = "ULD.tga" },
     ["Onyxia's Lair - 10"] = { Active = false, Expac = "Wrath of the Lich King",