Quantcast

Data regenerate to fix some faction issues

Ackis [12-08-08 - 23:48]
Data regenerate to fix some faction issues
Filename
ARLDataminer.rb
RecipeDB/ARL-Blacksmith.lua
RecipeDB/ARL-Cook.lua
RecipeDB/ARL-Enchant.lua
RecipeDB/ARL-Engineer.lua
RecipeDB/ARL-Jewelcraft.lua
RecipeDB/ARL-Leatherwork.lua
RecipeDB/ARL-Quest.lua
RecipeDB/ARL-Smelt.lua
RecipeDB/ARL-Tailor.lua
RecipeDB/ARL-Vendor.lua
RecipeStats.txt
diff --git a/ARLDataminer.rb b/ARLDataminer.rb
index 5acb149..cd2bbec 100644
--- a/ARLDataminer.rb
+++ b/ARLDataminer.rb
@@ -258,18 +258,19 @@ def parse_npc_data(npc,details,typenpc,acquirelisting,flaglisting,npcreact,npcfa
 			unless npc[:react].nil?
 				# Only has information for one faction
 				if not npc[:react][1]
-					$singlefaction << npc[:name]
 					if npc[:locs]
 						if $hordefactionlist.include?(npc[:locs][0])
 							flags << flaglisting["Horde"]
 							listing[npc[:id]][:faction] = npcfactions["Horde"]
 							npc[:react][0] = npcreact["Hostile"]
 							npc[:react][1] = npcreact["Friendly"]
+							$singlefaction << npc[:name]
 						elsif $alliancefactionlist.include?(npc[:locs][0])
 							flags << flaglisting["Alliance"]
 							listing[npc[:id]][:faction] = npcfactions["Alliance"]
 							npc[:react][0] = npcreact["Friendly"]
 							npc[:react][1] = npcreact["Hostile"]
+							$singlefaction << npc[:name]
 						else
 							$unknownfaction << npc[:name]
 							flags << flaglisting["Alliance"] << flaglisting["Horde"]
@@ -300,6 +301,47 @@ def parse_npc_data(npc,details,typenpc,acquirelisting,flaglisting,npcreact,npcfa

 end

+def parse_quest_data(quest,acquirelisting,flaglisting,npcfactions,maps)
+
+	acquire = Hash.new
+	flags = Array.new
+
+	acquire.clear
+	flags.clear
+
+	if not $globalignore.include?(quest[:name])
+		acquire = {"type" => acquirelisting["Quest"],
+					"id" => quest[:id]}
+		$quests[quest[:id]] = {:name => quest[:name]}
+		if quest[:side] == 1
+			flags << flaglisting["Alliance"] << flaglisting["Horde"]
+			$quests[quest[:id]][:faction] = npcfactions["Horde"]
+		elsif quest[:side] == 2
+			flags << flaglisting["Alliance"]
+			$quests[quest[:id]][:faction] = npcfactions["Alliance"]
+		elsif quest[:side] == 4
+			flags << flaglisting["Horde"]
+			$quests[quest[:id]][:faction] = npcfactions["Neutral"]
+		else
+			$unknownfaction << quest[:name]
+		end
+		quest[:questinfo] = maps.get_quest_map_info(quest[:id])
+		if quest[:questinfo]
+			quest[:questinfo][:quest_zones].values do |loc|
+				if $dungeons[loc]
+					flags << flaglisting["Instance"]
+				end
+				if $raids[loc]
+					flags << flaglisting["Raid"]
+				end
+			end
+		end
+	end
+
+	return flags,acquire
+
+end
+
 # Creates a database file for the specific recipe
 # TODO: Optimize the code for this function

@@ -601,31 +643,10 @@ EOF
 				data = details[:method_quests]
 				flags << flaglisting["Quest"]
 				data.each do |quest|
-					if not $globalignore.include?(quest[:name])
-						acquire << {"type" => acquirelisting["Quest"],
-									"id" => quest[:id]}
-						$quests[quest[:id]] = {:name => quest[:name]}
-						if quest[:side] == 1
-							flags << flaglisting["Alliance"] << flaglisting["Horde"]
-							$quests[quest[:id]][:faction] = npcfactions["Horde"]
-						elsif quest[:side] == 2
-							flags << flaglisting["Alliance"]
-							$quests[quest[:id]][:faction] = npcfactions["Alliance"]
-						elsif quest[:side] == 4
-							flags << flaglisting["Horde"]
-							$quests[quest[:id]][:faction] = npcfactions["Neutral"]
-						end
-						quest[:questinfo] = maps.get_quest_map_info(quest[:id])
-						if quest[:questinfo]
-							quest[:questinfo][:quest_zones].values do |loc|
-								if $dungeons[loc]
-									flags << flaglisting["Instance"]
-								end
-								if $raids[loc]
-									flags << flaglisting["Raid"]
-								end
-							end
-						end
+					foo,bar = parse_quest_data(quest,acquirelisting,flaglisting,npcfactions,maps)
+					flags << foo
+					if bar != {} then
+						acquire << bar
 					end
 				end
 			end
@@ -1078,7 +1099,6 @@ EOF
 						lookup_lua.print("#{$factionmap[v[:name]]})")
 					else
 						lookup_lua.print("0)")
-						$unknownfaction << "#{v[:name]} - #{locs.keys[0]}"
 					end
 				end
 				# Add the name to the list of localization strings
@@ -1520,6 +1540,7 @@ maps = WoWDBMaps.new
 $dungeons = maps.get_dungeon_maps
 $raids = maps.get_raid_maps

+# List of professions and their ID's
 $proftable = {
 	"Alchemy" => 2259,
 	"Blacksmithing" => 2018,
@@ -1528,7 +1549,7 @@ $proftable = {
 	"Engineering" => 4036,
 	"First Aid"	=> 746,
 	"Leatherworking" => 2108,
-	"Smelting" => 2575,
+	"Smelting" => 2656,
 	"Tailoring" => 3908,
 	"Jewelcrafting"	=> 25229,
 	"Inscription" => 45357,
@@ -2133,6 +2154,7 @@ $bosslist = [
 	"Warmaul Champion",
 ]

+# Manual mapping of mobs to their zones
 $bosszonemap = {
 	"Anub'ar Guardian" => "Azjol-Nerub",
 	"Anub'ar Prime Guard" => "Azjol-Nerub",
@@ -2471,6 +2493,7 @@ $bosszonemap = {
 	"Zulian Tiger" => "Zul'Gurub",
 }

+# Manual mapping of npc/quests to their factions
 $factionmap = {
 	"Wild Hearts" => "2",
 	"Flash Bomb Recipe" => "0",
@@ -2484,10 +2507,99 @@ $factionmap = {
 	"Firework Launcher" => "0",
 	"Festive Recipes" => "0",
 	"Cluster Launcher" => "0",
+	"Georgio Bolero" => "1",
+
 	"40 Tickets - Schematic: Steam Tonk Controller" => "0",
-	"Great-father Winter" => "0",
+	"Alanna Raveneye" => "1",
+	"Alchemist Gribble" => "1",
+	"Alys Vol'tyr" => "2",
+	"Amy Davenport" => "1",
+	#"Ancient Female Vrykul" => "",
+	"Andrew Hilbert" => "2",
+	"Apothecary Antonivich" => "2",
+	"Artificer Daelo" => "1",
+	"Bale" => "2",
+	"Banalash" => "2",
+	"Barim Spilthoof" => "2",
+	"Baxter" => "2",
+	"Borto" => "1",
+	"Bowen Brisboise" => "2",
+	#"Bradley Towns" => "",
+	#"Bronk Guzzlegear" => "",
+	#"Burko" => "",
+	#"Byancie" => "",
+	#"Captured Gnome" => "",
+	#"Celie Steelwing" => "",
+	#"Cyndra Kindwhisper" => "",
+	#"Daga Ramba" => "",
+	#"Daggle Ironshaper" => "",
 	"Dalinna" => "2",
-	"Georgio Bolero" => "1",
+	#"Derek Odds" => "",
+	#"Doba" => "",
+	#"Drakk Stonehand" => "",
+	#"Elixir of Pain - " => "",
+	#"Felannia" => "",
+	#"Gambarinka" => "",
+	#"Gara Skullcrush" => "2",
+	#"Gaston" => "",
+	#"Ghak Healtouch" => "",
+	#"Gorgolon the All-seeing" => "",
+	#"Gorgolon the All-seeing - " => "",
+	"Great-father Winter" => "0",
+	#"Gremlock Pilsnor" => "",
+	#"Grutah" => "",
+	#"Guillaume Sorouy" => "",
+	#"Haalrun" => "",
+	#"Hahrana Ironhide" => "",
+	#"Hama" => "",
+	#"Hurnak Grimmord" => "",
+	#"Jangdor Swiftstrider" => "",
+	#"Johan Focht" => "",
+	#"K. Lee Smallfry" => "",
+	#"Kalaen" => "",
+	#"Knight Dameron" => "",
+	#"Krek Cragcrush" => "",
+	#"Krugosh" => "",
+	#"Kylanna Windwhisper" => "",
+	#"Leeli Longhaggle" => "",
+	#"Linna Bruder" => "",
+	#"Logannas" => "",
+	"Logistics Officer Brighton" => "1",
+	"Logistics Officer Silverstone" => "1",
+	#"Loolruna" => "",
+	#"Mari Stonehand" => "",
+	#"Misensi" => "",
+	#"Muheru the Weaver" => "",
+	#"Nadyia Maneweaver" => "",
+	#"Nula the Butcher" => "",
+	#"Nurse Neela" => "",
+	#"Nyoma" => "",
+	#"Pratt McGrubben" => "",
+	#"Provisioner Lorkran" => "",
+	#"Quartermaster Urgronn" => "",
+	#"Rogvar" => "",
+	#"Rohok" => "",
+	#"Rungor" => "",
+	#"Sassa Weldwell" => "",
+	"Sebastian Crane" => "2",
+	#"Seer Janidi" => "",
+	#"Sid Limbardi" => "",
+	#"Skeletal Fiend (Enraged Form)" => "",
+	#"Skeletal Fiend (Enraged Form) - " => "",
+	#"Stone Guard Mukar" => "",
+	#"Tatiana" => "",
+	#"Thamner Pol" => "",
+	#"Tognus Flintfire" => "",
+	#"Truk Wildbeard" => "",
+	#"Uthok" => "",
+	#"Vance Undergloom" => "",
+	#"Victor Ward" => "",
+	#"Vix Chromeblaster" => "",
+	#"Wulan" => "",
+	#"Xylinnia Starshine" => "",
+	#"Yarr Hammerstone" => "",
+	#"Zarrin" => "",
+	#"Zurai" => "",
 }

 $hordefactionlist = [
diff --git a/RecipeDB/ARL-Blacksmith.lua b/RecipeDB/ARL-Blacksmith.lua
index 77b9746..ff853c4 100644
--- a/RecipeDB/ARL-Blacksmith.lua
+++ b/RecipeDB/ARL-Blacksmith.lua
@@ -1198,7 +1198,7 @@ function addon:InitBlacksmithing(RecipeDB)
 	-- Hammer of the Titans -- 16988
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,16988,300,12796,3,2018)
-	self:addTradeFlags(RecipeDB,16988,1,2,11,21,22,23,24,25,26,27,28,29,30,36,40,70)
+	self:addTradeFlags(RecipeDB,16988,1,2,5,21,22,23,24,25,26,27,28,29,30,36,40,70)
 	self:addTradeAcquire(RecipeDB,16988,3,10438)

 	-- Arcanite Champion -- 16990
@@ -1234,7 +1234,7 @@ function addon:InitBlacksmithing(RecipeDB)
 	-- Heartseeker -- 16995
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,16995,300,12783,3,2018)
-	self:addTradeFlags(RecipeDB,16995,1,2,11,21,22,23,24,25,26,27,28,29,30,36,40,63,72)
+	self:addTradeFlags(RecipeDB,16995,1,2,5,21,22,23,24,25,26,27,28,29,30,36,40,63,72)
 	self:addTradeAcquire(RecipeDB,16995,3,10997)

 	-- Silver Skeleton Key -- 19666
@@ -1474,7 +1474,7 @@ function addon:InitBlacksmithing(RecipeDB)
 	-- Black Grasp of the Destroyer -- 27589
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,27589,300,22194,3,2018)
-	self:addTradeFlags(RecipeDB,27589,1,2,11,21,22,23,24,25,26,27,28,29,30,36,40,58)
+	self:addTradeFlags(RecipeDB,27589,1,2,6,21,22,23,24,25,26,27,28,29,30,36,40,58)
 	self:addTradeAcquire(RecipeDB,27589,3,15340)

 	-- Obsidian Mail Tunic -- 27590
@@ -2277,7 +2277,7 @@ function addon:InitBlacksmithing(RecipeDB)
 	-- Heavy Copper Longsword -- 43549
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,43549,35,33791,2,2018)
-	self:addTradeFlags(RecipeDB,43549,1,8,21,22,23,24,25,26,27,28,29,30,36,40,69)
+	self:addTradeFlags(RecipeDB,43549,8,21,22,23,24,25,26,27,28,29,30,36,40,69)
 	self:addTradeAcquire(RecipeDB,43549,4,1578)

 	-- Hammer of Righteous Might -- 43846
@@ -2289,25 +2289,25 @@ function addon:InitBlacksmithing(RecipeDB)
 	-- Sunblessed Gauntlets -- 46140
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,46140,365,34380,4,2018)
-	self:addTradeFlags(RecipeDB,46140,1,2,11,21,22,23,24,25,26,27,28,29,30,36,41,59)
+	self:addTradeFlags(RecipeDB,46140,1,2,6,11,21,22,23,24,25,26,27,28,29,30,36,41,59)
 	self:addTradeAcquire(RecipeDB,46140,3,25363,3,25367,3,25368,3,25369,3,25370,3,25371,3,25507,3,25508,3,25591)

 	-- Hard Khorium Battlefists -- 46141
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,46141,365,34378,4,2018)
-	self:addTradeFlags(RecipeDB,46141,1,2,11,21,22,23,24,25,26,27,28,29,30,36,41,59)
+	self:addTradeFlags(RecipeDB,46141,1,2,6,11,21,22,23,24,25,26,27,28,29,30,36,41,59)
 	self:addTradeAcquire(RecipeDB,46141,3,25363,3,25367,3,25368,3,25369,3,25370,3,25371,3,25507)

 	-- Sunblessed Breastplate -- 46142
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,46142,365,34379,4,2018)
-	self:addTradeFlags(RecipeDB,46142,1,2,11,21,22,23,24,25,26,27,28,29,30,37,41,59)
+	self:addTradeFlags(RecipeDB,46142,1,2,6,11,21,22,23,24,25,26,27,28,29,30,37,41,59)
 	self:addTradeAcquire(RecipeDB,46142,3,25363,3,25367,3,25368,3,25369,3,25370,3,25371,3,25507,3,25509)

 	-- Hard Khorium Battleplate -- 46144
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,46144,365,34377,4,2018)
-	self:addTradeFlags(RecipeDB,46144,1,2,11,21,22,23,24,25,26,27,28,29,30,37,41,59)
+	self:addTradeFlags(RecipeDB,46144,1,2,6,11,21,22,23,24,25,26,27,28,29,30,37,41,59)
 	self:addTradeAcquire(RecipeDB,46144,3,25363,3,25367,3,25368,3,25369,3,25370,3,25371,3,25507,3,25597)

 	-- Cobalt Legplates -- 52567
