Merge branch 'development'

Hoizame · Dec 15, 2019 · b0a378f · b0a378f
2 parents f8fc68a + 3594bb0
commit b0a378f
Show file tree

Hide file tree

Showing 7 changed files with 216 additions and 202 deletions.
diff --git a/AtlasLootClassic/Data/ContentPhase.lua b/AtlasLootClassic/Data/ContentPhase.lua
diff --git a/AtlasLootClassic/Data/Profession.lua b/AtlasLootClassic/Data/Profession.lua
diff --git a/AtlasLootClassic/Documentation/Release_Notes.md b/AtlasLootClassic/Documentation/Release_Notes.md
@@ -2,6 +2,12 @@
 
 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.2 (Dec. 11, 2019)
+
+- Set Phase 2.5
+- Add PvP Ranks overview
+- Fix missing random enchants on gear
+
 ## v1.4.1 (Dec. 02, 2019)
 
 - Items for Sets now show PvP Rank requirements

diff --git a/AtlasLootClassic/GUI/GUI.lua b/AtlasLootClassic/GUI/GUI.lua
@@ -31,6 +31,7 @@ local db
 
 local function UpdateFrames(noPageUpdate, forceContentUpdate)
 	local moduleData = AtlasLoot.ItemDB:Get(db.selected[1])
+	if not moduleData then return end
 	local dataID = db.selected[2]
 	local bossID = db.selected[3]
 	if not GUI.frame.contentFrame.shownFrame then

diff --git a/AtlasLootClassic/ItemDB/ItemDB.lua b/AtlasLootClassic/ItemDB/ItemDB.lua
@@ -70,7 +70,7 @@ function ItemDB:Add(addonName, tierID)
 end
 
 function ItemDB:Get(addonName)
-	assert(ItemDB.Storage[addonName], addonName.." not found!")
+	--assert(ItemDB.Storage[addonName], addonName.." not found!")
 	return ItemDB.Storage[addonName]
 end
 

diff --git a/AtlasLootClassic_PvP/data.lua b/AtlasLootClassic_PvP/data.lua
@@ -739,7 +739,7 @@ data["ClassSets"] = {
 				{ 3, 549 }, -- Priest
 				{ 16, 546 }, -- Mage
 				{ 5, 548 }, -- Rogue
-				{ 20, 539 }, -- Druid
+				{ 20, 551 }, -- Druid
 				{ 7, 550 }, -- Hunter
 				{ 9, 545 }, -- Warrior
 				{ 24, 544 }, -- Paladin

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,8 +4,9 @@ This mod is distributed under Version 2 of the GPL.  A copy of the GPL is includ
 
 [Changelog history](https://github.com/Hoizame/AtlasLootClassic/blob/master/AtlasLootClassic/Documentation/Release_Notes.md)
 
-## v1.4.2 (Dec. 11, 2019)
+## v1.4.3 (Dec. 15, 2019)
 
-- Set Phase 2.5
-- Add PvP Ranks overview
-- Fix missing random enchants on gear
+- Update content phases
+- Update much crafting min skill
+- Fix alliance druid rare pvp set
+- Fix lua error when in combat