Merge branch 'development'

Hoizame · Feb 12, 2020 · 751d529 · 751d529
2 parents 349504a + f37b332
commit 751d529
Show file tree

Hide file tree

Showing 6 changed files with 1,374 additions and 1,402 deletions.
diff --git a/AtlasLootClassic/Data/ContentPhase.lua b/AtlasLootClassic/Data/ContentPhase.lua
diff --git a/AtlasLootClassic/Documentation/Release_Notes.md b/AtlasLootClassic/Documentation/Release_Notes.md
@@ -2,6 +2,10 @@
 
 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.5 (Jan. 16, 2020)
+
+- Update translations
+
 ## v1.4.4 (Dec. 24, 2019)
 
 - Favourites lists are now sorted by name

diff --git a/AtlasLootClassic_Data/source.lua b/AtlasLootClassic_Data/source.lua
@@ -2149,9 +2149,9 @@ local SOURCE_DATA = {
 		[17754] = {16,5,1},
 		[17755] = {16,5,1},
 		[17757] = {16,12,1},
-		[17761] = {16,15,1},
+		[17761] = {16,13,1},
 		[17762] = {16,14,1},
-		[17763] = {16,13,1},
+		[17763] = {16,15,1},
 		[17764] = {16,4,1},
 		[17765] = {16,1,1},
 		[17766] = {16,11,1},

diff --git a/AtlasLootClassic_DungeonsAndRaids/data.lua b/AtlasLootClassic_DungeonsAndRaids/data.lua
@@ -2283,16 +2283,16 @@ data["Maraudon"] = {
 				{ 1,  17757 }, -- Amulet of Spirits
 			},
 		},
-		{ -- MaraKhanMagra
-			name = AL["Magra"],
-			npcID = 13740,
-			DisplayIDs = {{9433}},
+		{ -- MaraKhanKolk
+			name = AL["Kolk"],
+			npcID = 13742,
+			DisplayIDs = {{4860}},
 			AtlasMapFile = "MaraudonEnt",
 			AtlasMapBossID = "*1",
 			ExtraList = true,
 			specialType = "quest",
 			[NORMAL_DIFF] = {
-				{ 1,  17763 }, -- Gem of the Third Khan
+				{ 1,  17761 }, -- Gem of the First Khan
 			},
 		},
 		{ -- MaraKhanGelk
@@ -2307,16 +2307,16 @@ data["Maraudon"] = {
 				{ 1,  17762 }, -- Gem of the Second Khan
 			},
 		},
-		{ -- MaraKhanKolk
-			name = AL["Kolk"],
-			npcID = 13742,
-			DisplayIDs = {{4860}},
+		{ -- MaraKhanMagra
+			name = AL["Magra"],
+			npcID = 13740,
+			DisplayIDs = {{9433}},
 			AtlasMapFile = "MaraudonEnt",
 			AtlasMapBossID = "*3",
 			ExtraList = true,
 			specialType = "quest",
 			[NORMAL_DIFF] = {
-				{ 1,  17761 }, -- Gem of the First Khan
+				{ 1,  17763 }, -- Gem of the Third Khan
 			},
 		},
 	},
@@ -7004,4 +7004,4 @@ data["Naxxramas"] = {
 		},
 		T3_SET,
 	},
-}
+}