diff --git a/RecipeDB/ARL-Cook.lua b/RecipeDB/ARL-Cook.lua
index e5c8960..105c127 100644
--- a/RecipeDB/ARL-Cook.lua
+++ b/RecipeDB/ARL-Cook.lua
@@ -490,7 +490,7 @@ function addon:InitCooking(RecipeDB)
 	-- Runn Tum Tuber Surprise -- 22761
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,22761,275,18254,2,2550)
-	self:addTradeFlags(RecipeDB,22761,1,2,11,21,22,23,24,25,26,27,28,29,30,36,41)
+	self:addTradeFlags(RecipeDB,22761,1,2,5,21,22,23,24,25,26,27,28,29,30,36,41)
 	self:addTradeAcquire(RecipeDB,22761,3,14354)

 	-- Heavy Crocolisk Stew -- 24418
diff --git a/RecipeDB/ARL-Enchant.lua b/RecipeDB/ARL-Enchant.lua
index e0ba178..a526fc9 100644
--- a/RecipeDB/ARL-Enchant.lua
+++ b/RecipeDB/ARL-Enchant.lua
@@ -113,7 +113,7 @@ function addon:InitEnchanting(RecipeDB)
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,7776,80,nil, 2,7411)
 	self:addTradeFlags(RecipeDB,7776,2,4,21,22,23,24,25,26,27,28,29,30,36,40)
-	self:addTradeAcquire(RecipeDB,7776,2,3346,2,5757)
+	self:addTradeAcquire(RecipeDB,7776,2,5757)

 	-- Enchant Bracer - Minor Agility -- 7779
 	recipecount = recipecount + 1
@@ -143,7 +143,7 @@ function addon:InitEnchanting(RecipeDB)
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,7793,100,nil, 1,7411)
 	self:addTradeFlags(RecipeDB,7793,1,2,4,21,22,23,24,25,26,27,28,29,30,36,40)
-	self:addTradeAcquire(RecipeDB,7793,2,3012,2,3346,2,5158,2,5758)
+	self:addTradeAcquire(RecipeDB,7793,2,3012,2,5158,2,5758)

 	-- Runed Silver Rod -- 7795
 	recipecount = recipecount + 1
