From 2242fc437bc6bd14de207a72ac8e887998f45045 Mon Sep 17 00:00:00 2001
From: Lexie <6937574+Lexiebean@users.noreply.github.com>
Date: Wed, 25 Jan 2023 23:03:10 +1100
Subject: [PATCH] Added many missing things

* Steel Plate added to Blacksmithing
* Intact Pounder Mainframe added to Gnomer
* Schematic: Hypertech Battery Pack added to Gnomer
* Missing rare trash drops from Maraudon
* Missing rare trash drops from Crescent Grove
* Missing epic trash drops from Molten Core
* Missing Talisman of Binding Shard from Garr
* Missing custom items from the Abyssal Council
* Missing custom items from the Elemental Invasion
* Added Concavius
---
 AtlasLoot.toc                   |   3 +-
 Core/AtlasLoot.lua              |  66 ++++++++++++++++++++-
 Core/ButtonRegistry.lua         |   5 ++
 Core/Crafting.lua               |  23 ++++---
 Core/Spells.lua                 |  93 +++++++++++++++++++++++++++++
 Core/TextParsing.lua            |   2 +
 Crafting/crafting.en.lua        |  26 ++++++--
 Instances/instances.en.lua      | 102 +++++++++++++++++++-------------
 Locale/locale.en.lua            |   2 +
 TableRegister/loottables.en.lua |   3 +
 WorldBosses/worldbosses.en.lua  |  35 +++++++++++
 WorldEvents/worldevents.lua     |  42 +++++++------
 12 files changed, 329 insertions(+), 73 deletions(-)

diff --git a/AtlasLoot.toc b/AtlasLoot.toc
index f4554ab..32f222f 100644
--- a/AtlasLoot.toc
+++ b/AtlasLoot.toc
@@ -2,7 +2,8 @@
 ## Title: AtlasLoot TW Edition
 ## Notes: Shows the possible loot from the bosses
 ## Author: Daviesh, Pompa (Turtle WoW World Bosses), Xerron (Turtle WoW World Bosses), Gurky (Turtle WoW 1.16/1.16.1 Dungeons), |cffbe5effLexie|r
-## Version: 1.0.5
+## Version: 1.0.6
+## SavedVariables: AtlasLoot_updateavailable
 ## SavedVariablesPerCharacter: AtlasLootCharDB
 ## OptionalDeps: Alphamap, AtlasLoader, LootLink, ItemSync, DewdropLib, Ace2, EquipCompare, EQCompare
 
diff --git a/Core/AtlasLoot.lua b/Core/AtlasLoot.lua
index 7489b91..6b9d310 100644
--- a/Core/AtlasLoot.lua
+++ b/Core/AtlasLoot.lua
@@ -69,7 +69,7 @@ local AL = AceLibrary("AceLocale-2.2"):new("AtlasLoot");
 --Establish version number and compatible version of Atlas
 local VERSION_MAJOR = "1";
 local VERSION_MINOR = "0";
-local VERSION_BOSSES = "5";
+local VERSION_BOSSES = "6";
 ATLASLOOT_VERSION = "|cffFF8400AtlasLoot TW Edition v"..VERSION_MAJOR.."."..VERSION_MINOR.."."..VERSION_BOSSES.."|r";
 ATLASLOOT_CURRENT_ATLAS = "1.12.0";
 ATLASLOOT_PREVIEW_ATLAS = "1.12.1";
