Merge branch 'development'

Hoizame · Dec 24, 2019 · 399f29f · 399f29f
2 parents b0a378f + 3279ccd
commit 399f29f
Show file tree

Hide file tree

Showing 8 changed files with 1,357 additions and 1,314 deletions.
diff --git a/AtlasLootClassic/Addons/Favourites.lua b/AtlasLootClassic/Addons/Favourites.lua
@@ -9,7 +9,7 @@ local Tooltip = AtlasLoot.Tooltip
 
 -- lua
 local type = _G.type
-local next, pairs, tblconcat = _G.next, _G.pairs, _G.table.concat
+local next, pairs, tblconcat, tblsort = _G.next, _G.pairs, _G.table.concat, _G.table.sort
 local format, strsub, strmatch, strgmatch, strsplit = _G.format, _G.strsub, _G.strmatch, _G.gmatch, _G.strsplit
 
 -- WoW
@@ -374,12 +374,37 @@ function Favourites:GetIconForActiveItemID(itemID)
     return icon
 end
 
-function Favourites:GetProfileLists()
-    return self.db.lists
+local function SortedListFunc(a,b)
+    return a.name:lower() < b.name:lower()
 end
 
-function Favourites:GetGlobaleLists()
-    return self.globalDb.lists
+local function GetSortedList(list, isGlobal)
+    local new = {}
+    for k,v in pairs(list) do
+        new[#new+1] = {
+            id = k,
+            name = Favourites:GetListName(k, isGlobal, false),
+            nameIcon = Favourites:GetListName(k, isGlobal, true),
+        }
+    end
+    tblsort(new, SortedListFunc)
+    return new
+end
+
+function Favourites:GetProfileLists(sorted)
+    if sorted then
+        return GetSortedList(self.db.lists, false)
+    else
+        return self.db.lists
+    end
+end
+
+function Favourites:GetGlobaleLists(sorted)
+    if sorted then
+        return GetSortedList(self.globalDb.lists, true)
+    else
+        return self.globalDb.lists
+    end
 end
 
 function Favourites:GetListByID(listID, isGlobalList)

diff --git a/AtlasLootClassic/Addons/Favourites_GUI.lua b/AtlasLootClassic/Addons/Favourites_GUI.lua
@@ -646,19 +646,16 @@ function GUI:UpdateDropDown()
     local listDb
     local db = Favourites:GetDb()
     if db.activeList[2] == true then
-        listDb = Favourites:GetGlobaleLists()
+        listDb = Favourites:GetGlobaleLists(true)
     else
-        listDb = Favourites:GetProfileLists()
+        listDb = Favourites:GetProfileLists(true)
     end
-    for k,v in pairs(listDb) do
+    for i,v in ipairs(listDb) do
         dataEntrys[ #dataEntrys + 1 ] = {
-            id = k,
-            name = Favourites:GetListName(k, db.activeList[2] == true, true),
-            --coinTexture = tabVal.CoinTexture,
-            tt_title = Favourites:GetListName(k, db.activeList[2] == true, true),
+            id = v.id,
+            name = v.nameIcon,
+            tt_title = v.nameIcon,
         }
-
-        Favourites:GetListName(k, db.activeList[2] == true, true)
     end
 
     self.dropDownData = data