@@ -748,7 +748,7 @@ function addon:InitEnchanting(RecipeDB)
 	-- Enchant Weapon - Unholy Weapon -- 20033
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,20033,295,nil, 2,7411)
-	self:addTradeFlags(RecipeDB,20033,1,2,11,21,22,23,24,25,26,27,28,29,30,36,40)
+	self:addTradeFlags(RecipeDB,20033,1,2,5,11,21,22,23,24,25,26,27,28,29,30,36,40)
 	self:addTradeAcquire(RecipeDB,20033,3,10398,3,16772,3,16810,3,18477,3,18595)

 	-- Enchant Weapon - Crusader -- 20034
@@ -766,7 +766,7 @@ function addon:InitEnchanting(RecipeDB)
 	-- Enchant 2H Weapon - Major Intellect -- 20036
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,20036,300,nil, 2,7411)
-	self:addTradeFlags(RecipeDB,20036,1,2,11,21,22,23,24,25,26,27,28,29,30,36,40)
+	self:addTradeFlags(RecipeDB,20036,1,2,5,21,22,23,24,25,26,27,28,29,30,36,40)
 	self:addTradeAcquire(RecipeDB,20036,3,10422)

 	-- Runed Arcanite Rod -- 20051
@@ -1624,7 +1624,7 @@ function addon:InitEnchanting(RecipeDB)
 	-- Enchant Cloak - Steelweave -- 47051
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,47051,375,nil, 3,7411)
-	self:addTradeFlags(RecipeDB,47051,1,2,11,21,22,23,24,25,26,27,28,29,30,36,41,63)
+	self:addTradeFlags(RecipeDB,47051,1,2,5,21,22,23,24,25,26,27,28,29,30,36,41,63)
 	self:addTradeAcquire(RecipeDB,47051,3,24560)

 	-- Enchant Cloak - Mighty Armor -- 47672
diff --git a/RecipeDB/ARL-Engineer.lua b/RecipeDB/ARL-Engineer.lua
index afd27e6..851e6bc 100644
--- a/RecipeDB/ARL-Engineer.lua
+++ b/RecipeDB/ARL-Engineer.lua
@@ -9,7 +9,7 @@ Engineering data for all of Ackis Recipe List
 Auto-generated using ARLDataminer.rb
 Entries to this file will be overwritten
 292 found from data mining.
-11 ignored.
+12 ignored.

 ************************************************************************

@@ -208,8 +208,8 @@ function addon:InitEngineering(RecipeDB)
 	-- Minor Recombobulator -- 3952
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,3952,140,4381,1,4036)
-	self:addTradeFlags(RecipeDB,3952,1,4,21,22,23,24,25,26,27,28,29,30,36,40,63)
-	self:addTradeAcquire(RecipeDB,3952,2,2682,2,2683)
+	self:addTradeFlags(RecipeDB,3952,1,2,4,21,22,23,24,25,26,27,28,29,30,36,40,63)
+	self:addTradeAcquire(RecipeDB,3952,2,2682,2,2683,2,3495)

 	-- Bronze Framework -- 3953
 	recipecount = recipecount + 1
@@ -756,7 +756,7 @@ function addon:InitEngineering(RecipeDB)
 	-- Voice Amplification Modulator -- 19819
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,19819,290,16009,2,4036)
-	self:addTradeFlags(RecipeDB,19819,1,2,11,21,22,23,24,25,26,27,28,29,30,36,40)
+	self:addTradeFlags(RecipeDB,19819,1,2,5,21,22,23,24,25,26,27,28,29,30,36,40)
 	self:addTradeAcquire(RecipeDB,19819,3,10426)

 	-- Master Engineer's Goggles -- 19825
@@ -881,7 +881,7 @@ function addon:InitEngineering(RecipeDB)
 	-- Ultra-Flash Shadow Reflector -- 23082
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,23082,300,18639,2,4036)
-	self:addTradeFlags(RecipeDB,23082,1,2,11,21,22,23,24,25,26,27,28,29,30,36,40,63)
+	self:addTradeFlags(RecipeDB,23082,1,2,5,21,22,23,24,25,26,27,28,29,30,36,40,63)
 	self:addTradeAcquire(RecipeDB,23082,3,10426)

 	-- Alarm-O-Bot -- 23096
@@ -1421,67 +1421,67 @@ function addon:InitEngineering(RecipeDB)
 	-- Wonderheal XT68 Shades -- 46106
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,46106,375,35183,4,4036)
-	self:addTradeFlags(RecipeDB,46106,1,2,11,22,37,41,57)
+	self:addTradeFlags(RecipeDB,46106,1,2,6,22,37,41,57)
 	self:addTradeAcquire(RecipeDB,46106,3,25368,3,25371)

 	-- Justicebringer 3000 Specs -- 46107
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,46107,375,35185,4,4036)
-	self:addTradeFlags(RecipeDB,46107,1,2,11,25,37,41,59)
+	self:addTradeFlags(RecipeDB,46107,1,2,6,11,25,37,41,59)
 	self:addTradeAcquire(RecipeDB,46107,3,25370,3,25507)

 	-- Powerheal 9000 Lens -- 46108
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,46108,375,35181,4,4036)
-	self:addTradeFlags(RecipeDB,46108,1,2,11,26,37,41,56)
+	self:addTradeFlags(RecipeDB,46108,1,2,6,26,37,41,56)
 	self:addTradeAcquire(RecipeDB,46108,3,25363,3,25368,3,25370)

 	-- Hyper-Magnified Moon Specs -- 46109
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,46109,375,35182,4,4036)
-	self:addTradeFlags(RecipeDB,46109,1,2,11,22,37,41,57)
+	self:addTradeFlags(RecipeDB,46109,1,2,6,11,22,37,41,57)
 	self:addTradeAcquire(RecipeDB,46109,3,25369,3,25484,3,25507)

 	-- Primal-Attuned Goggles -- 46110
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,46110,375,35184,4,4036)
-	self:addTradeFlags(RecipeDB,46110,1,2,11,27,37,41,58)
+	self:addTradeFlags(RecipeDB,46110,1,2,6,11,27,37,41,58)
 	self:addTradeAcquire(RecipeDB,46110,3,25369,3,25371,3,25507)

 	-- Annihilator Holo-Gogs -- 46111
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,46111,375,34847,4,4036)
-	self:addTradeFlags(RecipeDB,46111,1,2,11,26,37,41,56)
+	self:addTradeFlags(RecipeDB,46111,1,2,6,26,37,41,56)
 	self:addTradeAcquire(RecipeDB,46111,3,25368,3,25370)

 	-- Lightning Etched Specs -- 46112
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,46112,375,34355,4,4036)
-	self:addTradeFlags(RecipeDB,46112,1,2,11,27,37,41,58)
+	self:addTradeFlags(RecipeDB,46112,1,2,6,27,37,41,58)
 	self:addTradeAcquire(RecipeDB,46112,3,25367,3,25368,3,25369,3,25370,3,25371)

 	-- Surestrike Goggles v3.0 -- 46113
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,46113,375,34356,4,4036)
-	self:addTradeFlags(RecipeDB,46113,1,2,11,23,37,41,58)
+	self:addTradeFlags(RecipeDB,46113,1,2,6,11,23,37,41,58)
 	self:addTradeAcquire(RecipeDB,46113,3,25367,3,25369,3,25370,3,25371,3,25507)

 	-- Mayhem Projection Goggles -- 46114
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,46114,375,34354,4,4036)
-	self:addTradeFlags(RecipeDB,46114,1,2,11,30,37,41,59)
+	self:addTradeFlags(RecipeDB,46114,1,2,6,11,30,37,41,59)
 	self:addTradeAcquire(RecipeDB,46114,3,25369,3,25507,3,25592)

 	-- Hard Khorium Goggles -- 46115
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,46115,375,34357,4,4036)
-	self:addTradeFlags(RecipeDB,46115,1,2,11,30,37,41,52,59)
+	self:addTradeFlags(RecipeDB,46115,1,2,6,30,37,41,52,59)
 	self:addTradeAcquire(RecipeDB,46115,3,25363,3,25371)

 	-- Quad Deathblow X44 Goggles -- 46116
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,46116,375,34353,4,4036)
-	self:addTradeFlags(RecipeDB,46116,1,2,11,28,37,41,57)
+	self:addTradeFlags(RecipeDB,46116,1,2,6,28,37,41,57)
 	self:addTradeAcquire(RecipeDB,46116,3,25367,3,25369,3,25599)

 	-- Rocket Boots Xtreme Lite -- 46697
@@ -1740,6 +1740,12 @@ function addon:InitEngineering(RecipeDB)
 	self:addTradeFlags(RecipeDB,61471,3,21,22,23,24,25,26,27,28,29,30,36,41)
 	-- No acquire information

