Merge branch 'development'

Hoizame · Jul 10, 2020 · 2d6cc0b · 2d6cc0b
2 parents 6045b15 + 80fc261
commit 2d6cc0b
Show file tree

Hide file tree

Showing 11 changed files with 1,628 additions and 1,625 deletions.
diff --git a/AtlasLootClassic/AtlasLootClassic.toc b/AtlasLootClassic/AtlasLootClassic.toc
@@ -1,4 +1,4 @@
-## Interface: 11304
+## Interface: 11305
 ## Author: Lag
 ## Version: @project-version@
 ## SavedVariables: AtlasLootClassicDB

diff --git a/AtlasLootClassic/Data/ContentPhase.lua b/AtlasLootClassic/Data/ContentPhase.lua
@@ -76,30 +76,30 @@ local PHASE_ITEMS = {
 	[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] = 4, 	[22638] = 6, 	[22651] = 6, 	[22652] = 6, 	[22654] = 6, 	[22655] = 6, 	[22656] = 6, 	[22657] = 6, 	[22658] = 6, 	[22659] = 6, 	[22660] = 5,
-	[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, 	[22712] = 4, 	[22713] = 4,
-	[22714] = 4, 	[22715] = 4, 	[22725] = 6, 	[22726] = 6, 	[22727] = 6, 	[22730] = 5, 	[22731] = 5, 	[22732] = 5, 	[22733] = 6, 	[22734] = 6, 	[22736] = 6,
-	[22737] = 6, 	[22739] = 4, 	[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] = 5, 	[22757] = 6, 	[22758] = 6, 	[22759] = 5, 	[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, 	[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] = 0, 	[23324] = 0, 	[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, 	[24101] = 6, 	[24102] = 6, 	[24222] = 6
+	[22638] = 6, 	[22651] = 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, 	[22712] = 4, 	[22713] = 4, 	[22715] = 4,
+	[22725] = 6, 	[22726] = 6, 	[22727] = 6, 	[22730] = 5, 	[22731] = 5, 	[22732] = 5, 	[22733] = 6, 	[22734] = 6, 	[22736] = 6, 	[22737] = 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, 	[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] = 0, 	[23324] = 0, 	[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, 	[24101] = 6, 	[24102] = 6, 	[24222] = 6
 }
 --##END-DATA##
 PHASE_ITEMS[0] = 0

diff --git a/AtlasLootClassic_Collections/AtlasLootClassic_Collections.toc b/AtlasLootClassic_Collections/AtlasLootClassic_Collections.toc
@@ -1,4 +1,4 @@
-## Interface: 11304
+## Interface: 11305
 ## Author: Lag
 ## Version: @project-version@
 ## Dependencies: AtlasLootClassic

diff --git a/AtlasLootClassic_Crafting/AtlasLootClassic_Crafting.toc b/AtlasLootClassic_Crafting/AtlasLootClassic_Crafting.toc
@@ -1,4 +1,4 @@
-## Interface: 11304
+## Interface: 11305
 ## Author: Lag
 ## Version: @project-version@
 ## Dependencies: AtlasLootClassic

diff --git a/AtlasLootClassic_Data/AtlasLootClassic_Data.toc b/AtlasLootClassic_Data/AtlasLootClassic_Data.toc
@@ -1,4 +1,4 @@
-## Interface: 11304
+## Interface: 11305
 ## Author: Lag
 ## Version: @project-version@
 ## Dependencies: AtlasLootClassic

diff --git a/AtlasLootClassic_DungeonsAndRaids/AtlasLootClassic_DungeonsAndRaids.toc b/AtlasLootClassic_DungeonsAndRaids/AtlasLootClassic_DungeonsAndRaids.toc
@@ -1,4 +1,4 @@
-## Interface: 11304
+## Interface: 11305
 ## Author: Lag
 ## Version: @project-version@
 ## Dependencies: AtlasLootClassic