diff --git a/AtlasLootClassic/Data/ContentPhase.lua b/AtlasLootClassic/Data/ContentPhase.lua
@@ -140,49 +140,49 @@ local PHASE_ITEMS = {
 	[22234] = 5, 	[22240] = 5, 	[22241] = 5, 	[22242] = 5, 	[22245] = 5, 	[22247] = 5, 	[22248] = 5, 	[22251] = 5, 	[22252] = 5, 	[22253] = 5, 	[22254] = 5,
 	[22255] = 5, 	[22256] = 5, 	[22257] = 5, 	[22266] = 5, 	[22267] = 5, 	[22268] = 5, 	[22269] = 5, 	[22270] = 5, 	[22271] = 5, 	[22272] = 4, 	[22274] = 4,
 	[22275] = 5, 	[22276] = 5, 	[22277] = 5, 	[22278] = 5, 	[22279] = 5, 	[22280] = 5, 	[22281] = 5, 	[22282] = 5, 	[22301] = 5, 	[22302] = 5, 	[22303] = 5,
-	[22304] = 5, 	[22305] = 5, 	[22306] = 5, 	[22307] = 5, 	[22308] = 5, 	[22310] = 5, 	[22311] = 5, 	[22312] = 5, 	[22313] = 5, 	[22314] = 5, 	[22315] = 5,
-	[22317] = 5, 	[22318] = 5, 	[22319] = 5, 	[22321] = 5, 	[22322] = 5, 	[22325] = 5, 	[22326] = 5, 	[22327] = 5, 	[22328] = 5, 	[22329] = 5, 	[22330] = 5,
-	[22331] = 5, 	[22332] = 5, 	[22333] = 5, 	[22334] = 5, 	[22335] = 5, 	[22336] = 5, 	[22337] = 5, 	[22339] = 5, 	[22340] = 5, 	[22342] = 5, 	[22343] = 5,
-	[22345] = 5, 	[22347] = 5, 	[22348] = 5, 	[22352] = 6, 	[22353] = 6, 	[22354] = 6, 	[22355] = 6, 	[22356] = 6, 	[22357] = 6, 	[22358] = 6, 	[22359] = 6,
-	[22360] = 6, 	[22361] = 6, 	[22362] = 6, 	[22363] = 6, 	[22364] = 6, 	[22365] = 6, 	[22366] = 6, 	[22367] = 6, 	[22368] = 6, 	[22369] = 6, 	[22370] = 6,
-	[22371] = 6, 	[22372] = 6, 	[22377] = 5, 	[22378] = 5, 	[22379] = 5, 	[22380] = 5, 	[22383] = 5, 	[22384] = 5, 	[22385] = 5, 	[22388] = 5, 	[22389] = 5,
-	[22390] = 5, 	[22392] = 5, 	[22393] = 5, 	[22394] = 5, 	[22395] = 5, 	[22396] = 5, 	[22397] = 5, 	[22398] = 5, 	[22399] = 5, 	[22400] = 5, 	[22401] = 5,
-	[22402] = 5, 	[22403] = 5, 	[22404] = 5, 	[22405] = 5, 	[22406] = 5, 	[22407] = 5, 	[22408] = 5, 	[22409] = 5, 	[22410] = 5, 	[22411] = 5, 	[22412] = 5,
-	[22416] = 6, 	[22417] = 6, 	[22418] = 6, 	[22419] = 6, 	[22420] = 6, 	[22421] = 6, 	[22422] = 6, 	[22423] = 6, 	[22424] = 6, 	[22425] = 6, 	[22426] = 6,
-	[22427] = 6, 	[22428] = 6, 	[22429] = 6, 	[22430] = 6, 	[22431] = 6, 	[22433] = 5, 	[22436] = 6, 	[22437] = 6, 	[22438] = 6, 	[22439] = 6, 	[22440] = 6,
-	[22441] = 6, 	[22442] = 6, 	[22443] = 6, 	[22458] = 4, 	[22464] = 6, 	[22465] = 6, 	[22466] = 6, 	[22467] = 6, 	[22468] = 6, 	[22469] = 6, 	[22470] = 6,
-	[22471] = 6, 	[22472] = 5, 	[22476] = 6, 	[22477] = 6, 	[22478] = 6, 	[22479] = 6, 	[22480] = 6, 	[22481] = 6, 	[22482] = 6, 	[22483] = 6, 	[22484] = 6,
-	[22488] = 6, 	[22489] = 6, 	[22490] = 6, 	[22491] = 6, 	[22492] = 6, 	[22493] = 6, 	[22494] = 6, 	[22495] = 6, 	[22496] = 6, 	[22497] = 6, 	[22498] = 6,
-	[22499] = 6, 	[22500] = 6, 	[22501] = 6, 	[22502] = 6, 	[22503] = 6, 	[22504] = 6, 	[22505] = 6, 	[22506] = 6, 	[22507] = 6, 	[22508] = 6, 	[22509] = 6,
-	[22510] = 6, 	[22511] = 6, 	[22512] = 6, 	[22513] = 6, 	[22514] = 6, 	[22515] = 6, 	[22516] = 6, 	[22517] = 6, 	[22518] = 6, 	[22519] = 6, 	[22520] = 6,
-	[22527] = 6, 	[22528] = 5, 	[22529] = 6, 	[22589] = 6, 	[22600] = 6, 	[22601] = 6, 	[22602] = 6, 	[22603] = 6, 	[22604] = 6, 	[22605] = 6, 	[22606] = 6,
-	[22607] = 6, 	[22608] = 6, 	[22609] = 6, 	[22610] = 6, 	[22611] = 6, 	[22612] = 6, 	[22613] = 6, 	[22614] = 6, 	[22615] = 6, 	[22616] = 6, 	[22617] = 6,
-	[22618] = 6, 	[22619] = 6, 	[22620] = 6, 	[22621] = 6, 	[22622] = 6, 	[22623] = 6, 	[22624] = 6, 	[22625] = 6, 	[22626] = 6, 	[22630] = 6, 	[22631] = 6,
-	[22632] = 6, 	[22635] = 6, 	[22636] = 6, 	[22637] = 6, 	[22638] = 6, 	[22652] = 6, 	[22654] = 6, 	[22655] = 6, 	[22656] = 6, 	[22657] = 6, 	[22658] = 6,
-	[22659] = 6, 	[22660] = 6, 	[22661] = 6, 	[22662] = 6, 	[22663] = 6, 	[22664] = 6, 	[22665] = 6, 	[22666] = 6, 	[22667] = 6, 	[22668] = 6, 	[22669] = 6,
-	[22670] = 6, 	[22671] = 6, 	[22672] = 6, 	[22673] = 6, 	[22676] = 6, 	[22678] = 6, 	[22679] = 6, 	[22680] = 6, 	[22681] = 6, 	[22682] = 6, 	[22683] = 5,
-	[22684] = 6, 	[22685] = 6, 	[22686] = 6, 	[22687] = 6, 	[22688] = 6, 	[22689] = 6, 	[22690] = 6, 	[22691] = 6, 	[22692] = 6, 	[22694] = 6, 	[22695] = 6,
-	[22696] = 6, 	[22697] = 6, 	[22698] = 6, 	[22699] = 6, 	[22700] = 6, 	[22701] = 6, 	[22702] = 6, 	[22703] = 6, 	[22704] = 6, 	[22705] = 6, 	[22707] = 6,
-	[22711] = 6, 	[22712] = 6, 	[22713] = 6, 	[22714] = 6, 	[22715] = 6, 	[22716] = 6, 	[22718] = 6, 	[22720] = 6, 	[22721] = 4, 	[22722] = 4, 	[22725] = 6,
-	[22726] = 6, 	[22727] = 6, 	[22730] = 5, 	[22731] = 5, 	[22732] = 5, 	[22733] = 6, 	[22734] = 6, 	[22736] = 6, 	[22737] = 6, 	[22739] = 6, 	[22740] = 6,
-	[22741] = 6, 	[22742] = 6, 	[22743] = 6, 	[22744] = 6, 	[22745] = 6, 	[22747] = 6, 	[22748] = 6, 	[22749] = 6, 	[22750] = 6, 	[22752] = 6, 	[22753] = 6,
-	[22756] = 6, 	[22757] = 6, 	[22758] = 6, 	[22759] = 6, 	[22760] = 6, 	[22761] = 6, 	[22762] = 6, 	[22763] = 6, 	[22764] = 6, 	[22766] = 5, 	[22767] = 5,
-	[22768] = 5, 	[22769] = 5, 	[22770] = 5, 	[22771] = 5, 	[22772] = 5, 	[22773] = 5, 	[22774] = 5, 	[22798] = 6, 	[22799] = 6, 	[22800] = 6, 	[22801] = 6,
-	[22802] = 6, 	[22803] = 6, 	[22804] = 6, 	[22806] = 6, 	[22807] = 6, 	[22808] = 6, 	[22809] = 6, 	[22810] = 6, 	[22811] = 6, 	[22812] = 6, 	[22813] = 6,
-	[22815] = 6, 	[22816] = 6, 	[22818] = 6, 	[22819] = 6, 	[22820] = 6, 	[22821] = 6, 	[22890] = 6, 	[22891] = 6, 	[22897] = 6, 	[22932] = 4, 	[22935] = 6,
-	[22936] = 6, 	[22937] = 6, 	[22938] = 6, 	[22939] = 6, 	[22940] = 6, 	[22941] = 6, 	[22942] = 6, 	[22943] = 6, 	[22947] = 6, 	[22954] = 6, 	[22960] = 6,
-	[22961] = 6, 	[22967] = 6, 	[22968] = 6, 	[22981] = 6, 	[22983] = 6, 	[22988] = 6, 	[22994] = 6, 	[22999] = 6, 	[23000] = 6, 	[23001] = 6, 	[23004] = 6,
-	[23005] = 6, 	[23006] = 6, 	[23009] = 6, 	[23014] = 6, 	[23017] = 6, 	[23018] = 6, 	[23019] = 6, 	[23020] = 6, 	[23021] = 6, 	[23023] = 6, 	[23025] = 6,
-	[23027] = 6, 	[23028] = 6, 	[23029] = 6, 	[23030] = 6, 	[23031] = 6, 	[23032] = 6, 	[23033] = 6, 	[23035] = 6, 	[23036] = 6, 	[23037] = 6, 	[23038] = 6,
-	[23039] = 6, 	[23040] = 6, 	[23041] = 6, 	[23042] = 6, 	[23043] = 6, 	[23044] = 6, 	[23045] = 6, 	[23046] = 6, 	[23047] = 6, 	[23048] = 6, 	[23049] = 6,
-	[23050] = 6, 	[23053] = 6, 	[23054] = 6, 	[23056] = 6, 	[23057] = 6, 	[23059] = 6, 	[23060] = 6, 	[23061] = 6, 	[23062] = 6, 	[23063] = 6, 	[23064] = 6,
-	[23065] = 6, 	[23066] = 6, 	[23067] = 6, 	[23068] = 6, 	[23069] = 6, 	[23070] = 6, 	[23071] = 6, 	[23073] = 6, 	[23075] = 6, 	[23078] = 6, 	[23081] = 6,
-	[23082] = 6, 	[23084] = 6, 	[23085] = 6, 	[23087] = 6, 	[23088] = 6, 	[23089] = 6, 	[23090] = 6, 	[23091] = 6, 	[23092] = 6, 	[23093] = 6, 	[23124] = 6,
-	[23125] = 6, 	[23126] = 6, 	[23127] = 6, 	[23128] = 6, 	[23129] = 6, 	[23132] = 6, 	[23139] = 6, 	[23156] = 6, 	[23168] = 6, 	[23169] = 6, 	[23170] = 6,
-	[23171] = 6, 	[23173] = 6, 	[23177] = 6, 	[23178] = 6, 	[23197] = 6, 	[23198] = 6, 	[23199] = 6, 	[23200] = 6, 	[23201] = 6, 	[23203] = 6, 	[23206] = 6,
-	[23207] = 6, 	[23219] = 6, 	[23220] = 6, 	[23221] = 6, 	[23226] = 6, 	[23237] = 6, 	[23238] = 6, 	[23242] = 6, 	[23320] = 6, 	[23323] = 6, 	[23324] = 6,
-	[23545] = 6, 	[23548] = 6, 	[23557] = 5, 	[23558] = 5, 	[23570] = 5, 	[23577] = 6, 	[23663] = 6, 	[23664] = 6, 	[23665] = 6, 	[23666] = 6, 	[23667] = 6,
-	[23668] = 6, 	[23705] = 6, 	[23709] = 6, 	[23714] = 6, 	[23716] = 6, 	[23794] = 4, 	[23795] = 4, 	[23796] = 4, 	[24101] = 6, 	[24102] = 6, 	[24222] = 6
+	[22304] = 5, 	[22305] = 5, 	[22306] = 5, 	[22308] = 5, 	[22310] = 5, 	[22311] = 5, 	[22312] = 5, 	[22313] = 5, 	[22314] = 5, 	[22315] = 5, 	[22317] = 5,
+	[22318] = 5, 	[22319] = 5, 	[22321] = 5, 	[22322] = 5, 	[22325] = 5, 	[22326] = 5, 	[22327] = 5, 	[22328] = 5, 	[22329] = 5, 	[22330] = 5, 	[22331] = 5,
+	[22332] = 5, 	[22333] = 5, 	[22334] = 5, 	[22335] = 5, 	[22336] = 5, 	[22337] = 5, 	[22339] = 5, 	[22340] = 5, 	[22342] = 5, 	[22343] = 5, 	[22345] = 5,
+	[22347] = 5, 	[22348] = 5, 	[22352] = 6, 	[22353] = 6, 	[22354] = 6, 	[22355] = 6, 	[22356] = 6, 	[22357] = 6, 	[22358] = 6, 	[22359] = 6, 	[22360] = 6,
+	[22361] = 6, 	[22362] = 6, 	[22363] = 6, 	[22364] = 6, 	[22365] = 6, 	[22366] = 6, 	[22367] = 6, 	[22368] = 6, 	[22369] = 6, 	[22370] = 6, 	[22371] = 6,
+	[22372] = 6, 	[22377] = 5, 	[22378] = 5, 	[22379] = 5, 	[22380] = 5, 	[22383] = 5, 	[22384] = 5, 	[22385] = 5, 	[22388] = 5, 	[22389] = 5, 	[22390] = 5,
+	[22392] = 5, 	[22393] = 5, 	[22394] = 5, 	[22395] = 5, 	[22396] = 5, 	[22397] = 5, 	[22398] = 5, 	[22399] = 5, 	[22400] = 5, 	[22401] = 5, 	[22402] = 5,
+	[22403] = 5, 	[22404] = 5, 	[22405] = 5, 	[22406] = 5, 	[22407] = 5, 	[22408] = 5, 	[22409] = 5, 	[22410] = 5, 	[22411] = 5, 	[22412] = 5, 	[22416] = 6,
+	[22417] = 6, 	[22418] = 6, 	[22419] = 6, 	[22420] = 6, 	[22421] = 6, 	[22422] = 6, 	[22423] = 6, 	[22424] = 6, 	[22425] = 6, 	[22426] = 6, 	[22427] = 6,
+	[22428] = 6, 	[22429] = 6, 	[22430] = 6, 	[22431] = 6, 	[22433] = 5, 	[22436] = 6, 	[22437] = 6, 	[22438] = 6, 	[22439] = 6, 	[22440] = 6, 	[22441] = 6,
+	[22442] = 6, 	[22443] = 6, 	[22458] = 4, 	[22464] = 6, 	[22465] = 6, 	[22466] = 6, 	[22467] = 6, 	[22468] = 6, 	[22469] = 6, 	[22470] = 6, 	[22471] = 6,
+	[22472] = 5, 	[22476] = 6, 	[22477] = 6, 	[22478] = 6, 	[22479] = 6, 	[22480] = 6, 	[22481] = 6, 	[22482] = 6, 	[22483] = 6, 	[22484] = 6, 	[22488] = 6,
+	[22489] = 6, 	[22490] = 6, 	[22491] = 6, 	[22492] = 6, 	[22493] = 6, 	[22494] = 6, 	[22495] = 6, 	[22496] = 6, 	[22497] = 6, 	[22498] = 6, 	[22499] = 6,
+	[22500] = 6, 	[22501] = 6, 	[22502] = 6, 	[22503] = 6, 	[22504] = 6, 	[22505] = 6, 	[22506] = 6, 	[22507] = 6, 	[22508] = 6, 	[22509] = 6, 	[22510] = 6,
+	[22511] = 6, 	[22512] = 6, 	[22513] = 6, 	[22514] = 6, 	[22515] = 6, 	[22516] = 6, 	[22517] = 6, 	[22518] = 6, 	[22519] = 6, 	[22520] = 6, 	[22527] = 6,
+	[22528] = 5, 	[22529] = 6, 	[22589] = 6, 	[22600] = 6, 	[22601] = 6, 	[22602] = 6, 	[22603] = 6, 	[22604] = 6, 	[22605] = 6, 	[22606] = 6, 	[22607] = 6,
+	[22608] = 6, 	[22609] = 6, 	[22610] = 6, 	[22611] = 6, 	[22612] = 6, 	[22613] = 6, 	[22614] = 6, 	[22615] = 6, 	[22616] = 6, 	[22617] = 6, 	[22618] = 6,
+	[22619] = 6, 	[22620] = 6, 	[22621] = 6, 	[22622] = 6, 	[22623] = 6, 	[22624] = 6, 	[22625] = 6, 	[22626] = 6, 	[22630] = 6, 	[22631] = 6, 	[22632] = 6,
+	[22635] = 6, 	[22636] = 6, 	[22637] = 6, 	[22638] = 6, 	[22652] = 6, 	[22654] = 6, 	[22655] = 6, 	[22656] = 6, 	[22657] = 6, 	[22658] = 6, 	[22659] = 6,
+	[22660] = 6, 	[22661] = 6, 	[22662] = 6, 	[22663] = 6, 	[22664] = 6, 	[22665] = 6, 	[22666] = 6, 	[22667] = 6, 	[22668] = 6, 	[22669] = 6, 	[22670] = 6,
+	[22671] = 6, 	[22672] = 6, 	[22673] = 6, 	[22676] = 6, 	[22678] = 6, 	[22679] = 6, 	[22680] = 6, 	[22681] = 6, 	[22682] = 6, 	[22683] = 5, 	[22684] = 6,
+	[22685] = 6, 	[22686] = 6, 	[22687] = 6, 	[22688] = 6, 	[22689] = 6, 	[22690] = 6, 	[22691] = 6, 	[22692] = 6, 	[22694] = 6, 	[22695] = 6, 	[22696] = 6,
+	[22697] = 6, 	[22698] = 6, 	[22699] = 6, 	[22700] = 6, 	[22701] = 6, 	[22702] = 6, 	[22703] = 6, 	[22704] = 6, 	[22705] = 6, 	[22707] = 6, 	[22711] = 6,
+	[22712] = 6, 	[22713] = 6, 	[22714] = 6, 	[22715] = 6, 	[22716] = 6, 	[22718] = 6, 	[22720] = 6, 	[22721] = 4, 	[22722] = 4, 	[22725] = 6, 	[22726] = 6,
+	[22727] = 6, 	[22730] = 5, 	[22731] = 5, 	[22732] = 5, 	[22733] = 6, 	[22734] = 6, 	[22736] = 6, 	[22737] = 6, 	[22739] = 6, 	[22740] = 6, 	[22741] = 6,
+	[22742] = 6, 	[22743] = 6, 	[22744] = 6, 	[22745] = 6, 	[22747] = 6, 	[22748] = 6, 	[22749] = 6, 	[22750] = 6, 	[22752] = 6, 	[22753] = 6, 	[22756] = 6,
+	[22757] = 6, 	[22758] = 6, 	[22759] = 6, 	[22760] = 6, 	[22761] = 6, 	[22762] = 6, 	[22763] = 6, 	[22764] = 6, 	[22766] = 5, 	[22767] = 5, 	[22768] = 5,
+	[22769] = 5, 	[22770] = 5, 	[22771] = 5, 	[22772] = 5, 	[22773] = 5, 	[22774] = 5, 	[22798] = 6, 	[22799] = 6, 	[22800] = 6, 	[22801] = 6, 	[22802] = 6,
+	[22803] = 6, 	[22804] = 6, 	[22806] = 6, 	[22807] = 6, 	[22808] = 6, 	[22809] = 6, 	[22810] = 6, 	[22811] = 6, 	[22812] = 6, 	[22813] = 6, 	[22815] = 6,
+	[22816] = 6, 	[22818] = 6, 	[22819] = 6, 	[22820] = 6, 	[22821] = 6, 	[22890] = 6, 	[22891] = 6, 	[22897] = 6, 	[22932] = 4, 	[22935] = 6, 	[22936] = 6,
+	[22937] = 6, 	[22938] = 6, 	[22939] = 6, 	[22940] = 6, 	[22941] = 6, 	[22942] = 6, 	[22943] = 6, 	[22947] = 6, 	[22954] = 6, 	[22960] = 6, 	[22961] = 6,
+	[22967] = 6, 	[22968] = 6, 	[22981] = 6, 	[22983] = 6, 	[22988] = 6, 	[22994] = 6, 	[22999] = 6, 	[23000] = 6, 	[23001] = 6, 	[23004] = 6, 	[23005] = 6,
+	[23006] = 6, 	[23009] = 6, 	[23014] = 6, 	[23017] = 6, 	[23018] = 6, 	[23019] = 6, 	[23020] = 6, 	[23021] = 6, 	[23023] = 6, 	[23025] = 6, 	[23027] = 6,
+	[23028] = 6, 	[23029] = 6, 	[23030] = 6, 	[23031] = 6, 	[23032] = 6, 	[23033] = 6, 	[23035] = 6, 	[23036] = 6, 	[23037] = 6, 	[23038] = 6, 	[23039] = 6,
+	[23040] = 6, 	[23041] = 6, 	[23042] = 6, 	[23043] = 6, 	[23044] = 6, 	[23045] = 6, 	[23046] = 6, 	[23047] = 6, 	[23048] = 6, 	[23049] = 6, 	[23050] = 6,
+	[23053] = 6, 	[23054] = 6, 	[23056] = 6, 	[23057] = 6, 	[23059] = 6, 	[23060] = 6, 	[23061] = 6, 	[23062] = 6, 	[23063] = 6, 	[23064] = 6, 	[23065] = 6,
+	[23066] = 6, 	[23067] = 6, 	[23068] = 6, 	[23069] = 6, 	[23070] = 6, 	[23071] = 6, 	[23073] = 6, 	[23075] = 6, 	[23078] = 6, 	[23081] = 6, 	[23082] = 6,
+	[23084] = 6, 	[23085] = 6, 	[23087] = 6, 	[23088] = 6, 	[23089] = 6, 	[23090] = 6, 	[23091] = 6, 	[23092] = 6, 	[23093] = 6, 	[23124] = 6, 	[23125] = 6,
+	[23126] = 6, 	[23127] = 6, 	[23128] = 6, 	[23129] = 6, 	[23132] = 6, 	[23139] = 6, 	[23156] = 6, 	[23168] = 6, 	[23169] = 6, 	[23170] = 6, 	[23171] = 6,
+	[23173] = 6, 	[23177] = 6, 	[23178] = 6, 	[23197] = 6, 	[23198] = 6, 	[23199] = 6, 	[23200] = 6, 	[23201] = 6, 	[23203] = 6, 	[23206] = 6, 	[23207] = 6,
+	[23219] = 6, 	[23220] = 6, 	[23221] = 6, 	[23226] = 6, 	[23237] = 6, 	[23238] = 6, 	[23242] = 6, 	[23320] = 6, 	[23323] = 6, 	[23324] = 6, 	[23545] = 6,
+	[23548] = 6, 	[23557] = 5, 	[23558] = 5, 	[23570] = 5, 	[23577] = 6, 	[23663] = 6, 	[23664] = 6, 	[23665] = 6, 	[23666] = 6, 	[23667] = 6, 	[23668] = 6,
+	[23705] = 6, 	[23709] = 6, 	[23714] = 6, 	[23716] = 6, 	[23794] = 4, 	[23795] = 4, 	[23796] = 4, 	[24101] = 6, 	[24102] = 6, 	[24222] = 6
 }
 --##END-DATA##
 PHASE_ITEMS[0] = 0