+	-- Mechanized Snow Goggles -- 61483
+	--recipecount = recipecount + 1
+	--self:addTradeSkill(RecipeDB,61483,400,44742,3,4036)
+	--self:addTradeFlags(RecipeDB,61483,3,21,25,30,36,41,59)
+	-- No acquire information
+
 	-- Mechanized Snow Goggles (Cloth) -- 56465
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,56465,400,41112,3,4036)
diff --git a/RecipeDB/ARL-Jewelcraft.lua b/RecipeDB/ARL-Jewelcraft.lua
index 2cab1fb..0614926 100644
--- a/RecipeDB/ARL-Jewelcraft.lua
+++ b/RecipeDB/ARL-Jewelcraft.lua
@@ -1468,37 +1468,37 @@ function addon:InitJewelcrafting(RecipeDB)
 	-- Loop of Forged Power -- 46122
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,46122,365,34362,4,25229)
-	self:addTradeFlags(RecipeDB,46122,1,2,11,21,22,23,24,25,26,27,28,29,30,36,41,62)
+	self:addTradeFlags(RecipeDB,46122,1,2,6,21,22,23,24,25,26,27,28,29,30,36,41,62)
 	self:addTradeAcquire(RecipeDB,46122,3,25363,3,25367,3,25368,3,25369,3,25370,3,25371)

 	-- Ring of Flowing Life -- 46123
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,46123,365,34363,4,25229)
-	self:addTradeFlags(RecipeDB,46123,1,2,11,21,22,23,24,25,26,27,28,29,30,36,41,62)
+	self:addTradeFlags(RecipeDB,46123,1,2,6,21,22,23,24,25,26,27,28,29,30,36,41,62)
 	self:addTradeAcquire(RecipeDB,46123,3,25363,3,25367,3,25369,3,25370)

 	-- Hard Khorium Band -- 46124
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,46124,365,34361,4,25229)
-	self:addTradeFlags(RecipeDB,46124,1,2,11,21,22,23,24,25,26,27,28,29,30,36,41,62)
+	self:addTradeFlags(RecipeDB,46124,1,2,6,11,21,22,23,24,25,26,27,28,29,30,36,41,62)
 	self:addTradeAcquire(RecipeDB,46124,3,25363,3,25367,3,25368,3,25369,3,25370,3,25371,3,25507)

 	-- Pendant of Sunfire -- 46125
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,46125,365,34359,4,25229)
-	self:addTradeFlags(RecipeDB,46125,1,2,11,21,22,23,24,25,26,27,28,29,30,37,41)
+	self:addTradeFlags(RecipeDB,46125,1,2,6,21,22,23,24,25,26,27,28,29,30,37,41)
 	self:addTradeAcquire(RecipeDB,46125,3,25369,3,25370,3,25599)

 	-- Amulet of Flowing Life -- 46126
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,46126,365,34360,4,25229)
-	self:addTradeFlags(RecipeDB,46126,1,2,11,21,22,23,24,25,26,27,28,29,30,37,41)
+	self:addTradeFlags(RecipeDB,46126,1,2,6,21,22,23,24,25,26,27,28,29,30,37,41)
 	self:addTradeAcquire(RecipeDB,46126,3,25363,3,25367,3,25368,3,25369,3,25370,3,25371)

 	-- Hard Khorium Choker -- 46127
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,46127,365,34358,4,25229)
-	self:addTradeFlags(RecipeDB,46127,1,2,11,21,22,23,24,25,26,27,28,29,30,37,41)
+	self:addTradeFlags(RecipeDB,46127,1,2,6,11,21,22,23,24,25,26,27,28,29,30,37,41)
 	self:addTradeAcquire(RecipeDB,46127,3,25363,3,25367,3,25369,3,25371,3,25507)

 	-- Quick Dawnstone -- 46403
@@ -2458,7 +2458,7 @@ function addon:InitJewelcrafting(RecipeDB)
 	-- Fierce Monarch Topaz -- 54019
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,54019,390,40041,3,25229)
-	self:addTradeFlags(RecipeDB,54019,1,2,11,21,22,23,24,25,26,27,28,29,30,36,41)
+	self:addTradeFlags(RecipeDB,54019,1,2,5,11,21,22,23,24,25,26,27,28,29,30,36,41)
 	self:addTradeAcquire(RecipeDB,54019,3,23954,3,24083,3,29735)

 	-- Resolute Monarch Topaz -- 54023
diff --git a/RecipeDB/ARL-Leatherwork.lua b/RecipeDB/ARL-Leatherwork.lua
index 8f783c6..522660c 100644
--- a/RecipeDB/ARL-Leatherwork.lua
+++ b/RecipeDB/ARL-Leatherwork.lua
@@ -586,7 +586,7 @@ function addon:InitLeatherworking(RecipeDB)
 	-- Comfortable Leather Hat -- 10490
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,10490,200,8174,3,2108)
-	self:addTradeFlags(RecipeDB,10490,1,2,11,21,22,23,24,25,26,27,28,29,30,36,40,57)
+	self:addTradeFlags(RecipeDB,10490,1,2,5,11,21,22,23,24,25,26,27,28,29,30,36,40,57)
 	self:addTradeAcquire(RecipeDB,10490,3,2249,3,4852)

 	-- Nightscape Tunic -- 10499
@@ -2212,49 +2212,49 @@ function addon:InitLeatherworking(RecipeDB)
 	-- Leather Gauntlets of the Sun -- 46132
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,46132,365,34372,4,2108)
-	self:addTradeFlags(RecipeDB,46132,1,2,11,21,22,23,24,25,26,27,28,29,30,36,41,57)
+	self:addTradeFlags(RecipeDB,46132,1,2,6,11,21,22,23,24,25,26,27,28,29,30,36,41,57)
 	self:addTradeAcquire(RecipeDB,46132,3,25363,3,25367,3,25368,3,25369,3,25371,3,25507,3,25597)

 	-- Fletcher's Gloves of the Phoenix -- 46133
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,46133,365,34374,4,2108)
-	self:addTradeFlags(RecipeDB,46133,1,2,11,21,22,23,24,25,26,27,28,29,30,36,41,58)
+	self:addTradeFlags(RecipeDB,46133,1,2,6,11,21,22,23,24,25,26,27,28,29,30,36,41,58)
 	self:addTradeAcquire(RecipeDB,46133,3,25363,3,25367,3,25369,3,25370,3,25507)

 	-- Gloves of Immortal Dusk -- 46134
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,46134,365,34370,4,2108)
-	self:addTradeFlags(RecipeDB,46134,1,2,11,21,22,23,24,25,26,27,28,29,30,36,41,57)
+	self:addTradeFlags(RecipeDB,46134,1,2,6,11,21,22,23,24,25,26,27,28,29,30,36,41,57)
 	self:addTradeAcquire(RecipeDB,46134,3,25369,3,25370,3,25371,3,25507)

 	-- Sun-Drenched Scale Gloves -- 46135
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,46135,365,34376,4,2108)
-	self:addTradeFlags(RecipeDB,46135,1,2,11,21,22,23,24,25,26,27,28,29,30,36,41,58)
+	self:addTradeFlags(RecipeDB,46135,1,2,6,21,22,23,24,25,26,27,28,29,30,36,41,58)
 	self:addTradeAcquire(RecipeDB,46135,3,25369,3,25371)

 	-- Leather Chestguard of the Sun -- 46136
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,46136,365,34371,4,2108)
-	self:addTradeFlags(RecipeDB,46136,1,2,11,21,22,23,24,25,26,27,28,29,30,37,41,57)
+	self:addTradeFlags(RecipeDB,46136,1,2,6,11,21,22,23,24,25,26,27,28,29,30,37,41,57)
 	self:addTradeAcquire(RecipeDB,46136,3,25367,3,25369,3,25370,3,25507,3,25593)

 	-- Embrace of the Phoenix -- 46137
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,46137,365,34373,4,2108)
-	self:addTradeFlags(RecipeDB,46137,1,2,11,21,22,23,24,25,26,27,28,29,30,37,41,58)
+	self:addTradeFlags(RecipeDB,46137,1,2,6,11,21,22,23,24,25,26,27,28,29,30,37,41,58)
 	self:addTradeAcquire(RecipeDB,46137,3,25367,3,25369,3,25371,3,25507)

 	-- Carapace of Sun and Shadow -- 46138
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,46138,365,34369,4,2108)
-	self:addTradeFlags(RecipeDB,46138,1,2,11,21,22,23,24,25,26,27,28,29,30,37,41,57)
+	self:addTradeFlags(RecipeDB,46138,1,2,6,11,21,22,23,24,25,26,27,28,29,30,37,41,57)
 	self:addTradeAcquire(RecipeDB,46138,3,25363,3,25367,3,25368,3,25369,3,25507)

 	-- Sun-Drenched Scale Chestguard -- 46139
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,46139,365,34375,4,2108)
-	self:addTradeFlags(RecipeDB,46139,1,2,11,21,22,23,24,25,26,27,28,29,30,37,41,58)
+	self:addTradeFlags(RecipeDB,46139,1,2,6,21,22,23,24,25,26,27,28,29,30,37,41,58)
 	self:addTradeAcquire(RecipeDB,46139,3,25363,3,25367,3,25368,3,25369,3,25371,3,25593)

 	-- Heavy Borean Leather -- 50936
