update to szyler discord version 7.3.9 (#9)

* update to release 7.3.1 * minor tweaks - tweaked the drop location text to display a bit more cleanly - added boss sigils to bc raid tables - added right click context menu to boss name list so you can open db to that boss (only has raids atm) - the All dungeon items list now wont precache past the normal loot * fixs and text display change - updated old locations to have new display - frame now sits on top when selected - fixed some incorrect ids * favorites button change/loot table updates - Changed how favorites buttons are saved you now alt right click them to save - Added missing new t0 sets to classic dungeon sets - Added missing new trash loot weapons to Black temple * minor changes/fixs - fixed t3 incorrect itemids - added heroic bloodforged * merg from main repo * bug fix and item removals - some quest tooltip was showing up incorrect - removed depreciated high risk patterns * swapped to using ItemButtonTemplate for popup window buttons * added all the new heirloom items * all the changes from main git up to 7.3.9
2024-06-01 15:32:06 +12:00
parent db7e75ae95
commit 4e5b892de9
21 changed files with 480 additions and 577 deletions
@@ -2,7 +2,7 @@
 ## Title: AtlasLoot Ascension Edition
 ## Notes: Shows the possible loot from the bosses
 ## Author: v7 Rebuid Done by: Anch, Rvng
-## Version: v7.3.5
+## Version: v7.3.9
 ## X-eMail: 
 ## X-Credits: Skray, Szyler and others.
 ## X-Category: Map
@@ -15,6 +15,7 @@

    AtlasLoot.Difficultys["ClassicDungeonExt"] = {
        {"Bloodforged", 1},
+        {"Heroic Bloodforged", 100},
        {"Normal", 2},
        {"Heroic", 3},
        {"Mythic", 4},
@@ -39,6 +40,7 @@

    AtlasLoot.Difficultys["BCDungeon"] = {
        {"Bloodforged", 1},
+        {"Heroic Bloodforged", 100},
        {"Normal/Heroic", 2},
        {"Mythic", 4},
        {"Mythic 1", 5 },  {"Mythic 2", 6 },  {"Mythic 3", 7 },  {"Mythic 4", 8 },  {"Mythic 5", 9 },
@@ -64,6 +66,7 @@
        {"Normal/Heroic", 2},
        {"Mythic", 4},
        {"Bloodforged", 1},
+        {"Heroic Bloodforged", 100},
        {"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 },
        {"Mythic 11", 15 }, {"Mythic 12", 16 }, {"Mythic 13", 17 }, {"Mythic 14", 18 }, {"Mythic 15", 19 },
@@ -151,7 +151,8 @@ function AtlasLoot:OnEnable()
 			{Name = AL["Select a Loot Table..."]},
 		}
    end
-
+	self.db.profile.showUnknownRecipeTooltip = self.db.profile.showUnknownRecipeTooltip or true
+	if self.db.profile.knownRecipes then self.db.profile.knownRecipes  = nil end
 	if IsAddOnLoaded("TomTom") then
 		self.TomTomLoaded = true
 	end
@@ -208,6 +209,7 @@ function AtlasLoot:OnEnable()
 	self:LoadTradeskillRecipes()
 	self:PopulateProfessions()
 	self:CreateVanityCollection()
+	self:RegisterEvent("UNIT_SPELLCAST_SUCCEEDED")
 end

 function AtlasLoot:Reset(data)
@@ -453,9 +455,9 @@ function AtlasLoot:CreateToken(dataID)
 end

 --Creates a sorted and consolidated loottable of all of an xpacs dungeon loot
-function AtlasLoot:CreateOnDemandLootTable(type)
+function AtlasLoot:CreateOnDemandLootTable(typeL)
 	-- Return and show loot table if its already been created
-	if AtlasLoot_OnDemand and AtlasLoot_OnDemand[type] then return self:ShowItemsFrame(type, "AtlasLoot_OnDemand", 1) end
+	if AtlasLoot_OnDemand and AtlasLoot_OnDemand[typeL] then return self:ShowItemsFrame(typeL, "AtlasLoot_OnDemand", 1) end
 	-- Create ondemand loot table if it dosnt exist
 	if not AtlasLoot_OnDemand then AtlasLoot_OnDemand = {} end

@@ -489,7 +491,7 @@ function AtlasLoot:CreateOnDemandLootTable(type)
 		if firstLoad then
 			self:ShowItemsFrame(AtlasLootItemsFrame.refresh[1], AtlasLootItemsFrame.refresh[2], AtlasLootItemsFrame.refresh[3])
 		else
-			self:ShowItemsFrame(type, "AtlasLoot_OnDemand", 1)
+			self:ShowItemsFrame(typeL, "AtlasLoot_OnDemand", 1)
 			firstLoad = true
 		end
 	end
@@ -504,18 +506,18 @@ function AtlasLoot:CreateOnDemandLootTable(type)
 		else
 			tinsert(unsorted[armorSubType]["Misc"], {item, armorType})
 		end
-		AtlasLoot_OnDemand[type] = {Name = "All Dungeon Items", Type = type, filter = true }
+		AtlasLoot_OnDemand[typeL] = {Name = "All Dungeon Items", Type = typeL, filter = true }

 		for aType, v in pairs(unsorted) do
 			for eLoc, t in pairs(v) do
 				for i, items in ipairs(t) do
 					local name = equipSlot[getEquip(eLoc)] and aType.." "..items[2].." - "..equipSlot[getEquip(eLoc)] or aType
 					if #t > 30 and (i == 1 or i == 31 or i == 61 or i == 91)  then
-						tinsert(AtlasLoot_OnDemand[type],{Name = correctText(name)..WHITE.." - Page".. math.ceil(i/30) })
+						tinsert(AtlasLoot_OnDemand[typeL],{Name = correctText(name)..WHITE.." - Page".. math.ceil(i/30) })
 					elseif i == 1 then
-						tinsert(AtlasLoot_OnDemand[type],{Name = correctText(name)})
+						tinsert(AtlasLoot_OnDemand[typeL],{Name = correctText(name)})
 					end
-					tinsert(AtlasLoot_OnDemand[type][#AtlasLoot_OnDemand[type]], items[1])
+					tinsert(AtlasLoot_OnDemand[typeL][#AtlasLoot_OnDemand[typeL]], items[1])
 				end
 			end
 		end
@@ -549,10 +551,10 @@ function AtlasLoot:CreateOnDemandLootTable(type)
 	local itemList = {}
 	local checkList = {}
 	for _, data in pairs(AtlasLoot_Data) do
-		if data.Type == type then
+		if data.Type == typeL then
 			for _, t in ipairs(data) do
 				for _, itemData in pairs(t) do
-					if itemData.itemID and not checkList[itemData.itemID] then
+					if type(itemData) == "table" and itemData.itemID and not checkList[itemData.itemID] then
 						itemData.dropLoc = {data.DisplayName or data.Name, t.Name}
 						checkList[itemData.itemID] = true
 						tinsert(itemList, {itemData})
@@ -582,6 +584,8 @@ function AtlasLoot:CreateOnDemandLootTable(type)
 	return continue()
 end

+
+local lastTablenum = 1
 --[[
 AtlasLoot:ShowItemsFrame(dataID, dataSource, tablenum):
 dataID - Name of the loot table
@@ -710,6 +714,13 @@ function AtlasLoot:ShowItemsFrame(dataID, dataSource_backup, tablenum)
 		return
 	end

+	if dataSource ~= self.dataSourceBackup and tablenum ~= lastTablenum then
+		for i = 1, 30, 1 do
+			_G["AtlasLootItem_"..i]:Hide()
+			_G["AtlasLootItem_"..i.."_Highlight"]:Hide()
+		end
+	end
+
 	-- find the right itemID for the difficulty selected
 	local function getProperItemConditionals(item)
 		isValid = false
@@ -751,7 +762,7 @@ function AtlasLoot:ShowItemsFrame(dataID, dataSource_backup, tablenum)
 	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, dataSource, dataID, tablenum, dataSource_backup, item)
 		local text, extra
 		local itemName, itemQuality, itemSubType, itemEquipLoc, itemColor
 		local spellName, spellIcon
@@ -772,7 +783,7 @@ function AtlasLoot:ShowItemsFrame(dataID, dataSource_backup, tablenum)
 				text = self:FixText(text)
 			end
 			if itemID then
-				text = select(4,GetItemQualityColor(select(3,GetItemInfo(itemID))))..text
+				text = select(4,GetItemQualityColor(item:GetQuality()))..text
 			end
 			--Adds button highlights if you know a recipe or have a char that knows one
 			if CA_IsSpellKnown(spellID) then
@@ -782,15 +793,16 @@ function AtlasLoot:ShowItemsFrame(dataID, dataSource_backup, tablenum)
 			else
 				itemButton.hasTrade = false
 				hightlightFrame:Hide()
-				for key,v in pairs(self.db.profiles) do
-					if gsub(key,"-",""):match(gsub(realmName,"-","")) and v.knownRecipes and v.knownRecipes[spellID] then
-						hightlightFrame:SetTexture(itemHighlightBlue)
-						hightlightFrame:Show()
-					end
+				if self:GetKnownRecipes(spellID) then
+					hightlightFrame:SetTexture(itemHighlightBlue)
+					hightlightFrame:Show()
 				end
+
 			end
 		elseif itemID then
 			itemName, _, itemQuality, _, _, _, itemSubType, _, itemEquipLoc, _ = GetItemInfo(itemID)
+			itemName = itemName or item:GetName()
+			itemSubType = itemSubType or AtlasLoot_ExtraData["ArmorConversion"][item:GetSubClassID()]
 				if not itemName then
 					itemID = orgItemID
 					itemName, _, itemQuality, _, _, _, itemSubType, _, itemEquipLoc, _ = GetItemInfo(itemID)
@@ -801,8 +813,8 @@ function AtlasLoot:ShowItemsFrame(dataID, dataSource_backup, tablenum)
 				text = dataSource[dataID][tablenum][i].name
 				text = self:FixText(text)
 			elseif itemName then
-				_, _, _, itemColor = GetItemQualityColor(itemQuality)
-				text = itemColor..itemName
+				itemQuality = itemQuality or item:GetQuality()
+				text = itemQuality and select(4,GetItemQualityColor(itemQuality))..itemName or itemName
 			else
 				text = ""
 			end
@@ -886,7 +898,8 @@ function AtlasLoot:ShowItemsFrame(dataID, dataSource_backup, tablenum)
 		elseif spellIcon then
 			iconFrame:SetTexture(spellIcon)
 		elseif dataSource[dataID][tablenum][i].itemID then
-			iconFrame:SetTexture(GetItemIcon(itemID))
+			local icon = item:GetIcon()
+			iconFrame:SetTexture(icon)
 		end

 		if iconFrame:GetTexture() == nil and dataSource[dataID][tablenum][i].icon ~= "Blank" then
@@ -956,12 +969,11 @@ function AtlasLoot:ShowItemsFrame(dataID, dataSource_backup, tablenum)
 		itemButton:Show()
 	end

-	local function getItemData(itemID, i, orgItemID)
-		local item = Item:CreateFromID(itemID)
+	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)
+			setupButton(itemID, i, dataSource, dataID, tablenum, dataSource_backup, item)
 		end)
 	end

@@ -978,11 +990,15 @@ function AtlasLoot:ShowItemsFrame(dataID, dataSource_backup, tablenum)
 			if isValid and toShow then
 				hightlightFrame:Hide()
 				if itemID then
-					getItemData(itemID, i, orgItemID)
+					local item = Item:CreateFromID(itemID)
+					if not item:GetInfo() then
+						getItemData(itemID, i, orgItemID, item)
+					end
+					setupButton(itemID, i, dataSource, dataID, tablenum, dataSource_backup, item)
 				elseif recipeID then
-					getItemData(recipeID, i)
+					getItemData(recipeID, i, nil, Item:CreateFromID(recipeID))
 				else
-					setupButton(itemID, i, dataSource, dataID, tablenum, dataSource_backup)
+					setupButton(itemID, i, dataSource, dataID, tablenum, dataSource_backup, Item:CreateFromID(itemID))
 				end
 			else
 				itemButton:Hide()
@@ -1115,6 +1131,8 @@ function AtlasLoot:ShowItemsFrame(dataID, dataSource_backup, tablenum)
 		end
 	end

+	lastTablenum = tablenum
+
 	--Anchor the item frame where it is supposed to be
 	if self.filterEnable and dataID ~= "FilterList" then
 		self:HideFilteredItems()
@@ -1123,6 +1141,7 @@ function AtlasLoot:ShowItemsFrame(dataID, dataSource_backup, tablenum)
 		--preload items from the rest of the instance table
 		self:PreLoadLootTable(dataSource, dataID, ItemindexID)
 	end
+
 end

 -- List of Moduel Names
@@ -1237,16 +1256,36 @@ function AtlasLoot:LoadItemIDsDatabase()
 	content:ParseAsync()
 end

+function AtlasLoot:UNIT_SPELLCAST_SUCCEEDED(event, arg1, arg2 , arg3)
+	if arg1 == "player" and arg2 == "Learning" then
+		self:PopulateProfessions()
+	end
+end
+
 function AtlasLoot:PopulateProfessions()
-	if not self.db.profile.knownRecipes then self.db.profile.knownRecipes = {} end
-	for _,prof in pairs(TRADESKILL_RECIPES) do
-	   for _,cat in pairs(prof) do
-		  for _,recipe in pairs(cat) do
-			 if CA_IsSpellKnown(recipe.SpellEntry) then
-				self.db.profile.knownRecipes[recipe.SpellEntry] = true
-			 end
-		  end
-	   end
+	self.db.profile.professions = self.db.profile.professions or {}
+	for _, skillID in pairs(PRIMARY_PROFESSIONS) do
+		local _, _, _, skillMaxRank = GetSkillInfo(skillID)
+		if skillMaxRank and skillMaxRank > 0 then
+			self.db.profile.professions[skillID] = self.db.profile.professions[skillID] or { knownRecipes = {} }
+		end
+	end
+	for _, skillID in pairs(SECONDARY_PROFESSIONS) do
+		local _, _, _, skillMaxRank = GetSkillInfo(skillID)
+		if skillMaxRank and skillMaxRank > 0 then
+			self.db.profile.professions[skillID] = self.db.profile.professions[skillID] or { knownRecipes = {} }
+		end
+	end
+	for prof, _ in pairs(self.db.profile.professions) do
+		if TRADESKILL_RECIPES[prof] then
+			for _,cat in pairs(TRADESKILL_RECIPES[prof]) do
+				for _,recipe in pairs(cat) do
+					if CA_IsSpellKnown(recipe.SpellEntry) then
+						self.db.profile.professions[prof].knownRecipes[recipe.SpellEntry] = true
+					end
+				end
+			end
+		end
 	end
 end

@@ -14,7 +14,5 @@
 	<Script file="WishList.lua"/>
 	<Script file="SearchAdvanced.lua"/>
    <Script file="Search.lua"/>
-	
-    <GameTooltip name="AtlasLootTooltip" inherits="GameTooltipTemplate" parent="UIParent" hidden="true"/>
 </Ui>

@@ -45,12 +45,9 @@ function AtlasLoot:SetQuestTooltip(data)
    if not data.quest then return end
    for _,v in ipairs(data.quest) do
        local quest = AtlasLoot_CraftingData["QuestList"][v]
-        local text = ""
-        if quest.text then
-            text = data.quest.text
-        end
-        GameTooltip:AddDoubleLine(AL["Quest"], WHITE..text)
-        GameTooltip:AddDoubleLine(quest[4]..quest[1], WHITE.." ("..GOLD..quest[2]..WHITE..", "..GOLD..quest[3]..WHITE..")")
+        local text = data.quest.text or ""
+        GameTooltip:AddDoubleLine(quest[1], WHITE..text)
+        GameTooltip:AddDoubleLine(quest[5][1]..quest[2], WHITE.." ("..GOLD..quest[3]..WHITE..", "..GOLD..quest[4]..WHITE..")")
    end
 end

@@ -111,35 +108,27 @@ function AtlasLoot:ItemOnEnter(data)

            self:SetCraftingTooltip(data)

-            local hasSpace = false
-            local showOwn = nil
+            local showOwn
            --adds tooltip showing if you know a recipe and it is one of your chars trade skills
            if data.hasTrade then
-                hasSpace = true
                if CA_IsSpellKnown(spellID) then
                    showOwn = "|cff1EFF00You know this Recipe"
                else
                    showOwn = " |cffFF3F40You don't know this Recipe"
                end
            end
-            local text = ""
-            local showOther = false
-            local firstChar = false
-            --adds a tooltip if any of your other charaters knows a recipe 
-            for key,v in pairs(self.db.profiles) do
-                if gsub(key,"-",""):match(gsub(realmName,"-","")) and not gsub(key,"-",""):match(gsub(playerName,"-","")) and v.knownRecipes and v.knownRecipes[spellID] then
-                    local charName = strsplit("-", key, 5)
-                    if firstChar then text = text..", " end
-                    text = text..gsub(charName, " ", "")
-                    showOther = true
-                    hasSpace = true
-                    firstChar = true
-                end
+            --gets a list of characters with this recipe known
+            local text = self:GetKnownRecipes(spellID)
+            local hasSpace
+            if (text or showOwn) and not hasSpace then
+                GameTooltip:AddLine(" ")
+                hasSpace = true
            end
-            text = BLUE.."Recipe known by: "..WHITE..text
-            if hasSpace then GameTooltip:AddLine(" ") end
            if showOwn then GameTooltip:AddLine(showOwn) end
-            if showOther then GameTooltip:AddLine(text) end
+            if text then
+                text = BLUE.."Recipe known by: "..WHITE..text
+                GameTooltip:AddLine(text)
+            end
            GameTooltip:Show()
            if self.db.profile.EquipCompare or IsShiftKeyDown() then
                self:ShowCompareItem(data) --- CALL MISSING METHOD TO SHOW 2 TOOLTIPS (Item Compare)
@@ -278,13 +267,11 @@ end
 -- Enables item comparing. I've ripped self method directly from GameTooltip.lua and modified to work with GameTooltip /siena
 -------
 function AtlasLoot:ShowCompareItem(data)
-   local shift = 1
-   local item,link = nil,nil
+   local link
   if data.spellID then
-      item = GameTooltip:GetSpell()
-      _,link = GetItemInfo(data.itemID)
+      link = Item:CreateFromID(data.itemID):GetLink()
   else
-      item,link = GameTooltip:GetItem()
+      _,link = GameTooltip:GetItem()
   end

   if ( not link ) then
@@ -298,7 +285,6 @@ function AtlasLoot:ShowCompareItem(data)
   local item1 = nil
   local item2 = nil
   local item3 = nil
-   local side = "left"
   if ( ShoppingTooltip1:SetHyperlinkCompareItem(link, 1, 1, GameTooltip) ) then
      item1 = true
   end
@@ -37,6 +37,7 @@ function AtlasLoot:OptionsInit()
    AtlasLootOptionsMinimapIcon:SetChecked(self.db.profile.minimap.hide)
    AtlasLootOptionsFrameCraftingInfo:SetChecked(self.db.profile.recipeExtraInfoSwitch)
    AtlasLootOptionsFrameDropLocation:SetChecked(self.db.profile.showdropLocationOnSearch)
+    AtlasLootOptionsFrameUnknownRecipe:SetChecked(self.db.profile.showUnknownRecipeTooltip)
 end

 --[[
@@ -228,10 +229,16 @@ local craftingInfo = CreateFrame("CheckButton", "AtlasLootOptionsFrameCraftingIn
        AtlasLootOptionsFrameCraftingInfoText:SetText(AL["Hide crafting source unless holding CTRL"])
        craftingInfo:SetScript("OnClick", function() self.db.profile.recipeExtraInfoSwitch = not self.db.profile.recipeExtraInfoSwitch end)

-local craftingInfo = CreateFrame("CheckButton", "AtlasLootOptionsFrameDropLocation", AtlasLootOptionsFrame, "OptionsCheckButtonTemplate")
-        craftingInfo:SetPoint("TOPLEFT",5,-130)
+local craftingDropInfo = CreateFrame("CheckButton", "AtlasLootOptionsFrameDropLocation", AtlasLootOptionsFrame, "OptionsCheckButtonTemplate")
+        craftingDropInfo:SetPoint("TOPLEFT",5,-130)
        AtlasLootOptionsFrameDropLocationText:SetText(AL["Show drop location on search results"])
-        craftingInfo:SetScript("OnClick", function() self.db.profile.showdropLocationOnSearch = not self.db.profile.showdropLocationOnSearch end)
+        craftingDropInfo:SetScript("OnClick", function() self.db.profile.showdropLocationOnSearch = not self.db.profile.showdropLocationOnSearch end)
+
+local unknownRecipeTooltip = CreateFrame("CheckButton", "AtlasLootOptionsFrameUnknownRecipe", AtlasLootOptionsFrame, "OptionsCheckButtonTemplate")
+        unknownRecipeTooltip:SetPoint("TOPLEFT",5,-160)
+        AtlasLootOptionsFrameUnknownRecipeText:SetText(AL["Show if recipe is unknown in tooltips"])
+        unknownRecipeTooltip:SetScript("OnClick", function() self.db.profile.showUnknownRecipeTooltip = not self.db.profile.showUnknownRecipeTooltip end)
+

 local itemid = CreateFrame("CheckButton", "AtlasLootOptionsFrameItemID", AtlasLootOptionsFrame, "OptionsCheckButtonTemplate")
        itemid:SetPoint("TOP",5,-70)
@@ -604,17 +604,26 @@ local count = 0
 local tablenum = 1

 function AtlasLoot:AddItemToSearchResult(item, dataSource, dataID, tableNum)
-    if AtlasLootCharDB["SearchResult"][tablenum] == nil then
-        AtlasLootCharDB["SearchResult"][tablenum] = {Name = "Page "..tablenum}
-    end
+    AtlasLootCharDB["SearchResult"].SearchIDs = AtlasLootCharDB["SearchResult"].SearchIDs or {}
    local tableCopy = self:CloneTable(item)
-    tinsert(AtlasLootCharDB["SearchResult"][tablenum], tableCopy)
-    local tNum = #AtlasLootCharDB["SearchResult"][tablenum]
-    AtlasLootCharDB["SearchResult"][tablenum][tNum].lootTable = {{dataID, dataSource, tableNum}, "Source"}
-    AtlasLootCharDB["SearchResult"][tablenum][tNum][1] = (count % 30) + 1
-    count = count + 1
-    if (count) % 30 == 0 then
-        tablenum = tablenum + 1
+    local inResults = AtlasLootCharDB["SearchResult"].SearchIDs[item.itemID]
+    if inResults then
+        AtlasLootCharDB["SearchResult"][inResults[1]][inResults[2]] = tableCopy
+        AtlasLootCharDB["SearchResult"][inResults[1]][inResults[2]].lootTable = {{dataID, dataSource, tableNum}, "Source"}
+        AtlasLootCharDB["SearchResult"][inResults[1]][inResults[2]][1] = inResults[3]
+    else
+        if AtlasLootCharDB["SearchResult"][tablenum] == nil then
+            AtlasLootCharDB["SearchResult"][tablenum] = {Name = "Page "..tablenum}
+        end
+        tinsert(AtlasLootCharDB["SearchResult"][tablenum], tableCopy)
+        local tNum = #AtlasLootCharDB["SearchResult"][tablenum]
+        AtlasLootCharDB["SearchResult"][tablenum][tNum].lootTable = {{dataID, dataSource, tableNum}, "Source"}
+        AtlasLootCharDB["SearchResult"][tablenum][tNum][1] = (count % 30) + 1
+        if item.itemID then AtlasLootCharDB["SearchResult"].SearchIDs[item.itemID] = {tablenum, tNum, AtlasLootCharDB["SearchResult"][tablenum][tNum][1]} end
+        count = count + 1
+        if (count) % 30 == 0 then
+            tablenum = tablenum + 1
+        end
    end
 end

@@ -637,32 +646,34 @@ function AtlasLoot:ProcessItem(data)
                self:ItemFrameRefresh()
            end
        elseif itemID then
-            local item = Item:CreateFromID(itemID)
-            if item then
-                local function nextItem()
-                    self:ItemsLoading(-1)
-                    local itemDetails = {self:GetItemDetails(itemID)}
-                    if self:ItemMatchesAllTerms(searchTerms, itemDetails) then
-                        self:AddItemToSearchResult(itemData, "AtlasLoot_Data", dataID, tableNum)
-                        if not showSearch then
-                            self:ShowSearchResult()
-                            showSearch = true
-                        else
-                            self:ItemFrameRefresh()
-                        end
+            local function nextItem(item)
+                self:ItemsLoading(-1)
+                local itemDetails = {self:GetItemDetails(itemID)}
+                itemDetails[1] = item:GetName()
+                if not itemDetails[1] then return end
+                if self:ItemMatchesAllTerms(searchTerms, itemDetails) then
+                    self:AddItemToSearchResult(itemData, "AtlasLoot_Data", dataID, tableNum)
+                    if not showSearch then
+                        self:ShowSearchResult()
+                        showSearch = true
+                    else
+                        self:ItemFrameRefresh()
                    end
                end
-                if not item:GetInfo() then
-                    item:ContinueOnLoad(function(itemID)
-                        nextItem()
+            end
+            local item = Item:CreateFromID(itemID)
+            if item then
+                if searchTerms.relational and not item:GetInfo() then
+                    item:ContinueOnLoad(function(item)
+                        nextItem(item)
                    end)
+                    nextItem(item)
                else
-                    nextItem()
+                    nextItem(item)
                end
            end
        end
    end
-    
 end

 local itemList = {}
@@ -794,12 +805,8 @@ function AtlasLoot:ShowSearchOptions(button)
                    local title = GetAddOnMetadata(module, "title")
                    local notes = GetAddOnMetadata(module, "notes")
                    self.Dewdrop:AddLine("text", title, "checked", not self.db.profile.SearchAscensionDB and self.db.profile.SearchOn.All or self.db.profile.SearchOn[module], "disabled", self.db.profile.SearchAscensionDB or self.db.profile.SearchOn.All, "tooltipTitle", title,
-                                    "tooltipText", notes, "func", function()
-                        if self.db.profile.SearchOn[module] == nil then
-                            self.db.profile.SearchOn[module] = true
-                        else
-                            self.db.profile.SearchOn[module] = nil
-                        end
+                    "tooltipText", notes, "func", function()
+                    self.db.profile.SearchOn[module] = not self.db.profile.SearchOn[module]
                    end)
                end
            end
@@ -233,7 +233,7 @@ function AtlasLoot:AdvancedSearchReset()

    local expansionLevels = {60, 70, 80}

-    AtlasLootDefaultFrame_AdvancedSearchPanel_LevelMin:SetText(expansionLevels[GetAccountExpansionLevel() + 1])
+    AtlasLootDefaultFrame_AdvancedSearchPanel_LevelMin:SetText(expansionLevels[GetAccountExpansionLevel() + 1] - 5)
    AtlasLootDefaultFrame_AdvancedSearchPanel_LevelMax:SetText(expansionLevels[GetAccountExpansionLevel() + 1])
    AtlasLootDefaultFrame_AdvancedSearchPanel_iLevelMin:SetText("")
    AtlasLootDefaultFrame_AdvancedSearchPanel_iLevelMax:SetText("")
@@ -36,6 +36,12 @@ AtlasLoot.FixedItemText = {


 function AtlasLoot:FixText(text)
+
+    if not string.find(string.lower(text), string.lower("INVTYPE")) then
+        text = gsub(text, ", Leather", "Leather")
+        text = gsub(text, ", Cloth", "Cloth")
+    end
+
    -- Classes
    text = gsub(text, "#c1#", "Druid")
    text = gsub(text, "#c2#", LOCALIZED_CLASS_NAMES_MALE["HUNTER"])
@@ -323,16 +329,6 @@ function AtlasLoot:FixText(text)
    text = gsub(text, "#aq20t5#", AL["Qiraji Regal Drape"])
    text = gsub(text, "#aq20t6#", AL["Qiraji Spiked Hilt"])

-    -- AQ40 Tokens
-    text = gsub(text, "#aq40t1#", AL["Qiraji Bindings of Dominance"])
-    text = gsub(text, "#aq40t2#", AL["Vek'nilash's Circlet"])
-    text = gsub(text, "#aq40t3#", AL["Ouro's Intact Hide"])
-    text = gsub(text, "#aq40t4#", AL["Husk of the Old God"])
-    text = gsub(text, "#aq40t5#", AL["Qiraji Bindings of Command"])
-    text = gsub(text, "#aq40t6#", AL["Vek'lor's Diadem"])
-    text = gsub(text, "#aq40t7#", AL["Skin of the Great Sandworm"])
-    text = gsub(text, "#aq40t8#", AL["Carapace of the Old God"])
-
    -- Battleground Factions
    text = gsub(text, "#b1#", BabbleFaction["Stormpike Guard"])
    text = gsub(text, "#b2#", BabbleFaction["Frostwolf Clan"])
@@ -559,258 +555,9 @@ function AtlasLoot:FixText(text)
    text = gsub(text, "#f8#", BabbleFaction["The Wyrmrest Accord"])
    text = gsub(text, "#f9#", AL["Argent Tournament"])

-    -- Blacksmithing Crafted Mail Sets
-    text = gsub(text, "#craftbm1#", AL["Bloodsoul Embrace"])
-    text = gsub(text, "#craftbm2#", AL["Fel Iron Chain"])
-
-    -- Blacksmithing Crafted Plate Sets
-    text = gsub(text, "#craftbp1#", AL["Imperial Plate"])
-    text = gsub(text, "#craftbp2#", AL["The Darksoul"])
-    text = gsub(text, "#craftbp3#", AL["Fel Iron Plate"])
-    text = gsub(text, "#craftbp4#", AL["Adamantite Battlegear"])
-    text = gsub(text, "#craftbp5#", AL["Flame Guard"])
-    text = gsub(text, "#craftbp6#", AL["Enchanted Adamantite Armor"])
-    text = gsub(text, "#craftbp7#", AL["Khorium Ward"])
-    text = gsub(text, "#craftbp8#", AL["Faith in Felsteel"])
-    text = gsub(text, "#craftbp9#", AL["Burning Rage"])
-    text = gsub(text, "#craftbp10#", AL["Ornate Saronite Battlegear"])
-    text = gsub(text, "#craftbp11#", AL["Savage Saronite Battlegear"])
-
-    -- Leatherworking Crafted Leather Sets
-    text = gsub(text, "#craftlwl1#", AL["Volcanic Armor"])
-    text = gsub(text, "#craftlwl2#", AL["Ironfeather Armor"])
-    text = gsub(text, "#craftlwl3#", AL["Stormshroud Armor"])
-    text = gsub(text, "#craftlwl4#", AL["Devilsaur Armor"])
-    text = gsub(text, "#craftlwl5#", AL["Blood Tiger Harness"])
-    text = gsub(text, "#craftlwl6#", AL["Primal Batskin"])
-    text = gsub(text, "#craftlwl7#", AL["Wild Draenish Armor"])
-    text = gsub(text, "#craftlwl8#", AL["Thick Draenic Armor"])
-    text = gsub(text, "#craftlwl9#", AL["Fel Skin"])
-    text = gsub(text, "#craftlwl10#", AL["Strength of the Clefthoof"])
-    text = gsub(text, "#craftlwe1#", AL["Primal Intent"])
-    text = gsub(text, "#craftlwt1#", AL["Windhawk Armor"])
-    text = gsub(text, "#craftlwl11#", AL["Borean Embrace"])
-    text = gsub(text, "#craftlwl12#", AL["Iceborne Embrace"])
-    text = gsub(text, "#craftlwl13#", AL["Eviscerator's Battlegear"])
-    text = gsub(text, "#craftlwl14#", AL["Overcaster Battlegear"])
-
-    -- Leatherworking Crafted Mail Sets
-    text = gsub(text, "#craftlwm1#", AL["Green Dragon Mail"])
-    text = gsub(text, "#craftlwm2#", AL["Blue Dragon Mail"])
-    text = gsub(text, "#craftlwm3#", AL["Black Dragon Mail"])
-    text = gsub(text, "#craftlwm4#", AL["Scaled Draenic Armor"])
-    text = gsub(text, "#craftlwm5#", AL["Felscale Armor"])
-    text = gsub(text, "#craftlwm6#", AL["Felstalker Armor"])
-    text = gsub(text, "#craftlwm7#", AL["Fury of the Nether"])
-    text = gsub(text, "#craftlwd1#", AL["Netherscale Armor"])
-    text = gsub(text, "#craftlwd2#", AL["Netherstrike Armor"])
-    text = gsub(text, "#craftlwm8#", AL["Frostscale Binding"])
-    text = gsub(text, "#craftlwm9#", AL["Nerubian Hive"])
-    text = gsub(text, "#craftlwm10#", AL["Stormhide Battlegear"])
-    text = gsub(text, "#craftlwm11#", AL["Swiftarrow Battlefear"])
-
-    -- Tailoring Crafted Sets
-    text = gsub(text, "#craftt1#", AL["Bloodvine Garb"])
-    text = gsub(text, "#craftt2#", AL["Netherweave Vestments"])
-    text = gsub(text, "#craftt3#", AL["Imbued Netherweave"])
-    text = gsub(text, "#craftt4#", AL["Arcanoweave Vestments"])
-    text = gsub(text, "#craftt5#", AL["The Unyielding"])
-    text = gsub(text, "#craftt6#", AL["Whitemend Wisdom"])
-    text = gsub(text, "#craftt7#", AL["Spellstrike Infusion"])
-    text = gsub(text, "#craftt8#", AL["Battlecast Garb"])
-    text = gsub(text, "#craftt9#", AL["Soulcloth Embrace"])
-    text = gsub(text, "#crafttm1#", AL["Primal Mooncloth"])
-    text = gsub(text, "#crafttsh1#", AL["Shadow's Embrace"])
-    text = gsub(text, "#crafttsf1#", AL["Wrath of Spellfire"])
-    text = gsub(text, "#craftt10#", AL["Frostwoven Power"])
-    text = gsub(text, "#craftt11#", AL["Duskweaver"])
-    text = gsub(text, "#craftt12#", AL["Frostsavage Battlegear"])
-
-    -- Vanilla WoW Sets
-    text = gsub(text, "#pre60s1#", AL["Defias Leather"])
-    text = gsub(text, "#pre60s2#", AL["Embrace of the Viper"])
-    text = gsub(text, "#pre60s3#", AL["Chain of the Scarlet Crusade"])
-    text = gsub(text, "#pre60s4#", AL["The Gladiator"])
-    text = gsub(text, "#pre60s5#", AL["Ironweave Battlesuit"])
-    text = gsub(text, "#pre60s6#", AL["Necropile Raiment"])
-    text = gsub(text, "#pre60s7#", AL["Cadaverous Garb"])
-    text = gsub(text, "#pre60s8#", AL["Bloodmail Regalia"])
-    text = gsub(text, "#pre60s9#", AL["Deathbone Guardian"])
-    text = gsub(text, "#pre60s10#", AL["The Postmaster"])
-    text = gsub(text, "#pre60s15#", AL["Shard of the Gods"])
-    text = gsub(text, "#pre60s16#", AL["Major Mojo Infusion"])
-    text = gsub(text, "#pre60s17#", AL["Overlord's Resolution"])
-    text = gsub(text, "#pre60s18#", AL["Prayer of the Primal"])
-    text = gsub(text, "#pre60s19#", AL["Zanzil's Concentration"])
-    text = gsub(text, "#pre60s20#", AL["Spirit of Eskhandar"])
-    text = gsub(text, "#pre60s21#", AL["The Twin Blades of Hakkari"])
-    text = gsub(text, "#pre60s22#", AL["Primal Blessing"])
-    text = gsub(text, "#pre60s23#", AL["Dal'Rend's Arms"])
-    text = gsub(text, "#pre60s24#", AL["Spider's Kiss"])
-
-    -- The Burning Crusade Sets
-    text = gsub(text, "#bcs1#", AL["The Twin Stars"])
-    text = gsub(text, "#bcs2#", AL["The Twin Blades of Azzinoth"])
-    text = gsub(text, "#bcs3#", AL["Latro's Flurry"])
-    text = gsub(text, "#bcs4#", AL["The Fists of Fury"])
-
-    -- Wrath Of The Lich King Sets
-    text = gsub(text, "#wotlk1#", AL["Raine's Revenge"])
-    text = gsub(text, "#wotlk2#", AL["Purified Shard of the Gods"])
-    text = gsub(text, "#wotlk3#", AL["Shiny Shard of the Gods"])
-
-    -- ZG Sets
-    text = gsub(text, "#zgs1#", AL["Haruspex's Garb"])
-    text = gsub(text, "#zgs2#", AL["Predator's Armor"])
-    text = gsub(text, "#zgs3#", AL["Illusionist's Attire"])
-    text = gsub(text, "#zgs4#", AL["Freethinker's Armor"])
-    text = gsub(text, "#zgs5#", AL["Confessor's Raiment"])
-    text = gsub(text, "#zgs6#", AL["Madcap's Outfit"])
-    text = gsub(text, "#zgs7#", AL["Augur's Regalia"])
-    text = gsub(text, "#zgs8#", AL["Demoniac's Threads"])
-    text = gsub(text, "#zgs9#", AL["Vindicator's Battlegear"])
-
-    -- AQ20 Sets
-    text = gsub(text, "#aq20s1#", AL["Symbols of Unending Life"])
-    text = gsub(text, "#aq20s2#", AL["Trappings of the Unseen Path"])
-    text = gsub(text, "#aq20s3#", AL["Trappings of Vaulted Secrets"])
-    text = gsub(text, "#aq20s4#", AL["Battlegear of Eternal Justice"])
-    text = gsub(text, "#aq20s5#", AL["Finery of Infinite Wisdom"])
-    text = gsub(text, "#aq20s6#", AL["Emblems of Veiled Shadows"])
-    text = gsub(text, "#aq20s7#", AL["Gift of the Gathering Storm"])
-    text = gsub(text, "#aq20s8#", AL["Implements of Unspoken Names"])
-    text = gsub(text, "#aq20s9#", AL["Battlegear of Unyielding Strength"])
-    text = gsub(text, "#aq20s10#", AL["Keepsakes of Endless Machinations"])
-    text = gsub(text, "#aq20s11#", AL["Regalia of Roaring Earth"])
-    text = gsub(text, "#aq20s12#", AL["Relics of Ferocious Vigor"])
-    text = gsub(text, "#aq20s13#", AL["Laurels of the Faithful Zealot"])
-    text = gsub(text, "#aq20s14#", AL["Instruments of Masterful Technique"])
-    text = gsub(text, "#aq20s15#", AL["Decorations of Martial Prowess"])
-    text = gsub(text, "#aq20s16#", AL["Trophies of Unrivaled Rage"])
-    text = gsub(text, "#aq20s17#", AL["Remnants of Expansive Research"])
-
-    -- AQ40 Sets
-    text = gsub(text, "#aq40s1#", AL["Genesis Raiment"])
-    text = gsub(text, "#aq40s2#", AL["Striker's Garb"])
-    text = gsub(text, "#aq40s3#", AL["Enigma Vestments"])
-    text = gsub(text, "#aq40s4#", AL["Avenger's Battlegear"])
-    text = gsub(text, "#aq40s5#", AL["Garments of the Oracle"])
-    text = gsub(text, "#aq40s6#", AL["Deathdealer's Embrace"])
-    text = gsub(text, "#aq40s7#", AL["Stormcaller's Garb"])
-    text = gsub(text, "#aq40s8#", AL["Doomcaller's Attire"])
-    text = gsub(text, "#aq40s9#", AL["Conqueror's Battlegear"])
-
    -- Tier Tokens
    text = gsub(text, "#setToken#", AL["Set Token (Click)"]) --Accessory tokens

-    -- Dungeon 3 Sets
-    text = gsub(text, "#ds3s1#", AL["Hallowed Raiment"])
-    text = gsub(text, "#ds3s2#", AL["Incanter's Regalia"])
-    text = gsub(text, "#ds3s3#", AL["Mana-Etched Regalia"])
-    text = gsub(text, "#ds3s4#", AL["Oblivion Raiment"])
-    text = gsub(text, "#ds3s5#", AL["Assassination Armor"])
-    text = gsub(text, "#ds3s6#", AL["Moonglade Raiment"])
-    text = gsub(text, "#ds3s7#", AL["Wastewalker Armor"])
-    text = gsub(text, "#ds3s8#", AL["Beast Lord Armor"])
-    text = gsub(text, "#ds3s9#", AL["Desolation Battlegear"])
-    text = gsub(text, "#ds3s10#", AL["Tidefury Raiment"])
-    text = gsub(text, "#ds3s11#", AL["Bold Armor"])
-    text = gsub(text, "#ds3s12#", AL["Doomplate Battlegear"])
-    text = gsub(text, "#ds3s13#", AL["Righteous Armor"])
-
-    -- Tier 1 Sets
-    text = gsub(text, "#t1s1#", AL["Cenarion Raiment"])
-    text = gsub(text, "#t1s2#", AL["Giantstalker Armor"])
-    text = gsub(text, "#t1s3#", AL["Arcanist Regalia"])
-    text = gsub(text, "#t1s4#", AL["Lawbringer Armor"])
-    text = gsub(text, "#t1s5#", AL["Vestments of Prophecy"])
-    text = gsub(text, "#t1s6#", AL["Nightslayer Armor"])
-    text = gsub(text, "#t1s7#", AL["The Earthfury"])
-    text = gsub(text, "#t1s8#", AL["Felheart Raiment"])
-    text = gsub(text, "#t1s9#", AL["Battlegear of Might"])
-    text = gsub(text, "#t1s10#", AL["Fury of Might"])
-
-    -- Tier 2 Sets
-    text = gsub(text, "#t2s1#", AL["Stormrage Raiment"])
-    text = gsub(text, "#t2s2#", AL["Dragonstalker Armor"])
-    text = gsub(text, "#t2s3#", AL["Netherwind Regalia"])
-    text = gsub(text, "#t2s4#", AL["Judgement Armor"])
-    text = gsub(text, "#t2s5#", AL["Vestments of Transcendence"])
-    text = gsub(text, "#t2s6#", AL["Bloodfang Armor"])
-    text = gsub(text, "#t2s7#", AL["The Ten Storms"])
-    text = gsub(text, "#t2s8#", AL["Nemesis Raiment"])
-    text = gsub(text, "#t2s9#", AL["Battlegear of Wrath"])
-    text = gsub(text, "#t2s10#", AL["Fury of Wrath"])
-
-    -- Tier 3 Sets
-    text = gsub(text, "#t3s1#", AL["Dreamwalker Raiment"])
-    text = gsub(text, "#t3s2#", AL["Cryptstalker Armor"])
-    text = gsub(text, "#t3s3#", AL["Frostfire Regalia"])
-    text = gsub(text, "#t3s4#", AL["Redemption Armor"])
-    text = gsub(text, "#t3s5#", AL["Vestments of Faith"])
-    text = gsub(text, "#t3s6#", AL["Bonescythe Armor"])
-    text = gsub(text, "#t3s7#", AL["The Earthshatterer"])
-    text = gsub(text, "#t3s8#", AL["Plagueheart Raiment"])
-    text = gsub(text, "#t3s9#", AL["Dreadnaught's Battlegear"])
-    text = gsub(text, "#t3s10#", AL["Dreadborne Warplate"])
-
-    -- Tier 4 Sets
-    text = gsub(text, "#t4s1_1#", AL["Malorne Harness"])
-    text = gsub(text, "#t4s1_2#", AL["Malorne Raiment"])
-    text = gsub(text, "#t4s1_3#", AL["Malorne Regalia"])
-    text = gsub(text, "#t4s2#", AL["Demon Stalker Armor"])
-    text = gsub(text, "#t4s3#", AL["Aldor Regalia"])
-    text = gsub(text, "#t4s4_1#", AL["Justicar Armor"])
-    text = gsub(text, "#t4s4_2#", AL["Justicar Battlegear"])
-    text = gsub(text, "#t4s4_3#", AL["Justicar Raiment"])
-    text = gsub(text, "#t4s5_1#", AL["Incarnate Raiment"])
-    text = gsub(text, "#t4s5_2#", AL["Incarnate Regalia"])
-    text = gsub(text, "#t4s6#", AL["Netherblade Set"])
-    text = gsub(text, "#t4s7_1#", AL["Cyclone Harness"])
-    text = gsub(text, "#t4s7_2#", AL["Cyclone Raiment"])
-    text = gsub(text, "#t4s7_3#", AL["Cyclone Regalia"])
-    text = gsub(text, "#t4s8#", AL["Voidheart Raiment"])
-    text = gsub(text, "#t4s9_1#", AL["Warbringer Armor"])
-    text = gsub(text, "#t4s9_2#", AL["Warbringer Battlegear"])
-
-    -- Tier 5 Sets
-    text = gsub(text, "#t5s1_1#", AL["Nordrassil Harness"])
-    text = gsub(text, "#t5s1_2#", AL["Nordrassil Raiment"])
-    text = gsub(text, "#t5s1_3#", AL["Nordrassil Regalia"])
-    text = gsub(text, "#t5s2#", AL["Rift Stalker Armor"])
-    text = gsub(text, "#t5s3#", AL["Tirisfal Regalia"])
-    text = gsub(text, "#t5s4_1#", AL["Crystalforge Armor"])
-    text = gsub(text, "#t5s4_2#", AL["Crystalforge Battlegear"])
-    text = gsub(text, "#t5s4_3#", AL["Crystalforge Raiment"])
-    text = gsub(text, "#t5s5_1#", AL["Avatar Raiment"])
-    text = gsub(text, "#t5s5_2#", AL["Avatar Regalia"])
-    text = gsub(text, "#t5s6#", AL["Deathmantle Set"])
-    text = gsub(text, "#t5s7_1#", AL["Cataclysm Harness"])
-    text = gsub(text, "#t5s7_2#", AL["Cataclysm Raiment"])
-    text = gsub(text, "#t5s7_3#", AL["Cataclysm Regalia"])
-    text = gsub(text, "#t5s8#", AL["Corruptor Raiment"])
-    text = gsub(text, "#t5s9_1#", AL["Destroyer Armor"])
-    text = gsub(text, "#t5s9_2#", AL["Destroyer Battlegear"])
-
-    -- Tier 6 Sets
-    text = gsub(text, "#t6s1_1#", AL["Thunderheart Harness"])
-    text = gsub(text, "#t6s1_2#", AL["Thunderheart Raiment"])
-    text = gsub(text, "#t6s1_3#", AL["Thunderheart Regalia"])
-    text = gsub(text, "#t6s2#", AL["Gronnstalker's Armor"])
-    text = gsub(text, "#t6s3#", AL["Tempest Regalia"])
-    text = gsub(text, "#t6s4_1#", AL["Lightbringer Armor"])
-    text = gsub(text, "#t6s4_2#", AL["Lightbringer Battlegear"])
-    text = gsub(text, "#t6s4_3#", AL["Lightbringer Raiment"])
-    text = gsub(text, "#t6s5_1#", AL["Vestments of Absolution"])
-    text = gsub(text, "#t6s5_2#", AL["Absolution Regalia"])
-    text = gsub(text, "#t6s6#", AL["Slayer's Armor"])
-    text = gsub(text, "#t6s7_1#", AL["Skyshatter Harness"])
-    text = gsub(text, "#t6s7_2#", AL["Skyshatter Raiment"])
-    text = gsub(text, "#t6s7_3#", AL["Skyshatter Regalia"])
-    text = gsub(text, "#t6s8#", AL["Malefic Raiment"])
-    text = gsub(text, "#t6s9_1#", AL["Onslaught Armor"])
-    text = gsub(text, "#t6s9_2#", AL["Onslaught Battlegear"])
-
    -- Tier 7 Sets
    text = gsub(text, "#t7s1_1#", AL["Dreamwalker Garb"])
    text = gsub(text, "#t7s1_2#", AL["Dreamwalker Battlegear"])
@@ -914,89 +661,6 @@ function AtlasLoot:FixText(text)
    text = gsub(text, "#t10s10_1#", AL["Scourgelord's Battlegear"])
    text = gsub(text, "#t10s10_2#", AL["Scourgelord's Plate"])

-    -- Arathi Basin Sets - Alliance
-    text = gsub(text, "#absa1#", AL["The Highlander's Intent"])
-    text = gsub(text, "#absa2#", AL["The Highlander's Purpose"])
-    text = gsub(text, "#absa3#", AL["The Highlander's Will"])
-    text = gsub(text, "#absa4#", AL["The Highlander's Determination"])
-    text = gsub(text, "#absa5#", AL["The Highlander's Fortitude"])
-    text = gsub(text, "#absa6#", AL["The Highlander's Resolution"])
-    text = gsub(text, "#absa7#", AL["The Highlander's Resolve"])
-
-    -- Arathi Basin Sets - Horde
-    text = gsub(text, "#absh1#", AL["The Defiler's Intent"])
-    text = gsub(text, "#absh2#", AL["The Defiler's Purpose"])
-    text = gsub(text, "#absh3#", AL["The Defiler's Will"])
-    text = gsub(text, "#absh4#", AL["The Defiler's Determination"])
-    text = gsub(text, "#absh5#", AL["The Defiler's Fortitude"])
-    text = gsub(text, "#absh6#", AL["The Defiler's Resolution"])
-
-    -- PvP Level 60 Rare Sets - Alliance 
-    text = gsub(text, "#pvpra1#", AL["Lieutenant Commander's Refuge"])
-    text = gsub(text, "#pvpra2#", AL["Lieutenant Commander's Pursuance"])
-    text = gsub(text, "#pvpra3#", AL["Lieutenant Commander's Arcanum"])
-    text = gsub(text, "#pvpra4#", AL["Lieutenant Commander's Redoubt"])
-    text = gsub(text, "#pvpra5#", AL["Lieutenant Commander's Investiture"])
-    text = gsub(text, "#pvpra6#", AL["Lieutenant Commander's Guard"])
-    text = gsub(text, "#pvpra7#", AL["Lieutenant Commander's Dreadgear"])
-    text = gsub(text, "#pvpra8#", AL["Lieutenant Commander's Battlearmor"])
-    text = gsub(text, "#pvpra9#", AL["Lieutenant Commander's Stormcaller"])
-
-    -- PvP Level 60 Rare Sets - Horde
-    text = gsub(text, "#pvprh1#", AL["Champion's Refuge"])
-    text = gsub(text, "#pvprh2#", AL["Champion's Pursuance"])
-    text = gsub(text, "#pvprh3#", AL["Champion's Arcanum"])
-    text = gsub(text, "#pvprh4#", AL["Champion's Investiture"])
-    text = gsub(text, "#pvprh5#", AL["Champion's Guard"])
-    text = gsub(text, "#pvprh6#", AL["Champion's Stormcaller"])
-    text = gsub(text, "#pvprh7#", AL["Champion's Dreadgear"])
-    text = gsub(text, "#pvprh8#", AL["Champion's Battlearmor"])
-    text = gsub(text, "#pvprh9#", AL["Champion's Redoubt"])
-
-    -- PvP Level 60 Epic Sets - Alliance
-    text = gsub(text, "#pvpea1#", AL["Field Marshal's Sanctuary"])
-    text = gsub(text, "#pvpea2#", AL["Field Marshal's Pursuit"])
-    text = gsub(text, "#pvpea3#", AL["Field Marshal's Regalia"])
-    text = gsub(text, "#pvpea4#", AL["Field Marshal's Aegis"])
-    text = gsub(text, "#pvpea5#", AL["Field Marshal's Raiment"])
-    text = gsub(text, "#pvpea6#", AL["Field Marshal's Vestments"])
-    text = gsub(text, "#pvpea7#", AL["Field Marshal's Threads"])
-    text = gsub(text, "#pvpea8#", AL["Field Marshal's Battlegear"])
-    text = gsub(text, "#pvpea9#", AL["Field Marshal's Earthshaker"])
-
-    -- PvP Level 60 Epic Sets - Horde
-    text = gsub(text, "#pvpeh1#", AL["Warlord's Sanctuary"])
-    text = gsub(text, "#pvpeh2#", AL["Warlord's Pursuit"])
-    text = gsub(text, "#pvpeh3#", AL["Warlord's Regalia"])
-    text = gsub(text, "#pvpeh4#", AL["Warlord's Raiment"])
-    text = gsub(text, "#pvpeh5#", AL["Warlord's Vestments"])
-    text = gsub(text, "#pvpeh6#", AL["Warlord's Earthshaker"])
-    text = gsub(text, "#pvpeh7#", AL["Warlord's Threads"])
-    text = gsub(text, "#pvpeh8#", AL["Warlord's Battlegear"])
-    text = gsub(text, "#pvpeh9#", AL["Warlord's Aegis"])
-
-    -- PvP Level 60 Epic Sets - Alliance
-    text = gsub(text, "#pvpeea1#", AL["Grand Marshal's Sanctuary"])
-    text = gsub(text, "#pvpeea2#", AL["Grand Marshal's Pursuit"])
-    text = gsub(text, "#pvpeea3#", AL["Grand Marshal's Regalia"])
-    text = gsub(text, "#pvpeea4#", AL["Grand Marshal's Aegis"])
-    text = gsub(text, "#pvpeea5#", AL["Grand Marshal's Raiment"])
-    text = gsub(text, "#pvpeea6#", AL["Grand Marshal's Vestments"])
-    text = gsub(text, "#pvpeea7#", AL["Grand Marshal's Threads"])
-    text = gsub(text, "#pvpeea8#", AL["Grand Marshal's Battlegear"])
-    text = gsub(text, "#pvpeea9#", AL["Grand Marshal's Earthshaker"])
-
-    -- PvP Level 60 Epic Sets - Horde
-    text = gsub(text, "#pvpeeh1#", AL["High Warlord's Sanctuary"])
-    text = gsub(text, "#pvpeeh2#", AL["High Warlord's Pursuit"])
-    text = gsub(text, "#pvpeeh3#", AL["High Warlord's Regalia"])
-    text = gsub(text, "#pvpeeh4#", AL["High Warlord's Raiment"])
-    text = gsub(text, "#pvpeeh5#", AL["High Warlord's Vestments"])
-    text = gsub(text, "#pvpeeh6#", AL["High Warlord's Earthshaker"])
-    text = gsub(text, "#pvpeeh7#", AL["High Warlord's Threads"])
-    text = gsub(text, "#pvpeeh8#", AL["High Warlord's Battlegear"])
-    text = gsub(text, "#pvpeeh9#", AL["High Warlord's Aegis"])
-
    -- Outland Faction Reputation PvP Sets
    text = gsub(text, "#pvprep701_1#", AL["Dragonhide Battlegear"])
    text = gsub(text, "#pvprep701_2#", AL["Wyrmhide Battlegear"])
@@ -1128,6 +792,23 @@ function AtlasLoot:FixText(text)
 	text = gsub(text, "#valentineday#", "|TInterface\\Icons\\inv_valentinescard01:0|t")
 	text = gsub(text, "#valentineday2#", "|TInterface\\Icons\\inv_jewelry_necklace_43:0|t")

+    text = gsub(text, ", Herb", "Herbalism")
+    text = gsub(text, ", Meat", "Meat")
+    text = gsub(text, ", Item Enhancement", "Enchant")
+    text = gsub(text, ", Weapon Enchantment", "Enchanting")
+    text = gsub(text, ", Armor Enchantment", "Enchanting")
+    text = gsub(text, ", Scroll", "Scroll")
+    text = gsub(text, ", Holiday", "Holiday")
+    text = gsub(text, ", Metal & Stone", "Metal & Stone")
+    text = gsub(text, ", Potion", "Potion")
+    text = gsub(text, ", Engineering", "Parts")
+    text = gsub(text, ", Simple", "Gems")
+    text = gsub(text, ", Elemental", "Elemental")
+    text = gsub(text, ", Elixir", "Elixir")
+    text = gsub(text, ", Reagent", "Reagent")
+    text = gsub(text, ", Devices", "Devices")
+    text = gsub(text, ", Trade Goods", "Trade Goods")
+    
    local englishFaction, _ = UnitFactionGroup("player")
    if englishFaction == "Horde" then
        text = gsub(text, "#faction#", "|TInterface\\AddOns\\AtlasLoot\\Images\\Horde:14:14:0:-1|t")
@@ -11,6 +11,9 @@ local CYAN =  "|cff00ffff"
 local SPRINGGREEN = "|cFF00FF7F"
 local YELLOW = "|cffFFd200"

+local playerName = UnitName("player")
+local realmName = GetRealmName()
+
 -- Used to create a dewdrop menu from a table
 function AtlasLoot:OpenDewdropMenu(frame, menuList, skipRegister)
 	if self.Dewdrop:IsOpen(frame) then self.Dewdrop:Close() return end
@@ -125,8 +128,38 @@ On the form of {ID, {normal, heroic, mythic, mythic1, mythic2, ... ,mythicN}}
 function AtlasLoot:FindId(id, difficulty, type, sourceType)
 	if not ItemIDsDatabase[id] then return nil, false end
 	if difficulty == 100 then
+		local newIDs = {
+			(id < 1000000 and (id) + 6300000),
+			(id < 1000000 and (id) + 7800000),
+			(id > 1000000 and (id - 1500000) + 6300000),
+			(id > 1000000 and (id - 1500000) + 7800000),
+	}
+		for _, newID in ipairs(newIDs) do
+		local ogName = GetItemInfoInstant(id)
+			local newName = GetItemInfoInstant(newID)
+			if newName and ogName and string.find(newName.name, ogName.name) then
+				return  newID, true
+			end
+		end
 		return ItemIDsDatabase[id]["HeroicBloodforged"], true
 	end
+
+	if difficulty == 1 then
+		local newIDs = {
+			(id < 1000000 and (id) + 6000000),
+			(id < 1000000 and (id) + 7500000),
+			(id > 1000000 and (id - 1500000) + 6000000),
+			(id > 1000000 and (id - 1500000) + 7500000),
+	}
+		for _, newID in ipairs(newIDs) do
+		local ogName = GetItemInfoInstant(id)
+			local newName = GetItemInfoInstant(newID)
+			if newName and ogName and string.find(newName.name, ogName.name) then
+				return  newID, true
+			end
+		end
+	end
+
 	if (difficulty == 4 and (type == "BCRaid" or type == "ClassicRaid") and sourceType == "Search") or
 	(difficulty == 5 and (type == "BCRaid" or type == "ClassicRaid") and sourceType ~= "Search") then
 		return ItemIDsDatabase[id]["MythicRaid"], true
@@ -135,7 +168,7 @@ function AtlasLoot:FindId(id, difficulty, type, sourceType)
 		difficulty = 4
 	end
 	return ItemIDsDatabase[id][difficulty], true
-	end
+end

 -- Create enchant tooltip
 function AtlasLoot:GetEnchantLink(enchantID)
@@ -176,7 +209,7 @@ function AtlasLoot:GetRecipeData(recipeID, idType)
 		for _,cat in pairs(prof) do
 		   for _,recipe in pairs(cat) do
 			  if (idType == "spell" and recipeID == recipe.SpellEntry) or (idType == "item" and recipeID == recipe.RecipeItemEntry) then
-				local info = {{recipe.CreatedItemEntry}, "blank", "blank", "blank", "blank", "blank",spellID = recipe.SpellEntry}
+				local info = {{recipe.CreatedItemEntry}, "blank", "blank", "blank", "blank", "blank",spellID = recipe.SpellEntry, skillIndex = recipe.SkillIndex}
 				if ItemIDsDatabase[recipe.CreatedItemEntry] and ItemIDsDatabase[recipe.CreatedItemEntry][1] then
 					info[2] = {ItemIDsDatabase[recipe.CreatedItemEntry][1]}
 				end
@@ -212,6 +245,44 @@ function AtlasLoot:GetRecipeID(spellID)
 	 end
 end

+function AtlasLoot:IsRecipeKnown(ID, profile)
+	if not profile or not profile.professions then return end
+	for _, prof in pairs(profile.professions) do
+		if prof.knownRecipes[ID] then return true end
+	end
+end
+
+function AtlasLoot:GetKnownRecipes(spellID)
+    --returns a list of characters with the recipe
+	local text
+    for key, profile in pairs(self.db.profiles) do
+        if gsub(key,"-",""):match(gsub(realmName,"-","")) and not gsub(key,"-",""):match(gsub(playerName,"-","")) and self:IsRecipeKnown(spellID, profile) then
+            local charName = strsplit("-", key, 5)
+            text = text and text..", "..gsub(charName, " ", "") or gsub(charName, " ", "")
+        end
+    end
+	return text
+end
+
+function AtlasLoot:IsProfessionKnown(skillID, profile)
+	if profile and profile.professions and profile.professions[skillID] then return true end
+end
+
+function AtlasLoot:IsRecipeUnknown(ID)
+	local recipeData = self:GetRecipeData(ID, "item")
+	if not recipeData or not recipeData.skillIndex then return end
+
+	local text
+	for key, profile in pairs(self.db.profiles) do
+		if gsub(key,"-",""):match(gsub(realmName,"-","")) and
+		self:IsProfessionKnown(recipeData.skillIndex, profile) and not self:IsRecipeKnown(recipeData.spellID, profile) then
+			local charName = strsplit("-", key, 5)
+			text = text and text..", "..gsub(charName, " ", "") or gsub(charName, " ", "")
+		end
+	end
+	return text
+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
@@ -247,21 +318,11 @@ function AtlasLoot:PopoupItemFrame(frame, data)
 	--creates a button only if one dosnt already exist re use old one if it does
 	local function createButton(num)
 		if _G["AtlasLoot_PopupButton_"..num] then return end
-		local button = CreateFrame("Button", "AtlasLoot_PopupButton_"..num, AtlasLoot_PopupFrame)
+		local button = CreateFrame("Button", "AtlasLoot_PopupButton_"..num, AtlasLoot_PopupFrame, "ItemButtonTemplate")
 		button:SetID(num)
 		button:SetSize(30,30)
 		button:EnableMouse()
 		button:RegisterForClicks("AnyDown")
-		button:SetHighlightTexture("Interface\\QuestFrame\\UI-QuestTitleHighlight", "ADD")
-		button.icon = button:CreateTexture(nil,"ARTWORK")
-		button.icon:SetSize(30,30)
-		button.icon:SetPoint("CENTER")
-		button.name = button:CreateFontString(nil,"ARTWORK","GameFontHighlightLarge")
-		button.name:SetFont("GameFontHighlightLarge", 30)
-        button.name:SetSize(30,30)
-        button.name:SetPoint("CENTER", button.icon,0,0)
-        button.name:SetJustifyH("CENTER")
-		button.name:Hide()
 		button.number = num
 		button:SetScript("OnClick", function(btn, arg1) self:ItemOnClick(btn, arg1) end)
 		button:SetScript("OnEnter", function(btn)
@@ -274,6 +335,7 @@ function AtlasLoot:PopoupItemFrame(frame, data)
 			end
 		end)

+		
 		if num == 1 then
 			button:SetPoint("TOPLEFT", "AtlasLoot_PopupFrame", 9, -8)
 		elseif num == 7 then
@@ -303,7 +365,10 @@ function AtlasLoot:PopoupItemFrame(frame, data)
 						self:ItemsLoading(-1)
 					end)
 				end
-			button.icon:SetTexture(GetItemIcon(itemID))
+			local itemData = {GetItemInfo(itemID)}
+			SetItemButtonTexture(button, itemData[10])
+			SetItemButtonQuality(button, itemData[3])
+			
 			button.itemID = itemID
 			button.itemTexture = frame.itemTexture
 			local recipe = self:GetRecipeData(itemID, "item")
@@ -311,10 +376,9 @@ function AtlasLoot:PopoupItemFrame(frame, data)
 			button.craftingData = self:RecipeSource(recipe.spellID)
 			end
 		if item[2] then
-			button.name:SetText(WHITE..item[2])
-			button.name:Show()
+			SetItemButtonCount(button, item[2])
 		else
-			button.name:Hide()
+			SetItemButtonCount(button)
 		end
 		button:Show()
 		end
@@ -402,7 +466,7 @@ end

 function AtlasLoot:ItemFrameRefresh()
    if refreshTimer then return end
-    self:ScheduleTimer("ItemRefreshTimer", 5)
+    self:ScheduleTimer("ItemRefreshTimer", .5)
    refreshTimer = true
 end
 -----------------------------------------------------
@@ -454,3 +518,39 @@ function AtlasLoot:BatchRequestVanity(itemList)
    end
    return nextItem()
 end
+
+local function CheckTooltipForDuplicate(tooltip, text)
+    -- Check if we already added to this tooltip.
+    for i = 1,15 do
+        local frame = _G[tooltip:GetName() .. "TextLeft" .. i]
+        local textOld
+        if frame then textOld = frame:GetText() end
+        if textOld and textOld == text then return true end
+    end
+end
+
+-- finds and sets the tooltip for the itemID that it is sent
+local function SetTooltip(itemID, tooltip)
+    local self = AtlasLoot
+	if not self.db.profile.showUnknownRecipeTooltip or UnitAffectingCombat("player") then return end
+	local text = self:IsRecipeUnknown(itemID)
+	if not text then return end
+	text = "Recipe could be learned by: "..GREEN..text
+	if not CheckTooltipForDuplicate(tooltip, text) then
+		tooltip:AddLine(text)
+	end
+end
+
+-- item tooltip handler
+local function TooltipHandlerItem(tooltip)
+    --checks for combat less likley to cause a lag spike
+    if UnitAffectingCombat("player") then return end
+    --get item link and itemID
+	local link = select(2, tooltip:GetItem())
+	if not link then return end
+	local itemID = GetItemInfoFromHyperlink(link)
+	if not itemID then return end
+    SetTooltip(itemID, tooltip)
+end
+
+GameTooltip:HookScript("OnTooltipSetItem", TooltipHandlerItem)
@@ -1489,6 +1489,7 @@ AtlasLoot_CraftingData["CraftingLevels"] = {
    [25078] = { 300, 310, 325, 340 }; --  Enchant Gloves - Fire Power -- 25078
    [25079] = { 300, 310, 325, 340 }; --  Enchant Gloves - Healing Power -- 25079
    [25080] = { 300, 310, 325, 340 }; --  Enchant Gloves - Superior Agility -- 25080
+    [225080] = { 300, 310, 325, 340 }; --  Enchant Gloves - Superior Agility -- 25080
    [25081] = { 300, 310, 325, 340 }; --  Enchant Cloak - Greater Fire Resistance -- 25081
    [25082] = { 300, 310, 325, 340 }; --  Enchant Cloak - Greater Nature Resistance -- 25082
    [25083] = { 300, 310, 325, 340 }; --  Enchant Cloak - Stealth -- 25083
@@ -3619,24 +3620,12 @@ AtlasLoot_CraftingData["CraftingLevels"] = {
 	[968699] = { 300, 320, 330, 340 };
 	[968702] = { 300, 320, 330, 340 };
 	[968771] = { 300, 320, 330, 340 };
-	[968061] = { 300, 320, 330, 340 };
-	[968064] = { 300, 320, 330, 340 };
-	[968067] = { 300, 320, 330, 340 };
-	[968070] = { 300, 320, 330, 340 };
-	[968073] = { 300, 320, 330, 340 };
-	[968076] = { 300, 320, 330, 340 };
    [968500] = { 300, 320, 330, 340 };
    [968496] = { 300, 320, 330, 340 };
    [968506] = { 300, 320, 330, 340 };
    [968498] = { 300, 320, 330, 340 };
    [968502] = { 300, 320, 330, 340 };
    [968504] = { 300, 320, 330, 340 };
-	[968062] = { 300, 320, 330, 340 };
-	[968065] = { 300, 320, 330, 340 };
-	[968068] = { 300, 320, 330, 340 };
-	[968071] = { 300, 320, 330, 340 };
-	[968074] = { 300, 320, 330, 340 };
-	[968077] = { 300, 320, 330, 340 };
    [968501] = { 300, 320, 330, 340 };
    [968497] = { 300, 320, 330, 340 };
    [968507] = { 300, 320, 330, 340 };
@@ -3284,18 +3284,6 @@ AtlasLoot_CraftingData["Vendor"][968696] = { 970014};
 AtlasLoot_CraftingData["Vendor"][968699] = { 970007};
 AtlasLoot_CraftingData["Vendor"][968702] = { 970009};
 AtlasLoot_CraftingData["Vendor"][968771] = { 970015};
-AtlasLoot_CraftingData["Vendor"][968061] = { 970015};
-AtlasLoot_CraftingData["Vendor"][968064] = { 970017};
-AtlasLoot_CraftingData["Vendor"][968067] = { 970009};
-AtlasLoot_CraftingData["Vendor"][968070] = { 970016};
-AtlasLoot_CraftingData["Vendor"][968073] = { 970008};
-AtlasLoot_CraftingData["Vendor"][968076] = { 970011};
-AtlasLoot_CraftingData["Vendor"][968062] = { 970015};
-AtlasLoot_CraftingData["Vendor"][968065] = { 970017};
-AtlasLoot_CraftingData["Vendor"][968068] = { 970009};
-AtlasLoot_CraftingData["Vendor"][968071] = { 970016};
-AtlasLoot_CraftingData["Vendor"][968074] = { 970008};
-AtlasLoot_CraftingData["Vendor"][968077] = { 970011};
 AtlasLoot_CraftingData["Vendor"][968280] = { 970018};
 AtlasLoot_CraftingData["Vendor"][968283] = { 970004};
 AtlasLoot_CraftingData["Vendor"][968286] = { 970022};
@@ -3478,7 +3466,7 @@ AtlasLoot_CraftingData["RepVendor"][23802] = { BabbleFaction["Argent Dawn"], Bab
 AtlasLoot_CraftingData["RepVendor"][23803] = { BabbleFaction["Thorium Brotherhood"], BabbleFaction["Honored"], 12944} -- Enchant Weapon - Mighty Spirit -- 23803
 AtlasLoot_CraftingData["RepVendor"][23804] = { BabbleFaction["Thorium Brotherhood"], BabbleFaction["Revered"], 12944} -- Enchant Weapon - Mighty Intellect -- 23804
 AtlasLoot_CraftingData["RepVendor"][25072] = { BabbleFaction["The Sha'tar"], BabbleFaction["Exalted"], 21432} -- Enchant Gloves - Threat -- 25072
-AtlasLoot_CraftingData["RepVendor"][25080] = { BabbleFaction["Keepers of Time"], BabbleFaction["Exalted"], 21643} -- Enchant Gloves - Superior Agility -- 25080
+AtlasLoot_CraftingData["RepVendor"][225080] = { BabbleFaction["Keepers of Time"], BabbleFaction["Exalted"], 21643} -- Enchant Gloves - Superior Agility -- 225080
 AtlasLoot_CraftingData["RepVendor"][25081] = { BabbleFaction["Cenarion Circle"], BabbleFaction["Friendly"], 15419} -- Enchant Cloak - Greater Fire Resistance -- 25081
 AtlasLoot_CraftingData["RepVendor"][25082] = { BabbleFaction["Cenarion Circle"], BabbleFaction["Honored"], 15419} -- Enchant Cloak - Greater Nature Resistance -- 25082
 AtlasLoot_CraftingData["RepVendor"][25083] = { BabbleFaction["Cenarion Expedition"], BabbleFaction["Exalted"], 17904} -- Enchant Cloak - Stealth -- 25083
@@ -82,6 +82,12 @@ AtlasLoot_CraftingData["Seasonal"] = {
 }


+AtlasLoot_ExtraData["ArmorConversion"] = {
+	"Cloth",
+	"Leather",
+	"Mail",
+	"Plate"
+}

 ----------------------
 --- Heirloom Items ---
@@ -89,44 +95,31 @@ AtlasLoot_CraftingData["Seasonal"] = {
 AtlasLoot_Data["Heirloom"] = {
 	Name = AL["Heirloom"];
 	{
-		Name = "Chests";
-		[1] = { itemID = 1648691, price = "1200 #tokenofprestige# | 192000 #marks# | 800 #bazaar#"  }; --Tattered Dreadmist Robe
-		[2] = { itemID = 1648687, price = "1200 #tokenofprestige# | 192000 #marks# | 800 #bazaar#"  }; --Preened Ironfeather Breastplate
-		[3] = { itemID = 1648689, price = "1200 #tokenofprestige# | 192000 #marks# | 800 #bazaar#"  }; --Stained Shadowcraft Tunic
-		[4] = { itemID = 1648677, price = "1200 #tokenofprestige# | 192000 #marks# | 800 #bazaar#"  }; --Champion's Deathdealer Breastplate
-		[5] = { itemID = 1648683, price = "1200 #tokenofprestige# | 192000 #marks# | 800 #bazaar#"  }; --Mystical Vest of Elements
-		[6] = { itemID = 1648685, price = "1200 #tokenofprestige# | 192000 #marks# | 800 #bazaar#"  }; --Polished Breastplate of Valor
-		[7] = { itemID = 3148685, price = "1200 #tokenofprestige# | 192000 #marks# | 800 #bazaar#"  }; --Polished Breastplate of Might
-	},
-	{
-		Name = "Shoulders";
-		[1] = { itemID = 1642985, price = "800 #tokenofprestige# | 128000 #marks# | 600 #bazaar#"  }; --Tattered Dreadmist Mantle
-		[2] = { itemID = 1642984, price = "800 #tokenofprestige# | 128000 #marks# | 600 #bazaar#"  }; --Preened Ironfeather Shoulders
-		[3] = { itemID = 1642952, price = "800 #tokenofprestige# | 128000 #marks# | 600 #bazaar#"  }; --Stained Shadowcraft Spaulders
-		[4] = { itemID = 1642950, price = "800 #tokenofprestige# | 128000 #marks# | 600 #bazaar#"  }; --Champion Herod's Shoulder
-		[5] = { itemID = 1642951, price = "800 #tokenofprestige# | 128000 #marks# | 600 #bazaar#"  }; --Mystical Pauldrons of Elements
-		[6] = { itemID = 1642949, price = "800 #tokenofprestige# | 128000 #marks# | 600 #bazaar#"  }; --Polished Spaulders of Valor
-		[7] = { itemID = 3142949, price = "800 #tokenofprestige# | 128000 #marks# | 600 #bazaar#"  }; --Polished Spaulders of Might
-		[16] = { itemID = 1644107, price = "800 #tokenofprestige# | 128000 #marks# | 600 #bazaar#"  }; --Exquisite Sunderseer Mantle
-		[17] = { itemID = 1644103, price = "800 #tokenofprestige# | 128000 #marks# | 600 #bazaar#"  }; --Exceptional Stormshroud Shoulders
-		[18] = { itemID = 1644105, price = "800 #tokenofprestige# | 128000 #marks# | 600 #bazaar#"  }; --Lasting Feralheart Spaulders
-		[19] = { itemID = 1644102, price = "800 #tokenofprestige# | 128000 #marks# | 600 #bazaar#"  }; --Aged Pauldrons of The Five Thunders
-		[20] = { itemID = 1644101, price = "800 #tokenofprestige# | 128000 #marks# | 600 #bazaar#"  }; --Prized Beastmaster's Mantle
-		[21] = { itemID = 1644100, price = "800 #tokenofprestige# | 128000 #marks# | 600 #bazaar#"  }; --Pristine Lightforge Spaulders
-		[22] = { itemID = 1644099, price = "800 #tokenofprestige# | 128000 #marks# | 600 #bazaar#"  }; --Strengthened Stockade Pauldrons
-	},
-	{
-		Name = AL["Accessories"];
+		Name = AL["Trinkets"];
 		[1] = { itemID = 1642992, price = "500 #tokenofprestige# | 80000 #marks# | 500 #bazaar#"  }; --Discerning Eye of the Beast
 		[2] = { itemID = 1642991, price = "500 #tokenofprestige# | 80000 #marks# | 500 #bazaar#"  }; --Swift Hand of Justice
 		[3] = { itemID = 1644098, price = "500 #tokenofprestige# | 80000 #marks# | 500 #bazaar#"  }; --Inherited Insignia of the Alliance
 		[4] = { itemID = 1644097, price = "500 #tokenofprestige# | 80000 #marks# | 500 #bazaar#"  }; --Inherited Insignia of the Horde
-		[5] = { itemID = 339076, price = ""  }; --Pendant of Adventure
-		[6] = { itemID = 339100, price = ""  }; --Pendant of Discovery
-		[7] = { itemID = 50255 }; --Dread Pirate Ring
 	},
 	{
-		Name = "Weapons";
+		Name = AL["Necks"];
+		[1] = { itemID = 1339077, price = "225 #tokenofprestige# | 60000 #marks# | TBD #bazaar#" };
+		[2] = { itemID = 1339076, price = "225 #tokenofprestige# | 60000 #marks# | TBD #bazaar#" };
+		[3] = { itemID = 1339078, price = "225 #tokenofprestige# | 60000 #marks# | TBD #bazaar#" };
+		[4] = { itemID = 339076, price = ""  }; --Pendant of Adventure
+		[5] = { itemID = 339100, price = ""  }; --Pendant of Discovery
+	},
+	{
+		Name = AL["Rings"];
+		[1] = { itemID = 1339079, price = "225 #tokenofprestige# | 60000 #marks# | TBD #bazaar#" };
+		[2] = { itemID = 1339080, price = "225 #tokenofprestige# | 60000 #marks# | TBD #bazaar#" };
+		[3] = { itemID = 1339081, price = "225 #tokenofprestige# | 60000 #marks# | TBD #bazaar#" };
+		[4] = { itemID = 1339082, price = "225 #tokenofprestige# | 60000 #marks# | TBD #bazaar#" };
+		[5] = { itemID = 1339083, price = "225 #tokenofprestige# | 60000 #marks# | TBD #bazaar#" };
+		[6] = { itemID = 50255 }; --Dread Pirate Ring
+	},
+	{
+		Name = AL["Weapons"];
 		[1] = { itemID = 1642944, price = "600 #tokenofprestige# | 96000 #marks# | 600 #bazaar#"  }; --Balanced Heartseeker
 		[2] = { itemID = 1642945, price = "600 #tokenofprestige# | 96000 #marks# | 600 #bazaar#"  }; --Venerable Dal'Rend's Sacred Charge
 		[3] = { itemID = 1642948, price = "600 #tokenofprestige# | 96000 #marks# | 600 #bazaar#"  }; --Devout Aurastone Hammer
@@ -146,4 +139,98 @@ AtlasLoot_Data["Heirloom"] = {
 		[24] = { itemID = 1644093, price = "1000 #tokenofprestige# | 160000 #marks# | 800 #bazaar#"  }; --Upgraded Dwarven Hand Cannon
 		[25] = { itemID = 1642846, price = "1000 #tokenofprestige# | 160000 #marks# | 800 #bazaar#"  }; --Wand of the Forgotten Lich
 	},
+		{
+		Name = "Might",
+		[1] = { itemID = 1339126, price = "375 #tokenofprestige# | 75000 #marks# | TBD #bazaar#" }, --Head
+		[2] = { itemID = 3142949, price = "800 #tokenofprestige# | 128000 #marks# | 600 #bazaar#"  },	--Shoulders
+		[3] = { itemID = 1339087, price = "375 #tokenofprestige# | 75000 #marks# | TBD #bazaar#" },	--Back
+		[4] = { itemID = 3148685, price = "1200 #tokenofprestige# | 192000 #marks# | 800 #bazaar#" },	--Chest
+		[5] = { itemID = 1339112, price = "375 #tokenofprestige# | 75000 #marks# | TBD #bazaar#" },	--Wrists
+		[6] = { itemID = 1339133, price = "225 #tokenofprestige# | 60000 #marks# | TBD #bazaar#" },	--Gloves
+		[7] = { itemID = 1339098, price = "375 #tokenofprestige# | 75000 #marks# | TBD #bazaar#" },	--Waist
+		[8] = { itemID = 1339119, price = "600 #tokenofprestige# | 90000 #marks# | TBD #bazaar#" },	--Legs
+		[9] = { itemID = 1339105, price = "375 #tokenofprestige# | 75000 #marks# | TBD #bazaar#" },	--Boots
+		},
+		{
+		Name = "Shadowcraft",
+		[1] = { itemID = 1339121, price = "375 #tokenofprestige# | 75000 #marks# | TBD #bazaar#" }, --Head
+		[2] = { itemID = 1642952, price = "800 #tokenofprestige# | 128000 #marks# | 600 #bazaar#" }, --Shoulders
+		[3] = { itemID = 1339088, price = "375 #tokenofprestige# | 75000 #marks# | TBD #bazaar#" },	--Back
+		[4] = { itemID = 1648689, price = "1200 #tokenofprestige# | 192000 #marks# | 800 #bazaar#" }, --Chest
+		[5] = { itemID = 1339107, price = "375 #tokenofprestige# | 75000 #marks# | TBD #bazaar#" },	--Wrists
+		[6] = { itemID = 1339128, price = "225 #tokenofprestige# | 60000 #marks# | TBD #bazaar#" },	--Gloves
+		[7] = { itemID = 1339093, price = "375 #tokenofprestige# | 75000 #marks# | TBD #bazaar#" }, --Waist
+		[8] = { itemID = 1339114, price = "600 #tokenofprestige# | 90000 #marks# | TBD #bazaar#" }, --Legs
+		[9] = { itemID = 1339100, price = "375 #tokenofprestige# | 75000 #marks# | TBD #bazaar#" }, --Boots
+		},
+		{
+		Name = "Dreadmist",
+		[1] = { itemID = 1339120, price = "375 #tokenofprestige# | 75000 #marks# | TBD #bazaar#" },	--Head
+		[2] = { itemID = 1642985, price = "800 #tokenofprestige# | 128000 #marks# | 600 #bazaar#" },	--Shoulders
+		[3] = { itemID = 1339086, price = "375 #tokenofprestige# | 75000 #marks# | TBD #bazaar#" },	--Back
+		[4] = { itemID = 1648691, price = "1200 #tokenofprestige# | 192000 #marks# | 800 #bazaar#" },	--Chest
+		[5] = { itemID = 1339106, price = "375 #tokenofprestige# | 75000 #marks# | TBD #bazaar#" },	--Wrists
+		[6] = { itemID = 1339127, price = "225 #tokenofprestige# | 60000 #marks# | TBD #bazaar#" },	--Gloves
+		[7] = { itemID = 1339092, price = "375 #tokenofprestige# | 75000 #marks# | TBD #bazaar#" },	--Waist
+		[8] = { itemID = 1339113, price = "600 #tokenofprestige# | 90000 #marks# | TBD #bazaar#" },	--Legs
+		[9] = { itemID = 1339099, price = "375 #tokenofprestige# | 75000 #marks# | TBD #bazaar#" },	--Boots
+		},
+		{
+		Name = "Herods",
+		[1] = { itemID = 1339124, price = "375 #tokenofprestige# | 75000 #marks# | TBD #bazaar#" },	--Head
+		[2] = { itemID = 1642950, price = "800 #tokenofprestige# | 128000 #marks# | 600 #bazaar#" },	--Shoulders
+		[3] = { itemID = 1339084, price = "375 #tokenofprestige# | 75000 #marks# | TBD #bazaar#" },	--Back
+		[4] = { itemID = 1648677, price = "1200 #tokenofprestige# | 192000 #marks# | 800 #bazaar#" },	--Chest
+		[5] = { itemID = 1339110, price = "375 #tokenofprestige# | 75000 #marks# | TBD #bazaar#" },	--Wrists
+		[6] = { itemID = 1339131, price = "225 #tokenofprestige# | 60000 #marks# | TBD #bazaar#" },	--Gloves
+		[7] = { itemID = 1339096, price = "375 #tokenofprestige# | 75000 #marks# | TBD #bazaar#" },	--Waist
+		[8] = { itemID = 1339117, price = "600 #tokenofprestige# | 90000 #marks# | TBD #bazaar#" },	--Legs
+		[9] = { itemID = 1339103, price = "375 #tokenofprestige# | 75000 #marks# | TBD #bazaar#" },	--Boots
+		},
+		{
+		Name = "Elements",
+		[1] = { itemID = 1339123, price = "375 #tokenofprestige# | 75000 #marks# | TBD #bazaar#" },	--Head
+		[2] = { itemID = 1642951, price = "800 #tokenofprestige# | 128000 #marks# | 600 #bazaar#" },	--Shoulders
+		[3] = { itemID = 1339090, price = "375 #tokenofprestige# | 75000 #marks# | TBD #bazaar#" },	--Back
+		[4] = { itemID = 1648683, price = "1200 #tokenofprestige# | 192000 #marks# | 800 #bazaar#" },	--Chest
+		[5] = { itemID = 1339109, price = "375 #tokenofprestige# | 75000 #marks# | TBD #bazaar#" },	--Wrists
+		[6] = { itemID = 1339130, price = "225 #tokenofprestige# | 60000 #marks# | TBD #bazaar#" },	--Gloves
+		[7] = { itemID = 1339095, price = "375 #tokenofprestige# | 75000 #marks# | TBD #bazaar#" },	--Waist
+		[8] = { itemID = 1339116, price = "600 #tokenofprestige# | 90000 #marks# | TBD #bazaar#" },	--Legs
+		[9] = { itemID = 1339102, price = "375 #tokenofprestige# | 75000 #marks# | TBD #bazaar#" },	--Boots
+		},
+		{
+		Name = "Valor",
+		[1] = { itemID = 1339125, price = "375 #tokenofprestige# | 75000 #marks# | TBD #bazaar#" },	--Head
+		[2] = { itemID = 1642949, price = "800 #tokenofprestige# | 128000 #marks# | 600 #bazaar#" },	--Shoulders
+		[3] = { itemID = 1339085, price = "375 #tokenofprestige# | 75000 #marks# | TBD #bazaar#" },	--Back
+		[4] = { itemID = 1648685, price = "1200 #tokenofprestige# | 192000 #marks# | 800 #bazaar#" },	--Chest
+		[5] = { itemID = 1339111, price = "375 #tokenofprestige# | 75000 #marks# | TBD #bazaar#" },	--Wrists
+		[6] = { itemID = 1339132, price = "225 #tokenofprestige# | 60000 #marks# | TBD #bazaar#" },	--Gloves
+		[7] = { itemID = 1339097, price = "375 #tokenofprestige# | 75000 #marks# | TBD #bazaar#" },	--Waist
+		[8] = { itemID = 1339118, price = "600 #tokenofprestige# | 90000 #marks# | TBD #bazaar#" },	--Legs
+		[9] = { itemID = 1339104, price = "375 #tokenofprestige# | 75000 #marks# | TBD #bazaar#" },	--Boots		
+		},
+		{
+		Name = "IronFeather",
+		[1] = { itemID = 1339122, price = "375 #tokenofprestige# | 75000 #marks# | TBD #bazaar#" },	--Head
+		[2] = { itemID = 1642984, price = "800 #tokenofprestige# | 128000 #marks# | 600 #bazaar#" },	--Shoulders
+		[3] = { itemID = 1339089, price = "375 #tokenofprestige# | 75000 #marks# | TBD #bazaar#" },	--Back
+		[4] = { itemID = 1648687, price = "1200 #tokenofprestige# | 192000 #marks# | 800 #bazaar#" },	--Chest
+		[5] = { itemID = 1339108, price = "375 #tokenofprestige# | 75000 #marks# | TBD #bazaar#" },	--Wrists
+		[6] = { itemID = 1339129, price = "225 #tokenofprestige# | 60000 #marks# | TBD #bazaar#" },	--Gloves
+		[7] = { itemID = 1339094, price = "375 #tokenofprestige# | 75000 #marks# | TBD #bazaar#" },	--Waist
+		[8] = { itemID = 1339115, price = "600 #tokenofprestige# | 90000 #marks# | TBD #bazaar#" },	--Legs
+		[9] = { itemID = 1339101, price = "375 #tokenofprestige# | 75000 #marks# | TBD #bazaar#" },	--Boots
+		},
+		{
+		Name = "Pvp Shoulders",
+		[1] = { itemID = 1644107, price = "800 #tokenofprestige# | 128000 #marks# | 600 #bazaar#"  }; --Exquisite Sunderseer Mantle
+		[2] = { itemID = 1644103, price = "800 #tokenofprestige# | 128000 #marks# | 600 #bazaar#"  }; --Exceptional Stormshroud Shoulders
+		[3] = { itemID = 1644105, price = "800 #tokenofprestige# | 128000 #marks# | 600 #bazaar#"  }; --Lasting Feralheart Spaulders
+		[4] = { itemID = 1644102, price = "800 #tokenofprestige# | 128000 #marks# | 600 #bazaar#"  }; --Aged Pauldrons of The Five Thunders
+		[5] = { itemID = 1644101, price = "800 #tokenofprestige# | 128000 #marks# | 600 #bazaar#"  }; --Prized Beastmaster's Mantle
+		[6] = { itemID = 1644100, price = "800 #tokenofprestige# | 128000 #marks# | 600 #bazaar#"  }; --Pristine Lightforge Spaulders
+		[7] = { itemID = 1644099, price = "800 #tokenofprestige# | 128000 #marks# | 600 #bazaar#"  }; --Strengthened Stockade Pauldrons
+		},
 }
@@ -94,6 +94,15 @@ ItemIDsDatabase[1516960] = { 7516960, 1516960, 1816960, MythicRaid = 2816960, 17
 ItemIDsDatabase[1516962] = { 7516962, 1516962, 1816962, MythicRaid = 2816962, 1716962 }
 ItemIDsDatabase[1516965] = { 7516965, 1516965, 1816965, MythicRaid = 2816965, 1716965 }

+ItemIDsDatabase[10962] = { 6010962, 10962, 310962, MythicRaid = 1310962, 210962 }
+ItemIDsDatabase[10963] = { 6010963, 10963, 310963, MythicRaid = 1310963, 210963 }
+ItemIDsDatabase[10964] = { 6010964, 10964, 310964, MythicRaid = 1310964, 210964 }
+ItemIDsDatabase[10965] = { 6010965, 10965, 310965, MythicRaid = 1310965, 210965 }
+ItemIDsDatabase[11001] = { 6011001, 11001, 311001, MythicRaid = 1311001, 211001 }
+ItemIDsDatabase[11002] = { 6011002, 11002, 311002, MythicRaid = 1311002, 211002 }
+ItemIDsDatabase[11003] = { 6011003, 11003, 311003, MythicRaid = 1311003, 211003 }
+ItemIDsDatabase[11004] = { 6011004, 11004, 311004, MythicRaid = 1311004, 211004 }
+
 --Tier 3 Missing Sets

 ItemIDsDatabase[1522418] = { 7522515, 1522418, 1822418, MythicRaid = 2822418, 1722418 }
@@ -331,7 +340,15 @@ ItemIDsDatabase[1507032] = { 7507032, 1507032, 1807032, 1707032, MythicRaid = 28
 ItemIDsDatabase[1507033] = { 7507033, 1507033, 1807033, 1707033, MythicRaid = 2807033 }-- Avenger's Legplates
 ItemIDsDatabase[1507034] = { 7507034, 1507034, 1807034, 1707034, MythicRaid = 2807034 }-- Avenger's Shoulderguards

-
+ItemIDsDatabase[1522466] = { 7522466, 1522466, 1822466, 1722466, MythicRaid = 2822466 }
+ItemIDsDatabase[1522467] = { 7522467, 1522467, 1822467, 1722467, MythicRaid = 2822467 }
+ItemIDsDatabase[1522464] = { 7522464, 1522464, 1822464, 1722464, MythicRaid = 2822464 }
+ItemIDsDatabase[1522471] = { 7522471, 1522471, 1822471, 1722471, MythicRaid = 2822471 }
+ItemIDsDatabase[1522469] = { 7522469, 1522469, 1822469, 1722469, MythicRaid = 2822469 }
+ItemIDsDatabase[1522470] = { 7522470, 1522470, 1822470, 1722470, MythicRaid = 2822470 }
+ItemIDsDatabase[1522465] = { 7522465, 1522465, 1822465, 1722465, MythicRaid = 2822465 }
+ItemIDsDatabase[1522468] = { 7522468, 1522468, 1822468, 1722468, MythicRaid = 2822468 }
+ItemIDsDatabase[1523065] = { 7523065, 1523065, 1823065, 1723065, MythicRaid = 2823065 }

 --Tier 3 Tokens

@@ -586,7 +603,4 @@ for _, v in pairs(ItemIDsDatabase) do
    if not v["MythicRaid"] then
        v["MythicRaid"] = tonumber("13"..v[2])
    end
-    if not v["HeroicBloodforged"] then
-        v["HeroicBloodforged"] = tonumber("63"..v[2])
-    end
 end
@@ -24,9 +24,9 @@ searchbox:SetTextInsets(0, 8, 0, 0)
 searchbox.title = searchbox:CreateFontString(nil, "ARTWORK", "GameFontNormal")
 searchbox.title:SetText("Name: ")
 searchbox.title:SetPoint("TOPLEFT", searchbox, "TOPLEFT", -3, 8)
-searchbox:SetScript("OnEnterPressed", function(self)
-    AtlasLoot:AdvancedSearch(AtlasLootDefaultFrame_AdvancedSearchPanel_SearchBox:GetText())
-	self:ClearFocus()
+searchbox:SetScript("OnEnterPressed", function(editbox)
+    AtlasLoot:AdvancedSearch(editbox:GetText())
+	editbox:ClearFocus()
 end)
 searchbox:SetScript("OnShow", function(self) self:SetFrameLevel( (self:GetParent()):GetFrameLevel() + 1 ) end)
 local searchbox_string = searchbox:CreateFontString(framename.."_SearchBoxString", "ARTWORK", "GameFontNormal")
@@ -858,7 +858,7 @@ subtableFrame.rows = rows2
    end)
    mainframe.mapButton.mapButtonIcon = mainframe.mapButton:CreateTexture("ARTWORK")
    mainframe.mapButton.mapButtonIcon:SetSize(19,19)
-    mainframe.mapButton.mapButtonIcon:SetAtlas("many-quests-area")
+    mainframe.mapButton.mapButtonIcon:SetAtlas("poi-islands-table")
    mainframe.mapButton.mapButtonIcon:SetPoint("RIGHT",mainframe.mapButton, -20, -1)
 -- item data loading icon animation
 local streamIcon = CreateFrame("Frame", "AtlasLoot_ItemsLoading", AtlaslLoot_LootBackground)
@@ -1547,6 +1547,7 @@ if AL then
 	AL["Gordok Commons"] = true
 	AL["Hide crafting source unless holding CTRL"] = true
 	AL["Show drop location on search results"] = true
+	AL["Show if recipe is unknown in tooltips"] = true


 	-- Shortcuts for Bossname files
@@ -628,18 +628,17 @@ AtlasLoot_Data["BlackTemple"] = {
 		[4] = { itemID = 32376 }; --Forest Prowler's Helm
 		[5] = { itemID = 32373 }; --Helm of the Illidari Shatterer
 		[7] = { itemID = 32326 }; --Twisted Blades of Zarak
-		[16] = { itemID = 31089, droprate = "100%", lootTable = {"T6CHEST","Token"} }; --Chestguard of the Forgotten Conqueror
-		[17] = { itemID = 31101, droprate = "100%", lootTable = {"T6SHOULDER","Token"} }; --Pauldrons of the Forgotten Conqueror
-		[18] = { itemID = 31098, droprate = "100%", lootTable = {"T6LEGS","Token"} }; --Leggings of the Forgotten Conqueror
-		[19] = { itemID = 31097, droprate = "100%", lootTable = {"T6HEAD","Token"} }; --Helm of the Forgotten Conqueror
-		[20] = { itemID = 31092, droprate = "100%", lootTable = {"T6HAND","Token"} }; --Gloves of the Forgotten Conqueror
-		[22] = { itemID = 29434, droprate = "100%" }; --Badge of Justice
-		[23] = { itemID = 400751, droprate = "100%" }; --Raider's Commendations
-		[24] = { itemID = 98570, droprate = "100%" }; --Mystic Orb
-		[26] = { itemID = 63929, droprate = "1%" }; --Pet Sigil
-		[27] = { itemID = 63928, droprate = "1%" }; --Pet Sigil
-		[28] = { itemID = 63690, droprate = "1%" }; --Pet Sigil
-		[29] = { itemID = 63529, droprate = "1%" }; --Pet Sigil
+		[16] = { itemID = 31101, droprate = "100%", lootTable = {"T6SHOULDER","Token"} }; --Pauldrons of the Forgotten Conqueror
+		[17] = { itemID = 31098, droprate = "100%", lootTable = {"T6LEGS","Token"} }; --Leggings of the Forgotten Conqueror
+		[18] = { itemID = 31097, droprate = "100%", lootTable = {"T6HEAD","Token"} }; --Helm of the Forgotten Conqueror
+		[19] = { itemID = 31092, droprate = "100%", lootTable = {"T6HAND","Token"} }; --Gloves of the Forgotten Conqueror
+		[21] = { itemID = 29434, droprate = "100%" }; --Badge of Justice
+		[22] = { itemID = 400751, droprate = "100%" }; --Raider's Commendations
+		[23] = { itemID = 98570, droprate = "100%" }; --Mystic Orb
+		[25] = { itemID = 63929, droprate = "1%" }; --Pet Sigil
+		[26] = { itemID = 63928, droprate = "1%" }; --Pet Sigil
+		[27] = { itemID = 63690, droprate = "1%" }; --Pet Sigil
+		[28] = { itemID = 63529, droprate = "1%" }; --Pet Sigil
 	};
 	{
 		Name = BabbleBoss["Illidan Stormrage"];
@@ -694,6 +693,18 @@ AtlasLoot_Data["BlackTemple"] = {
 		[29] = { itemID = 32428, droprate = "6%" }; --Heart of Darkness
 		[30] = { itemID = 32897, droprate = "7%" }; --Mark of the Illidari
 	};
+	{
+		Name = "Reputation Trinkets";
+		[1] = { itemID = 32486 }; --Ashtongue Talisman of Equilibrium
+		[2] = { itemID = 32487 }; --Ashtongue Talisman of Swiftness
+		[3] = { itemID = 32488 }; --Ashtongue Talisman of Insight
+		[4] = { itemID = 32489 }; --Ashtongue Talisman of Zeal
+		[5] = { itemID = 32490 }; --Ashtongue Talisman of Acumen
+		[6] = { itemID = 32492 }; --Ashtongue Talisman of Lethality
+		[7] = { itemID = 32491 }; --Ashtongue Talisman of Vision
+		[8] = { itemID = 32493 }; --Ashtongue Talisman of Shadows
+		[9] = { itemID = 32485 }; --Ashtongue Talisman of Valor
+	};
 	{
 		Name = "BT Patterns/Plans";
 		[1] = { itemID = 32738 };
@@ -884,9 +895,6 @@ AtlasLoot_Data["CoTBlackMorass"] = {
 	};
 };

-
-
-
 -------------------------------------
 --- Caverns of Time: Hyjal Summit ---
 -------------------------------------
@@ -3085,6 +3093,7 @@ AtlasLoot_Data["ZulAman"] = {
 AtlasLoot_Data["Ashtongue"] = {
 	Module = "AtlasLoot_BurningCrusade";
 	Name = BabbleFaction["Ashtongue Deathsworn"];
+	Type = "BCRaid";
 	{
 		Name = BabbleFaction["Friendly"];
 		[1] = { itemID = 32444 }; --=q1=Plans: Shadesteel Girdle" 
@@ -1971,21 +1971,4 @@ AtlasLoot_Data["TailoringCLASSIC"] = {
 		[21] = {itemID = 967820, spellID = 968503 }; --Fitted Wrist Wraps of Efficiency
 		[22] = {itemID = 967822, spellID = 968505 }; --Fitted Wrist Wraps of Crushing
 	};
-	{
-		Name = AL["High Risk"].." Old";
-		[1] = { name = AL["Rare"], icon = "INV_Box_01"},
-		[2] = {itemID = 967215, spellID = 968061 }; --Heavy Dragonweave Cloak Lining
-		[3] = {itemID = 967218, spellID = 968064 }; --Heavy Twilight Cloak Lining
-		[4] = {itemID = 967221, spellID = 968067 }; --Heavy Scarlet Cloak Lining
-		[5] = {itemID = 967224, spellID = 968070 }; --Heavy Rampager's Cloak Lining
-		[6] = {itemID = 967227, spellID = 968073 }; --Heavy Deadwind Cloak Lining
-		[7] = {itemID = 967230, spellID = 968076 }; --Heavy Slippery Cloak Lining
-		[16] = { name = AL["Epic"], icon = "INV_Box_01"},
-		[17] = {itemID = 967216, spellID = 968062 }; --Illustrious Dragonweave Cloak Lining
-		[18] = {itemID = 967219, spellID = 968065 }; --Illustrious Twilight Cloak Lining
-		[19] = {itemID = 967222, spellID = 968068 }; --Illustrious Scarlet Cloak Lining
-		[20] = {itemID = 967225, spellID = 968071 }; --Illustrious Rampager's Cloak Lining
-		[21] = {itemID = 967228, spellID = 968074 }; --Illustrious Deadwind Cloak Lining
-		[22] = {itemID = 967231, spellID = 968077 }; --Illustrious Slippery Cloak Lining
-	};
 };
@@ -694,7 +694,7 @@ AtlasLoot_Data["EnchantingTBC"] = {
 		[4] = { icon = "Spell_Holy_GreaterHeal", spellID = 33995 }, --Enchant Gloves - Major Strength
 		[5] = { icon = "Spell_Holy_GreaterHeal", spellID = 33996 }, --Enchant Gloves - Assault
 		[6] = { icon = "Spell_Holy_GreaterHeal", spellID = 33993 }, --Enchant Gloves - Blasting
-		[7] = { icon = "Spell_Holy_GreaterHeal", spellID = 25080 }, --Enchant Gloves - Superior Agility
+		[7] = { icon = "Spell_Holy_GreaterHeal", spellID = 225080 }, --Enchant Gloves - Superior Agility
 		[8] = { icon = "Spell_Holy_GreaterHeal", spellID = 25072 }, --Enchant Gloves - Threat
 	};
 	{
@@ -4620,7 +4620,7 @@ AtlasLoot_Data["T2"] = {
 	Name = "Tier 2";
 	Type = "ClassicRaid";
 	{
-		Name = AL["Druid"];
+		Name = AL["Druid"]..WHITE.." - Healer";
 		[1] = { itemID = 16900, desc = "=ds=" .. BabbleBoss["Onyxia"] };--Stormrage Cover
 		[2] = { itemID = 16902, desc = "=ds=" .. BabbleBoss["Chromaggus"] };--Stormrage Pauldrons
 		[3] = { itemID = 16897, desc = "=ds=" .. BabbleBoss["Nefarian"] };--Stormrage Chestguard
@@ -4642,7 +4642,7 @@ AtlasLoot_Data["T2"] = {
 		[8] = { itemID = 1516898, desc = "=ds=" .. BabbleBoss["Broodlord Lashlayer"] };--Stormrage Boots
 	};
 	{
-		Name = AL["Druid"] .. WHITE.." - DPS";
+		Name = AL["Druid"] .. WHITE.." - Caster";
 		[1] = { itemID = 1516892, desc = "=ds=" .. BabbleBoss["Onyxia"] };--Stormrage Cover
 		[2] = { itemID = 1516894, desc = "=ds=" .. BabbleBoss["Chromaggus"] };--Stormrage Pauldrons
 		[3] = { itemID = 1516889, desc = "=ds=" .. BabbleBoss["Nefarian"] };--Stormrage Chestguard
@@ -4686,7 +4686,7 @@ AtlasLoot_Data["T2"] = {
 		[8] = { itemID = 16957, desc = "=ds=" .. BabbleBoss["Broodlord Lashlayer"] };--Judgement Sabatons
 	};
 	{
-		Name = LOCALIZED_CLASS_NAMES_MALE["PALADIN"].." - Tank";
+		Name = LOCALIZED_CLASS_NAMES_MALE["PALADIN"]..WHITE.." - Tank";
 		[1] = { itemID = 1516955, desc = "=ds=" .. BabbleBoss["Onyxia"] };--Judgement Crown
 		[2] = { itemID = 1516953, desc = "=ds=" .. BabbleBoss["Chromaggus"] };--Judgement Spaulders
 		[3] = { itemID = 1516958, desc = "=ds=" .. BabbleBoss["Nefarian"] };--Judgement Breastplate
@@ -4697,7 +4697,7 @@ AtlasLoot_Data["T2"] = {
 		[8] = { itemID = 1516957, desc = "=ds=" .. BabbleBoss["Broodlord Lashlayer"] };--Judgement Sabatons
 	};
 	{
-		Name = LOCALIZED_CLASS_NAMES_MALE["PRIEST"];
+		Name = LOCALIZED_CLASS_NAMES_MALE["PRIEST"]..WHITE.." - Healer";
 		[1] = { itemID = 16921, desc = "=ds=" .. BabbleBoss["Onyxia"] };--Halo of Transcendence
 		[2] = { itemID = 16924, desc = "=ds=" .. BabbleBoss["Chromaggus"] };--Pauldrons of Transcendence
 		[3] = { itemID = 16923, desc = "=ds=" .. BabbleBoss["Nefarian"] };--Robes of Transcendence
@@ -4708,7 +4708,7 @@ AtlasLoot_Data["T2"] = {
 		[8] = { itemID = 16919, desc = "=ds=" .. BabbleBoss["Broodlord Lashlayer"] };--Boots of Transcendence
 	};
 	{
-		Name = LOCALIZED_CLASS_NAMES_MALE["PRIEST"] .. " - DPS";
+		Name = LOCALIZED_CLASS_NAMES_MALE["PRIEST"]..WHITE.." - Caster";
 		[1] = { itemID = 1516921, desc = "=ds=" .. BabbleBoss["Onyxia"] };--Halo of Transcendence
 		[2] = { itemID = 1516924, desc = "=ds=" .. BabbleBoss["Chromaggus"] };--Pauldrons of Transcendence
 		[3] = { itemID = 1516923, desc = "=ds=" .. BabbleBoss["Nefarian"] };--Robes of Transcendence
@@ -4730,7 +4730,7 @@ AtlasLoot_Data["T2"] = {
 		[8] = { itemID = 16906, desc = "=ds=" .. BabbleBoss["Broodlord Lashlayer"] };--Bloodfang Boots
 	};
 	{
-		Name = LOCALIZED_CLASS_NAMES_MALE["SHAMAN"];
+		Name = LOCALIZED_CLASS_NAMES_MALE["SHAMAN"]..WHITE.." - Healer";
 		[1] = { itemID = 16947, desc = "=ds=" .. BabbleBoss["Onyxia"] };--Helmet of Ten Storms
 		[2] = { itemID = 16945, desc = "=ds=" .. BabbleBoss["Chromaggus"] };--Epaulets of Ten Storms
 		[3] = { itemID = 16950, desc = "=ds=" .. BabbleBoss["Nefarian"] };--Breastplate of Ten Storms
@@ -4741,7 +4741,18 @@ AtlasLoot_Data["T2"] = {
 		[8] = { itemID = 16949, desc = "=ds=" .. BabbleBoss["Broodlord Lashlayer"] };--Greaves of Ten Storms
 	};
 	{		
-		Name = LOCALIZED_CLASS_NAMES_MALE["SHAMAN"] .. " - Hybrid";
+		Name = LOCALIZED_CLASS_NAMES_MALE["SHAMAN"]..WHITE.." - Caster";
+		[1] = { itemID = 10962, desc = "=ds=" .. BabbleBoss["Onyxia"] };--Helmet of Ten Storms
+		[2] = { itemID = 10963, desc = "=ds=" .. BabbleBoss["Chromaggus"] };--Epaulets of Ten Storms
+		[3] = { itemID = 10964, desc = "=ds=" .. BabbleBoss["Nefarian"] };--Breastplate of Ten Storms
+		[4] = { itemID = 10965, desc = "=ds=" .. BabbleBoss["Razorgore the Untamed"] };--Bracers of Ten Storms
+		[5] = { itemID = 11001, desc = BabbleBoss["Firemaw"] .. ", " .. BabbleBoss["Ebonroc"] .. ", " .. BabbleBoss["Flamegor"] };--Gauntlets of Ten Storms
+		[6] = { itemID = 11002, desc = "=ds=" .. BabbleBoss["Vaelastrasz the Corrupt"] };--Belt of Ten Storms
+		[7] = { itemID = 11003, desc = "=ds=" .. BabbleBoss["Ragnaros"] };--Legplates of Ten Storms
+		[8] = { itemID = 11004, desc = "=ds=" .. BabbleBoss["Broodlord Lashlayer"] };--Greaves of Ten Storms
+	};
+	{		
+		Name = LOCALIZED_CLASS_NAMES_MALE["SHAMAN"]..WHITE.." - Hybrid";
 		[1] = { itemID = 1516947, desc = "=ds=" .. BabbleBoss["Onyxia"] };--Helmet of Ten Storms
 		[2] = { itemID = 1516945, desc = "=ds=" .. BabbleBoss["Chromaggus"] };--Epaulets of Ten Storms
 		[3] = { itemID = 1516950, desc = "=ds=" .. BabbleBoss["Nefarian"] };--Breastplate of Ten Storms
@@ -4763,7 +4774,7 @@ AtlasLoot_Data["T2"] = {
 		[8] = { itemID = 16927, desc = "=ds=" .. BabbleBoss["Broodlord Lashlayer"] };--Nemesis Boots
 	};
 	{
-		Name = LOCALIZED_CLASS_NAMES_MALE["WARRIOR"] .. " - DPS";
+		Name = LOCALIZED_CLASS_NAMES_MALE["WARRIOR"]..WHITE.." - DPS";
 		[1] = { itemID = 10904, desc = "=ds=" .. BabbleBoss["Onyxia"] };--Faceguard of Wrath
 		[2] = { itemID = 10902, desc = "=ds=" .. BabbleBoss["Chromaggus"] };--Shoulderpads of Wrath
 		[3] = { itemID = 10907, desc = "=ds=" .. BabbleBoss["Nefarian"] };--Chestplate of Wrath
@@ -4774,7 +4785,7 @@ AtlasLoot_Data["T2"] = {
 		[8] = { itemID = 10906, desc = "=ds=" .. BabbleBoss["Broodlord Lashlayer"] };--Stompers of Wrath
 	};
 	{
-		Name = LOCALIZED_CLASS_NAMES_MALE["WARRIOR"] .. " - Tank";
+		Name = LOCALIZED_CLASS_NAMES_MALE["WARRIOR"]..WHITE.." - Block Tank";
 		[1] = { itemID = 16963, desc = "=ds=" .. BabbleBoss["Onyxia"] };--Helm of Wrath
 		[2] = { itemID = 16961, desc = "=ds=" .. BabbleBoss["Chromaggus"] };--Pauldrons of Wrath
 		[3] = { itemID = 16966, desc = "=ds=" .. BabbleBoss["Nefarian"] };--Breastplate of Wrath
@@ -4785,7 +4796,7 @@ AtlasLoot_Data["T2"] = {
 		[8] = { itemID = 16965, desc = "=ds=" .. BabbleBoss["Broodlord Lashlayer"] };--Sabatons of Wrath
 	};
 	{
-		Name = LOCALIZED_CLASS_NAMES_MALE["WARRIOR"] .. " - Tank";
+		Name = LOCALIZED_CLASS_NAMES_MALE["WARRIOR"]..WHITE.." - Avoidance Tank";
 		[1] = { itemID = 1516963, desc = "=ds=" .. BabbleBoss["Onyxia"] };--Faceguard of Wrath
 		[2] = { itemID = 1516961, desc = "=ds=" .. BabbleBoss["Chromaggus"] };--Shoulderpads of Wrath
 		[3] = { itemID = 1516966, desc = "=ds=" .. BabbleBoss["Nefarian"] };--Chestplate of Wrath