update to version 7.3.18 (#11)

* Merged Magisters Terrace - Kael'thas Sunstriders normal/heroic pages

* update to build 7.3.18

.gitignore

@@ -1,9 +1,3 @@
-.env
-.DS_Store
-.release
-.install
-.lua/*
-.vscode
-.idea
 
 .vscode/settings.json
+README.md

AtlasLoot/AtlasLoot.toc

@@ -2,13 +2,13 @@
 ## Title: AtlasLoot Ascension Edition
 ## Notes: Shows the possible loot from the bosses
 ## Author: v7 Rebuid Done by: Anch, Rvng
-## Version: v7.3.15
+## Version: v7.3.18
-## X-eMail: 
 ## X-Credits: Skray, Szyler and others.
 ## Dependencies: AtlasLoot_Cache
 ## X-Category: Map
 ## X-License: GPL v2
-## X-Website: https://discord.gg/uYCE2X2FgA
+## X-Github-Repository: https://github.com/Szyler/AtlasLootAscension
+## X-Discord: https://discord.gg/uYCE2X2FgA
 ## X-Embeds: Ace3, DewdropLib, LibBabble-Boss-3.0, LibBabble-Faction-3.0, LibBabble-Inventory-3.0, LibBabble-Zone-3.0
 ## Title-deDE: AtlasLoot Enhanced
 ## Notes-deDE: Zeigt mögliche Beute von Bossen

AtlasLoot/Core/AtlasDifficulty.lua

@@ -46,7 +46,8 @@
     AtlasLoot.Difficulties["BCDungeon"] = {
         {"Bloodforged", 1},
         {"Heroic Bloodforged", 100},
-        {"Normal/Heroic", 2},
+        {"Normal", 2},
+        {"Heroic", 3},
         {"Mythic", 4},
         {"Mythic 1", 5 },  {"Mythic 2", 6 },  {"Mythic 3", 7 },  {"Mythic 4", 8 },  {"Mythic 5", 9 },
         {"Mythic 6", 10 }, {"Mythic 7", 11 }, {"Mythic 8", 12 }, {"Mythic 9", 13 }, {"Mythic 10", 14 },
@@ -125,9 +126,9 @@
     --Enums for comparisons in code
     AtlasLoot.Difficulties.Bloodforged = 1
     AtlasLoot.Difficulties["Heroic Bloodforged"] = 2
-    AtlasLoot.Difficulties.Normal = 3
+    AtlasLoot.Difficulties.Normal = 2
-    AtlasLoot.Difficulties.Heroic = 4
+    AtlasLoot.Difficulties.Heroic = 3
-    AtlasLoot.Difficulties.Mythic = 5
+    AtlasLoot.Difficulties.Mythic = 4
     AtlasLoot.Difficulties.Ascended = 5
 
     AtlasLoot.Difficulties.MythicPlus = {

AtlasLoot/Core/AtlasLoot.lua

@@ -56,6 +56,7 @@ AtlasLootCharDB = {}
 AtlasLoot_TokenData = {}
 
 local realmName = GetRealmName()
+local _, class = UnitClass("player")
 
 local AtlasLootDBDefaults = {
     profile = {
@@ -223,7 +224,7 @@ function AtlasLoot:OnEnable()
 	else
 		AtlasLootItemsFrame_Wishlist_UnLock:Enable()
 	end
-	self:LoadMissingIDs()
+	LoadItemIDsDatabase()
 	self:LoadTradeskillRecipes()
 	self:PopulateProfessions()
 	self:CreateVanityCollection()
@@ -564,11 +565,6 @@ function AtlasLoot:ShowItemsFrame(dataID, dataSource_backup, tablenum)
 		self:SubTableScrollFrameUpdate(dataID, dataSource_backup, tablenum)
 	end
 
-	-- Sets the main page lable
-	if dataSource[dataID][tablenum] and dataSource[dataID][tablenum].Name then
-		AtlasLoot_BossName:SetText(dataSource[dataID][tablenum].Name)
-	else
-		AtlasLoot_BossName:SetText("This Is Empty")
 	for i = 1, 30, 1 do
 		--Use shortcuts for easier reference to parts of the item button
 		local itemButton = _G["AtlasLootItem_"..i]
@@ -579,14 +575,13 @@ function AtlasLoot:ShowItemsFrame(dataID, dataSource_backup, tablenum)
 			hightlightFrame:Hide()
 			itemButton.hasTrade = false
 	end
-		return
-	end
 
-	if dataSource ~= self.dataSourceBackup and tablenum ~= lastTablenum then
+	-- Sets the main page lable
-		for i = 1, 30, 1 do
+	if dataSource[dataID][tablenum] and dataSource[dataID][tablenum].Name then
-			_G["AtlasLootItem_"..i]:Hide()
+		AtlasLoot_BossName:SetText(dataSource[dataID][tablenum].Name)
-			_G["AtlasLootItem_"..i.."_Highlight"]:Hide()
+	else
-		end
+		AtlasLoot_BossName:SetText("This Is Empty")
+		return
 	end
 
 	-- find the right itemID for the difficulty selected
@@ -595,18 +590,18 @@ function AtlasLoot:ShowItemsFrame(dataID, dataSource_backup, tablenum)
 		toShow = true
 		local itemDif = ItemindexID
 		local itemID = item and item.itemID
-		local orgItemID = itemID
 		if item and item.itemID then
 			itemID = item.itemID
 			isValid = true
 			local itemType = item.Type or dataSource[dataID].Type
-			if(item[self.Difficulties.MIN_DIF]) then
+			if class == "HERO" and item.COA then
+				toShow = false
+			elseif(item[self.Difficulties.MIN_DIF]) then
 				if item[self.Difficulties.MIN_DIF] > itemDif then
 					toShow = false
 				end
 				itemID = self:FindId(item.itemID, min(self:getMaxDifficulty(itemType), itemDif), itemType) or item.itemID
 			end
-
 			if toShow then
 				--Sets ItemindexID to normal(2) if it is nil for min/max difficulties.
 				if not tonumber(itemDif) then itemDif = self.Difficulties.Normal end
@@ -618,18 +613,23 @@ function AtlasLoot:ShowItemsFrame(dataID, dataSource_backup, tablenum)
 				itemID = self:FindId(item.itemID, itemDif, itemType) or item.itemID
 			end
 		elseif item and (item.spellID or item.icon) or item and itemID then
-			isValid = true
 			toShow = true
+			if(item[self.Difficulties.MIN_DIF]) then
+				if item[self.Difficulties.MIN_DIF] > itemDif then
+					toShow = false
+				end
+			end
+			isValid = true			
 		end
 		local recipeID
 		if item and item.spellID then
 			recipeID = self:GetRecipeID(item.spellID)
 		end
-		return isValid, toShow, itemID, recipeID, orgItemID
+		return isValid, toShow, itemID, recipeID
 	end
 
 	-- Setup the button for the to be displayed item/spell
-	local function setupButton(itemID, i, dataSource, dataID, tablenum, dataSource_backup)
+	local function setupButton(itemID, i, newPosition, dataSource, dataID, tablenum, dataSource_backup)
 		local text, extra
 		local itemName, itemQuality, itemSubType, itemEquipLoc, itemIcon
 		if itemID then
@@ -638,11 +638,11 @@ function AtlasLoot:ShowItemsFrame(dataID, dataSource_backup, tablenum)
 
 		local spellName, spellIcon
 		--Use shortcuts for easier reference to parts of the item button
-		local itemButton = _G["AtlasLootItem_"..i]
+		local itemButton = _G["AtlasLootItem_"..newPosition]
-		local iconFrame  = _G["AtlasLootItem_"..i.."_Icon"]
+		local iconFrame  = _G["AtlasLootItem_"..newPosition.."_Icon"]
-		local nameFrame  = _G["AtlasLootItem_"..i.."_Name"]
+		local nameFrame  = _G["AtlasLootItem_"..newPosition.."_Name"]
-		local extraFrame = _G["AtlasLootItem_"..i.."_Extra"]
+		local extraFrame = _G["AtlasLootItem_"..newPosition.."_Extra"]
-		local hightlightFrame = _G["AtlasLootItem_"..i.."_Highlight"]
+		local hightlightFrame = _G["AtlasLootItem_"..newPosition.."_Highlight"]
 		local spellID = dataSource[dataID][tablenum][i].spellID
 
 		if spellID then
@@ -831,54 +831,23 @@ function AtlasLoot:ShowItemsFrame(dataID, dataSource_backup, tablenum)
 		itemButton:Show()
 	end
 
-	local function getItemData(itemID, i, orgItemID, item)
-		self:ItemsLoading(1)
-		item:ContinueOnLoad(function(itemID)
-			self:ItemsLoading(-1)
-			setupButton(itemID, i, dataSource, dataID, tablenum, dataSource_backup)
-		end)
-	end
-
 	-- Create the loottable
 	if (dataID == "SearchResult") or (dataSource_backup == "AtlasLoot_CurrentWishList") or dataSource[dataID][tablenum] then
-
+	local displayNumber = 0
 		--Iterate through each item object and set its properties
 		for i = 1, 30, 1 do
-			--Use shortcuts for easier reference to parts of the item button
+			--Set new button number if a item has been hidden
-			local itemButton = _G["AtlasLootItem_"..i]
+			local newPosition = i - displayNumber
-			local hightlightFrame = _G["AtlasLootItem_"..i.."_Highlight"]
+			if i == 16 then
+				displayNumber = 0
+				newPosition = i
+			end
 			--Check for a valid object (that it exists, and that it has a name
-			isValid, toShow, itemID, recipeID, orgItemID = getProperItemConditionals(dataSource[dataID][tablenum][i])
+			isValid, toShow, itemID, recipeID = getProperItemConditionals(dataSource[dataID][tablenum][i])
 			if isValid and toShow then
-				hightlightFrame:Hide()
+				setupButton(itemID or recipeID, i, newPosition, dataSource, dataID, tablenum, dataSource_backup)
-				if itemID then
+			elseif isValid then
-					local item = Item:CreateFromID(itemID)
+				displayNumber = displayNumber + 1
-					if not item:GetInfo() then
-						getItemData(itemID, i, orgItemID, item)
-					end
-					setupButton(itemID, i, dataSource, dataID, tablenum, dataSource_backup)
-				elseif recipeID then
-					getItemData(recipeID, i, nil, Item:CreateFromID(recipeID))
-				else
-					setupButton(itemID, i, dataSource, dataID, tablenum, dataSource_backup)
-				end
-			else
-				itemButton:Hide()
-				itemButton.itemID = nil
-				itemButton.spellID = nil
-				hightlightFrame:Hide()
-				itemButton.hasTrade = false
-			end
-			if dataSource[itemID] then
-				for _,ID in pairs(dataSource[itemID]) do
-					local item = Item:CreateFromID(ID.itemID)
-					if ID.itemID and not item:GetInfo() then
-						self:ItemsLoading(1)
-						item:ContinueOnLoad(function(itemID)
-							self:ItemsLoading(-1)
-						end)
-					end
-				end
 			end
 		end
 

AtlasLoot/Core/LootButtons.lua

@@ -523,7 +523,7 @@ function AtlasLoot:ItemContextMenu(data, Type, recipeData)
                                 "notCheckable", true
                             )
                         end
-                        if self.TomTomLoaded then
+                        if self.TomTomLoaded and data.spellID then
                             if not self.db.profile.waypointList then self.db.profile.waypointList = {} end
                             local wayPoint
                             if (craftingData and self.db.profile.recipeExtraInfoSwitch and IsControlKeyDown()) or (craftingData and not self.db.profile.recipeExtraInfoSwitch) then
@@ -538,8 +538,6 @@ function AtlasLoot:ItemContextMenu(data, Type, recipeData)
                                     end
                                 end
                             end
-                            if craftingData and wayPoint then
-
                             self:AddDividerLine(35)
                             self.Dewdrop:AddLine(
                             'text', AL["Recipe Waypoints"],
@@ -548,6 +546,7 @@ function AtlasLoot:ItemContextMenu(data, Type, recipeData)
                             'textHeight', 13,
                             'textWidth', 13
                             )
+                            if craftingData and wayPoint then
                                 self.Dewdrop:AddLine(
                                 "text", "Add pin to map",
                                 "func", function()
@@ -560,7 +559,18 @@ function AtlasLoot:ItemContextMenu(data, Type, recipeData)
                                 'textWidth', 12,
                                 "notCheckable", true
                                 )
+
                             end
+                            self.Dewdrop:AddLine(
+                                "text", "Add pin to map for every missing recipe",
+                                "func", function()
+                                    self:SetRecipeMapPins()
+                                end,
+                                'closeWhenClicked', true,
+                                'textHeight', 12,
+                                'textWidth', 12,
+                                "notCheckable", true
+                            )
                         end
                     end
             elseif level == 2 then

AtlasLoot/Core/Maps.lua

@@ -244,7 +244,7 @@ function AtlasLoot:MapMenuOpen(frame)
             if v[1].Zone then
                 text = map[i][2][1]
             else
-                text = v[1][1]
+                text = v[1][1] or ""
             end
             tinsert(menuList[1], {text = WHITE..text, func = function() self:MapOnShow(mapID, i, true) end, notCheckable = true, closeWhenClicked = true, textHeight = 12, textWidth = 12})
         end

AtlasLoot/Core/Utils.lua

@@ -13,6 +13,7 @@ local YELLOW = "|cffFFd200"
 
 local playerName = UnitName("player")
 local realmName = GetRealmName()
+local playerFaction = UnitFactionGroup("player")
 
 -- Used to create a dewdrop menu from a table
 function AtlasLoot:OpenDewdropMenu(frame, menuList, skipRegister)
@@ -150,12 +151,20 @@ local itemEquipLocConversion = {
 	"INVTYPE_QUIVER",
 	"INVTYPE_RELIC",
 }
-function AtlasLoot:GetItemInfo(itemID)
+
-	local itemName, itemLink, itemQuality, itemLevel, itemMinLevel, itemType, itemSubType, itemStackCount, itemEquipLoc, itemTexture, itemSellPrice = GetItemInfo(itemID)
+function AtlasLoot:GetItemInfo(item)
-	if not itemName then
+	item = tonumber(item) and Item:CreateFromID(item) or Item:CreateFromLink(item)
-		local item = GetItemInfoInstant(itemID)
+	local itemName, itemLink, itemQuality, itemLevel, itemMinLevel, itemType, itemSubType, itemStackCount, itemEquipLoc, itemTexture, itemSellPrice = GetItemInfo(item.itemID)
-		if item then
+	if not item:GetInfo() then
-			itemName, itemSubType, itemEquipLoc, itemTexture, itemQuality = item.name, _G["ITEM_SUBCLASS_"..item.classID.."_"..item.subclassID], itemEquipLocConversion[item.inventoryType], item.icon, item.quality
+		self:ItemsLoading(1)
+		item:ContinueOnLoad(function()
+			self:ItemsLoading(-1)
+		end)
+		local itemInstant = GetItemInfoInstant(item.itemID)
+		if itemInstant then
+			itemName, itemSubType, itemEquipLoc, itemTexture, itemQuality = itemInstant.name, _G["ITEM_SUBCLASS_"..itemInstant.classID.."_"..itemInstant.subclassID], itemEquipLocConversion[itemInstant.inventoryType], itemInstant.icon, itemInstant.quality
+			local color = ITEM_QUALITY_COLORS[itemQuality] or ITEM_QUALITY_COLORS[1]
+			itemLink = color:WrapText("|Hitem:"..item.itemID.."|h["..itemName.."]|h|r")
 		end
 	end
 	return itemName, itemLink, itemQuality, itemLevel, itemMinLevel, itemType, itemSubType, itemStackCount, itemEquipLoc, itemTexture, itemSellPrice
@@ -275,6 +284,95 @@ function AtlasLoot:IsRecipeUnknown(ID)
 	return text
 end
 
+local professionTable = {
+	[171] = {
+	"AlchemyCLASSIC",
+	"AlchemyTBC",
+	"AlchemyWRATH",
+},
+	[164] = {
+	"SmithingCLASSIC",
+	"SmithingTBC",
+	"SmithingWRATH",
+	},
+	[333] = {
+	"EnchantingCLASSIC",
+	"EnchantingTBC",
+	"EnchantingWRATH",
+},
+	[202] = {
+	"EngineeringCLASSIC",
+	"EngineeringTBC",
+	"EngineeringWRATH",
+},
+	[755] = {
+	"JewelcraftingTBC",
+	"JewelcraftingWRATH",
+},
+	[165] = {
+	"LeatherworkingCLASSIC",
+	"LeatherworkingTBC",
+	"LeatherworkingWRATH",
+},
+	[197] = {
+	"TailoringCLASSIC",
+	"TailoringTBC",
+	"TailoringWRATH",
+},
+	[186] = {
+	"MiningCLASSIC",
+	"MiningTBC",
+	"MiningWRATH",
+},
+	[185] = {
+	"CookingCLASSIC",
+	"CookingTBC",
+	"CookingWRATH",
+},
+	[129] = {
+	"FirstAidCLASSIC",
+	"FirstAidTBC",
+	"FirstAidWRATH",
+},
+	[773] = {
+	"Inscription",
+},
+}
+
+local craftingXpac = { ClassicCrafting = 1, BCCrafting = 2, WrathCrafting = 3 }
+
+function AtlasLoot:SetRecipeMapPins()
+	local xpac = GetAccountExpansionLevel()+1
+	self:LoadAllModules()
+	for profKey, _ in pairs(self.db.profile.professions) do
+		if professionTable[profKey] then
+			for _, profTable in pairs(professionTable[profKey]) do
+				if craftingXpac[AtlasLoot_Data[profTable].Type] <= xpac then
+					for _, profType in pairs(AtlasLoot_Data[profTable]) do
+						if type(profType) == "table" then
+							for _, recipeData in pairs(profType) do
+								if recipeData.spellID and not CA_IsSpellKnown(recipeData.spellID) then
+									local craftingData = self:GetRecipeSource(recipeData.spellID)
+									if craftingData then
+										for _,v in pairs(craftingData) do
+											if v.cords and tonumber(v.cords[1]) ~= 0 and tonumber(v.cords[2]) ~= 0 then
+												local line1 = v[1]
+												local line2 = v[2]
+												if v.fac and (v.fac[2] == playerFaction or v.fac[2] == "Netural") then line1 = v.fac[1]..line1 end
+												self:AddWayPoint({ line2, tonumber(v.cords[1]), tonumber(v.cords[2]), line1})
+											end
+										end
+									end
+								end
+							end
+						end
+					end
+				end
+			end
+		end
+	end
+end
+
 -- Get rep faction for when you have 2 loot tables and want to show a different one depending on rep
 function AtlasLoot:GetReputationFaction(factions)
 	local factionIndex = 1
@@ -350,13 +448,6 @@ function AtlasLoot:PopoupItemFrame(frame, data)
 			button:Hide()
 		else
 			local itemID = item.itemID or item[1]
-			local itemData = Item:CreateFromID(itemID)
-				if itemID and not itemData:GetInfo() then
-					self:ItemsLoading(1)
-					itemData:ContinueOnLoad(function(itemID)
-						self:ItemsLoading(-1)
-					end)
-				end
 			local itemData = {self:GetItemInfo(itemID)}
 			SetItemButtonTexture(button, itemData[10])
 			SetItemButtonQuality(button, itemData[3])

AtlasLoot/Core/WishList.lua

@@ -72,7 +72,7 @@ function AtlasLoot:WishListAddDropClick(typ, tableNum, data, show)
 		xtyp = typ
 		xarg2 = tableNum
 		if typ == "Own" then
-			if AtlasLoot:WishListCheck(itemID) then
+			if AtlasLoot:WishListCheck(itemID) and not AtlasLootWishList["Options"][playerName].AllowDuplicates then
 				DEFAULT_CHAT_FRAME:AddMessage(BLUE..AL["AtlasLoot"]..": "..AtlasLoot:FixText(itemName)..RED..AL[" already in the WishList!"]..WHITE.." ("..AtlasLootWishList["Own"][tableNum].Name..")")
 				return
 			end
@@ -87,7 +87,7 @@ function AtlasLoot:WishListAddDropClick(typ, tableNum, data, show)
 			end
 			DEFAULT_CHAT_FRAME:AddMessage(RED..AL["AtlasLoot"]..": "..AtlasLoot:FixText(itemName)..GREY..AL[" added to the WishList."]..WHITE.." ("..AtlasLootWishList["Own"][tableNum].Name..")")
 		elseif typ == "Shared" then
-			if AtlasLoot:WishListCheck(itemID) then
+			if AtlasLoot:WishListCheck(itemID) and not AtlasLootWishList["Options"][playerName].AllowDuplicates then
 				DEFAULT_CHAT_FRAME:AddMessage(BLUE..AL["AtlasLoot"]..": "..AtlasLoot:FixText(itemName)..RED..AL[" already in the WishList!"]..WHITE.." ("..AtlasLootWishList["Shared"][tableNum].Name)
 				return
 			end
@@ -947,6 +947,13 @@ function AtlasLoot:CreateWishlistOptions()
 			end
 		end)
 
+		local WishListAllowDuplicates = CreateFrame("CheckButton", "AtlasLootOptionsWishListAllowDuplicates", WishlistOptionsFrame, "OptionsCheckButtonTemplate")
+		WishListAllowDuplicates:SetPoint("LEFT", WishlistOptionsFrame, "TOPLEFT", 5, -155)
+		WishListAllowDuplicates:SetSize(25,25)
+		AtlasLootOptionsWishListAllowDuplicatesText:SetText(AL["Allow Duplicates"])
+		WishListAllowDuplicates:SetScript("OnShow", function(button) button:SetChecked(AtlasLootWishList["Options"][playerName].AllowDuplicates) end)
+		WishListAllowDuplicates:SetScript("OnClick", function(button) AtlasLootWishList["Options"][playerName].AllowDuplicates = button:GetChecked() end)
+
 	InterfaceOptions_AddCategory(WishlistOptionsFrame)
 	OptionsLoadet = true
 end

AtlasLoot/Databases/CraftingSource.lua

@@ -181,7 +181,7 @@ AtlasLoot_CraftingData["AquireType"][46113] = { CUSTOM, 24}; -- Surestrike Goggl
 AtlasLoot_CraftingData["AquireType"][46114] = { CUSTOM, 24}; -- Mayhem Projection Goggles -- 46114
 AtlasLoot_CraftingData["AquireType"][46115] = { CUSTOM, 24}; -- Hard Khorium Goggles -- 46115
 AtlasLoot_CraftingData["AquireType"][46116] = { CUSTOM, 24}; -- Quad Deathblow X44 Goggles -- 46116
-AtlasLoot_CraftingData["AquireType"][60867] = { REPUTATION, BabbleFaction["Alliance Vanguard"], BabbleFaction["Exalted"], 32564, REPUTATION, BabbleFaction["Alliance Vanguard"], BabbleFaction["Exalted"], 32773}; -- Mekgineer's Chopper -- 60867
+--AtlasLoot_CraftingData["AquireType"][60867] = { REPUTATION, BabbleFaction["Alliance Vanguard"], BabbleFaction["Exalted"], 32564, REPUTATION, BabbleFaction["Alliance Vanguard"], BabbleFaction["Exalted"], 32773}; -- Mekgineer's Chopper -- 60867
 AtlasLoot_CraftingData["AquireType"][3275] = { CUSTOM, 8}; -- Linen Bandage -- 3275
 AtlasLoot_CraftingData["AquireType"][45382] = { CUSTOM, 8}; -- Scroll of Stamina -- 45382
 AtlasLoot_CraftingData["AquireType"][48114] = { CUSTOM, 8}; -- Scroll of Intellect -- 48114
@@ -3366,6 +3366,12 @@ AtlasLoot_CraftingData["Vendor"][968392] = { 970023};
 AtlasLoot_CraftingData["Vendor"][968395] = { 970034};
 AtlasLoot_CraftingData["Vendor"][968398] = { 970019};
 AtlasLoot_CraftingData["Vendor"][968401] = { 970039};
+AtlasLoot_CraftingData["Vendor"][968500] = { 970011};
+AtlasLoot_CraftingData["Vendor"][968496] = { 970011};
+AtlasLoot_CraftingData["Vendor"][968506] = { 970008};
+AtlasLoot_CraftingData["Vendor"][968498] = { 970008};
+AtlasLoot_CraftingData["Vendor"][968502] = { 970016};
+AtlasLoot_CraftingData["Vendor"][968504] = { 970016};
 
 AtlasLoot_CraftingData["RepVendor"][17559] = { BabbleFaction["Argent Dawn"], BabbleFaction["Honored"], 10856, 11536, 10857} -- Transmute: Air to Fire -- 17559
 AtlasLoot_CraftingData["RepVendor"][17561] = { BabbleFaction["Timbermaw Hold"], BabbleFaction["Friendly"], 11557} -- Transmute: Earth to Water -- 17561

AtlasLoot/Databases/DatabaseFunctions.lua

@@ -64,17 +64,15 @@ function AtlasLoot:CreateUpdateText()
     updateFrameCreated = true
 end
 
-local itemTypeIgnore = {[18] = true, [19] = true, [24] = true}
-
 local unknownIDs = {}
 function AtlasLoot:UpdateItemIDsDatabase(firstID, lastID)
 	AtlasLootItemCache = ItemIDsDatabase
 	self:IsLootTableAvailable("AtlasLootOriginalWoW")
 	self:IsLootTableAvailable("AtlasLootBurningCrusade")
 	self:IsLootTableAvailable("AtlasLootWotLK")
-    for dataID, data in pairs(AtlasLoot_Data) do
+    for _, data in pairs(AtlasLoot_Data) do
 		if data.Type then
-			for tableNum, t in ipairs(data) do
+			for _, t in ipairs(data) do
 				for _, itemData in pairs(t) do
 					if type(itemData) == "table" then
 						if itemData.itemID then
@@ -183,27 +181,3 @@ function AtlasLoot:FindId(id, difficulty, type, Difficultiestring)
 		return ItemIDsDatabase[id][difficulty], true
 	end
 end
-
---Updates the ItemIDsDatabase with any missing or incorrect items
-function AtlasLoot:LoadMissingIDs()
-	--loads any items in the saved varriables cache
-    if AtlasLootItemCache and not self:CheckIfEmptyTable(AtlasLootItemCache) then
-		for normalID, item in pairs(AtlasLootItemCache) do
-			for itemDif, itemID in pairs(item) do
-				ItemIDsDatabase[normalID] = ItemIDsDatabase[normalID] or {}
-				ItemIDsDatabase[normalID][itemDif] = itemID
-			end
-		end
-	end
-	-- loads ids that have been manuely corrected
-	if ItemIDManuelCorrections then
-		for normalID, item in pairs(ItemIDManuelCorrections) do
-			for itemDif, itemID in pairs(item) do
-				ItemIDsDatabase[normalID] = ItemIDsDatabase[normalID] or {}
-				ItemIDsDatabase[normalID][itemDif] = itemID
-			end
-		end
-	end
-	ItemIDManuelCorrections = nil
-    collectgarbage("collect")
-end

AtlasLoot/Databases/Databases.xml

@@ -1,7 +1,6 @@
 <Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
 ..\FrameXML\UI.xsd">
     <Script file="Databases.lua"/>
-    <Script file="ItemIDsDatabaseFixes.lua"/>
     <Script file="DatabaseFunctions.lua"/>
     <Script file="extraCraftingData.lua"/>
     <Script file="CraftingSource.lua"/>

AtlasLoot/Databases/npcs.lua

@@ -386,7 +386,7 @@ AtlasLoot_CraftingData["VendorList"] = {
 [970009] = { AL["Shady Dealer"], BabbleZone["Deadwind Pass"], 50.0, 74.8, NEUTRAL },
 [970010] = { AL["Shady Dealer"], BabbleZone["Thousand Needles"], 80.2, 77.1, NEUTRAL },
 [970011] = { AL["Shady Dealer"], BabbleZone["Felwood"], 64.8, 8.0, NEUTRAL },
-[970012] = { AL["Shady Dealer"], BabbleZone["Eastern Plaguelands"], 43.5, 18.5, NEUTRAL },
+[970012] = { AL["Shady Dealer"], BabbleZone["Eastern Plaguelands"], 35.7, 69, NEUTRAL },
 [970013] = { AL["Shady Dealer"], BabbleZone["The Barrens"], 49.4, 50.6, NEUTRAL },
 [970014] = { AL["Shady Dealer"], BabbleZone["Duskwood"], 81.8, 19.8, NEUTRAL },
 [970015] = { AL["Shady Dealer"], BabbleZone["Western Plaguelands"], 45.0, 15.8, NEUTRAL },

AtlasLoot/Libs/LibAboutPanel/LibAboutPanel.lua

@@ -12,7 +12,7 @@ Author: Tekkub, Ackis
 
 ]]--
 
-local lib, oldminor = LibStub:NewLibrary("LibAboutPanel", 2)
+local lib, oldminor = LibStub:NewLibrary("LibAboutPanel", 3)
 if not lib then return end
 
 function lib.new(parent, addonname)
@@ -31,95 +31,56 @@ local L = {}
 -- frFR
 if GAME_LOCALE == "frFR" then
 	L["About"] = "à propos de"
-	L["Click and press Ctrl-C to copy"] = "Click and press Ctrl-C to copy"
+	L["Click to copy to clipboard"] = "Click to copy to clipboard"
 -- deDE
 elseif GAME_LOCALE == "deDE" then
 	L["About"] = "Über"
-	L["Click and press Ctrl-C to copy"] = "Klicken und Strg-C drücken zum kopieren"
+	L["Click to copy to clipboard"] = "Klicken und Strg-C drücken zum kopieren"
 -- esES
 elseif GAME_LOCALE == "esES" then
 	L["About"] = "Acerca de"
-	L["Click and press Ctrl-C to copy"] = "Click and press Ctrl-C to copy"
+	L["Click to copy to clipboard"] = "Click to copy to clipboard"
 -- esMX
 elseif GAME_LOCALE == "esMX" then
 	L["About"] = "Sobre"
-	L["Click and press Ctrl-C to copy"] = "Click and press Ctrl-C to copy"
+	L["Click to copy to clipboard"] = "Click to copy to clipboard"
 -- koKR
 elseif GAME_LOCALE == "koKR" then
 	L["About"] = "대하여"
-	L["Click and press Ctrl-C to copy"] = "Click and press Ctrl-C to copy"
+	L["Click to copy to clipboard"] = "Click to copy to clipboard"
 -- ruRU
 elseif GAME_LOCALE == "ruRU" then
 	L["About"] = "Об аддоне"
-	L["Click and press Ctrl-C to copy"] = "Click and press Ctrl-C to copy"
+	L["Click to copy to clipboard"] = "Click to copy to clipboard"
 -- zhCN
 elseif GAME_LOCALE == "zhCN" then
 	L["About"] = "关于"
-	L["Click and press Ctrl-C to copy"] = "点击并 Ctrl-C 复制"
+	L["Click to copy to clipboard"] = "点击并 Ctrl-C 复制"
 -- zhTW
 elseif GAME_LOCALE == "zhTW" then
 	L["About"] = "關於"
-	L["Click and press Ctrl-C to copy"] = "點擊並 Ctrl-C 復制"
+	L["Click to copy to clipboard"] = "點擊並 Ctrl-C 復制"
 -- enUS and non-localized
 else
 	L["About"] ="About"
-	L["Click and press Ctrl-C to copy"] = "Click and press Ctrl-C to copy"
+	L["Click to copy to clipboard"] = "Click to copy to clipboard"
 end
 
-local editbox = CreateFrame('EditBox', nil, UIParent)
+function lib.CopyToClipboard(self)
-editbox:Hide()
+	Internal_CopyToClipboard(self.val)
-editbox:SetAutoFocus(true)
+	SendSystemMessage(S_COPIED_TO_CLIPBOARD:format(self.field:gsub("X%-", "")))
-editbox:SetHeight(32)
-editbox:SetFontObject('GameFontHighlightSmall')
-lib.editbox = editbox
-
-local left = editbox:CreateTexture(nil, "BACKGROUND")
-left:SetWidth(8) left:SetHeight(20)
-left:SetPoint("LEFT", -5, 0)
-left:SetTexture("Interface\\Common\\Common-Input-Border")
-left:SetTexCoord(0, 0.0625, 0, 0.625)
-
-local right = editbox:CreateTexture(nil, "BACKGROUND")
-right:SetWidth(8) right:SetHeight(20)
-right:SetPoint("RIGHT", 0, 0)
-right:SetTexture("Interface\\Common\\Common-Input-Border")
-right:SetTexCoord(0.9375, 1, 0, 0.625)
-
-local center = editbox:CreateTexture(nil, "BACKGROUND")
-center:SetHeight(20)
-center:SetPoint("RIGHT", right, "LEFT", 0, 0)
-center:SetPoint("LEFT", left, "RIGHT", 0, 0)
-center:SetTexture("Interface\\Common\\Common-Input-Border")
-center:SetTexCoord(0.0625, 0.9375, 0, 0.625)
-
-editbox:SetScript("OnEscapePressed", editbox.ClearFocus)
-editbox:SetScript("OnEnterPressed", editbox.ClearFocus)
-editbox:SetScript("OnEditFocusLost", editbox.Hide)
-editbox:SetScript("OnEditFocusGained", editbox.HighlightText)
-editbox:SetScript("OnTextChanged", function(self)
-	self:SetText(self:GetParent().val)
-	self:HighlightText()
-end)
-
-
-function lib.OpenEditbox(self)
-	editbox:SetText(self.val)
-	editbox:SetParent(self)
-	editbox:SetPoint("LEFT", self)
-	editbox:SetPoint("RIGHT", self)
-	editbox:Show()
 end
 
 
-local fields = {"Version", "Author", "X-Category", "X-License", "X-Email", "Email", "eMail", "X-Website", "X-Credits", "X-Localizations", "X-Donate"}
+local fields = {"Version", "Author", "X-Category", "X-License", "X-Email", "Email", "eMail", "X-Discord", "X-Github-Repository", "X-Website", "X-Credits", "X-Localizations", "X-Donate"}
-local haseditbox = {["X-Website"] = true, ["X-Email"] = true, ["X-Donate"] = true, ["Email"] = true, ["eMail"] = true}
+local haseditbox = {["X-Discord"] = true, ["X-Github-Repository"] = true, ["X-Website"] = true, ["X-Email"] = true, ["X-Donate"] = true, ["Email"] = true, ["eMail"] = true}
 
 local function HideTooltip() GameTooltip:Hide() end
 
 local function ShowTooltip(self)
 	GameTooltip:SetOwner(self, "ANCHOR_TOPRIGHT")
-	GameTooltip:SetText(L["Click and press Ctrl-C to copy"])
+	GameTooltip:SetText(L["Click to copy to clipboard"])
-	--GameTooltip:SetText("Click and press Ctrl-C to copy")
+	--GameTooltip:SetText("Click to copy to clipboard")
 end
 
 function lib.OnShow(frame)
@@ -189,7 +150,8 @@ function lib.OnShow(frame)
 				local button = CreateFrame("Button", nil, frame)
 				button:SetAllPoints(detail)
 				button.val = val
-				button:SetScript("OnClick", lib.OpenEditbox)
+				button.field = field
+				button:SetScript("OnClick", lib.CopyToClipboard)
 				button:SetScript("OnEnter", ShowTooltip)
 				button:SetScript("OnLeave", HideTooltip)
 			end

AtlasLoot/Locales/constants.en.lua

@@ -10,7 +10,7 @@ The AL["text"] = true shortcut can ONLY be used for English (the root translatio
 --Create the library instance
 local AceLocale = LibStub:GetLibrary("AceLocale-3.0")
 
-local AL = AceLocale:NewLocale("AtlasLoot", "enUS", true)
+local AL = AceLocale:NewLocale("AtlasLoot", "enUS", true, true)
 
 --Register translations
 if AL then
@@ -327,6 +327,7 @@ if AL then
 	AL["Sort Wishlist"] = true
 	AL["Add Filter Set"] = true
 	AL["Auto Sort WishLists"] = true
+	AL["Allow Duplicates"] = true
 	AL["Copy Wishlist To Own"] = true
 	AL["Make Wishlist Default"] = true
 	AL["Delete Wishlist"] = true

AtlasLoot/Menus/DungeonRaidMenus.lua

@@ -48,7 +48,7 @@ AtlasLoot_SubMenus["Dungeons and RaidsTBC"] = {
     { "", "GruulsLair", "", "Gruul's Lair" },
     { "", "HCMagtheridon", "", "Magtheridon's Lair" },
     { "", "CFRSerpentshrine", "", "Serpentshrine Cavern" },
-    { "", "TKEye", "", "The Eye" },
+    { "", "TKEye", "", "Tempest Keep" },
     { "", "ZulAman", "", "Zul'Aman" },
     { "", "CoTHyjal", "", "Hyjal Summit" },
     { "", "BlackTemple", "", "Black Temple" },

AtlasLoot/Menus/SetMenus.lua

@@ -27,6 +27,7 @@ local AL = LibStub("AceLocale-3.0"):GetLocale("AtlasLoot")
 			{ AL["Badge of Justice Rewards"], "BadgeShatt", "Header"},
 			{ "", "BadgeShatt"},
 			{ "", "BadgeSunwell"},
+			{ "", "SunmoteSunwell"},
 			{ "Tier Sets", "T4", "Header"},
 			{ "", "T4"},
 			{ "", "T5"},

AtlasLoot_Cache/AtlasLoot_Cache.toc

@@ -6,11 +6,11 @@
 ## Notes: AtlasLoot item cache
 ## Author: Original: Hegarol, Ascension: Skray/Szyler/Anch/Rvng
 ## Version: v6.2.0
-## X-eMail: manager@atlasloot.net
 ## X-Category: Map
 ## X-License: GPL v2
 ## X-Website: https://discord.gg/uYCE2X2FgA
-## Dependencies: AtlasLoot
 ## SavedVariables: AtlasLootItemCache
 
 AtlasLootCache.lua
+ItemIDsDatabaseFixes.lua
+CacheFunctions.lua

AtlasLoot_Cache/CacheFunctions.lua

@@ -0,0 +1,34 @@
+local function CheckIfEmptyTable(table)
+	if next(table) then
+		return false
+	else
+		return true
+	end
+end
+
+local databaseUpdated
+--Updates the ItemIDsDatabase with any missing or incorrect items
+function LoadItemIDsDatabase()
+    if databaseUpdated then return end
+	--loads any items in the saved varriables cache
+    if AtlasLootItemCache and not CheckIfEmptyTable(AtlasLootItemCache) then
+		for normalID, item in pairs(AtlasLootItemCache) do
+			for itemDif, itemID in pairs(item) do
+				ItemIDsDatabase[normalID] = ItemIDsDatabase[normalID] or {}
+				ItemIDsDatabase[normalID][itemDif] = itemID
+			end
+		end
+	end
+	-- loads ids that have been manuely corrected
+	if ItemIDManuelCorrections then
+		for normalID, item in pairs(ItemIDManuelCorrections) do
+			for itemDif, itemID in pairs(item) do
+				ItemIDsDatabase[normalID] = ItemIDsDatabase[normalID] or {}
+				ItemIDsDatabase[normalID][itemDif] = itemID
+			end
+		end
+	end
+	ItemIDManuelCorrections = nil
+    collectgarbage("collect")
+    databaseUpdated = true
+end

AtlasLoot_Cache/ItemIDsDatabaseFixes.lua

@@ -0,0 +1,60 @@
+ItemIDManuelCorrections = {}
+--ItemIDManuelCorrections[30312] = { nil, nil, HeroicID, MythicID, AscendedID }
+
+--T3
+ItemIDManuelCorrections[22491] = { nil, nil, 322491, 1322491, 222491 }
+ItemIDManuelCorrections[22493] = { nil, nil, 322493, 1322493, 222493 }
+ItemIDManuelCorrections[22489] = { nil, nil, 322489, 1322489, 222489 }
+ItemIDManuelCorrections[1507043] = { nil, nil, 1807043, 2807043, 1707043 }
+ItemIDManuelCorrections[1523064] = { nil, nil, 1823064, 2823064, 1723064 }
+
+ItemIDManuelCorrections[16900] = { nil, nil, 316921, 1316921, 216921 }
+
+--T2 helms
+ItemIDManuelCorrections[16939] = { nil, nil, 316939, 1316939, 216939 }
+ItemIDManuelCorrections[16914] = { nil, nil, 316914, 1316914, 216914 }
+ItemIDManuelCorrections[16955] = { nil, nil, 316955, 1316955, 216955 }
+ItemIDManuelCorrections[16921] = { nil, nil, 316921, 1316921, 216921 }
+ItemIDManuelCorrections[16908] = { nil, nil, 316908, 1316908, 216908 }
+ItemIDManuelCorrections[16947] = { nil, nil, 316947, 1316947, 216947 }
+ItemIDManuelCorrections[10962] = { nil, nil, 310962, 1310962, 210962 }
+ItemIDManuelCorrections[16929] = { nil, nil, 316929, 1316929, 216929 }
+ItemIDManuelCorrections[10904] = { nil, nil, 310904, 1310904, 210904 }
+ItemIDManuelCorrections[16963] = { nil, nil, 316963, 1316963, 216963 }
+ItemIDManuelCorrections[1516955] = { nil, nil, 1816955, 2816955, 1716955 }
+ItemIDManuelCorrections[1516921] = { nil, nil, 1816921, 2816921, 1716921 }
+ItemIDManuelCorrections[1516947] = { nil, nil, 1816947, 2816947, 1716947 }
+ItemIDManuelCorrections[1516963] = { nil, nil, 1816963, 2816963, 1716963 }
+ItemIDManuelCorrections[1516900] = { nil, nil, 1816900, 2816900, 1716900 }
+ItemIDManuelCorrections[1516892] = { nil, nil, 1816892, 2816892, 1716892 }
+
+
+--ZA Bears
+ItemIDManuelCorrections[1333809] = { nil, nil, 1433809, nil, 1233809 }
+
+--intact vial of kael'thas sunstrider
+ItemIDManuelCorrections[450001] = { nil, nil, 450003, 1450003, 450005 }
+ItemIDManuelCorrections[450000] = { nil, nil, 450002, 1450002, 450004 }
+
+ItemIDManuelCorrections[450009] = {nil, nil, 450011, 450013, 450015 }; --The String of Time
+
+--Atiesh, Greatstaff of the Guardian
+ItemIDManuelCorrections[22589] = { nil, nil, 322589, 1322589, 222589 }
+ItemIDManuelCorrections[22632] = { nil, nil, 322632, 1322632, 222632 }
+ItemIDManuelCorrections[22631] = { nil, nil, 322631, 1322631, 222631 }
+ItemIDManuelCorrections[22630] = { nil, nil, 322630, 1322630, 222630 }
+
+--Mark of the Champion
+ItemIDManuelCorrections[23207] = { nil, nil, 323207, 1323207, 223207 }
+ItemIDManuelCorrections[23206] = { nil, nil, 323206, 1323206, 223206 }
+
+ItemIDManuelCorrections[30889] = { nil, nil, 330889, 1330889, 230889 } --Kaz'rogal's Hardened Heart
+
+--[[ 
+    /atlasloot updatecache startID stopID
+    scans every id from 1 to 10 mil unless you set the startID and stopID
+    startID is the first itemid it will check stopID is the last itemid it will check
+
+    /atlasloot clearcache
+    clears variables cache
+ ]]

AtlasLoot_Crafting_OriginalWoW/craftingCLASSIC.lua

@@ -867,23 +867,22 @@ AtlasLoot_Data["EnchantingCLASSIC"] = {
 	{
 		Name = AL["Enchant Chest"];
 		[1] = {spellID = 20025, icon = "Spell_Holy_GreaterHeal" }; --Enchant Chest - Greater Stats
-		[2] = {spellID = 33991, icon = "Spell_Holy_GreaterHeal" }; --Enchant Chest - Restore Mana Prime
+		[2] = {spellID = 20028, icon = "Spell_Holy_GreaterHeal" }; --Enchant Chest - Major Mana
-		[3] = {spellID = 20028, icon = "Spell_Holy_GreaterHeal" }; --Enchant Chest - Major Mana
+		[3] = {spellID = 20026, icon = "Spell_Holy_GreaterHeal" }; --Enchant Chest - Major Health
-		[4] = {spellID = 20026, icon = "Spell_Holy_GreaterHeal" }; --Enchant Chest - Major Health
+		[4] = {spellID = 13941, icon = "Spell_Holy_GreaterHeal" }; --Enchant Chest - Stats
-		[5] = {spellID = 13941, icon = "Spell_Holy_GreaterHeal" }; --Enchant Chest - Stats
+		[5] = {spellID = 13917, icon = "Spell_Holy_GreaterHeal" }; --Enchant Chest - Superior Mana
-		[6] = {spellID = 13917, icon = "Spell_Holy_GreaterHeal" }; --Enchant Chest - Superior Mana
+		[6] = {spellID = 13858, icon = "Spell_Holy_GreaterHeal" }; --Enchant Chest - Superior Health
-		[7] = {spellID = 13858, icon = "Spell_Holy_GreaterHeal" }; --Enchant Chest - Superior Health
+		[7] = {spellID = 13700, icon = "Spell_Holy_GreaterHeal" }; --Enchant Chest - Lesser Stats
-		[8] = {spellID = 13700, icon = "Spell_Holy_GreaterHeal" }; --Enchant Chest - Lesser Stats
+		[8] = {spellID = 13663, icon = "Spell_Holy_GreaterHeal" }; --Enchant Chest - Greater Mana
-		[9] = {spellID = 13663, icon = "Spell_Holy_GreaterHeal" }; --Enchant Chest - Greater Mana
+		[9] = {spellID = 13640, icon = "Spell_Holy_GreaterHeal" }; --Enchant Chest - Greater Health
-		[10] = {spellID = 13640, icon = "Spell_Holy_GreaterHeal" }; --Enchant Chest - Greater Health
+		[10] = {spellID = 13626, icon = "Spell_Holy_GreaterHeal" }; --Enchant Chest - Minor Stats
-		[11] = {spellID = 13626, icon = "Spell_Holy_GreaterHeal" }; --Enchant Chest - Minor Stats
+		[11] = {spellID = 13607, icon = "Spell_Holy_GreaterHeal" }; --Enchant Chest - Mana
-		[12] = {spellID = 13607, icon = "Spell_Holy_GreaterHeal" }; --Enchant Chest - Mana
+		[12] = {spellID = 13538, icon = "Spell_Holy_GreaterHeal" }; --Enchant Chest - Lesser Absorption
-		[13] = {spellID = 13538, icon = "Spell_Holy_GreaterHeal" }; --Enchant Chest - Lesser Absorption
+		[13] = {spellID = 7857, icon = "Spell_Holy_GreaterHeal" }; --Enchant Chest - Health
-		[14] = {spellID = 7857, icon = "Spell_Holy_GreaterHeal" }; --Enchant Chest - Health
+		[14] = {spellID = 7776, icon = "Spell_Holy_GreaterHeal" }; --Enchant Chest - Lesser Mana
-		[15] = {spellID = 7776, icon = "Spell_Holy_GreaterHeal" }; --Enchant Chest - Lesser Mana
+		[15] = {spellID = 7748, icon = "Spell_Holy_GreaterHeal" }; --Enchant Chest - Lesser Health
-		[16] = {spellID = 7748, icon = "Spell_Holy_GreaterHeal" }; --Enchant Chest - Lesser Health
+		[16] = {spellID = 7443, icon = "Spell_Holy_GreaterHeal" }; --Enchant Chest - Minor Mana
-		[17] = {spellID = 7443, icon = "Spell_Holy_GreaterHeal" }; --Enchant Chest - Minor Mana
+		[17] = {spellID = 7420, icon = "Spell_Holy_GreaterHeal" }; --Enchant Chest - Minor Health
-		[18] = {spellID = 7420, icon = "Spell_Holy_GreaterHeal" }; --Enchant Chest - Minor Health
 	};
 	{
 		Name = AL["Enchant Cloak"];

AtlasLoot_Crafting_TBC/craftingTBC.lua

@@ -669,6 +669,7 @@ AtlasLoot_Data["EnchantingTBC"] = {
 		[3] = { icon = "Spell_Holy_GreaterHeal", spellID = 33992 }, --Enchant Chest - Major Resilience
 		[4] = { icon = "Spell_Holy_GreaterHeal", spellID = 33990 }, --Enchant Chest - Major Spirit
 		[5] = { icon = "Spell_Holy_GreaterHeal", spellID = 27957 }, --Enchant Chest - Exceptional Health
+		[6] = { icon = "Spell_Holy_GreaterHeal", spellID = 33991 }; --Enchant Chest - Restore Mana Prime
 	};
 	{
 		Name = AL["Enchant Cloak"];
@@ -916,6 +917,7 @@ AtlasLoot_Data["EngineeringTBC"] = {
 AtlasLoot_Data["FirstAid"] = {
 	Module = "AtlasLoot_Crafting_TBC";
 	Name = FIRSTAID;
+	Type = "BCCrafting";
 	{
 		Name = FIRSTAID;
 		[1] = { itemID = 34722, spellID = 45546 }, --Heavy Frostweave Bandage
@@ -1519,6 +1521,7 @@ AtlasLoot_Data["LeatherworkingTBC"] = {
 AtlasLoot_Data["MiningTBC"] = {
 	Module = "AtlasLoot_Crafting_TBC";
 	Name = MINING;
+	Type = "BCCrafting";
 	{
 		Name = MINING;
 		[1] = { itemID = 35128, spellID = 46353 }, --Smelt Hardened Khorium
@@ -1536,6 +1539,7 @@ AtlasLoot_Data["MiningTBC"] = {
 AtlasLoot_Data["FirstAidTBC"] = {
 	Module = "AtlasLoot_Crafting_TBC";
 	Name = FIRSTAID;
+	Type = "BCCrafting";
 	{
 		Name = FIRSTAID;
 		[1] = { itemID = 21991, spellID = 27033 }, --Heavy Netherweave Bandage

AtlasLoot_Crafting_Wrath/craftingWRATH.lua

@@ -464,6 +464,7 @@ AtlasLoot_Data["CookingWRATH"] = {
 AtlasLoot_Data["EnchantingWRATH"] = {
 	Module = "AtlasLoot_Crafting_Wrath";
 	Name = ENCHANTING;
+	Type = "WrathCrafting";
 	{
 		Name = AL["Enchant Boots"];
 		[1] = {spellID = 60763, icon = "Spell_Holy_GreaterHeal" }; --Enchant Boots - Greater Assault
@@ -1837,6 +1838,7 @@ AtlasLoot_Data["LeatherworkingWRATH"] = {
 AtlasLoot_Data["MiningWRATH"] = {
 	Module = "AtlasLoot_Crafting_Wrath";
 	Name = MINING;
+	Type = "WrathCrafting";
 	{
 		Name = MINING;
 		[1] = {itemID = 37663, spellID = 55208 }; --Smelt Titansteel
@@ -1849,6 +1851,7 @@ AtlasLoot_Data["MiningWRATH"] = {
 AtlasLoot_Data["FirstAidWRATH"] = {
 	Module = "AtlasLoot_Crafting_Wrath";
 	Name = FIRSTAID;
+	Type = "WrathCrafting";
 	{
 		Name = FIRSTAID;
 		[1] = {itemID = 34722, spellID = 45546 }; --Heavy Frostweave Bandage

AtlasLoot_OriginalWoW/MapData.lua

@@ -232,7 +232,7 @@ local boss = "dungeonskull"
 
         };
         [6] = {
-            { BabbleSubZone["Frostwyrm Lair"], SubZone = true };
+            { BabbleZone["Frostwyrm Lair"], SubZone = true };
             { AL["Sapphiron"], cords = {37,23}, pinType = boss };
             { AL["Kel'Thuzad"], cords = {57,68}, pinType = boss };
         };

AtlasLoot_OriginalWoW/originalwow.lua

@@ -200,6 +200,8 @@ AtlasLoot_Data["RuinsofAQ"] = {
 		[11] = { itemID = 21715 }; --Sand Polished Hammer
 		[12] = { itemID = 21459 }; --Crossbow of Imminent Doom
 		[13] = { itemID = 21452 }; --Staff of the Ruins
+		[14] = { itemID = 1506054 }; --Sword of the Ruins
+		[15] = { itemID = 15028 }; --Time-Lost Pocketwatch
 		[16] = { itemID = 21220 }; --Head of Ossirian the Unscarred
 		[17] = { itemID = 21504 }; --Charm of the Shifting Sands
 		[18] = { itemID = 21507 }; --Amulet of the Shifting Sands
@@ -243,7 +245,7 @@ AtlasLoot_Data["RuinsofAQ"] = {
 		[30] = { itemID = 21392 }; --Sickle of Unyielding Strength
 	};
 	{
-		Name = "AQ Enchants";
+		Name = AL["AQ Enchants"];
 		[1] = { itemID = 20728 }; --Formula: Enchant Gloves - Frost Power
 		[2] = { itemID = 20731 }; --Formula: Enchant Gloves - Superior Agility
 		[3] = { itemID = 20734 }; --Formula: Enchant Cloak - Stealth
@@ -483,18 +485,15 @@ AtlasLoot_Data["TempleofAQ"] = {
 		[8] = { itemID = 21645 }; --Hive Tunneler's Boots
 		[9] = { itemID = 21605 }; --Gloves of the Hidden Temple
 		[10] = { itemID = 15029 }; --Aera's Poison Gland
-
 		[16] = { itemID = 21237 }; --Imperial Qiraji Regalia
 		[17] = { itemID = 21273 }; --Blessed Qiraji Acolyte Staff
 		[18] = { itemID = 21275 }; --Blessed Qiraji Augur Staff
 		[19] = { itemID = 21268 }; --Blessed Qiraji War Hammer
-
 		[21] = { itemID = 21232 }; --Imperial Qiraji Armaments
 		[22] = { itemID = 21242 }; --Blessed Qiraji War Axe
 		[23] = { itemID = 21272 }; --Blessed Qiraji Musket
 		[24] = { itemID = 21244 }; --Blessed Qiraji Pugio
 		[25] = { itemID = 21269 }; --Blessed Qiraji Bulwark
-
 		[27] = { itemID = 20931, lootTable = {"T2.5LEGS","Token"} }; --Hardened Qiraj Chitin
 	};
 	{
@@ -506,25 +505,21 @@ AtlasLoot_Data["TempleofAQ"] = {
 		[5] = { itemID = 21582 }; --Grasp of the Old God
 		[6] = { itemID = 21586 }; --Belt of Never-ending Agony
 		[7] = { itemID = 21581 }; --Gauntlets of Annihilation
-
 		[9] = { itemID = 22732 }; --Mark of C'Thun
 		[10] = { itemID = 21596 }; --Ring of the Godslayer
 		[11] = { itemID = 21579 }; --Vanquished Tentacle of C'Thun
 		[12] = { itemID = 21126 }; --Death's Sting
 		[13] = { itemID = 21134 }; --Dark Edge of Insanity
 		[14] = { itemID = 21839 }; --Scepter of the False Prophet
-
 		[15] = { itemID = 21221 }; --Eye of C'Thun
 		[16] = { itemID = 21710 }; --Cloak of the Fallen God
 		[17] = { itemID = 21712 }; --Amulet of the Fallen God
 		[18] = { itemID = 21709 }; --Ring of the Fallen God
-
 		[20] = { itemID = 22734 }; --Base of Atiesh
 		[21] = { itemID = 22632 }; --Atiesh, Greatstaff of the Guardian
 		[22] = { itemID = 22589 }; --Atiesh, Greatstaff of the Guardian
 		[23] = { itemID = 22631 }; --Atiesh, Greatstaff of the Guardian
 		[24] = { itemID = 22630 }; --Atiesh, Greatstaff of the Guardian
-		
 		[26] = { itemID = 20933, lootTable = {"T2.5CHEST","Token"} }; --Husk of the Old God
 	};
 	{
@@ -543,6 +538,18 @@ AtlasLoot_Data["TempleofAQ"] = {
 		[18] = { itemID = 21323 }; --Green Qiraji Resonating Crystal
 		[19] = { itemID = 21321 }; --Red Qiraji Resonating Crystal
 	};
+	{
+		Name = AL["Shoulder Enchants"];
+		[1] = { itemID = 1319786, desc = AL["Quest Requirements"], contentsPreview = {{20878},{20868},{20872},{20859,3},{20864,3}} }; --Inscription of the Stormcaller
+		[2] = { itemID = 1319785, desc = AL["Quest Requirements"], contentsPreview = {{20881},{20869},{20871},{20861,3},{20862,3}} }; --Inscription of the Stalker
+		[3] = { itemID = 1319789, desc = AL["Quest Requirements"], contentsPreview = {{20874},{20872},{20866},{20864,3},{20858,3}} }; --Inscription of the Oracle
+		[4] = { itemID = 1319790, desc = AL["Quest Requirements"], contentsPreview = {{20879},{20873},{20868},{20865,3},{20859,3}} }; --Inscription of the Genesis
+		[5] = { itemID = 1319787, desc = AL["Quest Requirements"], contentsPreview = {{20877},{20871},{20867},{20862,3},{20860,3}} }; --Inscription of the Enigma
+		[6] = { itemID = 1319788, desc = AL["Quest Requirements"], contentsPreview = {{20875},{20870},{20869},{20863,3},{20861,3}} }; --Inscription of the Doomcaller
+		[7] = { itemID = 1319784, desc = AL["Quest Requirements"], contentsPreview = {{20876},{20867},{20870},{20860,3},{20863,3}} }; --Inscription of the Deathdealer
+		[8] = { itemID = 1319782, desc = AL["Quest Requirements"], contentsPreview = {{20882},{20866},{20873},{20858,3},{20865,3}} }; --Inscription of the Conqueror
+		[9] = { itemID = 1319783, desc = AL["Quest Requirements"], contentsPreview = {{20878},{20868},{20872},{20859,3},{20864,3}} }; --Inscription of the Avenger
+	};
 	{
 		Name = AL["Trash Mobs"];
 		[1] = { itemID = 20876 }; --Idol of Death
@@ -3786,6 +3793,7 @@ AtlasLoot_Data["ZulGurub"] = {
 		[16] = { icon = "INV_Banner_01", name = "=q4=ZG Sets", lootTable = {{"ZGSets", "AtlasLoot_Data", 1},"Source"} };
 		[18] = { itemID = 19943 }; --Massive Mojo
 		[19] = { itemID = 19881 }; --Channeler's Head
+		[21] = { itemID = 60101, droprate = "1%" }; --Pet Sigil
 	};
 	{
 		Name = BabbleBoss["High Priestess Arlokk"];
@@ -3930,6 +3938,7 @@ AtlasLoot_Data["Naxxramas60"] = {
 	Map = "Naxxramas60";
 	{
 		Name = BabbleBoss["Patchwerk"];
+		NpcID = 16028;
 		[1] = { itemID = 22960 }; --Cloak of Suturing
 		[2] = { itemID = 22815 }; --Severance
 		[3] = { itemID = 22820 }; --Wand of Fates
@@ -3941,6 +3950,7 @@ AtlasLoot_Data["Naxxramas60"] = {
 	};
 	{
 		Name = BabbleBoss["Grobbulus"];
+		NpcID = 15931;
 		[1] = { itemID = 22968 }; --Glacial Mantle
 		[2] = { itemID = 22967 }; --Icy Scale Spaulders
 		[3] = { itemID = 22803 }; --Midnight Haze
@@ -3952,6 +3962,7 @@ AtlasLoot_Data["Naxxramas60"] = {
 	};
 	{
 		Name = BabbleBoss["Gluth"];
+		NpcID = 15932;
 		[1] = { itemID = 22983 }; --Rime Covered Mantle
 		[2] = { itemID = 22813 }; --Claymore of Unholy Might
 		[3] = { itemID = 23075 }; --Death's Bargain
@@ -3966,17 +3977,20 @@ AtlasLoot_Data["Naxxramas60"] = {
 	};
 	{
 		Name = BabbleBoss["Thaddius"];
+		NpcID = 15928;
 		[1] = { itemID = 23070 }; --Leggings of Polarity
 		[2] = { itemID = 23000 }; --Plated Abomination Ribcage
 		[3] = { itemID = 22808 }; --The Castigator
 		[4] = { itemID = 22801 }; --Spire of Twilight
 		[5] = { itemID = 23001 }; --Eye of Diminution
+		[6] = { itemID = 15032 }; --Dislocated Spine
 		[16] = { itemID = 22353, lootTable = {"T3HEAD","Token"} }; --Desecrated Helmet
 		[18] = { itemID = 22726 }; --Splinter of Atiesh
 		[19] = { itemID = 22727 }; --Frame of Atiesh
 	};
 	{
 		Name = BabbleBoss["Anub'Rekhan"];
+		NpcID = 15956;
 		[1] = { itemID = 22938 }; --Cryptfiend Silk Cloak
 		[2] = { itemID = 22936 }; --Wristguards of Vengeance
 		[3] = { itemID = 22937 }; --Gem of Nerubis
@@ -3988,6 +4002,7 @@ AtlasLoot_Data["Naxxramas60"] = {
 	};
 	{
 		Name = BabbleBoss["Grand Widow Faerlina"];
+		NpcID = 15953;
 		[1] = { itemID = 22941 }; --Polar Shoulder Pads
 		[2] = { itemID = 22940 }; --Icebane Pauldrons
 		[3] = { itemID = 22806 }; --Widow's Remorse
@@ -3999,6 +4014,7 @@ AtlasLoot_Data["Naxxramas60"] = {
 	};
 	{
 		Name = BabbleBoss["Maexxna"];
+		NpcID = 15952;
 		[1] = { itemID = 23220 }; --Crystal Webbed Robe
 		[2] = { itemID = 22804 }; --Maexxna's Fang
 		[3] = { itemID = 22807 }; --Wraith Blade
@@ -4010,18 +4026,22 @@ AtlasLoot_Data["Naxxramas60"] = {
 	};
 	{
 		Name = BabbleBoss["Instructor Razuvious"];
+		NpcID = 16061;
 		[1] = { itemID = 23017 }; --Veil of Eclipse
 		[2] = { itemID = 23219 }; --Girdle of the Mentor
 		[3] = { itemID = 23014 }; --Iblis, Blade of the Fallen Seraph
 		[4] = { itemID = 23009 }; --Wand of the Whispering Dead
 		[5] = { itemID = 23004 }; --Idol of Longevity
 		[6] = { itemID = 23018 }; --Signet of the Fallen Defender
+		[7] = { itemID = 15030 }; --Jagged Cold Steel Knife
+		[8] = { itemID = 23328 }; --The Unholy Blade
 		[16] = { itemID = 22358, lootTable = {"T3FEET","Token"} }; --Desecrated Sabatons
 		[18] = { itemID = 22726 }; --Splinter of Atiesh
 		[19] = { itemID = 22727 }; --Frame of Atiesh
 	};
 	{
 		Name = BabbleBoss["Gothik the Harvester"];
+		NpcID = 16060;
 		[1] = { itemID = 23032 }; --Glacial Headdress
 		[2] = { itemID = 23021 }; --The Soul Harvester's Bindings
 		[3] = { itemID = 23020 }; --Polar Helmet
@@ -4033,6 +4053,7 @@ AtlasLoot_Data["Naxxramas60"] = {
 	};
 	{
 		Name = BabbleBoss["The Four Horsemen"];
+		NpcID = 16065;
 		[1] = { itemID = 23071 }; --Leggings of Apocalypse
 		[2] = { itemID = 22809 }; --Maul of the Redeemed Crusader
 		[3] = { itemID = 22691 }; --Corrupted Ashbringer
@@ -4045,6 +4066,7 @@ AtlasLoot_Data["Naxxramas60"] = {
 	};
 	{
 		Name = BabbleBoss["Noth the Plaguebringer"];
+		NpcID = 15954;
 		[1] = { itemID = 23030 }; --Cloak of the Scourge
 		[2] = { itemID = 22816 }; --Hatchet of Sundered Bone
 		[3] = { itemID = 23005 }; --Totem of Flowing Water
@@ -4058,6 +4080,7 @@ AtlasLoot_Data["Naxxramas60"] = {
 	};
 	{
 		Name = BabbleBoss["Heigan the Unclean"];
+		NpcID = 15936;
 		[1] = { itemID = 23035 }; --Preceptor's Hat
 		[2] = { itemID = 23033 }; --Icy Scale Coif
 		[3] = { itemID = 23019 }; --Icebane Helmet
@@ -4069,6 +4092,7 @@ AtlasLoot_Data["Naxxramas60"] = {
 	};
 	{
 		Name = BabbleBoss["Loatheb"];
+		NpcID = 16011;
 		[1] = { itemID = 23039 }; --The Eye of Nerub
 		[2] = { itemID = 22800 }; --Brimstone Staff
 		[3] = { itemID = 23037 }; --Ring of Spiritual Fervor
@@ -4080,6 +4104,7 @@ AtlasLoot_Data["Naxxramas60"] = {
 	};
 	{
 		Name = BabbleBoss["Sapphiron"];
+		NpcID = 15989;
 		[1] = { itemID = 23050 }; --Cloak of the Necropolis
 		[2] = { itemID = 23045 }; --Shroud of Dominion
 		[3] = { itemID = 23072 }; --Fists of the Unrelenting
@@ -4101,6 +4126,7 @@ AtlasLoot_Data["Naxxramas60"] = {
 	};
 	{
 		Name = BabbleBoss["Kel'Thuzad"];
+		NpcID = 15990;
 		[1] = { itemID = 22802 }; --Kingsfall
 		[2] = { itemID = 23054 }; --Gressil, Dawn of Ruin
 		[3] = { itemID = 23577 }; --The Hungering Cold
@@ -4112,15 +4138,18 @@ AtlasLoot_Data["Naxxramas60"] = {
 		[9] = { itemID = 22819 }; --Shield of Condemnation
 		[10] = { itemID = 23057 }; --Gem of Trapped Innocents
 		[11] = { itemID = 23053 }; --Stormrage's Talisman of Seething
-		[13] = { itemID = 22520 }; --The Phylactery of Kel'Thuzad
+		[12] = { itemID = 15036 }; --Lordaeron's Lament
-		[14] = { itemID = 23207 }; --Mark of the Champion
+		[13] = { itemID = 15033 }; --Staff of Twisted Dreams
-		[15] = { itemID = 23206 }; --Mark of the Champion
+		[16] = { itemID = 22520 }; --The Phylactery of Kel'Thuzad
-		[16] = { itemID = 1510496, lootTable = {"T3FINGER","Token"} }; --Desecrated Ring
+		[17] = { itemID = 23207 }; --Mark of the Champion
-		[18] = { itemID = 22733 }; --Staff Head of Atiesh
+		[18] = { itemID = 23206 }; --Mark of the Champion
-		[19] = { itemID = 22632 }; --Atiesh, Greatstaff of the Guardian
+		[20] = { itemID = 1510496, lootTable = {"T3FINGER","Token"} }; --Desecrated Ring
-		[20] = { itemID = 22589 }; --Atiesh, Greatstaff of the Guardian
+		[22] = { itemID = 22733 }; --Staff Head of Atiesh
-		[21] = { itemID = 22631 }; --Atiesh, Greatstaff of the Guardian
+		[23] = { itemID = 22632 }; --Atiesh, Greatstaff of the Guardian
-		[22] = { itemID = 22630 }; --Atiesh, Greatstaff of the Guardian
+		[24] = { itemID = 22589 }; --Atiesh, Greatstaff of the Guardian
+		[25] = { itemID = 22631 }; --Atiesh, Greatstaff of the Guardian
+		[26] = { itemID = 22630 }; --Atiesh, Greatstaff of the Guardian
+		[28] = { itemID = 60185, droprate = "1%" }; --Sigil
 	};
 	{
 		Name = AL["Trash Mobs"];
@@ -4354,6 +4383,50 @@ AtlasLoot_Data["T0"] = {
 		[7] = { itemID = 98271  }; --Legguards of Courage
 		[8] = { itemID = 98346  }; --Treads of Courage
 	};
+	{
+		Name = AL["Necropile Raiment"];
+		[1] = { itemID = 14626 }; --Necropile Robe
+        [2] = { itemID = 14629 }; --Necropile Cuffs
+        [3] = { itemID = 14631 }; --Necropile Boots
+        [4] = { itemID = 14632 }; --Necropile Leggings
+        [5] = { itemID = 14633 }; --Necropile Mantle
+        [6] = { itemID = 99029 }; --Necropile Belt
+        [7] = { itemID = 99387 }; --Necropile Crown
+        [8] = { itemID = 99430 }; --Necropile Gloves
+	};
+	{
+		Name = AL["Cadaverous Garb"];
+		[1] = { itemID = 14011 }; --Cadaverous Crown
+		[2] = { itemID = 14012 }; --Cadaverous Shoulders
+		[3] = { itemID = 14013 }; --Cadaverous Armor
+		[4] = { itemID = 14014 }; --Cadaverous Cuffs
+		[5] = { itemID = 14015 }; --Cadaverous Gloves
+		[6] = { itemID = 14016 }; --Cadaverous Belt
+		[7] = { itemID = 14017 }; --Cadaverous Leggings
+		[8] = { itemID = 14018 }; --Cadaverous Walkers
+	};
+	{
+		Name = AL["Bloodmail Regalia"];
+		[1] = { itemID = 14611 }; --Bloodmail Hauberk
+        [2] = { itemID = 14612 }; --Bloodmail Legguards
+        [3] = { itemID = 14614 }; --Bloodmail Belt
+        [4] = { itemID = 14615 }; --Bloodmail Gauntlets
+        [5] = { itemID = 14616 }; --Bloodmail Boots
+        [6] = { itemID = 99705 }; --Bloodmail Coif
+        [7] = { itemID = 99790 }; --Bloodmail Pauldrons
+        [8] = { itemID = 99835 }; --Bloodmail Wristguards
+	};
+	{
+		Name = AL["Deathbone Guardian"];
+		[1] = { itemID = 14026 }; --Deathbone Sabatons
+        [2] = { itemID = 14027 }; --Deathbone Legguards
+        [3] = { itemID = 14028 }; --Deathbone Girdle
+        [4] = { itemID = 14029 }; --Deathbone Gauntlets
+        [5] = { itemID = 14030 }; --Deathbone Wristguards
+        [6] = { itemID = 14031 }; --Deathbone Chestplate
+        [7] = { itemID = 14032 }; --Deathbone Pauldrons
+        [8] = { itemID = 14033 }; --Deathbone Helmet
+	};
 };
 
 AtlasLoot_Data["T0.5"] = {
@@ -4632,14 +4705,14 @@ AtlasLoot_Data["T2"] = {
 	};
 	{
 		Name = AL["Druid"] ..WHITE.." - Tank";
-		[1] = { itemID = 1516900, desc = "=ds=" ..BabbleBoss["Onyxia"] };--Stormrage Cover
+		[1] = { itemID = 1517000, desc = "=ds=" ..BabbleBoss["Onyxia"] };--Stormrage Cover
-		[2] = { itemID = 1516902, desc = "=ds=" ..BabbleBoss["Chromaggus"] };--Stormrage Pauldrons
+		[2] = { itemID = 1517002, desc = "=ds=" ..BabbleBoss["Chromaggus"] };--Stormrage Pauldrons
-		[3] = { itemID = 1516897, desc = "=ds=" ..BabbleBoss["Nefarian"] };--Stormrage Chestguard
+		[3] = { itemID = 1516997, desc = "=ds=" ..BabbleBoss["Nefarian"] };--Stormrage Chestguard
-		[4] = { itemID = 1516904, desc = "=ds=" ..BabbleBoss["Razorgore the Untamed"] };--Stormrage Bracers
+		[4] = { itemID = 1517004, desc = "=ds=" ..BabbleBoss["Razorgore the Untamed"] };--Stormrage Bracers
-		[5] = { itemID = 1516904, desc = BabbleBoss["Firemaw"] ..", " ..BabbleBoss["Ebonroc"] ..", " ..BabbleBoss["Flamegor"] };--Stormrage Handguards
+		[5] = { itemID = 1516999, desc = BabbleBoss["Firemaw"] ..", " ..BabbleBoss["Ebonroc"] ..", " ..BabbleBoss["Flamegor"] };--Stormrage Handguards
-		[6] = { itemID = 1516899, desc = "=ds=" ..BabbleBoss["Vaelastrasz the Corrupt"] };--Stormrage Belt
+		[6] = { itemID = 1517003, desc = "=ds=" ..BabbleBoss["Vaelastrasz the Corrupt"] };--Stormrage Belt
-		[7] = { itemID = 1516903, desc = "=ds=" ..BabbleBoss["Ragnaros"] };--Stormrage Legguards
+		[7] = { itemID = 1517001, desc = "=ds=" ..BabbleBoss["Ragnaros"] };--Stormrage Legguards
-		[8] = { itemID = 1516898, desc = "=ds=" ..BabbleBoss["Broodlord Lashlayer"] };--Stormrage Boots
+		[8] = { itemID = 1516998, desc = "=ds=" ..BabbleBoss["Broodlord Lashlayer"] };--Stormrage Boots
 	};
 	{
 		Name = AL["Druid"] ..WHITE.." - Caster";
@@ -5114,38 +5187,6 @@ AtlasLoot_Data["ClassicSets"] = {
 		[1] = { itemID = 12940 }; --Dal'Rend's Sacred Charge
 		[2] = { itemID = 12939 }; --Dal'Rend's Tribal Guardian
 	};
-	{
-		Name = AL["Necropile Raiment"];
-		[1] = { itemID = 14633 }; --Necropile Mantle
-		[2] = { itemID = 14626 }; --Necropile Robe
-		[3] = { itemID = 14629 }; --Necropile Cuffs
-		[4] = { itemID = 14632 }; --Necropile Leggings
-		[5] = { itemID = 14631 }; --Necropile Boots
-	};
-	{
-		Name = AL["Cadaverous Garb"];
-		[1] = { itemID = 14637 }; --Cadaverous Armor
-		[2] = { itemID = 14640 }; --Cadaverous Gloves
-		[3] = { itemID = 14636 }; --Cadaverous Belt
-		[4] = { itemID = 14638 }; --Cadaverous Leggings
-		[5] = { itemID = 14641 }; --Cadaverous Walkers
-	};
-	{
-		Name = AL["Bloodmail Regalia"];
-		[1] = { itemID = 14611 }; --Bloodmail Hauberk
-		[2] = { itemID = 14615 }; --Bloodmail Gauntlets
-		[3] = { itemID = 14614 }; --Bloodmail Belt
-		[4] = { itemID = 14612 }; --Bloodmail Legguards
-		[5] = { itemID = 14616 }; --Bloodmail Boots
-	};
-	{
-		Name = AL["Deathbone Guardian"];
-		[1] = { itemID = 14624 }; --Deathbone Chestplate
-		[2] = { itemID = 14622 }; --Deathbone Gauntlets
-		[3] = { itemID = 14620 }; --Deathbone Girdle
-		[4] = { itemID = 14623 }; --Deathbone Legguards
-		[5] = { itemID = 14621 }; --Deathbone Sabatons
-	};
 	{
 		Name = AL["Major Mojo Infusion"];
 		[1] = { itemID = 19898 }; --Seal of Jin