diff --git a/RecipeDB/ARL-Quest.lua b/RecipeDB/ARL-Quest.lua
index 9482b82..bde2bbe 100644
--- a/RecipeDB/ARL-Quest.lua
+++ b/RecipeDB/ARL-Quest.lua
@@ -60,7 +60,7 @@ function addon:InitQuest(QuestDB)
 	self:addLookupList(QuestDB,862,L["Dig Rat Stew"],BZONE["The Barrens"],55.00,33.000)
 	self:addLookupList(QuestDB,1487,L["Deviate Eradication"],BZONE["The Barrens"],46.50,35.952)
 	self:addLookupList(QuestDB,1559,L["Flash Bomb Recipe"],BZONE["Badlands"],0,00)
-	self:addLookupList(QuestDB,1578,L["Supplying the Front"],L["Unknown Zone"],0,01)
+	self:addLookupList(QuestDB,1578,L["Supplying the Front"],L["Unknown Zone"],0,00)
 	self:addLookupList(QuestDB,1582,L["Moonglow Vest"],BZONE["Darnassus"],64.76,22.391)
 	self:addLookupList(QuestDB,1618,L["Gearing Redridge"],BZONE["Redridge Mountains"],31.37,47.341)
 	self:addLookupList(QuestDB,2178,L["Easy Strider Living"],BZONE["Darkshore"],37.27,41.261)
diff --git a/RecipeDB/ARL-Smelt.lua b/RecipeDB/ARL-Smelt.lua
index 293aa34..321d8ce 100644
--- a/RecipeDB/ARL-Smelt.lua
+++ b/RecipeDB/ARL-Smelt.lua
@@ -39,151 +39,151 @@ function addon:InitSmelting(RecipeDB)

 	-- Smelt Copper -- 2657
 	recipecount = recipecount + 1
-	self:addTradeSkill(RecipeDB,2657,1,2840,1,2575)
+	self:addTradeSkill(RecipeDB,2657,1,2840,1,2656)
 	self:addTradeFlags(RecipeDB,2657,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41)
 	self:addTradeAcquire(RecipeDB,2657,8,8)

 	-- Smelt Silver -- 2658
 	recipecount = recipecount + 1
-	self:addTradeSkill(RecipeDB,2658,100,2842,1,2575)
+	self:addTradeSkill(RecipeDB,2658,100,2842,1,2656)
 	self:addTradeFlags(RecipeDB,2658,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41)
 	self:addTradeAcquire(RecipeDB,2658,1,1681,1,1701,1,3001,1,3137,1,3175,1,3357,1,3555,1,4254,1,4598,1,5392,1,5513,1,6297,1,8128,1,16663,1,16752,1,17488,1,18747,1,18779,1,18804)

 	-- Smelt Bronze -- 2659
 	recipecount = recipecount + 1
-	self:addTradeSkill(RecipeDB,2659,15,2841,1,2575)
+	self:addTradeSkill(RecipeDB,2659,15,2841,1,2656)
 	self:addTradeFlags(RecipeDB,2659,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41)
 	self:addTradeAcquire(RecipeDB,2659,1,1681,1,1701,1,3001,1,3137,1,3175,1,3357,1,3555,1,4254,1,4598,1,5392,1,5513,1,6297,1,8128,1,16663,1,16752,1,17488,1,18747,1,18779,1,18804)

 	-- Smelt Tin -- 3304
 	recipecount = recipecount + 1
-	self:addTradeSkill(RecipeDB,3304,55,3576,1,2575)
+	self:addTradeSkill(RecipeDB,3304,55,3576,1,2656)
 	self:addTradeFlags(RecipeDB,3304,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41)
 	self:addTradeAcquire(RecipeDB,3304,1,1681,1,1701,1,3001,1,3137,1,3175,1,3357,1,3555,1,4254,1,4598,1,5392,1,5513,1,6297,1,8128,1,16663,1,16752,1,17488,1,18747,1,18779,1,18804)

 	-- Smelt Iron -- 3307
 	recipecount = recipecount + 1
-	self:addTradeSkill(RecipeDB,3307,100,3575,1,2575)
+	self:addTradeSkill(RecipeDB,3307,100,3575,1,2656)
 	self:addTradeFlags(RecipeDB,3307,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41)
 	self:addTradeAcquire(RecipeDB,3307,1,1681,1,1701,1,3001,1,3137,1,3175,1,3357,1,3555,1,4254,1,4598,1,5392,1,5513,1,6297,1,8128,1,16663,1,16752,1,17488,1,18747,1,18779,1,18804)

 	-- Smelt Gold -- 3308
 	recipecount = recipecount + 1
-	self:addTradeSkill(RecipeDB,3308,155,3577,1,2575)
+	self:addTradeSkill(RecipeDB,3308,155,3577,1,2656)
 	self:addTradeFlags(RecipeDB,3308,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41)
 	self:addTradeAcquire(RecipeDB,3308,1,1681,1,1701,1,3001,1,3137,1,3175,1,3357,1,3555,1,4254,1,4598,1,5392,1,5513,1,6297,1,8128,1,16663,1,16752,1,17488,1,18747,1,18779,1,18804)

 	-- Smelt Steel -- 3569
 	recipecount = recipecount + 1
-	self:addTradeSkill(RecipeDB,3569,165,3859,1,2575)
+	self:addTradeSkill(RecipeDB,3569,165,3859,1,2656)
 	self:addTradeFlags(RecipeDB,3569,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41)
 	self:addTradeAcquire(RecipeDB,3569,1,1681,1,1701,1,3001,1,3137,1,3175,1,3357,1,3555,1,4254,1,4598,1,5392,1,5513,1,6297,1,8128,1,16663,1,16752,1,17488,1,18747,1,18779,1,18804)

 	-- Smelt Mithril -- 10097
 	recipecount = recipecount + 1
-	self:addTradeSkill(RecipeDB,10097,120,3860,1,2575)
+	self:addTradeSkill(RecipeDB,10097,120,3860,1,2656)
 	self:addTradeFlags(RecipeDB,10097,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41)
 	self:addTradeAcquire(RecipeDB,10097,1,1681,1,1701,1,3001,1,3137,1,3175,1,3357,1,3555,1,4254,1,4598,1,5392,1,5513,1,6297,1,8128,1,16663,1,16752,1,17488,1,18747,1,18779,1,18804)

 	-- Smelt Truesilver -- 10098
 	recipecount = recipecount + 1
-	self:addTradeSkill(RecipeDB,10098,220,6037,1,2575)
+	self:addTradeSkill(RecipeDB,10098,220,6037,1,2656)
 	self:addTradeFlags(RecipeDB,10098,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41)
 	self:addTradeAcquire(RecipeDB,10098,1,1681,1,1701,1,3001,1,3137,1,3175,1,3357,1,3555,1,4254,1,4598,1,5392,1,5513,1,6297,1,8128,1,16663,1,16752,1,17488,1,18747,1,18779,1,18804)

 	-- Smelt Dark Iron -- 14891
 	recipecount = recipecount + 1
-	self:addTradeSkill(RecipeDB,14891,290,11371,1,2575)
+	self:addTradeSkill(RecipeDB,14891,290,11371,1,2656)
 	self:addTradeFlags(RecipeDB,14891,3,21,22,23,24,25,26,27,28,29,30,36,41)
 	-- No acquire information

 	-- Smelt Thorium -- 16153
 	recipecount = recipecount + 1
-	self:addTradeSkill(RecipeDB,16153,210,12359,1,2575)
+	self:addTradeSkill(RecipeDB,16153,210,12359,1,2656)
 	self:addTradeFlags(RecipeDB,16153,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41)
 	self:addTradeAcquire(RecipeDB,16153,1,1681,1,1701,1,3001,1,3137,1,3175,1,3357,1,3555,1,4254,1,4598,1,5392,1,5513,1,6297,1,8128,1,16663,1,16752,1,17488,1,18747,1,18779,1,18804)

 	-- Smelt Elementium -- 22967
 	recipecount = recipecount + 1
-	self:addTradeSkill(RecipeDB,22967,325,17771,5,2575)
+	self:addTradeSkill(RecipeDB,22967,325,17771,5,2656)
 	self:addTradeFlags(RecipeDB,22967,3,21,22,23,24,25,26,27,28,29,30,36,41)
 	-- No acquire information

 	-- Smelt Fel Iron -- 29356
 	recipecount = recipecount + 1
-	self:addTradeSkill(RecipeDB,29356,285,23445,1,2575)
+	self:addTradeSkill(RecipeDB,29356,285,23445,1,2656)
 	self:addTradeFlags(RecipeDB,29356,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41)
 	self:addTradeAcquire(RecipeDB,29356,1,18747,1,18779)

 	-- Smelt Adamantite -- 29358
 	recipecount = recipecount + 1
-	self:addTradeSkill(RecipeDB,29358,310,23446,1,2575)
+	self:addTradeSkill(RecipeDB,29358,310,23446,1,2656)
 	self:addTradeFlags(RecipeDB,29358,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41)
 	self:addTradeAcquire(RecipeDB,29358,1,18747,1,18779)

 	-- Smelt Eternium -- 29359
 	recipecount = recipecount + 1
