Merge remote-tracking branch 'other/master' into merger-test
This commit is contained in:
@@ -7,7 +7,7 @@ local BLUE = "|cff0070dd";
|
||||
local ORANGE = "|cffFF8400";
|
||||
|
||||
local AL = LibStub("AceLocale-3.0"):GetLocale("AtlasLoot");
|
||||
local modules = {"AtlasLoot_BurningCrusade", "AtlasLoot_Crafting", "AtlasLoot_OriginalWoW", "AtlasLoot_WorldEvents", "AtlasLoot_WrathoftheLichKing"};
|
||||
local modules = {"AtlasLoot_BurningCrusade", "AtlasLoot_Vanity", "AtlasLoot_Crafting", "AtlasLoot_OriginalWoW", "AtlasLoot_WorldEvents", "AtlasLoot_WrathoftheLichKing"};
|
||||
local currentPage = 1;
|
||||
local SearchResult = nil;
|
||||
|
||||
@@ -665,7 +665,7 @@ local function DoSearch(searchText)
|
||||
end
|
||||
else
|
||||
local difficultyCap = min(AtlasLoot_Difficulty:getMaxDifficulty(data.Type), ItemindexID);
|
||||
itemId = AtlasLoot:FindId(itemId, difficultyCap) or 2;
|
||||
itemId = AtlasLoot:FindId(itemId, difficultyCap, data.Type) or 2;
|
||||
|
||||
local item = Item:CreateFromID(itemId);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user