diff --git a/AtlasLootClassic/Documentation/Release_Notes.md b/AtlasLootClassic/Documentation/Release_Notes.md
@@ -2,6 +2,13 @@
 
 This mod is distributed under Version 2 of the GPL.  A copy of the GPL is included in this zip file with links to non-english translations.
 
+## v1.4.3 (Dec. 15, 2019)
+
+- Update content phases
+- Update much crafting min skill
+- Fix alliance druid rare pvp set
+- Fix lua error when in combat
+
 ## v1.4.2 (Dec. 11, 2019)
 
 - Set Phase 2.5

diff --git a/AtlasLootClassic_DungeonsAndRaids/data.lua b/AtlasLootClassic_DungeonsAndRaids/data.lua
@@ -1964,7 +1964,7 @@ data["Zul'Farrak"] = {
 	AtlasMapFile = "ZulFarrak",
 	ContentType = DUNGEON_CONTENT,
 	LoadDifficulty = NORMAL_DIFF,
-	LevelRange = {39, 42, 46},
+	LevelRange = {39, 44, 54},
 	items = {
 		{ -- ZFAntusul
 			name = AL["Antu'sul"],
@@ -3652,7 +3652,7 @@ data["DireMaulWest"] = {
 	AtlasMapFile = {"DireMaulWest", "DireMaulEnt"},
 	ContentType = DUNGEON_CONTENT,
 	LoadDifficulty = NORMAL_DIFF,
-	LevelRange = {31, 55, 60},
+	LevelRange = {31, 58, 60},
 	items = {
 		{ -- DMWTendrisWarpwood
 			name = AL["Tendris Warpwood"],
@@ -3803,7 +3803,7 @@ data["DireMaulNorth"] = {
 	AtlasMapFile = {"DireMaulNorth", "DireMaulEnt"},
 	ContentType = DUNGEON_CONTENT,
 	LoadDifficulty = NORMAL_DIFF,
-	LevelRange = {31, 55, 60},
+	LevelRange = {31, 58, 60},
 	items = {
 		{ -- DMNGuardMoldar
 			name = AL["Guard Mol'dar"],
@@ -4468,8 +4468,8 @@ data["Stratholme"] = {
 		32319, 32320, 32367, 32331, 32357, 32281, 32285, 32277,
 		-- Undead
 		32342, 32322, 32303, 32301, 32352,
-			-- Ziggurats
-			32344, 32345, 32349,
+		-- Ziggurats
+		32344, 32345, 32349,
 	},
 	AtlasMapID = "Stratholme",
 	AtlasMapFile = "Stratholme",