-	self:addTradeSkill(RecipeDB,29359,335,23447,1,2575)
+	self:addTradeSkill(RecipeDB,29359,335,23447,1,2656)
 	self:addTradeFlags(RecipeDB,29359,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41)
 	self:addTradeAcquire(RecipeDB,29359,1,18747,1,18779)

 	-- Smelt Felsteel -- 29360
 	recipecount = recipecount + 1
-	self:addTradeSkill(RecipeDB,29360,305,23448,1,2575)
+	self:addTradeSkill(RecipeDB,29360,305,23448,1,2656)
 	self:addTradeFlags(RecipeDB,29360,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41)
 	self:addTradeAcquire(RecipeDB,29360,1,18747,1,18779)

 	-- Smelt Khorium -- 29361
 	recipecount = recipecount + 1
-	self:addTradeSkill(RecipeDB,29361,375,23449,1,2575)
+	self:addTradeSkill(RecipeDB,29361,375,23449,1,2656)
 	self:addTradeFlags(RecipeDB,29361,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41)
 	self:addTradeAcquire(RecipeDB,29361,1,18747,1,18779)

 	-- Smelt Hardened Adamantite -- 29686
 	recipecount = recipecount + 1
-	self:addTradeSkill(RecipeDB,29686,375,23573,1,2575)
+	self:addTradeSkill(RecipeDB,29686,375,23573,1,2656)
 	self:addTradeFlags(RecipeDB,29686,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41)
 	self:addTradeAcquire(RecipeDB,29686,1,18747,1,18779)

 	-- Earth Shatter -- 35750
 	recipecount = recipecount + 1
-	self:addTradeSkill(RecipeDB,35750,300,22573,1,2575)
+	self:addTradeSkill(RecipeDB,35750,300,22573,1,2656)
 	self:addTradeFlags(RecipeDB,35750,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41)
 	self:addTradeAcquire(RecipeDB,35750,1,18747,1,18779)

 	-- Fire Sunder -- 35751
 	recipecount = recipecount + 1
-	self:addTradeSkill(RecipeDB,35751,300,22574,1,2575)
+	self:addTradeSkill(RecipeDB,35751,300,22574,1,2656)
 	self:addTradeFlags(RecipeDB,35751,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41)
 	self:addTradeAcquire(RecipeDB,35751,1,18747,1,18779)

 	-- Smelt Hardened Khorium -- 46353
 	recipecount = recipecount + 1
-	self:addTradeSkill(RecipeDB,46353,375,35128,3,2575)
+	self:addTradeSkill(RecipeDB,46353,375,35128,3,2656)
 	self:addTradeFlags(RecipeDB,46353,1,2,10,21,22,23,24,25,26,27,28,29,30,36,41)
 	self:addTradeAcquire(RecipeDB,46353,7,3)

 	-- Smelt Cobalt -- 49252
 	recipecount = recipecount + 1
-	self:addTradeSkill(RecipeDB,49252,325,36916,1,2575)
+	self:addTradeSkill(RecipeDB,49252,325,36916,1,2656)
 	self:addTradeFlags(RecipeDB,49252,3,21,22,23,24,25,26,27,28,29,30,36,41)
 	-- No acquire information

 	-- Smelt Saronite -- 49258
 	recipecount = recipecount + 1
-	self:addTradeSkill(RecipeDB,49258,400,36913,1,2575)
+	self:addTradeSkill(RecipeDB,49258,400,36913,1,2656)
 	self:addTradeFlags(RecipeDB,49258,3,21,22,23,24,25,26,27,28,29,30,36,41)
 	-- No acquire information

 	-- Smelt Titansteel -- 55208
 	recipecount = recipecount + 1
-	self:addTradeSkill(RecipeDB,55208,450,37663,2,2575)
+	self:addTradeSkill(RecipeDB,55208,450,37663,2,2656)
 	self:addTradeFlags(RecipeDB,55208,3,21,22,23,24,25,26,27,28,29,30,36,41)
 	-- No acquire information

 	-- Smelt Titanium -- 55211
 	recipecount = recipecount + 1
-	self:addTradeSkill(RecipeDB,55211,450,41163,2,2575)
+	self:addTradeSkill(RecipeDB,55211,450,41163,2,2656)
 	self:addTradeFlags(RecipeDB,55211,3,21,22,23,24,25,26,27,28,29,30,36,41)
 	-- No acquire information

diff --git a/RecipeDB/ARL-Tailor.lua b/RecipeDB/ARL-Tailor.lua
index 8ab8e35..774c446 100644
--- a/RecipeDB/ARL-Tailor.lua
+++ b/RecipeDB/ARL-Tailor.lua
@@ -449,7 +449,7 @@ function addon:InitTailoring(RecipeDB)
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,7639,100,6263,1,3908)
 	self:addTradeFlags(RecipeDB,7639,1,2,4,21,22,23,24,25,26,27,28,29,30,36,40,56)
-	self:addTradeAcquire(RecipeDB,7639,2,843,2,1347,2,2394,2,3364,2,5944)
+	self:addTradeAcquire(RecipeDB,7639,2,843,2,2394,2,3364,2,5944)

 	-- Greater Adept's Robe -- 7643
 	recipecount = recipecount + 1
@@ -1579,7 +1579,7 @@ function addon:InitTailoring(RecipeDB)
 	-- Big Bag of Enchantment -- 27660
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,27660,300,22249,2,3908)
-	self:addTradeFlags(RecipeDB,27660,1,2,11,21,22,23,24,25,26,27,28,29,30,36,40)
+	self:addTradeFlags(RecipeDB,27660,1,2,5,21,22,23,24,25,26,27,28,29,30,36,40)
 	self:addTradeAcquire(RecipeDB,27660,3,11487)

 	-- Cenarion Herb Bag -- 27724
@@ -1957,25 +1957,25 @@ function addon:InitTailoring(RecipeDB)
 	-- Sunfire Handwraps -- 46128
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,46128,365,34366,4,3908)
-	self:addTradeFlags(RecipeDB,46128,1,2,11,21,22,23,24,25,26,27,28,29,30,36,41,56)
+	self:addTradeFlags(RecipeDB,46128,1,2,6,21,22,23,24,25,26,27,28,29,30,36,41,56)
 	self:addTradeAcquire(RecipeDB,46128,3,25363,3,25367,3,25368,3,25369,3,25370,3,25371)

 	-- Hands of Eternal Light -- 46129
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,46129,365,34367,4,3908)
-	self:addTradeFlags(RecipeDB,46129,1,2,11,21,22,23,24,25,26,27,28,29,30,36,41,56)
+	self:addTradeFlags(RecipeDB,46129,1,2,6,11,21,22,23,24,25,26,27,28,29,30,36,41,56)
 	self:addTradeAcquire(RecipeDB,46129,3,25363,3,25368,3,25369,3,25370,3,25371,3,25507)

 	-- Sunfire Robe -- 46130
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,46130,365,34364,4,3908)
-	self:addTradeFlags(RecipeDB,46130,1,2,11,21,22,23,24,25,26,27,28,29,30,37,41,56)
+	self:addTradeFlags(RecipeDB,46130,1,2,6,11,21,22,23,24,25,26,27,28,29,30,37,41,56)
 	self:addTradeAcquire(RecipeDB,46130,3,25363,3,25367,3,25368,3,25369,3,25370,3,25371,3,25507)

 	-- Robe of Eternal Light -- 46131
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,46131,365,34365,4,3908)
-	self:addTradeFlags(RecipeDB,46131,1,2,11,21,22,23,24,25,26,27,28,29,30,37,41,56)
+	self:addTradeFlags(RecipeDB,46131,1,2,6,21,22,23,24,25,26,27,28,29,30,37,41,56)
 	self:addTradeAcquire(RecipeDB,46131,3,25363,3,25367,3,25369,3,25370,3,25371,3,25486,3,25592)

 	-- Dress Shoes -- 49677
diff --git a/RecipeDB/ARL-Vendor.lua b/RecipeDB/ARL-Vendor.lua
index 12f376a..af29b7e 100644
--- a/RecipeDB/ARL-Vendor.lua
+++ b/RecipeDB/ARL-Vendor.lua
@@ -328,7 +328,7 @@ function addon:InitVendor(VendorDB)
 	self:addLookupList(VendorDB,26868,L["Provisioner Lorkran"],BZONE["Grizzly Hills"],22.48,65.900)
 	self:addLookupList(VendorDB,26947,L["Vix Chromeblaster"],BZONE["Borean Tundra"],31.32,40.900)
 	self:addLookupList(VendorDB,27030,L["Bradley Towns"],BZONE["Dragonblight"],76.78,60.420)
-	self:addLookupList(VendorDB,27054,L["Modoru"],BZONE["Ironforge"],33.83,50.081)
+	self:addLookupList(VendorDB,27054,L["Modoru"],BZONE["Ironforge"],35.52,52.581)
 	self:addLookupList(VendorDB,27147,L["Librarian Erickson"],BZONE["Borean Tundra"],45.94,32.680)
 	self:addLookupList(VendorDB,27666,L["Ontuvo"],BZONE["Zul'Aman"],0,00)
 	self:addLookupList(VendorDB,28714,L["Ildine Sorrowspear"],BZONE["Dalaran"],39.32,41.100)