@@ -2536,6 +2536,7 @@ AtlasLoot_DewDropDown_SubTables = {
 		{ AL["High Priestess A'lathea"], "TCGHighPriestessAlathea" },
 		{ AL["Fenektis the Deceiver"], "TCGFenektistheDeceiver" },
 		{ AL["Master Raxxieth"], "TCGMasterRaxxieth" },
+		{ AL["Trash Mobs"], "TCGTrash" },
 	},
 	["Gnomeregan"] = {
 		{ AL["Grubbis"], "GnGrubbis" },
@@ -2773,6 +2774,7 @@ AtlasLoot_DewDropDown_SubTables = {
 		{ AL["Tinkerer Gizlock"], "MaraTinkererGizlock" },
 		{ AL["Rotgrip"], "MaraRotgrip" },
 		{ AL["Princess Theradras"], "MaraPrincessTheradras" },
+		{ AL["Trash Mobs"], "MaraTrash" },
 	},
 	["Onyxia"] = {
 		{ AL["Onyxia"], "Onyxia" },
@@ -2864,6 +2866,7 @@ AtlasLoot_DewDropDown_SubTables = {
 		{ "Nerubian Overseer", "Nerubian" },
 		{ "Dark Reaver of Karazhan", "Reaver" },
 		{ "Ostarius", "Ostarius" },
+		{ "Concavius", "Concavius" },
 	},
 	["RareSpawns"] = {
 		{ "Tarangos The Dampener", "Tarangos" },
@@ -2915,6 +2918,7 @@ AtlasLoot_DewDropDown_SubTables = {
 		{ AtlasLoot_TableNames["WorldEpics1"][1], "WorldEpics1" },
 	},
 	["CraftSetBlacksmith"] = {
+		{ AL["Steel Plate"], "SteelPlate" },
 		{ AL["Imperial Plate"], "ImperialPlate" },
 		{ AL["The Darksoul"], "TheDarksoul" },
 		{ AL["Bloodsoul Embrace"], "BloodsoulEmbrace" },
@@ -3678,3 +3682,63 @@ function AtlasLoot_GetChatLink(id)
 	local e = string.sub(d, 2)
 	return "\124"..e.."\124H"..b.."\124h["..a.."]\124h\124r"
 end
+
+--pfUI.api.strsplit
+local function AtlasLoot_strsplit(delimiter, subject)
+  if not subject then return nil end
+  local delimiter, fields = delimiter or ":", {}
+  local pattern = string.format("([^%s]+)", delimiter)
+  string.gsub(subject, pattern, function(c) fields[table.getn(fields)+1] = c end)
+  return unpack(fields)
+end
+
+--Update announcing code taken from pfUI
+local major, minor, fix = AtlasLoot_strsplit(".", tostring(GetAddOnMetadata("AtlasLoot", "Version")))
+
+local alreadyshown = false
+local localversion  = tonumber(major*10000 + minor*100 + fix)
+local remoteversion = tonumber(AtlasLoot_updateavailable) or 0
+local loginchannels = { "BATTLEGROUND", "RAID", "GUILD" }
+local groupchannels = { "BATTLEGROUND", "RAID" }
+  
+AtlasLoot_updater = CreateFrame("Frame")
+AtlasLoot_updater:RegisterEvent("CHAT_MSG_ADDON")
+AtlasLoot_updater:RegisterEvent("PLAYER_ENTERING_WORLD")
+AtlasLoot_updater:RegisterEvent("PARTY_MEMBERS_CHANGED")
+AtlasLoot_updater:SetScript("OnEvent", function()
+	if event == "CHAT_MSG_ADDON" and arg1 == "AtlasLoot" then
+		local v, remoteversion = AtlasLoot_strsplit(":", arg2)
+		local remoteversion = tonumber(remoteversion)
+		if v == "VERSION" and remoteversion then
+			if remoteversion > localversion then
+				AtlasLoot_updateavailable = remoteversion
+				if not alreadyshown then
+					DEFAULT_CHAT_FRAME:AddMessage("|cffbe5eff[AtlasLoot]|r New version available! https://github.com/Lexiebean/AtlasLoot/")
+					alreadyshown = true
+				end
+			end
+		end
+	end
+
+	if event == "PARTY_MEMBERS_CHANGED" then
+		local groupsize = GetNumRaidMembers() > 0 and GetNumRaidMembers() or GetNumPartyMembers() > 0 and GetNumPartyMembers() or 0
+		if ( this.group or 0 ) < groupsize then
+			for _, chan in pairs(groupchannels) do
+				SendAddonMessage("AtlasLoot", "VERSION:" .. localversion, chan)
+			end
+		end
+		this.group = groupsize
+	end
+
+    if event == "PLAYER_ENTERING_WORLD" then
+      if not alreadyshown and localversion < remoteversion then
+        DEFAULT_CHAT_FRAME:AddMessage("|cffbe5eff[AtlasLoot]|r New version available! https://github.com/Lexiebean/AtlasLoot/")
+        AtlasLoot_updateavailable = localversion
+        alreadyshown = true
+      end
+
+      for _, chan in pairs(loginchannels) do
+        SendAddonMessage("AtlasLoot", "VERSION:" .. localversion, chan)
+      end
+    end
+  end)
diff --git a/Core/ButtonRegistry.lua b/Core/ButtonRegistry.lua
index 42b9b4d..46d8023 100644
--- a/Core/ButtonRegistry.lua
+++ b/Core/ButtonRegistry.lua
@@ -904,6 +904,11 @@ AtlasLoot_ButtonRegistry = {
         Back_Page = "PRE60SET";
         Back_Title = AL["Pre 60 Sets"];
     };
+    ["SteelPlate"] = {
+        Title = AL["Steel Plate"];
+        Back_Page = "CRAFTSET";
+        Back_Title = AL["Crafted Sets"];
+    };
     ["ImperialPlate"] = {
         Title = AL["Imperial Plate"];
         Back_Page = "CRAFTSET";
diff --git a/Core/Crafting.lua b/Core/Crafting.lua
index e2b97ce..0fe12c3 100644
--- a/Core/Crafting.lua
+++ b/Core/Crafting.lua
@@ -168,18 +168,25 @@ function AtlasLootCraftedSetMenu()
 	AtlasLootMenuItem_11_Icon:SetTexture("Interface\\Icons\\INV_Chest_Plate10");
 	AtlasLootMenuItem_11.isheader = true;
 	AtlasLootMenuItem_11:Show();
-	--Imperial Plate
-	AtlasLootMenuItem_12_Name:SetText(AL["Imperial Plate"]);
+	--Steel Plate
+	AtlasLootMenuItem_12_Name:SetText(AL["Steel Plate"]);
 	AtlasLootMenuItem_12_Extra:SetText("");
-	AtlasLootMenuItem_12_Icon:SetTexture("Interface\\Icons\\INV_Belt_01");
-	AtlasLootMenuItem_12.lootpage="ImperialPlate";
+	AtlasLootMenuItem_12_Icon:SetTexture("Interface\\Icons\\INV_Helmet_25");
+	AtlasLootMenuItem_12.lootpage="SteelPlate";
 	AtlasLootMenuItem_12:Show();
-	--The Darksoul
-	AtlasLootMenuItem_13_Name:SetText(AL["The Darksoul"]);
+	--Imperial Plate
+	AtlasLootMenuItem_13_Name:SetText(AL["Imperial Plate"]);
 	AtlasLootMenuItem_13_Extra:SetText("");
-	AtlasLootMenuItem_13_Icon:SetTexture("Interface\\Icons\\INV_Shoulder_01");
-	AtlasLootMenuItem_13.lootpage="TheDarksoul";
+	AtlasLootMenuItem_13_Icon:SetTexture("Interface\\Icons\\INV_Belt_01");
+	AtlasLootMenuItem_13.lootpage="ImperialPlate";
 	AtlasLootMenuItem_13:Show();
+	--The Darksoul
+	AtlasLootMenuItem_14_Name:SetText(AL["The Darksoul"]);
+	AtlasLootMenuItem_14_Extra:SetText("");
+	AtlasLootMenuItem_14_Icon:SetTexture("Interface\\Icons\\INV_Shoulder_01");
+	AtlasLootMenuItem_14.lootpage="TheDarksoul";
+	AtlasLootMenuItem_14:Show();
+	AtlasLootMenuItem_14:Show();
 		--Leatherworking Leather Header
 	AtlasLootMenuItem_16_Name:SetText(RED..AL["Leatherworking"]);
 	AtlasLootMenuItem_16_Extra:SetText(WHITE..AL["Leather"]);
diff --git a/Core/Spells.lua b/Core/Spells.lua
index 1793e0d..64037bd 100644
--- a/Core/Spells.lua
+++ b/Core/Spells.lua
@@ -1823,6 +1823,99 @@ GetSpellInfoVanillaDB = {
 				[7] = {17010, 10},
 			},
 		},
+		[46626] = {
+			["name"] = "Blacksmithing: Steel Plate Boots",
+			["requires"] = AL["Black Anvil"],
+			["tools"] = {5956},
+			["castTime"] = 10,
+			["text"] = "",
+			["craftItem"] = 83410,
+			["craftQuantityMin"] = "",
+			["craftQuantityMax"] = "",
+			["reagents"] = {
+				[1] = {3859, 14},
+				[2] = {7966, 2},
+			},
+		},
+		[46627] = {
+			["name"] = "Blacksmithing: Steel Plate Gauntlets",
+			["requires"] = AL["Black Anvil"],
+			["tools"] = {5956},
+			["castTime"] = 10,
+			["text"] = "",
+			["craftItem"] = 83411,
+			["craftQuantityMin"] = "",
+			["craftQuantityMax"] = "",
+			["reagents"] = {
+				[1] = {3859, 16},
+				[2] = {7966, 4},
+			},
+		},
+		[46628] = {
+			["name"] = "Blacksmithing: Steel Plate Legguards",
+			["requires"] = AL["Black Anvil"],
+			["tools"] = {5956},
+			["castTime"] = 10,
+			["text"] = "",
+			["craftItem"] = 83412,
+			["craftQuantityMin"] = "",
+			["craftQuantityMax"] = "",
+			["reagents"] = {
+				[1] = {3859, 18},
+				[2] = {7966, 2},
+				[3] = {3864},
+			},
+		},
+		[46629] = {
+			["name"] = "Blacksmithing: Steel Plate Armor",
+			["requires"] = AL["Black Anvil"],
+			["tools"] = {5956},
+			["castTime"] = 10,
+			["text"] = "",
+			["craftItem"] = 83413,
+			["craftQuantityMin"] = "",
+			["craftQuantityMax"] = "",
+			["reagents"] = {
+				[1] = {3859, 20},
+				[2] = {7966, 4},
+				[3] = {3864},
+				[4] = {1705},
+			},
+		},
+		[46630] = {
+			["name"] = "Blacksmithing: Steel Plate Pauldrons",
+			["requires"] = AL["Black Anvil"],
+			["tools"] = {5956},
+			["castTime"] = 10,
+			["text"] = "",
+			["craftItem"] = 83414,
+			["craftQuantityMin"] = "",
+			["craftQuantityMax"] = "",
+			["reagents"] = {
+				[1] = {3859, 20},
+				[2] = {7966, 3},
+				[3] = {3864},
+				[4] = {6037},
+			},
+		},
+		[46631] = {
+			["name"] = "Blacksmithing: Steel Plate Barbute",
+			["requires"] = AL["Black Anvil"],
+			["tools"] = {5956},
+			["castTime"] = 10,
+			["text"] = "",
+			["craftItem"] = 83415,
+			["craftQuantityMin"] = "",
+			["craftQuantityMax"] = "",
+			["reagents"] = {
+				[1] = {3859, 10},
+				[2] = {6037, 8},
+				[3] = {3864, 4},
+				[4] = {7966, 3},
+				[5] = {7909, 2},
+				[6] = {7922},
+			},
+		},
 		[13028] = {
 			["name"] = "Cooking: Goldthorn Tea",
 			["requires"] = AL["Cooking Fire"],
diff --git a/Core/TextParsing.lua b/Core/TextParsing.lua
index 4762056..5ad535d 100644
--- a/Core/TextParsing.lua
+++ b/Core/TextParsing.lua
@@ -189,6 +189,7 @@ function AtlasLoot_FixText(text)
     text = gsub(text, "#m38#", AL["Coin"]);
     text = gsub(text, "#m39#", AL["Bijou"]);
     text = gsub(text, "#m40#", AL["Doll"]);
+	text = gsub(text, "#m41#", AL["(250)"]);
 	
 	-- Random names
     text = gsub(text, "#x1#", AL["Lord Cobrahn"]);
@@ -311,6 +312,7 @@ function AtlasLoot_FixText(text)
     -- Blacksmithing Crafted Sets
     text = gsub(text, "#craftbp1#", AL["Imperial Plate"]);
     text = gsub(text, "#craftbp2#", AL["The Darksoul"]);
+	text = gsub(text, "#craftbp3#", AL["Steel Plate"]);
     text = gsub(text, "#craftbm1#", AL["Bloodsoul Embrace"]);
 
     -- Tailoring Crafted Sets
diff --git a/Crafting/crafting.en.lua b/Crafting/crafting.en.lua
index 5607946..8c63d3f 100644
--- a/Crafting/crafting.en.lua
+++ b/Crafting/crafting.en.lua
@@ -31,6 +31,18 @@ AtlasLoot_Data["AtlasLootCrafting"] = {
 --- Blacksmithing Plate Sets ---
 --------------------------------
 
+	SteelPlate = {
+		{ 0, "", "", "" },
+		{ 0, "INV_Box_01", "=q6=#craftbp3#", "" },
+		{ 0, "", "", "" },
+		{ 83415, "INV_Helmet_25", "=q3=Steel Plate Barbute", "=ds=#s1#, #a4#" },
+		{ 83414, "INV_Shoulder_16", "=q2=Steel Plate Pauldrons", "=ds=#s3#, #a4#" },
+		{ 83413, "inv_chest_chain_10", "=q3=Steel Plate Armor", "=ds=#s5#, #a4#" },
+		{ 83411, "inv_gauntlets_31", "=q2=Steel Plate Gauntlets", "=ds=#s9#, #a4#" },
+		{ 83412, "inv_pants_04", "=q2=Steel Plate Legguards", "=ds=#s11#, #a4#" },
+		{ 83410, "inv_boots_plate_01", "=q2=Steel Plate Boots", "=ds=#s12#, #a4#" },
+	};
+
 	ImperialPlate = {
 		{ 0, "", "", "" },
 		{ 0, "INV_Box_01", "=q6=#craftbp1#", "" },
@@ -681,11 +693,17 @@ AtlasLoot_Data["AtlasLootCrafting"] = {
 		{ "s9950", "inv_gauntlets_31", "=q2=Ornate Mithril Gloves", "=ds=#sr# =so1=220 =so2=240 =so3=250 =so4=260" },
 		{ "s9945", "inv_pants_04", "=q2=Ornate Mithril Pants", "=ds=#sr# =so1=220 =so2=240 =so3=250 =so4=260" },
 		{ "s9995", "inv_axe_03", "=q2=Blue Glittering Axe", "=ds=#sr# =so1=220 =so2=245 =so3=257 =so4=270" },
+		{ "s46626", "inv_boots_plate_01", "=q2=Steel Plate Boots", "=ds=#sr# =so1=220 =so2=220 =so3=220 =so4=220" },
+		{ "s46627", "inv_gauntlets_31", "=q2=Steel Plate Gauntlets", "=ds=#sr# =so1=220 =so2=220 =so3=220 =so4=220" },
 		{ "s9952", "inv_shoulder_09", "=q2=Ornate Mithril Shoulders", "=ds=#sr# =so1=225 =so2=245 =so3=255 =so4=265" },
 		{ "s9997", "inv_sword_10", "=q2=Wicked Mithril Blade", "=ds=#sr# =so1=225 =so2=250 =so3=262 =so4=275" },
+		{ "s46629", "inv_chest_chain_10", "=q2=Steel Plate Armor", "=ds=#sr# =so1=225 =so2=225 =so3=225 =so4=225" },
+		{ "s46628", "inv_pants_04", "=q2=Steel Plate Legguards", "=ds=#sr# =so1=225 =so2=225 =so3=225 =so4=225" },
 	};
 
 	SmithingArtisan1 = {
+		{ "s46631", "inv_helmet_25", "=q3=Steel Plate Barbute", "=ds=#sr# =so1=230 =so2=230 =so3=230 =so4=230" },
+		{ "s46630", "inv_shoulder_16", "=q2=Steel Plate Pauldrons", "=ds=#sr# =so1=230 =so2=230 =so3=230 =so4=230" },
 		{ "s9959", "inv_chest_plate10", "=q2=Heavy Mithril Breastplate", "=ds=#sr# =so1=230 =so2=250 =so3=260 =so4=270" },
 		{ "s9961", "inv_helmet_35", "=q2=Mithril Coif", "=ds=#sr# =so1=230 =so2=250 =so3=260 =so4=270" },
 		{ "s10001", "inv_mace_15", "=q2=Big Black Mace", "=ds=#sr# =so1=230 =so2=255 =so3=267 =so4=280" },
@@ -714,11 +732,11 @@ AtlasLoot_Data["AtlasLootCrafting"] = {
 		{ "s16969", "inv_axe_12", "=q2=Ornate Thorium Handaxe", "=ds=#sr# =so1=275 =so2=300 =so3=312 =so4=325" },
 		{ "s15295", "inv_shoulder_09", "=q2=Dark Iron Shoulders", "=ds=#sr# =so1=280 =so2=300 =so3=310 =so4=320" },
 		{ "s16652", "inv_boots_plate_08", "=q2=Thorium Boots", "=ds=#sr# =so1=280 =so2=300 =so3=310 =so4=320" },
-		{ "s16653", "inv_helmet_23", "=q2=Thorium Helm", "=ds=#sr# =so1=280 =so2=300 =so3=310 =so4=320" },
-		{ "s16971", "inv_weapon_halberd_11", "=q2=Huge Thorium Battleaxe", "=ds=#sr# =so1=280 =so2=305 =so3=317 =so4=330" },
 	};
 
 	SmithingArtisan2 = {
+		{ "s16653", "inv_helmet_23", "=q2=Thorium Helm", "=ds=#sr# =so1=280 =so2=300 =so3=310 =so4=320" },
+		{ "s16971", "inv_weapon_halberd_11", "=q2=Huge Thorium Battleaxe", "=ds=#sr# =so1=280 =so2=305 =so3=317 =so4=330" },
 		{ "s16654", "inv_gauntlets_26", "=q2=Radiant Gloves", "=ds=#sr# =so1=285 =so2=305 =so3=315 =so4=325" },
 		{ "s16656", "inv_boots_plate_03", "=q2=Radiant Boots", "=ds=#sr# =so1=290 =so2=310 =so3=320 =so4=330" },
 		{ "s16660", "inv_shoulder_20", "=q3=Dawnbringer Shoulders", "=ds=#sr# =so1=290 =so2=310 =so3=320 =so4=330" },
@@ -747,11 +765,11 @@ AtlasLoot_Data["AtlasLootCrafting"] = {
 		{ "s24139", "inv_chest_plate08", "=q3=Darksoul Breastplate", "=ds=#sr# =so1=300 =so2=320 =so3=330 =so4=340" },
 		{ "s24140", "inv_pants_plate_21", "=q3=Darksoul Leggings", "=ds=#sr# =so1=300 =so2=320 =so3=330 =so4=340" },
 		{ "s24141", "inv_shoulder_01", "=q3=Darksoul Shoulders", "=ds=#sr# =so1=300 =so2=320 =so3=330 =so4=340" },
-		{ "s23633", "inv_gauntlets_29", "=q3=Gloves of the Dawn", "=ds=#sr# =so1=300 =so2=320 =so3=330 =so4=340" },
-		{ "s27585", "inv_belt_16", "=q3=Heavy Obsidian Belt", "=ds=#sr# =so1=300 =so2=320 =so3=330 =so4=340" },
 	};
 
 	SmithingArtisan3 = {
+		{ "s23633", "inv_gauntlets_29", "=q3=Gloves of the Dawn", "=ds=#sr# =so1=300 =so2=320 =so3=330 =so4=340" },
+		{ "s27585", "inv_belt_16", "=q3=Heavy Obsidian Belt", "=ds=#sr# =so1=300 =so2=320 =so3=330 =so4=340" },
 		{ "s23629", "inv_boots_chain_10", "=q3=Heavy Timbermaw Boots", "=ds=#sr# =so1=300 =so2=320 =so3=330 =so4=340" },
 		{ "s28463", "inv_belt_21", "=q3=Ironvine Belt", "=ds=#sr# =so1=300 =so2=320 =so3=330 =so4=340" },
 		{ "s28461", "inv_chest_plate07", "=q3=Ironvine Breastplate", "=ds=#sr# =so1=300 =so2=320 =so3=330 =so4=340" },
diff --git a/Instances/instances.en.lua b/Instances/instances.en.lua
index 1877045..dbdfcf0 100644
--- a/Instances/instances.en.lua
+++ b/Instances/instances.en.lua
@@ -626,6 +626,7 @@ AtlasLootBossButtons = {
         "TCGHighPriestessAlathea";
         "TCGFenektistheDeceiver";
         "TCGMasterRaxxieth";
+		"TCGTrash";
 	};
 	KarazhanCrypt = {
 		"";
@@ -1293,7 +1294,7 @@ AtlasLoot_Data["AtlasLootItems"] = {
 		{ 0,"","","" },
 		{ 0,"","","" },
 		{ 0,"","","" },
-		{ 0,"","","" },
+		{ 17782, "", "=q5=Talisman of Binding Shard", "=q1=#s2#", "4%" },
 		{ 18564, "Spell_Ice_Lament", "=q5=Bindings of the Windseeker", "=q1=#m3# =ds=#m9#", "3.74%" },
 		{ 19019, "INV_Sword_39", "=q5=Thunderfury, Blessed Blade of the Windseeker", "=q1=#m4# =ds=#h1#, #w10#" },
 		{ 18829, "INV_Shoulder_04", "=q4=Deep Earth Spaulders", "=ds=#s3#, #a3#", "1.68%" },
@@ -1484,30 +1485,37 @@ AtlasLoot_Data["AtlasLootItems"] = {
 		{ 17076, "INV_Sword_12", "=q4=Bonereaver's Edge", "=ds=#h2#, #w10#", "5.12%" },
 	};
 	MCTrashMobs = {
-		{ 16817, "INV_Belt_22", "=q4=Girdle of Prophecy", "=ds=#s10#, #a1# =q9=#c5#", "0.18%" },
-		{ 16802, "INV_Belt_30", "=q4=Arcanist Belt", "=ds=#s10#, #a1# =q10=#c3#", "0.16%" },
-		{ 16806, "INV_Belt_13", "=q4=Felheart Belt", "=ds=#s10#, #a1# =q11=#c8#", "0.19%" },
-		{ 16827, "INV_Belt_23", "=q4=Nightslayer Belt", "=ds=#s10#, #a2# =q12=#c6#", "0.15%" },
-		{ 16828, "INV_Belt_06", "=q4=Cenarion Belt", "=ds=#s10#, #a2# =q13=#c1#", "0.16%" },
-		{ 16851, "INV_Belt_28", "=q4=Giantstalker's Belt", "=ds=#s10#, #a3# =q14=#c2#", "0.17%" },
-		{ 16838, "INV_Belt_14", "=q4=Earthfury Belt", "=ds=#s10#, #a3# =q15=#c7#", "0.07%" },
-		{ 16858, "INV_Belt_27", "=q4=Lawbringer Belt", "=ds=#s10#, #a4# =q16=#c4#", "0.10%" },
-		{ 16864, "INV_Belt_09", "=q4=Belt of Might", "=ds=#s10#, #a4# =q17=#c9#", "0.16%" },
-		{ 0,"","","" },
+		{ 16817, "INV_Belt_22", "=q4=Girdle of Prophecy", "=ds=#s10#, #a1# =q9=#c5#", "0.24%" },
+		{ 16802, "INV_Belt_30", "=q4=Arcanist Belt", "=ds=#s10#, #a1# =q10=#c3#", "0.24%" },
+		{ 16806, "INV_Belt_13", "=q4=Felheart Belt", "=ds=#s10#, #a1# =q11=#c8#", "0.36%" },
+		{ 16827, "INV_Belt_23", "=q4=Nightslayer Belt", "=ds=#s10#, #a2# =q12=#c6#", "0.28%" },
+		{ 16828, "INV_Belt_06", "=q4=Cenarion Belt", "=ds=#s10#, #a2# =q13=#c1#", "0.3%" },
+		{ 16851, "INV_Belt_28", "=q4=Giantstalker's Belt", "=ds=#s10#, #a3# =q14=#c2#", "0.22%" },
+		{ 16838, "INV_Belt_14", "=q4=Earthfury Belt", "=ds=#s10#, #a3# =q15=#c7#", "0.2%" },
+		{ 16858, "INV_Belt_27", "=q4=Lawbringer Belt", "=ds=#s10#, #a4# =q16=#c4#", "0.2%" },
+		{ 16864, "INV_Belt_09", "=q4=Belt of Might", "=ds=#s10#, #a4# =q17=#c9#", "0.2%" },
 		{ 0,"","","" },
+		{ 81260, "", "=q4=Lavashard Axe", "=ds=#h1#, #w1#", "0.2%" },
 		{ 17011,"Spell_Nature_Earthquake","=q3=Lava Core","=ds=#m31#", "21.29%" },
 		{ 17010,"Spell_Fire_FlameBolt","=q3=Fiery Core","=ds=#m31#", "43.98%" },
 		{ 11382,"INV_Misc_Gem_Bloodstone_03","=q2=Blood of the Mountain","=ds=#m31# =q7=#x63#", "8.85%" },
 		{ 17012,"INV_Ammo_FireTar","=q1=Core Leather","=ds=#m31#" },
-		{ 16819, "INV_Bracer_09", "=q4=Vambraces of Prophecy", "=ds=#s8#, #a1# =q9=#c5#", "0.16%" },
-		{ 16799, "INV_Belt_29", "=q4=Arcanist Bindings", "=ds=#s8#, #a1# =q10=#c3#", "0.16%" },
-		{ 16804, "INV_Bracer_07", "=q4=Felheart Bracers", "=ds=#s8#, #a1# =q11=#c8#", "0.16%" },
-		{ 16825, "INV_Bracer_02", "=q4=Nightslayer Bracelets", "=ds=#s8#, #a2# =q12=#c6#", "0.17%" },
-		{ 16830, "INV_Bracer_03", "=q4=Cenarion Bracers", "=ds=#s8#, #a2# =q13=#c1#", "0.17%" },
-		{ 16850, "INV_Bracer_17", "=q4=Giantstalker's Bracers", "=ds=#s8#, #a3# =q14=#c2#", "0.18%" },
-		{ 16840, "INV_Bracer_16", "=q4=Earthfury Bracers", "=ds=#s8#, #a3# =q15=#c7#", "0.06%" },
-		{ 16857, "INV_Bracer_18", "=q4=Lawbringer Bracers", "=ds=#s8#, #a4# =q16=#c4#", "0.11%" },
-		{ 16861, "INV_Bracer_19", "=q4=Bracers of Might", "=ds=#s8#, #a4# =q17=#c9#", "0.16%" },
+		{ 16819, "INV_Bracer_09", "=q4=Vambraces of Prophecy", "=ds=#s8#, #a1# =q9=#c5#", "0.24%" },
+		{ 16799, "INV_Belt_29", "=q4=Arcanist Bindings", "=ds=#s8#, #a1# =q10=#c3#", "0.22%" },
+		{ 16804, "INV_Bracer_07", "=q4=Felheart Bracers", "=ds=#s8#, #a1# =q11=#c8#", "0.28%" },
+		{ 16825, "INV_Bracer_02", "=q4=Nightslayer Bracelets", "=ds=#s8#, #a2# =q12=#c6#", "0.2%" },
+		{ 16830, "INV_Bracer_03", "=q4=Cenarion Bracers", "=ds=#s8#, #a2# =q13=#c1#", "0.32%" },
+		{ 16850, "INV_Bracer_17", "=q4=Giantstalker's Bracers", "=ds=#s8#, #a3# =q14=#c2#", "0.28%" },
+		{ 16840, "INV_Bracer_16", "=q4=Earthfury Bracers", "=ds=#s8#, #a3# =q15=#c7#", "0.16%" },
+		{ 16857, "INV_Bracer_18", "=q4=Lawbringer Bracers", "=ds=#s8#, #a4# =q16=#c4#", "0.14%" },
+		{ 16861, "INV_Bracer_19", "=q4=Bracers of Might", "=ds=#s8#, #a4# =q17=#c9#", "0.24%" },
+		
+		{ 81261, "", "=q4=Boots of Blistering Flames", "=ds=#s12#, #a1#", "0.2%" },
+		{ 81262, "", "=q4=Core Forged Helmet", "=ds=#s1#, #a4#", "0.2%" },
+		{ 81263, "", "=q4=Lost Dark Iron Chain", "=ds=#s2#", "0.2%" },
+		{ 81264, "", "=q4=Shoulderpads of True Flight", "=ds=#s3#, #a3#", "0.2%" },
+		{ 81265, "", "=q4=Ashskin Belt", "=ds=#s10#, #a2#", "0.2%" },
+
 	};
 	MCRANDOMBOSSDROPS = {
 		{ 18264, "INV_Scroll_05", "=q3=Plans: Elemental Sharpening Stone", "=ds=#p2# #m14#", "1.02%" },
@@ -2509,11 +2517,11 @@ AtlasLoot_Data["AtlasLootItems"] = {
 		{ 6893, "INV_Misc_Key_06", "=q1=Workshop Key", "=ds=#e14#" },
 	};
 	GnMekgineerThermaplugg = {
-		{ 9492, "INV_Gizmo_01", "=q3=Electromagnetic Gigaflux Reactivator", "=ds=#s1#, #a1#", "7.65%" },
-		{ 9461, "INV_Misc_Gear_01", "=q3=Charged Gear", "=ds=#s13# =q2=#e31#", "28.49%" },
-		{ 9458, "INV_Shield_10", "=q3=Thermaplugg's Central Core", "=ds=#w8#", "28.61%" },
-		{ 9459, "INV_Axe_03", "=q3=Thermaplugg's Left Arm", "=ds=#h2#, #w1#", "18.05%" },
-		{ 60098,"","=q3=", "50%" },
+		{ 9492, "INV_Gizmo_01", "=q3=Electromagnetic Gigaflux Reactivator", "=ds=#s1#, #a1#", "25%" },
+		{ 9461, "INV_Misc_Gear_01", "=q3=Charged Gear", "=ds=#s13# =q2=#e31#", "25%" },
+		{ 9458, "INV_Shield_10", "=q3=Thermaplugg's Central Core", "=ds=#w8#", "25%" },
+		{ 9459, "INV_Axe_03", "=q3=Thermaplugg's Left Arm", "=ds=#h2#, #w1#", "25%" },
+		{ 60098,"","=q3=", "=ds=#m33#", "50%" },
 		{ 0,"","","" },
 		{ 0,"","","" },
 		{ 0,"","","" },
@@ -2524,17 +2532,20 @@ AtlasLoot_Data["AtlasLootItems"] = {
 		{ 0,"","","" },
 		{ 0,"","","" },
 		{ 0,"","","" },
-		{ 4415,"INV_Scroll_03","=q3=Schematic: Craftsman's Monocle","=ds=#p5# #m26#", "2.05%" },
+		{ 4415,"INV_Scroll_03","=q3=Schematic: Craftsman's Monocle","=ds=#p5# #m26#", "2%" },
 		{ 4393,"INV_Helmet_44","=q2=Craftsman's Monocle","=ds=#s1#, #a1#" },
 		{ 0,"","","" },
-		{ 4413,"INV_Scroll_06","=q2=Schematic: Discombobulator Ray","=ds=#p5# #m27#", "1.95%" },
+		{ 4413,"INV_Scroll_06","=q2=Schematic: Discombobulator Ray","=ds=#p5# #m27#", "2%" },
 		{ 4388,"INV_Misc_Spyglass_02","=q1=Discombobulator Ray","=ds=#m25#" },
 		{ 0,"","","" },
-		{ 4411,"INV_Scroll_03","=q2=Schematic: Flame Deflector","=ds=#p5# #m28#", "2.13%" },
+		{ 4411,"INV_Scroll_03","=q2=Schematic: Flame Deflector","=ds=#p5# #m28#", "1.2%" },
 		{ 4376,"INV_Gizmo_01","=q1=Flame Deflector","=ds=#m25#" },
 		{ 0,"","","" },
-		{ 7742,"INV_Scroll_03","=q1=Schematic: Gnomish Cloaking Device","=ds=#p5# #m29#", "0.23%" },
+		{ 7742,"INV_Scroll_03","=q1=Schematic: Gnomish Cloaking Device","=ds=#p5# #m29#", "2%" },
 		{ 4397,"INV_Gizmo_01","=q1=Gnomish Cloaking Device","=ds=#s14#" },
+		{ 0,"","","" },
+		{ 51801,"INV_Scroll_05","=q3=Schematic: Hypertech Battery Pack","=ds=#p5# #m41#", "4%" },
+		{ 60098,"","=q2=Hypertech Battery Pack","=ds=#m33#" },
 	};
 	GnDIAmbassador = {
 		{ 9455, "INV_Bracer_09", "=q3=Emissary Cuffs", "=ds=#s8#, #a2# =q2=#e31#", "33.96%" },
@@ -2542,11 +2553,13 @@ AtlasLoot_Data["AtlasLootItems"] = {
 		{ 9457, "INV_Mace_08", "=q3=Royal Diplomatic Scepter", "=ds=#h1#, #w6#", "17.79%" },
 	};
 	GnCrowdPummeler960 = {
-		{ 9449, "INV_Mace_14", "=q3=Manual Crowd Pummeler", "=ds=#h2#, #w6#", "33.14%" },
+		{ 9449, "INV_Mace_14", "=q3=Manual Crowd Pummeler", "=ds=#h2#, #w6#", "50%" },
 		{ 0,"","","" },
-		{ 9450, "INV_Boots_03", "=q2=Gnomebot Operating Boots", "=ds=#s12#, #a2#", "60.45%" },
+		{ 9450, "INV_Boots_03", "=q2=Gnomebot Operating Boots", "=ds=#s12#, #a2#", "50%" },
 		{ 0,"","","" },
-		{ 80740, "", "=q2=", "" },
+		{ 80740, "inv_gauntlets_11", "=q2=Pummeler Gauntlet", "=ds=#h1#, #w13#", "35%" },
+		{ 0,"","","" },
+		{ 81275, "", "=q2=", "=ds=#m2#", "0.8%" },
 	};
 	GnTrash = {
 		{ 9508, "INV_Shirt_14", "=q3=Mechbuilder's Overalls", "=ds=#s5#, #a1#", "0.02%" },
@@ -2773,6 +2786,12 @@ AtlasLoot_Data["AtlasLootItems"] = {
 		{ 83218, "INV_misc_cape_19", "=q3=Shadowthread Cloak", "=ds=#s4#, #a1#", "25%" },
 		{ 83219, "INV_sword_18", "=q3=Slayer's Edge", "=ds=#h1#, #w10#", "25%" },
 	};
+	TCGTrash = {
+		{ 83201, "", "=q3=Grizzlehide Brawlers", "=ds=#s9#, #a2#", "0.5%" },
+		{ 83202, "", "=q3=Grizzlehide Belt", "=ds=#s10#, #a2#", "0.5%" },
+		{ 83204, "", "=q3=Canopy Cloak", "=ds=#s4#, #a1#", "0.5%" },
+		{ 83205, "", "=q3=Thornwood Claw", "=ds=#h3#, #w13#", "0.5%" },
+	};
 	KCMarrowspike = {
 		{ 83441, "INV_chest_chain_15", "=q3=Splintercage Breastplate", "=ds=#s5#, #a4#", "18%" },
 		{ 83442, "INV_boots_08", "=q3=Miasma Walkers", "=ds=#s12#, #a2#", "18%" },
@@ -3245,15 +3264,16 @@ AtlasLoot_Data["AtlasLootItems"] = {
 		{ 17730, "INV_Axe_04", "=q3=Gatorbite Axe", "=ds=#h2#, #w1#", "19.21%" },
 	};
 	MaraTrash = {
-		{ 80748, "", "=q2=", ""},
-		{ 80749, "", "=q2=", ""},
-		{ 80750, "", "=q2=", ""},
-		{ 80751, "", "=q2=", ""},
-		{ 80752, "", "=q2=", ""},
-		{ 80753, "", "=q2=", ""},
-		{ 80754, "", "=q2=", ""},
-		{ 80755, "", "=q2=", ""},
-		{ 80756, "", "=q2=", ""},
+		{ 80748, "", "=q2=Corrupter's Focus", "=ds=#w12#", "0.01%"},
+		{ 80749, "", "=q2=Pysan's Lost Girdle", "=ds=#s8# #a4#", "0.01%"},
+		{ 80750, "", "=q2=Thornfist", "=ds=#w13# #h3#", "0.01%"},
+		{ 80751, "", "=q2=Thornclad Warhammer", "=ds=#w6# #h2#", "0.01%"},
+		{ 80752, "", "=q2=Cape of Unbridled Growth", "=ds=#s4# #a1#", "0.01%"},
+		{ 80753, "", "=q2=Vileplate Pauldrons", "=ds=#s3# #a4#", "0.01%"},
+		{ 80754, "", "=q2=Earthsong Treaders", "=ds=#s12# #a3#", "0.01%"},
+		{ 80755, "", "=q2=Befouled Handwraps", "=ds=#s9# #a1#", "0.01%"},
+		{ 80756, "", "=q2=Vinebound Headband", "=ds=#s1# #a2#", "0.01%"},
+		{ 80757, "", "=q2=Thornpod", "=ds=#s14#", "0.01%"},
 	};
 	MaraPrincessTheradras = {
 		{ 17780, "INV_Sword_09", "=q4=Blade of Eternal Darkness", "=ds=#h3#, #w4#", "0.20%" },
diff --git a/Locale/locale.en.lua b/Locale/locale.en.lua
index 3ce892b..3e6ea6a 100644
--- a/Locale/locale.en.lua
+++ b/Locale/locale.en.lua
@@ -196,6 +196,7 @@ AL:RegisterTranslations("enUS", function() return {
 	["(275)"] = true,
 	["(265)"] = true,
 	["(200)"] = true,
+	["(250)"] = true,
 	["(125)"] = true,
 	["(1)"] = true,
 	["Schematic: Field Repair Bot 74A"] = true,
@@ -286,6 +287,7 @@ AL:RegisterTranslations("enUS", function() return {
 	["Skin of the Great Sandworm"] = true,
 	["Husk of the Old God"] = true,
 	["Carapace of the Old God"] = true,
+	["Steel Plate"] = true,
 	["Imperial Plate"] = true,
 	["The Darksoul"] = true,
 	["Fel Iron Plate"] = true,
diff --git a/TableRegister/loottables.en.lua b/TableRegister/loottables.en.lua
index 9e28e64..3525983 100644
--- a/TableRegister/loottables.en.lua
+++ b/TableRegister/loottables.en.lua
@@ -366,6 +366,7 @@ AtlasLoot_TableNames = {
 	["TCGHighPriestessAlathea"] = { AL["High Priestess A'lathea"], "AtlasLootItems" },
 	["TCGFenektistheDeceiver"] = { AL["Fenektis the Deceiver"], "AtlasLootItems" },
 	["TCGMasterRaxxieth"] = { AL["Master Raxxieth"], "AtlasLootItems" },
+	["TCGTrash"] = { AL["Trash Mobs"], "AtlasLootItems" },
 	-- Karazhan Crypt
     ["KCMarrowspike"] = { AL["Marrowspike"], "AtlasLootItems" },
     ["KCHivaxxis"] = { AL["Hivaxxis"], "AtlasLootItems" },
@@ -503,6 +504,7 @@ AtlasLoot_TableNames = {
     ["RarePets1"] = { AL["Rare Pets"], "AtlasLootSetItems" },
     ["RarePets2"] = { AL["Rare Pets"], "AtlasLootSetItems" },
     --Crafted Sets - Blacksmithing
+	["SteelPlate"] = { AL["Steel Plate"], "AtlasLootCrafting" },
     ["ImperialPlate"] = { AL["Imperial Plate"], "AtlasLootCrafting" },
     ["TheDarksoul"] = { AL["The Darksoul"], "AtlasLootCrafting" },
     ["BloodsoulEmbrace"] = { AL["Bloodsoul Embrace"], "AtlasLootCrafting" },
@@ -615,6 +617,7 @@ AtlasLoot_TableNames = {
     ["Nerubian"] = { "Nerubian Overseer", "AtlasLootWBItems" },
     ["Reaver"] = { "Dark Reaver of Karazhan", "AtlasLootWBItems" },
 	["Ostarius"] = { "Ostarius", "AtlasLootWBItems" },
+	["Concavius"] = { "Concavius", "AtlasLootWBItems" },
     --Doom Lord Kazzak
     ["KKazzak"] = { AL["Lord Kazzak"], "AtlasLootWBItems" },
     --Emrald Dragons
diff --git a/WorldBosses/worldbosses.en.lua b/WorldBosses/worldbosses.en.lua
index 6c6910e..08e04f9 100644
--- a/WorldBosses/worldbosses.en.lua
+++ b/WorldBosses/worldbosses.en.lua
@@ -31,6 +31,9 @@ AtlasLootWBBossButtons = {
 	Ostarius = {
 		"Ostarius";
 	};
+	Concavius = {
+		"Concavius";
+	};
     RareSpawns = {
         "";
         "";
@@ -169,6 +172,38 @@ AtlasLoot_Data["AtlasLootWBItems"] = {
 		{ 83235, "inv_misc_pocketwatch_03", "=q4=Ancient Locking Mechanism", "", "100%" },
 		{ 17962,"INV_Misc_Bag_10_Blue","=q2=Blue Sack of Gems","=ds=#m23# =q2=#e33#", "25%" },
 	};
+	Concavius = {
+		{ 83233, "", "=q4=Charm of Dark Domination", "=ds=#s2#", "17%" },
+		{ 83234, "", "=q4=Voidclaw Choker", "=ds=#s2#", "17%" },
+		{ 83237, "", "=q4=Band of Ancient Lethality", "=ds=#s13#", "17%" },
+		{ 83238, "", "=q4=Ring of the Abyss Watcher", "=ds=#s13#", "17%" },
+		{ 83239, "", "=q4=Signet of the Voidwalker", "=ds=#s13#", "17%" },
+		{ 83240, "", "=q4=Ring of the Whispering Mist", "=ds=#s13#", "17%" },
+		{ 0,"","","" },
+		{ 0,"","","" },
+		{ 0,"","","" },
+		{ 0,"","","" },
+		{ 0,"","","" },
+		{ 0,"","","" },
+		{ 0,"","","" },
+		{ 0,"","","" },
+		{ 0,"","","" },
+		{ 83236, "", "=q4=Void-Linked Satchel of Goods", "=ds=#m23#", "100%" },
+		{ 7076, "", "=q2=Essence of Earth", "Group 1", "[1-2] 25%" },
+		{ 7078, "", "=q2=Essence of Fire", "Group 1", "[1-2] 25%" },
+		{ 7080, "", "=q2=Essence of Water", "Group 1", "[1-2] 25%" },
+		{ 7082, "", "=q2=Essence of Air", "Group 1", "[1-2] 25%" },
+		{ 7971, "", "=q2=Black Pearl", "Group 2", "[2-3] 20%" },
+		{ 12361, "", "=q2=Blue Sapphire", "Group 2", "[1-2] 20%" },
+		{ 12363, "", "=q2=Arcane Crystal", "Group 2", "[1-2] 20%" },
+		{ 12364, "", "=q2=Huge Emerald", "Group 2", "[1-2] 20%" },
+		{ 12800, "", "=q2=Azerothian Diamond", "Group 2", "[1-3] 20%" },
+		{ 11370, "", "=q1=Dark Iron Ore", "Group 3", "[3-6] 20%" },
+		{ 13468, "", "=q2=Black Lotus", "Group 3", "[1-3] 20%" },
+		{ 14256, "", "=q1=Felcloth", "Group 3", "[2-4] 20%" },
+		{ 15416, "", "=q1=Black Dragonscale", "Group 3", "[2-5] 20%" },
+		{ 20520, "", "=q2=Dark Rune", "Group 3", "[2-4] 20%" },
+	};
     KKazzak = {
         { 18546, "INV_Helmet_18", "=q4=Infernal Headcage", "=ds=#s1#, #a3#", "9.39%" },
         { 17111, "INV_Jewelry_Talisman_01", "=q4=Blazefury Medallion", "=ds=#s2#", "10.95%" },
diff --git a/WorldEvents/worldevents.lua b/WorldEvents/worldevents.lua
index 16bbfef..b6ff400 100644
--- a/WorldEvents/worldevents.lua
+++ b/WorldEvents/worldevents.lua
@@ -63,39 +63,45 @@ AtlasLoot_Data["AtlasLootWorldEvents"] = {
 	};
 	AbyssalLords = {
 		{ 0, "INV_Box_01", "=q6=#x90#", "=q1=#j15#" },
-		{ 20682, "INV_Jewelry_Ring_23", "=q4=Elemental Focus Band", "=ds=#s13#", "22.83%" },
+		{ 20682, "INV_Jewelry_Ring_23", "=q4=Elemental Focus Band", "=ds=#s13#", "50%" },
+		{ 83562, "", "=q4=Skaldrenox's Rage", "=ds=#w7#, #h2#", "50%" },
+		{ 20681, "INV_Bracer_10", "=q3=Abyssal Leather Bracers", "=ds=#s8#, #a2# =q2=#e31#", "50%" },
+		{ 20680, "INV_Shoulder_16", "=q3=Abyssal Mail Pauldrons", "=ds=#s3#, #a3# =q2=#e31#", "50%" },
 		{ 20515, "INV_Staff_13", "=q4=Abyssal Scepter", "=ds=#m3#", "100%" },
-		{ 20681, "INV_Bracer_10", "=q3=Abyssal Leather Bracers", "=ds=#s8#, #a2# =q2=#e31#", "24.70%" },
-		{ 20680, "INV_Shoulder_16", "=q3=Abyssal Mail Pauldrons", "=ds=#s3#, #a3# =q2=#e31#", "24.21%" },
+		{ 83554, "", "=q4=Abyssal Flame", "=ds=#m33#", "40%" },
 		{ 0,"","","" },
 		{ 0, "INV_Box_01", "=q6=#x91#", "=q1=#j16#" },
-		{ 20685, "INV_Jewelry_Necklace_21", "=q4=Wavefront Necklace", "=ds=#s2#", "24.48%" },
+		{ 20685, "INV_Jewelry_Necklace_21", "=q4=Wavefront Necklace", "=ds=#s2#", "50%" },
+		{ 83563, "", "=q4=Pearl of the Tides", "=ds=#s14#", "50%" },
+		{ 20684, "INV_Bracer_07", "=q3=Abyssal Mail Armguards", "=ds=#s8#, #a3# =q2=#e31#", "50%" },
+		{ 20683, "INV_Shoulder_22", "=q3=Abyssal Plate Epaulets", "=ds=#s3#, #a4# =q2=#e31#", "50%" },
 		{ 20515, "INV_Staff_13", "=q4=Abyssal Scepter", "=ds=#m3#", "100%" },
-		{ 20684, "INV_Bracer_07", "=q3=Abyssal Mail Armguards", "=ds=#s8#, #a3# =q2=#e31#", "27.68%" },
-		{ 20683, "INV_Shoulder_22", "=q3=Abyssal Plate Epaulets", "=ds=#s3#, #a4# =q2=#e31#", "21.52%" },
-		{ 0,"","","" },
-		{ 0,"","","" },
-		{ 0,"","","" },
-		{ 0,"","","" },
+		{ 83557, "", "=q4=Abyssal Wave", "=ds=#m33#", "40%" },
 		{ 0, "INV_Box_01", "=q6=#x88#", "=q1=#j18#" },
-		{ 20691, "INV_Misc_Cape_20", "=q4=Windshear Cape", "=ds=#s4#", "22.08%" },
+		{ 20691, "INV_Misc_Cape_20", "=q4=Windshear Cape", "=ds=#s4#", "50%" },
+		{ 83564, "", "=q4=Tempest's Rage", "=ds=#h1# #w10#", "50%" },
+		{ 20690, "INV_Bracer_12", "=q3=Abyssal Cloth Wristbands", "=ds=#s8#, #a1# =q2=#e31#", "50%" },
+		{ 20689, "INV_Shoulder_08", "=q3=Abyssal Leather Shoulders", "=ds=#s3#, #a3# =q2=#e31#", "50%" },
 		{ 20515, "INV_Staff_13", "=q4=Abyssal Scepter", "=ds=#m3#", "100%" },
-		{ 20690, "INV_Bracer_12", "=q3=Abyssal Cloth Wristbands", "=ds=#s8#, #a1# =q2=#e31#", "23.60%" },
-		{ 20689, "INV_Shoulder_08", "=q3=Abyssal Leather Shoulders", "=ds=#s3#, #a3# =q2=#e31#", "23.40%" },
+		{ 83556, "", "=q4=Abyssal Wind", "=ds=#m33#", "40%" },
 		{ 0,"","","" },
 		{ 0, "INV_Box_01", "=q6=#x89#", "=q1=#j17#" },
-		{ 20688, "INV_Shield_15", "=q4=Earthen Guard", "=ds=#w8#", "20.64%" },
+		{ 20688, "INV_Shield_15", "=q4=Earthen Guard", "=ds=#w8#", "50%" },
+		{ 83565, "", "=q4=Blackstone Crown", "=ds=#s1#, #a3#", "50%" },
+		{ 20686, "INV_Shoulder_25", "=q3=Abyssal Cloth Amice", "=ds=#s3#, #a1# =q2=#e31#", "50%" },
+		{ 20687, "INV_Bracer_19", "=q3=Abyssal Plate Vambraces", "=ds=#s8#, #a4# =q2=#e31#", "50%" },
 		{ 20515, "INV_Staff_13", "=q4=Abyssal Scepter", "=ds=#m3#", "100%" },
-		{ 20686, "INV_Shoulder_25", "=q3=Abyssal Cloth Amice", "=ds=#s3#, #a1# =q2=#e31#", "23.96%" },
-		{ 20687, "INV_Bracer_19", "=q3=Abyssal Plate Vambraces", "=ds=#s8#, #a4# =q2=#e31#", "23.66%" },
+		{ 83555, "", "=q4=Abyssal Slate", "=ds=#m33#", "40%" },
 	};
 	ElementalInvasion = {
 		{ 0, "INV_Box_01", "=q6=#x92#", "=q1=#j15#, Un'goro Crater" },
+		{ 83550, "", "=q4=Primordial Flame", "=ds=#m33#", "40%" },
 		{ 18671, "INV_Mace_08", "=q3=Baron Charr's Sceptre", "=ds=#h3#, #w6#", "12.18%" },
 		{ 19268, "INV_Misc_Ticket_Tarot_Elemental_01", "=q3=Ace of Elementals", "=ds=#e16#", "10.14%" },
 		{ 18672, "INV_Misc_Orb_05", "=q2=Elemental Ember", "=ds=#s15#", "53.31%" },
 		{ 0,"","","" },
 		{ 0, "INV_Box_01", "=q6=#x94#", "=q1=#j16#, Winterspring" },
+		{ 83552, "", "=q4=Unmelting Ice", "=ds=#m33#", "40%" },
 		{ 18678, "INV_Jewelry_Necklace_03", "=q3=Tempestria's Frozen Necklace", "=ds=#s2#", "12.33%" },
 		{ 19268, "INV_Misc_Ticket_Tarot_Elemental_01", "=q3=Ace of Elementals", "=ds=#e16#", "5.24%" },
 		{ 21548, "INV_Scroll_03", "=q3=Pattern: Stormshroud Gloves", "=ds=#p7# #m14#", "25.00%" },
@@ -103,14 +109,14 @@ AtlasLoot_Data["AtlasLootWorldEvents"] = {
 		{ 0,"","","" },
 		{ 0,"","","" },
 		{ 0,"","","" },
-		{ 0,"","","" },
-		{ 0,"","","" },
 		{ 0, "INV_Box_01", "=q6=#x93#", "=q1=#j17#, Azshara" },
+		{ 83551, "", "=q4=Evershifting Stone", "=ds=#m33#", "40%" },
 		{ 18673, "INV_Shield_03", "=q3=Avalanchion's Stony Hide", "=ds=#w8#", "14.56%" },
 		{ 19268, "INV_Misc_Ticket_Tarot_Elemental_01", "=q3=Ace of Elementals", "=ds=#e16#", "5.89%" },
 		{ 18674, "INV_Jewelry_Ring_14", "=q2=Hardened Stone Band", "=ds=#s13#", "41.50%" },
 		{ 0,"","","" },
 		{ 0, "INV_Box_01", "=q6=#x95#", "=q1=#j18#, Silithus" },
+		{ 83553, "", "=q4=Unyielding Gust", "=ds=#m33#", "40%" },
 		{ 18676, "INV_Belt_31", "=q3=Sash of the Windreaver", "=ds=#s10#, #a3#", "16.76%" },
 		{ 19268, "INV_Misc_Ticket_Tarot_Elemental_01", "=q3=Ace of Elementals", "=ds=#e16#", "9.76%" },
 		{ 21548, "INV_Scroll_03", "=q3=Pattern: Stormshroud Gloves", "=ds=#p7# #m14#", "36.28%" },