@@ -338,7 +338,7 @@ function addon:InitVendor(VendorDB)
 	self:addLookupList(VendorDB,29512,L["Ainderu Summerleaf"],BZONE["Dalaran"],37.05,33.730)
 	self:addLookupList(VendorDB,30431,L["Veteran Crusader Aliocha Segard"],BZONE["Icecrown"],88.03,76.870)
 	self:addLookupList(VendorDB,30489,L["Morgan Day"],BZONE["Wintergrasp"],49.31,17.921)
-	self:addLookupList(VendorDB,31031,L["Misensi"],BZONE["Dalaran"],69.77,37.740)
+	self:addLookupList(VendorDB,31031,L["Misensi"],BZONE["Dalaran"],69.78,37.590)
 	self:addLookupList(VendorDB,31032,L["Derek Odds"],BZONE["Dalaran"],41.05,65.700)
 	self:addLookupList(VendorDB,31910,L["Geen"],BZONE["Sholazar Basin"],54.21,56.980)
 	self:addLookupList(VendorDB,31911,L["Tanak"],BZONE["Sholazar Basin"],55.09,68.930)
diff --git a/RecipeStats.txt b/RecipeStats.txt
index 680019a..ed7fc18 100644
--- a/RecipeStats.txt
+++ b/RecipeStats.txt
@@ -21,6 +21,7 @@ Unknown zones:
 	"Supplying the Front" => "",

 Unknown faction:
+	"40 Tickets - Schematic: Steam Tonk Controller" => "",
 	"Alanna Raveneye" => "",
 	"Alchemist Gribble" => "",
 	"Alys Vol'tyr" => "",
@@ -41,6 +42,7 @@ Unknown faction:
 	"Byancie" => "",
 	"Captured Gnome" => "",
 	"Celie Steelwing" => "",
+	"Cluster Launcher" => "",
 	"Cyndra Kindwhisper" => "",
 	"Daga Ramba" => "",
 	"Daggle Ironshaper" => "",
@@ -48,14 +50,16 @@ Unknown faction:
 	"Derek Odds" => "",
 	"Doba" => "",
 	"Drakk Stonehand" => "",
-	"Elixir of Pain - " => "",
+	"Elixir of Pain" => "",
 	"Felannia" => "",
+	"Festive Recipes" => "",
+	"Firework Launcher" => "",
+	"Flash Bomb Recipe" => "",
 	"Gambarinka" => "",
 	"Gara Skullcrush" => "",
 	"Gaston" => "",
 	"Ghak Healtouch" => "",
 	"Gorgolon the All-seeing" => "",
-	"Gorgolon the All-seeing - " => "",
 	"Great-father Winter" => "",
 	"Gremlock Pilsnor" => "",
 	"Grutah" => "",
@@ -64,6 +68,13 @@ Unknown faction:
 	"Hahrana Ironhide" => "",
 	"Hama" => "",
 	"Hurnak Grimmord" => "",
+	"Imperial Plate Belt" => "",
+	"Imperial Plate Boots" => "",
+	"Imperial Plate Bracer" => "",
+	"Imperial Plate Chest" => "",
+	"Imperial Plate Helm" => "",
+	"Imperial Plate Leggings" => "",
+	"Imperial Plate Shoulders" => "",
 	"Jangdor Swiftstrider" => "",
 	"Johan Focht" => "",
 	"K. Lee Smallfry" => "",
@@ -96,8 +107,8 @@ Unknown faction:
 	"Seer Janidi" => "",
 	"Sid Limbardi" => "",
 	"Skeletal Fiend (Enraged Form)" => "",
-	"Skeletal Fiend (Enraged Form) - " => "",
 	"Stone Guard Mukar" => "",
+	"Supplying the Front" => "",
 	"Tatiana" => "",
 	"Thamner Pol" => "",
 	"Tognus Flintfire" => "",
@@ -114,58 +125,31 @@ Unknown faction:

 Single faction:
 	"Ainethil" => "",
-	"Alanna Raveneye" => "",
-	"Alchemist Gribble" => "",
 	"Alegorn" => "",
 	"Aleinia" => "",
 	"Alexandra Bolero" => "",
-	"Alys Vol'tyr" => "",
 	"Amin" => "",
-	"Amy Davenport" => "",
-	"Ancient Female Vrykul" => "",
-	"Andrew Hilbert" => "",
-	"Apothecary Antonivich" => "",
 	"Arnok" => "",
 	"Arras" => "",
 	"Arred" => "",
-	"Artificer Daelo" => "",
-	"Bale" => "",
-	"Banalash" => "",
-	"Barim Spilthoof" => "",
-	"Baxter" => "",
 	"Belil" => "",
 	"Bemarrin" => "",
 	"Betty Quin" => "",
 	"Borgosh Corebender" => "",
 	"Borgus Steelhand" => "",
-	"Borto" => "",
 	"Borya" => "",
-	"Bowen Brisboise" => "",
-	"Bradley Towns" => "",
 	"Brek Stonehoof" => "",
-	"Bronk Guzzlegear" => "",
 	"Burbik Gearspanner" => "",
-	"Burko" => "",
-	"Byancie" => "",
 	"Camberon" => "",
-	"Captured Gnome" => "",
-	"Celie Steelwing" => "",
-	"Cyndra Kindwhisper" => "",
-	"Daga Ramba" => "",
-	"Daggle Ironshaper" => "",
-	"Dalinna" => "",
 	"Dane Lindgren" => "",
 	"Daniel Bartlett" => "",
 	"Dannelor" => "",
 	"Danwe" => "",
 	"Darianna" => "",
-	"Derek Odds" => "",
 	"Deynna" => "",
-	"Doba" => "",
 	"Doctor Herbert Halsey" => "",
 	"Doctor Marsh" => "",
 	"Dolothos" => "",
-	"Drakk Stonehand" => "",
 	"Edrem" => "",
 	"Egomis" => "",
 	"Elynna" => "",
@@ -174,46 +158,30 @@ Single faction:
 	"Faldron" => "",
 	"Farii" => "",
 	"Feera" => "",
-	"Felannia" => "",
 	"Felicia Doan" => "",
 	"Felika" => "",
 	"Feruul" => "",
 	"Fimble Finespindle" => "",
 	"Franklin Lloyd" => "",
 	"Fyldan" => "",
-	"Gambarinka" => "",
-	"Gara Skullcrush" => "",
-	"Gaston" => "",
 	"Gearcutter Cogspinner" => "",
 	"Gelanthis" => "",
 	"Gelman Stonehand" => "",
 	"Georgio Bolero" => "",
-	"Ghak Healtouch" => "",
 	"Ghermas" => "",
 	"Gimble Thistlefuzz" => "",
 	"Gloresse" => "",
 	"Godan" => "",
 	"Graham Van Talen" => "",
-	"Gremlock Pilsnor" => "",
-	"Grutah" => "",
-	"Guillaume Sorouy" => "",
-	"Haalrun" => "",
 	"Haferet" => "",
 	"Hagrus" => "",
-	"Hahrana Ironhide" => "",
-	"Hama" => "",
-	"Hurnak Grimmord" => "",
 	"Innkeeper Grilka" => "",
 	"James Van Brunt" => "",
-	"Jangdor Swiftstrider" => "",
 	"Jessara Cordell" => "",
 	"Jhag" => "",
-	"Johan Focht" => "",
 	"Josef Gregorian" => "",
 	"Joseph Moore" => "",
 	"Josephine Lister" => "",
-	"K. Lee Smallfry" => "",
-	"Kalaen" => "",
 	"Kalinda" => "",
 	"Kamari" => "",
 	"Karolek" => "",
@@ -222,22 +190,12 @@ Single faction:
 	"Kelgruk Bloodaxe" => "",
 	"Kendor Kabonka" => "",
 	"Kithas" => "",
-	"Knight Dameron" => "",
 	"Kor'geld" => "",
-	"Krek Cragcrush" => "",
-	"Krugosh" => "",
 	"Kudrii" => "",
-	"Kylanna Windwhisper" => "",
 	"Landraelanis" => "",
 	"Lavinia Crowe" => "",
 	"Lawrence Schneider" => "",
-	"Leeli Longhaggle" => "",
 	"Lilyssia Nightbreeze" => "",
-	"Linna Bruder" => "",
-	"Logannas" => "",
-	"Logistics Officer Brighton" => "",
-	"Logistics Officer Silverstone" => "",
-	"Loolruna" => "",
 	"Lucan Cordell" => "",
 	"Lyna" => "",
 	"Lynalis" => "",
@@ -245,7 +203,6 @@ Single faction:
 	"Mahu" => "",
 	"Makaru" => "",
 	"Malcomb Wynn" => "",
-	"Mari Stonehand" => "",
 	"Mary Edras" => "",
 	"Master Chef Mouldier" => "",
 	"Me'lynn" => "",
@@ -254,54 +211,37 @@ Single faction:
 	"Milla Fairancora" => "",
 	"Millie Gregorian" => "",
 	"Mirvedon" => "",
-	"Misensi" => "",
 	"Muaat" => "",
-	"Muheru the Weaver" => "",
 	"Mythrin'dir" => "",
-	"Nadyia Maneweaver" => "",
 	"Nahogg" => "",
 	"Neii" => "",
 	"Nissa Firestone" => "",
 	"Nogg" => "",
-	"Nula the Butcher" => "",
-	"Nurse Neela" => "",
 	"Nus" => "",
-	"Nyoma" => "",
 	"Okothos Ironrager" => "",
 	"Outfitter Eric" => "",
 	"Padaar" => "",
 	"Phea" => "",
-	"Pratt McGrubben" => "",
-	"Provisioner Lorkran" => "",
-	"Quartermaster Urgronn" => "",
 	"Randal Worth" => "",
 	"Rawrk" => "",
 	"Razia" => "",
 	"Refik" => "",
 	"Rhiannon Davis" => "",
-	"Rogvar" => "",
-	"Rohok" => "",
 	"Ronald Burch" => "",
 	"Roxxik" => "",
-	"Rungor" => "",
 	"Saenorion" => "",
 	"Saru Steelfury" => "",
-	"Sassa Weldwell" => "",
-	"Sebastian Crane" => "",
 	"Sedana" => "",
-	"Seer Janidi" => "",
 	"Sellandus" => "",
 	"Sewa Mistrunner" => "",
 	"Shankys" => "",
 	"Shayis Steelfury" => "",
-	"Sid Limbardi" => "",
 	"Simon Tanner" => "",
 	"Snang" => "",
 	"Snarl" => "",
 	"Sovik" => "",
 	"Sprite Jumpsprocket" => "",
 	"Stephen Ryback" => "",
-	"Stone Guard Mukar" => "",
 	"Sumi" => "",
 	"Sylvanna Forestmoon" => "",
 	"Taladan" => "",
@@ -309,37 +249,24 @@ Single faction:
 	"Tamar" => "",
 	"Tansy Puddlefizz" => "",
 	"Tarn" => "",
-	"Tatiana" => "",
 	"Tel'Athir" => "",
 	"Telonis" => "",
 	"Thaddeus Webb" => "",
-	"Thamner Pol" => "",
 	"Thonys Pillarstone" => "",
 	"Thund" => "",
 	"Tilli Thistlefuzz" => "",
-	"Tognus Flintfire" => "",
 	"Trianna" => "",
-	"Truk Wildbeard" => "",
 	"Ug'thok" => "",
 	"Ulthir" => "",
 	"Una" => "",
-	"Uthok" => "",
 	"Uthrar Threx" => "",
 	"Vaean" => "",
-	"Vance Undergloom" => "",
 	"Vhan" => "",
-	"Victor Ward" => "",
-	"Vix Chromeblaster" => "",
-	"Wulan" => "",
 	"Xen'to" => "",
-	"Xylinnia Starshine" => "",
-	"Yarr Hammerstone" => "",
 	"Yatheon" => "",
 	"Yelmak" => "",
 	"Zamja" => "",
 	"Zaralda" => "",
-	"Zarrin" => "",
-	"Zurai" => "",

 Instance mobs:
 	"Abomination",
@@ -365,6 +292,7 @@ Instance mobs:
 	"Anvilrage Marshal",
 	"Anvilrage Overseer",
 	"Anvilrage Soldier",
+	"Apocalypse Guard",
 	"Arcane Anomaly",
 	"Arcane Protector",
 	"Arcatraz Sentinel",
@@ -374,6 +302,7 @@ Instance mobs:
 	"Atal'ai Witch Doctor",
 	"Attumen the Huntsman",
 	"Auchenai Monk",
+	"Ayamiss the Hunter",
 	"Azgalor",
 	"Azure Magus",
 	"Azure Warder",
@@ -391,11 +320,14 @@ Instance mobs:
 	"Bog Giant",
 	"Bonechewer Destroyer",
 	"Burrowing Thundersnout",
+	"Buru the Gorger",
 	"Cabal Acolyte",
 	"Cabal Cultist",
 	"Cabal Fanatic",
 	"Cabal Spellbinder",
+	"Cannon Master Willey",
 	"Captain Skarloc",
+	"Cataclysm Hound",
 	"Chrono Lord Deja",
 	"Cobalt Serpent",
 	"Coilfang Champion",
@@ -410,6 +342,8 @@ Instance mobs:
 	"Coilfang Warrior",
 	"Coilskar Sea-Caller",
 	"Commander Sarannis",
+	"Crimson Inquisitor",
+	"Crimson Sorcerer",
 	"Crypt Fiend",
 	"Crystalcore Mechanic",
 	"Crystalline Keeper",
@@ -425,6 +359,7 @@ Instance mobs:
 	"Defias Renegade Mage",
 	"Defias Squallshaper",
 	"Don Carlos",
+	"Doomfire Destroyer",
 	"Doomforge Craftsman",
 	"Doomforge Dragoon",
 	"Dragonmaw Wind Reaver",
@@ -456,6 +391,7 @@ Instance mobs:
 	"Garr",
 	"Gehennas",
 	"General Drakkisath",
+	"General Rajaxx",
 	"Ghaz'an",
 	"Ghostly Philanthropist",
 	"Ghostly Steward",
@@ -477,15 +413,19 @@ Instance mobs:
 	"High Botanist Freywinn",
 	"Homunculus",
 	"Hydromancer Thespia",
+	"Ironbark Protector",
 	"Jan'alai",
 	"Kaz'rogal",
+	"Kurinnaxx",
 	"Lord Kri",
 	"Lord Roccor",
 	"Loro",
 	"Lucifron",
 	"Mage Slayer",
 	"Magical Horror",
+	"Magister Kalendris",
 	"Magmadar",
+	"Maleki the Pallid",
 	"Mana Warp",
 	"Mechano-Lord Capacitus",
 	"Mekgineer Steamrigger",
@@ -493,6 +433,7 @@ Instance mobs:
 	"Mennu the Betrayer",
 	"Midnight",
 	"Mijan",
+	"Moam",
 	"Moroes",
 	"Murk Spitter",
 	"Murk Worm",
@@ -504,11 +445,14 @@ Instance mobs:
 	"Nexus-Prince Shaffar",
 	"Nightbane",
 	"Nightmare Scalebane",
+	"Oblivion Mage",
 	"Onyxia",
 	"Ormorok the Tree-Shaper",
+	"Ossirian the Unscarred",
 	"Ouro",
 	"Overlord Wyrmthalak",
 	"Overmaster Pyron",
+	"Painbringer",
 	"Pathaleon the Calculator",
 	"Phantom Attendant",
 	"Phantom Guardsman",
@@ -518,9 +462,12 @@ Instance mobs:
 	"Phoenix-Hawk",
 	"Phoenix-Hawk Hatchling",
 	"Plugger Spazzring",
+	"Priestess Delrissa",
+	"Priestess of Torment",
 	"Primordial Behemoth",
 	"Princess Huhuran",
 	"Princess Yauj",
+	"Pusillin",
 	"Pyromancer Loregrain",
 	"Quartermaster Zigris",
 	"Rabid Warhound",
@@ -537,6 +484,7 @@ Instance mobs:
 	"Sable Jaguar",
 	"Sandfury Blood Drinker",
 	"Sandfury Shadowcaster",
+	"Savage Worg",
 	"Scarlet Adept",
 	"Scarlet Centurion",
 	"Scarlet Gallant",
@@ -553,11 +501,16 @@ Instance mobs:
 	"Shadow Pillager",
 	"Shadowforge Peasant",
 	"Shadowmoon Reaver",
+	"Shadowsword Assassin",
+	"Shadowsword Guardian",
+	"Shadowsword Vanquisher",
 	"Shadowy Necromancer",
 	"Shattered Hand Centurion",
 	"Shattered Hand Champion",
 	"Shattered Hand Reaver",
 	"Shazzrah",
+	"Shrike Bat",
+	"Sister of Torment",
 	"Skeletal Usher",
 	"Solakar Flamewreath",
 	"Sorcerous Shade",
@@ -570,7 +523,16 @@ Instance mobs:
 	"Spectral Stallion",
 	"Spell Shade",
 	"Spirestone Warlord",
+	"Splinterbone Centurion",
+	"Stonevault Oracle",
+	"Stonevault Pillager",
 	"Subterranean Diemetradon",
+	"Sunblade Arch Mage",
+	"Sunblade Cabalist",
+	"Sunblade Dawn Priest",
+	"Sunblade Dusk Priest",
+	"Sunblade Slayer",
+	"Sunblade Vindicator",
 	"Sunseeker Astromage",
 	"Sunseeker Botanist",
 	"Sunseeker Harvester",
@@ -579,6 +541,7 @@ Instance mobs:
 	"The Crone",
 	"The Prophet Skeram",
 	"Thorngrin the Tender",
+	"Thuzadin Shadowcaster",
 	"Time-Lost Shadowmage",
 	"Twilight Emissary",
 	"Unchained Doombringer",