Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

186 files changed, 95 insertions, 129 deletions

diff --git a/sql/base/characters_database.sql b/sql/base/characters_database.sql
index 93c5ee59cf1..a45af500f88 100644
--- a/sql/base/characters_database.sql
+++ b/sql/base/characters_database.sql
@@ -547,25 +547,26 @@ CREATE TABLE `character_equipmentsets` (
   `setindex` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `name` varchar(31) NOT NULL,
   `iconname` varchar(100) NOT NULL,
-  `item0` int(10) unsigned NOT NULL DEFAULT '0',
-  `item1` int(10) unsigned NOT NULL DEFAULT '0',
-  `item2` int(10) unsigned NOT NULL DEFAULT '0',
-  `item3` int(10) unsigned NOT NULL DEFAULT '0',
-  `item4` int(10) unsigned NOT NULL DEFAULT '0',
-  `item5` int(10) unsigned NOT NULL DEFAULT '0',
-  `item6` int(10) unsigned NOT NULL DEFAULT '0',
-  `item7` int(10) unsigned NOT NULL DEFAULT '0',
-  `item8` int(10) unsigned NOT NULL DEFAULT '0',
-  `item9` int(10) unsigned NOT NULL DEFAULT '0',
-  `item10` int(10) unsigned NOT NULL DEFAULT '0',
-  `item11` int(10) unsigned NOT NULL DEFAULT '0',
-  `item12` int(10) unsigned NOT NULL DEFAULT '0',
-  `item13` int(10) unsigned NOT NULL DEFAULT '0',
-  `item14` int(10) unsigned NOT NULL DEFAULT '0',
-  `item15` int(10) unsigned NOT NULL DEFAULT '0',
-  `item16` int(10) unsigned NOT NULL DEFAULT '0',
-  `item17` int(10) unsigned NOT NULL DEFAULT '0',
-  `item18` int(10) unsigned NOT NULL DEFAULT '0',
+  `ignore_mask` int(11) unsigned NOT NULL DEFAULT '0',
+  `item0` int(11) unsigned NOT NULL DEFAULT '0',
+  `item1` int(11) unsigned NOT NULL DEFAULT '0',
+  `item2` int(11) unsigned NOT NULL DEFAULT '0',
+  `item3` int(11) unsigned NOT NULL DEFAULT '0',
+  `item4` int(11) unsigned NOT NULL DEFAULT '0',
+  `item5` int(11) unsigned NOT NULL DEFAULT '0',
+  `item6` int(11) unsigned NOT NULL DEFAULT '0',
+  `item7` int(11) unsigned NOT NULL DEFAULT '0',
+  `item8` int(11) unsigned NOT NULL DEFAULT '0',
+  `item9` int(11) unsigned NOT NULL DEFAULT '0',
+  `item10` int(11) unsigned NOT NULL DEFAULT '0',
+  `item11` int(11) unsigned NOT NULL DEFAULT '0',
+  `item12` int(11) unsigned NOT NULL DEFAULT '0',
+  `item13` int(11) unsigned NOT NULL DEFAULT '0',
+  `item14` int(11) unsigned NOT NULL DEFAULT '0',
+  `item15` int(11) unsigned NOT NULL DEFAULT '0',
+  `item16` int(11) unsigned NOT NULL DEFAULT '0',
+  `item17` int(11) unsigned NOT NULL DEFAULT '0',
+  `item18` int(11) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`setguid`),
   UNIQUE KEY `idx_set` (`guid`,`setguid`,`setindex`),
   KEY `Idx_setindex` (`setindex`)
diff --git a/sql/updates/world/2012_05_19_03_world_version.sql b/sql/old/3.3.5a/2012_05_19_03_world_version.sql
index 53c6821be69..53c6821be69 100644
--- a/sql/updates/world/2012_05_19_03_world_version.sql
+++ b/sql/old/3.3.5a/2012_05_19_03_world_version.sql
diff --git a/sql/updates/world/2012_05_19_04_world_creature_loot_template.sql b/sql/old/3.3.5a/2012_05_19_04_world_creature_loot_template.sql
index ae996e01956..ae996e01956 100644
--- a/sql/updates/world/2012_05_19_04_world_creature_loot_template.sql
+++ b/sql/old/3.3.5a/2012_05_19_04_world_creature_loot_template.sql
diff --git a/sql/updates/world/2012_05_19_05_world_gameobject_loot_template.sql b/sql/old/3.3.5a/2012_05_19_05_world_gameobject_loot_template.sql
index f95cb45efe4..f95cb45efe4 100644
--- a/sql/updates/world/2012_05_19_05_world_gameobject_loot_template.sql
+++ b/sql/old/3.3.5a/2012_05_19_05_world_gameobject_loot_template.sql
diff --git a/sql/updates/world/2012_05_19_06_world_gameobject_loot_template.sql b/sql/old/3.3.5a/2012_05_19_06_world_gameobject_loot_template.sql
index 9b2dcbb9363..9b2dcbb9363 100644
--- a/sql/updates/world/2012_05_19_06_world_gameobject_loot_template.sql
+++ b/sql/old/3.3.5a/2012_05_19_06_world_gameobject_loot_template.sql
diff --git a/sql/updates/world/2012_05_20_00_world_misc.sql b/sql/old/3.3.5a/2012_05_20_00_world_misc.sql
index 5b96f9881d6..5b96f9881d6 100644
--- a/sql/updates/world/2012_05_20_00_world_misc.sql
+++ b/sql/old/3.3.5a/2012_05_20_00_world_misc.sql
diff --git a/sql/updates/world/2012_05_20_01_world_spell_bonus_data.sql b/sql/old/3.3.5a/2012_05_20_01_world_spell_bonus_data.sql
index 7603f7dd938..7603f7dd938 100644
--- a/sql/updates/world/2012_05_20_01_world_spell_bonus_data.sql
+++ b/sql/old/3.3.5a/2012_05_20_01_world_spell_bonus_data.sql
diff --git a/sql/updates/world/2012_05_22_00_world_spell_proc_event.sql b/sql/old/3.3.5a/2012_05_22_00_world_spell_proc_event.sql
index ba2ea83f643..ba2ea83f643 100644
--- a/sql/updates/world/2012_05_22_00_world_spell_proc_event.sql
+++ b/sql/old/3.3.5a/2012_05_22_00_world_spell_proc_event.sql
diff --git a/sql/updates/world/2012_05_22_01_world_creature_loot_template.sql b/sql/old/3.3.5a/2012_05_22_01_world_creature_loot_template.sql
index bcae5be9ae1..bcae5be9ae1 100644
--- a/sql/updates/world/2012_05_22_01_world_creature_loot_template.sql
+++ b/sql/old/3.3.5a/2012_05_22_01_world_creature_loot_template.sql
diff --git a/sql/updates/world/2012_05_23_00_world_creature.sql b/sql/old/3.3.5a/2012_05_23_00_world_creature.sql
index 8a965b7fdfe..8a965b7fdfe 100644
--- a/sql/updates/world/2012_05_23_00_world_creature.sql
+++ b/sql/old/3.3.5a/2012_05_23_00_world_creature.sql
diff --git a/sql/updates/world/2012_05_23_01_world_sai.sql b/sql/old/3.3.5a/2012_05_23_01_world_sai.sql
index af2fd5409d1..af2fd5409d1 100644
--- a/sql/updates/world/2012_05_23_01_world_sai.sql
+++ b/sql/old/3.3.5a/2012_05_23_01_world_sai.sql
diff --git a/sql/updates/world/2012_05_23_02_world_sai.sql b/sql/old/3.3.5a/2012_05_23_02_world_sai.sql
index 588f25f1568..588f25f1568 100644
--- a/sql/updates/world/2012_05_23_02_world_sai.sql
+++ b/sql/old/3.3.5a/2012_05_23_02_world_sai.sql
diff --git a/sql/updates/world/2012_05_23_03_world_gameobject_loot_template.sql b/sql/old/3.3.5a/2012_05_23_03_world_gameobject_loot_template.sql
index 22ecebcae31..22ecebcae31 100644
--- a/sql/updates/world/2012_05_23_03_world_gameobject_loot_template.sql
+++ b/sql/old/3.3.5a/2012_05_23_03_world_gameobject_loot_template.sql
diff --git a/sql/updates/world/2012_05_23_04_world_gameobject.sql b/sql/old/3.3.5a/2012_05_23_04_world_gameobject.sql
index afcb1e89317..afcb1e89317 100644
--- a/sql/updates/world/2012_05_23_04_world_gameobject.sql
+++ b/sql/old/3.3.5a/2012_05_23_04_world_gameobject.sql
diff --git a/sql/updates/world/2012_05_23_05_world_creature.sql b/sql/old/3.3.5a/2012_05_23_05_world_creature.sql
index bb162f927bd..bb162f927bd 100644
--- a/sql/updates/world/2012_05_23_05_world_creature.sql
+++ b/sql/old/3.3.5a/2012_05_23_05_world_creature.sql
diff --git a/sql/updates/world/2012_05_24_00_world_creature_misc.sql b/sql/old/3.3.5a/2012_05_24_00_world_creature_misc.sql
index ae35b3fba5d..ae35b3fba5d 100644
--- a/sql/updates/world/2012_05_24_00_world_creature_misc.sql
+++ b/sql/old/3.3.5a/2012_05_24_00_world_creature_misc.sql
diff --git a/sql/updates/world/2012_05_24_01_world_gameobject.sql b/sql/old/3.3.5a/2012_05_24_01_world_gameobject.sql
index 32bbc15494f..32bbc15494f 100644
--- a/sql/updates/world/2012_05_24_01_world_gameobject.sql
+++ b/sql/old/3.3.5a/2012_05_24_01_world_gameobject.sql
diff --git a/sql/updates/world/2012_05_25_00_world_sai.sql b/sql/old/3.3.5a/2012_05_25_00_world_sai.sql
index fa5682db02f..fa5682db02f 100644
--- a/sql/updates/world/2012_05_25_00_world_sai.sql
+++ b/sql/old/3.3.5a/2012_05_25_00_world_sai.sql
diff --git a/sql/updates/world/2012_05_25_01_world_waypoints.sql b/sql/old/3.3.5a/2012_05_25_01_world_waypoints.sql
index 0d2c04bc6bc..0d2c04bc6bc 100644
--- a/sql/updates/world/2012_05_25_01_world_waypoints.sql
+++ b/sql/old/3.3.5a/2012_05_25_01_world_waypoints.sql
diff --git a/sql/updates/world/2012_05_25_02_world_creature_template.sql b/sql/old/3.3.5a/2012_05_25_02_world_creature_template.sql
index fd4c1743f07..fd4c1743f07 100644
--- a/sql/updates/world/2012_05_25_02_world_creature_template.sql
+++ b/sql/old/3.3.5a/2012_05_25_02_world_creature_template.sql
diff --git a/sql/updates/world/2012_05_25_03_world_template.sql b/sql/old/3.3.5a/2012_05_25_03_world_template.sql
index 6ef112f342f..6ef112f342f 100644
--- a/sql/updates/world/2012_05_25_03_world_template.sql
+++ b/sql/old/3.3.5a/2012_05_25_03_world_template.sql
diff --git a/sql/updates/world/2012_05_26_00_world_scripts.sql b/sql/old/3.3.5a/2012_05_26_00_world_scripts.sql
index 18b0fa2f6b2..18b0fa2f6b2 100644
--- a/sql/updates/world/2012_05_26_00_world_scripts.sql
+++ b/sql/old/3.3.5a/2012_05_26_00_world_scripts.sql
diff --git a/sql/updates/world/2012_05_26_01_world_spell_dbc.sql b/sql/old/3.3.5a/2012_05_26_01_world_spell_dbc.sql
index 7efebc37489..7efebc37489 100644
--- a/sql/updates/world/2012_05_26_01_world_spell_dbc.sql
+++ b/sql/old/3.3.5a/2012_05_26_01_world_spell_dbc.sql
diff --git a/sql/updates/world/2012_05_26_02_world_creature_template.sql b/sql/old/3.3.5a/2012_05_26_02_world_creature_template.sql
index e51567390b7..e51567390b7 100644
--- a/sql/updates/world/2012_05_26_02_world_creature_template.sql
+++ b/sql/old/3.3.5a/2012_05_26_02_world_creature_template.sql
diff --git a/sql/updates/world/2012_05_26_03_world_page_text.sql b/sql/old/3.3.5a/2012_05_26_03_world_page_text.sql
index 9dc285cd99d..9dc285cd99d 100644
--- a/sql/updates/world/2012_05_26_03_world_page_text.sql
+++ b/sql/old/3.3.5a/2012_05_26_03_world_page_text.sql
diff --git a/sql/updates/world/2012_05_26_04_world_creature_template.sql b/sql/old/3.3.5a/2012_05_26_04_world_creature_template.sql
index 911cd45ef8c..911cd45ef8c 100644
--- a/sql/updates/world/2012_05_26_04_world_creature_template.sql
+++ b/sql/old/3.3.5a/2012_05_26_04_world_creature_template.sql
diff --git a/sql/updates/world/2012_05_26_05_world_creature_template.sql b/sql/old/3.3.5a/2012_05_26_05_world_creature_template.sql
index 59d69b3fbe1..59d69b3fbe1 100644
--- a/sql/updates/world/2012_05_26_05_world_creature_template.sql
+++ b/sql/old/3.3.5a/2012_05_26_05_world_creature_template.sql
diff --git a/sql/updates/world/2012_05_26_06_world_smart_scripts.sql b/sql/old/3.3.5a/2012_05_26_06_world_smart_scripts.sql
index 397a5ad517a..397a5ad517a 100644
--- a/sql/updates/world/2012_05_26_06_world_smart_scripts.sql
+++ b/sql/old/3.3.5a/2012_05_26_06_world_smart_scripts.sql
diff --git a/sql/updates/world/2012_05_27_00_world_gameobject_template.sql b/sql/old/3.3.5a/2012_05_27_00_world_gameobject_template.sql
index 5fa3c15a505..5fa3c15a505 100644
--- a/sql/updates/world/2012_05_27_00_world_gameobject_template.sql
+++ b/sql/old/3.3.5a/2012_05_27_00_world_gameobject_template.sql
diff --git a/sql/updates/world/2012_05_27_01_world_waypoints.sql b/sql/old/3.3.5a/2012_05_27_01_world_waypoints.sql
index 3685b58a629..3685b58a629 100644
--- a/sql/updates/world/2012_05_27_01_world_waypoints.sql
+++ b/sql/old/3.3.5a/2012_05_27_01_world_waypoints.sql
diff --git a/sql/updates/world/2012_05_27_02_world_creature.sql b/sql/old/3.3.5a/2012_05_27_02_world_creature.sql
index 8ca3ee75c94..8ca3ee75c94 100644
--- a/sql/updates/world/2012_05_27_02_world_creature.sql
+++ b/sql/old/3.3.5a/2012_05_27_02_world_creature.sql
diff --git a/sql/updates/world/2012_05_27_03_world_creature.sql b/sql/old/3.3.5a/2012_05_27_03_world_creature.sql
index 097f40581a7..097f40581a7 100644
--- a/sql/updates/world/2012_05_27_03_world_creature.sql
+++ b/sql/old/3.3.5a/2012_05_27_03_world_creature.sql
diff --git a/sql/updates/world/2012_05_27_04_world_smart_scripts.sql b/sql/old/3.3.5a/2012_05_27_04_world_smart_scripts.sql
index 1f7cfa3d19c..1f7cfa3d19c 100644
--- a/sql/updates/world/2012_05_27_04_world_smart_scripts.sql
+++ b/sql/old/3.3.5a/2012_05_27_04_world_smart_scripts.sql
diff --git a/sql/updates/world/2012_05_27_05_world_gameobject.sql b/sql/old/3.3.5a/2012_05_27_05_world_gameobject.sql
index 66fbfd0afca..66fbfd0afca 100644
--- a/sql/updates/world/2012_05_27_05_world_gameobject.sql
+++ b/sql/old/3.3.5a/2012_05_27_05_world_gameobject.sql
diff --git a/sql/updates/world/2012_05_27_06_world_creature.sql b/sql/old/3.3.5a/2012_05_27_06_world_creature.sql
index 1074465a0be..1074465a0be 100644
--- a/sql/updates/world/2012_05_27_06_world_creature.sql
+++ b/sql/old/3.3.5a/2012_05_27_06_world_creature.sql
diff --git a/sql/updates/world/2012_05_27_07_world_game_event.sql b/sql/old/3.3.5a/2012_05_27_07_world_game_event.sql
index eff4a9e7652..eff4a9e7652 100644
--- a/sql/updates/world/2012_05_27_07_world_game_event.sql
+++ b/sql/old/3.3.5a/2012_05_27_07_world_game_event.sql
diff --git a/sql/updates/world/2012_05_27_07_world_waypoints.sql b/sql/old/3.3.5a/2012_05_27_07_world_waypoints.sql
index bd6aa2d0fc1..bd6aa2d0fc1 100644
--- a/sql/updates/world/2012_05_27_07_world_waypoints.sql
+++ b/sql/old/3.3.5a/2012_05_27_07_world_waypoints.sql
diff --git a/sql/updates/world/2012_05_28_00_world_creature_ai_scripts.sql b/sql/old/3.3.5a/2012_05_28_00_world_creature_ai_scripts.sql
index aef4e4c6f67..aef4e4c6f67 100644
--- a/sql/updates/world/2012_05_28_00_world_creature_ai_scripts.sql
+++ b/sql/old/3.3.5a/2012_05_28_00_world_creature_ai_scripts.sql
diff --git a/sql/updates/world/2012_05_28_01_world_creature.sql b/sql/old/3.3.5a/2012_05_28_01_world_creature.sql
index d39aa7230b5..d39aa7230b5 100644
--- a/sql/updates/world/2012_05_28_01_world_creature.sql
+++ b/sql/old/3.3.5a/2012_05_28_01_world_creature.sql
diff --git a/sql/updates/world/2012_05_28_02_world_creature.sql b/sql/old/3.3.5a/2012_05_28_02_world_creature.sql
index 77da626d89e..77da626d89e 100644
--- a/sql/updates/world/2012_05_28_02_world_creature.sql
+++ b/sql/old/3.3.5a/2012_05_28_02_world_creature.sql
diff --git a/sql/updates/world/2012_05_28_03_world_waypoint_data.sql b/sql/old/3.3.5a/2012_05_28_03_world_waypoint_data.sql
index aa0e0ddd5ef..aa0e0ddd5ef 100644
--- a/sql/updates/world/2012_05_28_03_world_waypoint_data.sql
+++ b/sql/old/3.3.5a/2012_05_28_03_world_waypoint_data.sql
diff --git a/sql/updates/world/2012_05_28_04_world_creature_template.sql b/sql/old/3.3.5a/2012_05_28_04_world_creature_template.sql
index d8c9a15e412..d8c9a15e412 100644
--- a/sql/updates/world/2012_05_28_04_world_creature_template.sql
+++ b/sql/old/3.3.5a/2012_05_28_04_world_creature_template.sql
diff --git a/sql/updates/world/2012_05_28_05_world_creature.sql b/sql/old/3.3.5a/2012_05_28_05_world_creature.sql
index c7d4af5b494..c7d4af5b494 100644
--- a/sql/updates/world/2012_05_28_05_world_creature.sql
+++ b/sql/old/3.3.5a/2012_05_28_05_world_creature.sql
diff --git a/sql/updates/world/2012_05_28_06_world_creature_addon.sql b/sql/old/3.3.5a/2012_05_28_06_world_creature_addon.sql
index a2b573da10a..a2b573da10a 100644
--- a/sql/updates/world/2012_05_28_06_world_creature_addon.sql
+++ b/sql/old/3.3.5a/2012_05_28_06_world_creature_addon.sql
diff --git a/sql/updates/world/2012_05_28_06_world_waypoint_data.sql b/sql/old/3.3.5a/2012_05_28_06_world_waypoint_data.sql
index 1c738cacdc9..1c738cacdc9 100644
--- a/sql/updates/world/2012_05_28_06_world_waypoint_data.sql
+++ b/sql/old/3.3.5a/2012_05_28_06_world_waypoint_data.sql
diff --git a/sql/updates/world/2012_05_28_07_world_quest_template.sql b/sql/old/3.3.5a/2012_05_28_07_world_quest_template.sql
index 3cdf1895a9d..3cdf1895a9d 100644
--- a/sql/updates/world/2012_05_28_07_world_quest_template.sql
+++ b/sql/old/3.3.5a/2012_05_28_07_world_quest_template.sql
diff --git a/sql/updates/world/2012_05_30_00_world_reference_loot_template.sql b/sql/old/3.3.5a/2012_05_30_00_world_reference_loot_template.sql
index c2cab663d4a..c2cab663d4a 100644
--- a/sql/updates/world/2012_05_30_00_world_reference_loot_template.sql
+++ b/sql/old/3.3.5a/2012_05_30_00_world_reference_loot_template.sql
diff --git a/sql/updates/world/2012_05_30_01_world_creature_template.sql b/sql/old/3.3.5a/2012_05_30_01_world_creature_template.sql
index 4b469a13891..4b469a13891 100644
--- a/sql/updates/world/2012_05_30_01_world_creature_template.sql
+++ b/sql/old/3.3.5a/2012_05_30_01_world_creature_template.sql
diff --git a/sql/updates/world/2012_05_30_02_world_quest_template.sql b/sql/old/3.3.5a/2012_05_30_02_world_quest_template.sql
index 2b829aa0875..2b829aa0875 100644
--- a/sql/updates/world/2012_05_30_02_world_quest_template.sql
+++ b/sql/old/3.3.5a/2012_05_30_02_world_quest_template.sql
diff --git a/sql/updates/world/2012_05_30_03_world_creature_formation.sql b/sql/old/3.3.5a/2012_05_30_03_world_creature_formation.sql
index 2964415e85b..2964415e85b 100644
--- a/sql/updates/world/2012_05_30_03_world_creature_formation.sql
+++ b/sql/old/3.3.5a/2012_05_30_03_world_creature_formation.sql
diff --git a/sql/updates/world/2012_05_30_04_world_gossip.sql b/sql/old/3.3.5a/2012_05_30_04_world_gossip.sql
index 0abbea7b964..0abbea7b964 100644
--- a/sql/updates/world/2012_05_30_04_world_gossip.sql
+++ b/sql/old/3.3.5a/2012_05_30_04_world_gossip.sql
diff --git a/sql/updates/world/2012_05_30_05_world_gossip.sql b/sql/old/3.3.5a/2012_05_30_05_world_gossip.sql
index 5e7f1375320..5e7f1375320 100644
--- a/sql/updates/world/2012_05_30_05_world_gossip.sql
+++ b/sql/old/3.3.5a/2012_05_30_05_world_gossip.sql
diff --git a/sql/updates/world/2012_05_31_00_world_reference_loot_template.sql b/sql/old/3.3.5a/2012_05_31_00_world_reference_loot_template.sql
index 03723c82536..03723c82536 100644
--- a/sql/updates/world/2012_05_31_00_world_reference_loot_template.sql
+++ b/sql/old/3.3.5a/2012_05_31_00_world_reference_loot_template.sql
diff --git a/sql/updates/world/2012_05_31_01_world_item_template.sql b/sql/old/3.3.5a/2012_05_31_01_world_item_template.sql
index 144ee6715a9..144ee6715a9 100644
--- a/sql/updates/world/2012_05_31_01_world_item_template.sql
+++ b/sql/old/3.3.5a/2012_05_31_01_world_item_template.sql
diff --git a/sql/updates/world/2012_05_31_01_world_sai.sql b/sql/old/3.3.5a/2012_05_31_01_world_sai.sql
index 3055e98f167..3055e98f167 100644
--- a/sql/updates/world/2012_05_31_01_world_sai.sql
+++ b/sql/old/3.3.5a/2012_05_31_01_world_sai.sql
diff --git a/sql/updates/world/2012_05_31_02_world_creature_model_info.sql b/sql/old/3.3.5a/2012_05_31_02_world_creature_model_info.sql
index a1aa1155aa6..a1aa1155aa6 100644
--- a/sql/updates/world/2012_05_31_02_world_creature_model_info.sql
+++ b/sql/old/3.3.5a/2012_05_31_02_world_creature_model_info.sql
diff --git a/sql/updates/world/2012_05_31_03_world_gameobject_loot_template.sql b/sql/old/3.3.5a/2012_05_31_03_world_gameobject_loot_template.sql
index 5dcedaaf342..5dcedaaf342 100644
--- a/sql/updates/world/2012_05_31_03_world_gameobject_loot_template.sql
+++ b/sql/old/3.3.5a/2012_05_31_03_world_gameobject_loot_template.sql
diff --git a/sql/updates/world/2012_05_31_05_world_sai.sql b/sql/old/3.3.5a/2012_05_31_05_world_sai.sql
index aa95c93aae1..aa95c93aae1 100644
--- a/sql/updates/world/2012_05_31_05_world_sai.sql
+++ b/sql/old/3.3.5a/2012_05_31_05_world_sai.sql
diff --git a/sql/updates/world/2012_05_31_06_world_gameobject.sql b/sql/old/3.3.5a/2012_05_31_06_world_gameobject.sql
index 1db1d6fbd76..1db1d6fbd76 100644
--- a/sql/updates/world/2012_05_31_06_world_gameobject.sql
+++ b/sql/old/3.3.5a/2012_05_31_06_world_gameobject.sql
diff --git a/sql/updates/world/2012_05_31_07_world_gossip.sql b/sql/old/3.3.5a/2012_05_31_07_world_gossip.sql
index 9b82f333a4c..9b82f333a4c 100644
--- a/sql/updates/world/2012_05_31_07_world_gossip.sql
+++ b/sql/old/3.3.5a/2012_05_31_07_world_gossip.sql
diff --git a/sql/updates/world/2012_05_31_08_world_gameobject_template.sql b/sql/old/3.3.5a/2012_05_31_08_world_gameobject_template.sql
index 41527e22919..41527e22919 100644
--- a/sql/updates/world/2012_05_31_08_world_gameobject_template.sql
+++ b/sql/old/3.3.5a/2012_05_31_08_world_gameobject_template.sql
diff --git a/sql/updates/world/2012_05_31_09_world_sai.sql b/sql/old/3.3.5a/2012_05_31_09_world_sai.sql
index a7eb1248905..a7eb1248905 100644
--- a/sql/updates/world/2012_05_31_09_world_sai.sql
+++ b/sql/old/3.3.5a/2012_05_31_09_world_sai.sql
diff --git a/sql/updates/world/2012_05_31_10_world_creature_template.sql b/sql/old/3.3.5a/2012_05_31_10_world_creature_template.sql
index 5499d26b0e3..5499d26b0e3 100644
--- a/sql/updates/world/2012_05_31_10_world_creature_template.sql
+++ b/sql/old/3.3.5a/2012_05_31_10_world_creature_template.sql
diff --git a/sql/updates/world/2012_05_31_11_world_creature.sql b/sql/old/3.3.5a/2012_05_31_11_world_creature.sql
index 177c6230964..177c6230964 100644
--- a/sql/updates/world/2012_05_31_11_world_creature.sql
+++ b/sql/old/3.3.5a/2012_05_31_11_world_creature.sql
diff --git a/sql/updates/world/2012_05_31_12_world_creature.sql b/sql/old/3.3.5a/2012_05_31_12_world_creature.sql
index cad0364d021..cad0364d021 100644
--- a/sql/updates/world/2012_05_31_12_world_creature.sql
+++ b/sql/old/3.3.5a/2012_05_31_12_world_creature.sql
diff --git a/sql/updates/world/2012_06_01_00_world_spell_script_names.sql b/sql/old/3.3.5a/2012_06_01_00_world_spell_script_names.sql
index cc024fe71cb..cc024fe71cb 100644
--- a/sql/updates/world/2012_06_01_00_world_spell_script_names.sql
+++ b/sql/old/3.3.5a/2012_06_01_00_world_spell_script_names.sql
diff --git a/sql/updates/world/2012_06_01_01_world_creature_script.sql b/sql/old/3.3.5a/2012_06_01_01_world_creature_script.sql
index d90800bd1af..d90800bd1af 100644
--- a/sql/updates/world/2012_06_01_01_world_creature_script.sql
+++ b/sql/old/3.3.5a/2012_06_01_01_world_creature_script.sql
diff --git a/sql/updates/world/2012_06_01_02_world_misc.sql b/sql/old/3.3.5a/2012_06_01_02_world_misc.sql
index 23663ef9270..23663ef9270 100644
--- a/sql/updates/world/2012_06_01_02_world_misc.sql
+++ b/sql/old/3.3.5a/2012_06_01_02_world_misc.sql
diff --git a/sql/updates/world/2012_06_01_03_world_creature_template.sql b/sql/old/3.3.5a/2012_06_01_03_world_creature_template.sql
index fb20691ad69..fb20691ad69 100644
--- a/sql/updates/world/2012_06_01_03_world_creature_template.sql
+++ b/sql/old/3.3.5a/2012_06_01_03_world_creature_template.sql
diff --git a/sql/updates/world/2012_06_01_04_world_misc.sql b/sql/old/3.3.5a/2012_06_01_04_world_misc.sql
index d5273cec233..d5273cec233 100644
--- a/sql/updates/world/2012_06_01_04_world_misc.sql
+++ b/sql/old/3.3.5a/2012_06_01_04_world_misc.sql
diff --git a/sql/updates/world/2012_06_02_00_world_sai.sql b/sql/old/3.3.5a/2012_06_02_00_world_sai.sql
index af0b12be244..af0b12be244 100644
--- a/sql/updates/world/2012_06_02_00_world_sai.sql
+++ b/sql/old/3.3.5a/2012_06_02_00_world_sai.sql
diff --git a/sql/updates/world/2012_06_02_01_world_waypoints.sql b/sql/old/3.3.5a/2012_06_02_01_world_waypoints.sql
index c50436bba8d..c50436bba8d 100644
--- a/sql/updates/world/2012_06_02_01_world_waypoints.sql
+++ b/sql/old/3.3.5a/2012_06_02_01_world_waypoints.sql
diff --git a/sql/updates/world/2012_06_02_02_world_creature_text.sql b/sql/old/3.3.5a/2012_06_02_02_world_creature_text.sql
index c38e413617d..c38e413617d 100644
--- a/sql/updates/world/2012_06_02_02_world_creature_text.sql
+++ b/sql/old/3.3.5a/2012_06_02_02_world_creature_text.sql
diff --git a/sql/updates/world/2012_06_02_03_world_creature_loot_template_hp.sql b/sql/old/3.3.5a/2012_06_02_03_world_creature_loot_template_hp.sql
index cd6015929b1..cd6015929b1 100644
--- a/sql/updates/world/2012_06_02_03_world_creature_loot_template_hp.sql
+++ b/sql/old/3.3.5a/2012_06_02_03_world_creature_loot_template_hp.sql
diff --git a/sql/updates/world/2012_06_02_03_world_creature_loot_template_zm.sql b/sql/old/3.3.5a/2012_06_02_03_world_creature_loot_template_zm.sql
index e739f81407b..e739f81407b 100644
--- a/sql/updates/world/2012_06_02_03_world_creature_loot_template_zm.sql
+++ b/sql/old/3.3.5a/2012_06_02_03_world_creature_loot_template_zm.sql
diff --git a/sql/updates/world/2012_06_02_03_world_reference_loot_template.sql b/sql/old/3.3.5a/2012_06_02_03_world_reference_loot_template.sql
index c712cbe18bd..c712cbe18bd 100644
--- a/sql/updates/world/2012_06_02_03_world_reference_loot_template.sql
+++ b/sql/old/3.3.5a/2012_06_02_03_world_reference_loot_template.sql
diff --git a/sql/updates/world/2012_06_02_04_world_reference_loot_template.sql b/sql/old/3.3.5a/2012_06_02_04_world_reference_loot_template.sql
index 57be9083048..57be9083048 100644
--- a/sql/updates/world/2012_06_02_04_world_reference_loot_template.sql
+++ b/sql/old/3.3.5a/2012_06_02_04_world_reference_loot_template.sql
diff --git a/sql/updates/world/2012_06_02_05_world_reference_loot_template.sql b/sql/old/3.3.5a/2012_06_02_05_world_reference_loot_template.sql
index 51dee84ad9b..51dee84ad9b 100644
--- a/sql/updates/world/2012_06_02_05_world_reference_loot_template.sql
+++ b/sql/old/3.3.5a/2012_06_02_05_world_reference_loot_template.sql
diff --git a/sql/updates/world/2012_06_02_06_world_waypoints.sql b/sql/old/3.3.5a/2012_06_02_06_world_waypoints.sql
index 65d5d43bad2..65d5d43bad2 100644
--- a/sql/updates/world/2012_06_02_06_world_waypoints.sql
+++ b/sql/old/3.3.5a/2012_06_02_06_world_waypoints.sql
diff --git a/sql/updates/world/2012_06_02_07_world_Misc.sql b/sql/old/3.3.5a/2012_06_02_07_world_Misc.sql
index c541819841c..c541819841c 100644
--- a/sql/updates/world/2012_06_02_07_world_Misc.sql
+++ b/sql/old/3.3.5a/2012_06_02_07_world_Misc.sql
diff --git a/sql/updates/world/2012_06_02_08_world_waypoints.sql b/sql/old/3.3.5a/2012_06_02_08_world_waypoints.sql
index 60b936a7f72..60b936a7f72 100644
--- a/sql/updates/world/2012_06_02_08_world_waypoints.sql
+++ b/sql/old/3.3.5a/2012_06_02_08_world_waypoints.sql
diff --git a/sql/updates/world/2012_06_02_09_world_creature_transport.sql b/sql/old/3.3.5a/2012_06_02_09_world_creature_transport.sql
index 9a0b062f9ea..9a0b062f9ea 100644
--- a/sql/updates/world/2012_06_02_09_world_creature_transport.sql
+++ b/sql/old/3.3.5a/2012_06_02_09_world_creature_transport.sql
diff --git a/sql/updates/world/2012_06_03_00_world_sai.sql b/sql/old/3.3.5a/2012_06_03_00_world_sai.sql
index 7a5932e61fc..7a5932e61fc 100644
--- a/sql/updates/world/2012_06_03_00_world_sai.sql
+++ b/sql/old/3.3.5a/2012_06_03_00_world_sai.sql
diff --git a/sql/updates/world/2012_06_03_01_world_creature.sql b/sql/old/3.3.5a/2012_06_03_01_world_creature.sql
index 68448b31591..68448b31591 100644
--- a/sql/updates/world/2012_06_03_01_world_creature.sql
+++ b/sql/old/3.3.5a/2012_06_03_01_world_creature.sql
diff --git a/sql/updates/world/2012_06_03_02_world_misc.sql b/sql/old/3.3.5a/2012_06_03_02_world_misc.sql
index 69de8eacdf3..69de8eacdf3 100644
--- a/sql/updates/world/2012_06_03_02_world_misc.sql
+++ b/sql/old/3.3.5a/2012_06_03_02_world_misc.sql
diff --git a/sql/updates/world/2012_06_03_03_world_quest_template.sql b/sql/old/3.3.5a/2012_06_03_03_world_quest_template.sql
index 023182aaf1b..023182aaf1b 100644
--- a/sql/updates/world/2012_06_03_03_world_quest_template.sql
+++ b/sql/old/3.3.5a/2012_06_03_03_world_quest_template.sql
diff --git a/sql/updates/world/2012_06_03_04_world_misc.sql b/sql/old/3.3.5a/2012_06_03_04_world_misc.sql
index 22621d92cbd..22621d92cbd 100644
--- a/sql/updates/world/2012_06_03_04_world_misc.sql
+++ b/sql/old/3.3.5a/2012_06_03_04_world_misc.sql
diff --git a/sql/updates/world/2012_06_03_05_world_creature.sql b/sql/old/3.3.5a/2012_06_03_05_world_creature.sql
index c5bccdbf33c..c5bccdbf33c 100644
--- a/sql/updates/world/2012_06_03_05_world_creature.sql
+++ b/sql/old/3.3.5a/2012_06_03_05_world_creature.sql
diff --git a/sql/updates/world/2012_06_03_06_world_sai.sql b/sql/old/3.3.5a/2012_06_03_06_world_sai.sql
index 32d1995a092..32d1995a092 100644
--- a/sql/updates/world/2012_06_03_06_world_sai.sql
+++ b/sql/old/3.3.5a/2012_06_03_06_world_sai.sql
diff --git a/sql/updates/world/2012_06_04_00_world_sai.sql b/sql/old/3.3.5a/2012_06_04_00_world_sai.sql
index 9497f73041c..9497f73041c 100644
--- a/sql/updates/world/2012_06_04_00_world_sai.sql
+++ b/sql/old/3.3.5a/2012_06_04_00_world_sai.sql
diff --git a/sql/updates/world/2012_06_04_01_world_gossip.sql b/sql/old/3.3.5a/2012_06_04_01_world_gossip.sql
index f6246967452..f6246967452 100644
--- a/sql/updates/world/2012_06_04_01_world_gossip.sql
+++ b/sql/old/3.3.5a/2012_06_04_01_world_gossip.sql
diff --git a/sql/updates/world/2012_06_04_02_world_gossip.sql b/sql/old/3.3.5a/2012_06_04_02_world_gossip.sql
index 0122e9b736e..0122e9b736e 100644
--- a/sql/updates/world/2012_06_04_02_world_gossip.sql
+++ b/sql/old/3.3.5a/2012_06_04_02_world_gossip.sql
diff --git a/sql/updates/world/2012_06_04_03_world_conditions.sql b/sql/old/3.3.5a/2012_06_04_03_world_conditions.sql
index 0eadeb8542e..0eadeb8542e 100644
--- a/sql/updates/world/2012_06_04_03_world_conditions.sql
+++ b/sql/old/3.3.5a/2012_06_04_03_world_conditions.sql
diff --git a/sql/updates/world/2012_06_04_04_world_sai.sql b/sql/old/3.3.5a/2012_06_04_04_world_sai.sql
index f38cd1fe63f..f38cd1fe63f 100644
--- a/sql/updates/world/2012_06_04_04_world_sai.sql
+++ b/sql/old/3.3.5a/2012_06_04_04_world_sai.sql
diff --git a/sql/updates/world/2012_06_04_05_world_sai.sql b/sql/old/3.3.5a/2012_06_04_05_world_sai.sql
index 51d998c15ab..51d998c15ab 100644
--- a/sql/updates/world/2012_06_04_05_world_sai.sql
+++ b/sql/old/3.3.5a/2012_06_04_05_world_sai.sql
diff --git a/sql/updates/world/2012_06_04_06_world_sai.sql b/sql/old/3.3.5a/2012_06_04_06_world_sai.sql
index 455246d82b7..455246d82b7 100644
--- a/sql/updates/world/2012_06_04_06_world_sai.sql
+++ b/sql/old/3.3.5a/2012_06_04_06_world_sai.sql
diff --git a/sql/updates/world/2012_06_04_07_world_misc.sql b/sql/old/3.3.5a/2012_06_04_07_world_misc.sql
index 947ba3b31ee..947ba3b31ee 100644
--- a/sql/updates/world/2012_06_04_07_world_misc.sql
+++ b/sql/old/3.3.5a/2012_06_04_07_world_misc.sql
diff --git a/sql/updates/world/2012_06_05_00_world_sai.sql b/sql/old/3.3.5a/2012_06_05_00_world_sai.sql
index c43998b7459..c43998b7459 100644
--- a/sql/updates/world/2012_06_05_00_world_sai.sql
+++ b/sql/old/3.3.5a/2012_06_05_00_world_sai.sql
diff --git a/sql/updates/world/2012_06_05_01_world_gossip.sql b/sql/old/3.3.5a/2012_06_05_01_world_gossip.sql
index 11697eeffd4..11697eeffd4 100644
--- a/sql/updates/world/2012_06_05_01_world_gossip.sql
+++ b/sql/old/3.3.5a/2012_06_05_01_world_gossip.sql
diff --git a/sql/updates/world/2012_06_05_01_world_gossip_sai.sql b/sql/old/3.3.5a/2012_06_05_01_world_gossip_sai.sql
index 84893613c75..84893613c75 100644
--- a/sql/updates/world/2012_06_05_01_world_gossip_sai.sql
+++ b/sql/old/3.3.5a/2012_06_05_01_world_gossip_sai.sql
diff --git a/sql/updates/world/2012_06_05_03_world_script.sql b/sql/old/3.3.5a/2012_06_05_03_world_script.sql
index d10247979d9..d10247979d9 100644
--- a/sql/updates/world/2012_06_05_03_world_script.sql
+++ b/sql/old/3.3.5a/2012_06_05_03_world_script.sql
diff --git a/sql/updates/world/2012_06_06_00_world_script.sql b/sql/old/3.3.5a/2012_06_06_00_world_script.sql
index 727d28e8ea9..727d28e8ea9 100644
--- a/sql/updates/world/2012_06_06_00_world_script.sql
+++ b/sql/old/3.3.5a/2012_06_06_00_world_script.sql
diff --git a/sql/updates/world/2012_06_06_01_world_sai.sql b/sql/old/3.3.5a/2012_06_06_01_world_sai.sql
index 97e175652d2..97e175652d2 100644
--- a/sql/updates/world/2012_06_06_01_world_sai.sql
+++ b/sql/old/3.3.5a/2012_06_06_01_world_sai.sql
diff --git a/sql/updates/world/2012_06_06_02_world_sai.sql b/sql/old/3.3.5a/2012_06_06_02_world_sai.sql
index 297409ed776..297409ed776 100644
--- a/sql/updates/world/2012_06_06_02_world_sai.sql
+++ b/sql/old/3.3.5a/2012_06_06_02_world_sai.sql
diff --git a/sql/updates/world/2012_06_06_03_world_conditions.sql b/sql/old/3.3.5a/2012_06_06_03_world_conditions.sql
index c9af2a1bcbc..c9af2a1bcbc 100644
--- a/sql/updates/world/2012_06_06_03_world_conditions.sql
+++ b/sql/old/3.3.5a/2012_06_06_03_world_conditions.sql
diff --git a/sql/updates/world/2012_06_06_04_world_sai.sql b/sql/old/3.3.5a/2012_06_06_04_world_sai.sql
index af820f418be..af820f418be 100644
--- a/sql/updates/world/2012_06_06_04_world_sai.sql
+++ b/sql/old/3.3.5a/2012_06_06_04_world_sai.sql
diff --git a/sql/updates/characters/2012_06_07_00_characters_respawn.sql b/sql/old/3.3.5a/2012_06_07_00_characters_respawn.sql
index 168aa312713..168aa312713 100644
--- a/sql/updates/characters/2012_06_07_00_characters_respawn.sql
+++ b/sql/old/3.3.5a/2012_06_07_00_characters_respawn.sql
diff --git a/sql/updates/world/2012_06_07_00_world_gossip.sql b/sql/old/3.3.5a/2012_06_07_00_world_gossip.sql
index aac3ac53e74..aac3ac53e74 100644
--- a/sql/updates/world/2012_06_07_00_world_gossip.sql
+++ b/sql/old/3.3.5a/2012_06_07_00_world_gossip.sql
diff --git a/sql/updates/world/2012_06_07_01_world_gossip.sql b/sql/old/3.3.5a/2012_06_07_01_world_gossip.sql
index d77d41fa523..d77d41fa523 100644
--- a/sql/updates/world/2012_06_07_01_world_gossip.sql
+++ b/sql/old/3.3.5a/2012_06_07_01_world_gossip.sql
diff --git a/sql/updates/world/2012_06_07_02_world_item_template.sql b/sql/old/3.3.5a/2012_06_07_02_world_item_template.sql
index fdf3cce7c24..fdf3cce7c24 100644
--- a/sql/updates/world/2012_06_07_02_world_item_template.sql
+++ b/sql/old/3.3.5a/2012_06_07_02_world_item_template.sql
diff --git a/sql/updates/world/2012_06_07_03_world_item_template.sql b/sql/old/3.3.5a/2012_06_07_03_world_item_template.sql
index a6caa15632e..a6caa15632e 100644
--- a/sql/updates/world/2012_06_07_03_world_item_template.sql
+++ b/sql/old/3.3.5a/2012_06_07_03_world_item_template.sql
diff --git a/sql/updates/world/2012_06_07_04_world_spell_dbc.sql b/sql/old/3.3.5a/2012_06_07_04_world_spell_dbc.sql
index de5753fc7a6..de5753fc7a6 100644
--- a/sql/updates/world/2012_06_07_04_world_spell_dbc.sql
+++ b/sql/old/3.3.5a/2012_06_07_04_world_spell_dbc.sql
diff --git a/sql/updates/world/2012_06_07_05_world_misc.sql b/sql/old/3.3.5a/2012_06_07_05_world_misc.sql
index d45384dd3ef..d45384dd3ef 100644
--- a/sql/updates/world/2012_06_07_05_world_misc.sql
+++ b/sql/old/3.3.5a/2012_06_07_05_world_misc.sql
diff --git a/sql/updates/world/2012_06_08_00_world_spell_bonus_data.sql b/sql/old/3.3.5a/2012_06_08_00_world_spell_bonus_data.sql
index bf899421605..bf899421605 100644
--- a/sql/updates/world/2012_06_08_00_world_spell_bonus_data.sql
+++ b/sql/old/3.3.5a/2012_06_08_00_world_spell_bonus_data.sql
diff --git a/sql/updates/world/2012_06_09_00_world_creature.sql b/sql/old/3.3.5a/2012_06_09_00_world_creature.sql
index b2454b54163..b2454b54163 100644
--- a/sql/updates/world/2012_06_09_00_world_creature.sql
+++ b/sql/old/3.3.5a/2012_06_09_00_world_creature.sql
diff --git a/sql/updates/world/2012_06_12_00_world_transport.sql b/sql/old/3.3.5a/2012_06_12_00_world_transport.sql
index d3a35c254d9..d3a35c254d9 100644
--- a/sql/updates/world/2012_06_12_00_world_transport.sql
+++ b/sql/old/3.3.5a/2012_06_12_00_world_transport.sql
diff --git a/sql/updates/world/2012_06_13_00_world_creature.sql b/sql/old/3.3.5a/2012_06_13_00_world_creature.sql
index 0d2aa74c9c7..0d2aa74c9c7 100644
--- a/sql/updates/world/2012_06_13_00_world_creature.sql
+++ b/sql/old/3.3.5a/2012_06_13_00_world_creature.sql
diff --git a/sql/updates/world/2012_06_13_01_world_creature.sql b/sql/old/3.3.5a/2012_06_13_01_world_creature.sql
index 5ba3e0d34a2..5ba3e0d34a2 100644
--- a/sql/updates/world/2012_06_13_01_world_creature.sql
+++ b/sql/old/3.3.5a/2012_06_13_01_world_creature.sql
diff --git a/sql/updates/world/2012_06_13_02_world_gossip.sql b/sql/old/3.3.5a/2012_06_13_02_world_gossip.sql
index 2cac9fe2a0a..2cac9fe2a0a 100644
--- a/sql/updates/world/2012_06_13_02_world_gossip.sql
+++ b/sql/old/3.3.5a/2012_06_13_02_world_gossip.sql
diff --git a/sql/updates/world/2012_06_13_03_world_sai.sql b/sql/old/3.3.5a/2012_06_13_03_world_sai.sql
index ad9642447c0..ad9642447c0 100644
--- a/sql/updates/world/2012_06_13_03_world_sai.sql
+++ b/sql/old/3.3.5a/2012_06_13_03_world_sai.sql
diff --git a/sql/updates/world/2012_06_14_00_world_spell_linked_spell.sql b/sql/old/3.3.5a/2012_06_14_00_world_spell_linked_spell.sql
index 85cae64c21d..85cae64c21d 100644
--- a/sql/updates/world/2012_06_14_00_world_spell_linked_spell.sql
+++ b/sql/old/3.3.5a/2012_06_14_00_world_spell_linked_spell.sql
diff --git a/sql/updates/world/2012_06_14_01_world_spell_linked_spell.sql b/sql/old/3.3.5a/2012_06_14_01_world_spell_linked_spell.sql
index 6109c8db068..6109c8db068 100644
--- a/sql/updates/world/2012_06_14_01_world_spell_linked_spell.sql
+++ b/sql/old/3.3.5a/2012_06_14_01_world_spell_linked_spell.sql
diff --git a/sql/updates/world/2012_06_14_02_world_spell_bonus_data.sql b/sql/old/3.3.5a/2012_06_14_02_world_spell_bonus_data.sql
index b7f61f407b4..b7f61f407b4 100644
--- a/sql/updates/world/2012_06_14_02_world_spell_bonus_data.sql
+++ b/sql/old/3.3.5a/2012_06_14_02_world_spell_bonus_data.sql
diff --git a/sql/updates/world/2012_06_14_03_world_spell_bonus_data.sql b/sql/old/3.3.5a/2012_06_14_03_world_spell_bonus_data.sql
index dc59f152e33..dc59f152e33 100644
--- a/sql/updates/world/2012_06_14_03_world_spell_bonus_data.sql
+++ b/sql/old/3.3.5a/2012_06_14_03_world_spell_bonus_data.sql
diff --git a/sql/updates/world/2012_06_14_03_world_spell_ranks.sql b/sql/old/3.3.5a/2012_06_14_03_world_spell_ranks.sql
index f6641f2f095..f6641f2f095 100644
--- a/sql/updates/world/2012_06_14_03_world_spell_ranks.sql
+++ b/sql/old/3.3.5a/2012_06_14_03_world_spell_ranks.sql
diff --git a/sql/updates/world/2012_06_14_04_world_spell_script_names.sql b/sql/old/3.3.5a/2012_06_14_04_world_spell_script_names.sql
index 00ceb1df9e9..00ceb1df9e9 100644
--- a/sql/updates/world/2012_06_14_04_world_spell_script_names.sql
+++ b/sql/old/3.3.5a/2012_06_14_04_world_spell_script_names.sql
diff --git a/sql/updates/world/2012_06_14_05_world_spelldifficulty_dbc.sql b/sql/old/3.3.5a/2012_06_14_05_world_spelldifficulty_dbc.sql
index 1f218027f91..1f218027f91 100644
--- a/sql/updates/world/2012_06_14_05_world_spelldifficulty_dbc.sql
+++ b/sql/old/3.3.5a/2012_06_14_05_world_spelldifficulty_dbc.sql
diff --git a/sql/updates/world/2012_06_14_06_world_conditions.sql b/sql/old/3.3.5a/2012_06_14_06_world_conditions.sql
index 43d422e9239..43d422e9239 100644
--- a/sql/updates/world/2012_06_14_06_world_conditions.sql
+++ b/sql/old/3.3.5a/2012_06_14_06_world_conditions.sql
diff --git a/sql/updates/world/2012_06_14_07_world_spell_bonus_data.sql b/sql/old/3.3.5a/2012_06_14_07_world_spell_bonus_data.sql
index aa9c1b732c4..aa9c1b732c4 100644
--- a/sql/updates/world/2012_06_14_07_world_spell_bonus_data.sql
+++ b/sql/old/3.3.5a/2012_06_14_07_world_spell_bonus_data.sql
diff --git a/sql/updates/world/2012_06_14_08_world_spell_script_names.sql b/sql/old/3.3.5a/2012_06_14_08_world_spell_script_names.sql
index a9faa529143..a9faa529143 100644
--- a/sql/updates/world/2012_06_14_08_world_spell_script_names.sql
+++ b/sql/old/3.3.5a/2012_06_14_08_world_spell_script_names.sql
diff --git a/sql/updates/world/2012_06_14_09_world_sai.sql b/sql/old/3.3.5a/2012_06_14_09_world_sai.sql
index 3beb7c06326..3beb7c06326 100644
--- a/sql/updates/world/2012_06_14_09_world_sai.sql
+++ b/sql/old/3.3.5a/2012_06_14_09_world_sai.sql
diff --git a/sql/updates/world/2012_06_14_10_world_eai.sql b/sql/old/3.3.5a/2012_06_14_10_world_eai.sql
index 355646fbd69..355646fbd69 100644
--- a/sql/updates/world/2012_06_14_10_world_eai.sql
+++ b/sql/old/3.3.5a/2012_06_14_10_world_eai.sql
diff --git a/sql/updates/world/2012_06_14_11_world_sai.sql b/sql/old/3.3.5a/2012_06_14_11_world_sai.sql
index 1d01b02f86b..1d01b02f86b 100644
--- a/sql/updates/world/2012_06_14_11_world_sai.sql
+++ b/sql/old/3.3.5a/2012_06_14_11_world_sai.sql
diff --git a/sql/updates/world/2012_06_15_00_world_spell_script_names.sql b/sql/old/3.3.5a/2012_06_15_00_world_spell_script_names.sql
index 040ad3c87ba..040ad3c87ba 100644
--- a/sql/updates/world/2012_06_15_00_world_spell_script_names.sql
+++ b/sql/old/3.3.5a/2012_06_15_00_world_spell_script_names.sql
diff --git a/sql/updates/world/2012_06_15_01_world_sai.sql b/sql/old/3.3.5a/2012_06_15_01_world_sai.sql
index 501c3aa1c40..501c3aa1c40 100644
--- a/sql/updates/world/2012_06_15_01_world_sai.sql
+++ b/sql/old/3.3.5a/2012_06_15_01_world_sai.sql
diff --git a/sql/updates/world/2012_06_15_02_world_sai.sql b/sql/old/3.3.5a/2012_06_15_02_world_sai.sql
index f813ae2996b..f813ae2996b 100644
--- a/sql/updates/world/2012_06_15_02_world_sai.sql
+++ b/sql/old/3.3.5a/2012_06_15_02_world_sai.sql
diff --git a/sql/updates/world/2012_06_16_00_world_sai.sql b/sql/old/3.3.5a/2012_06_16_00_world_sai.sql
index a714e498bc9..a714e498bc9 100644
--- a/sql/updates/world/2012_06_16_00_world_sai.sql
+++ b/sql/old/3.3.5a/2012_06_16_00_world_sai.sql
diff --git a/sql/updates/world/2012_06_16_01_world_creature.sql b/sql/old/3.3.5a/2012_06_16_01_world_creature.sql
index d44b568f79b..d44b568f79b 100644
--- a/sql/updates/world/2012_06_16_01_world_creature.sql
+++ b/sql/old/3.3.5a/2012_06_16_01_world_creature.sql
diff --git a/sql/updates/world/2012_06_17_00_world_creature.sql b/sql/old/3.3.5a/2012_06_17_00_world_creature.sql
index 53e101c5d60..53e101c5d60 100644
--- a/sql/updates/world/2012_06_17_00_world_creature.sql
+++ b/sql/old/3.3.5a/2012_06_17_00_world_creature.sql
diff --git a/sql/updates/world/2012_06_17_01_world_creature.sql b/sql/old/3.3.5a/2012_06_17_01_world_creature.sql
index c5d50fdde1e..c5d50fdde1e 100644
--- a/sql/updates/world/2012_06_17_01_world_creature.sql
+++ b/sql/old/3.3.5a/2012_06_17_01_world_creature.sql
diff --git a/sql/updates/world/2012_06_17_02_world_creature.sql b/sql/old/3.3.5a/2012_06_17_02_world_creature.sql
index a309ada3498..a309ada3498 100644
--- a/sql/updates/world/2012_06_17_02_world_creature.sql
+++ b/sql/old/3.3.5a/2012_06_17_02_world_creature.sql
diff --git a/sql/updates/world/2012_06_18_00_world_creature.sql b/sql/old/3.3.5a/2012_06_18_00_world_creature.sql
index 23538c33f73..23538c33f73 100644
--- a/sql/updates/world/2012_06_18_00_world_creature.sql
+++ b/sql/old/3.3.5a/2012_06_18_00_world_creature.sql
diff --git a/sql/updates/world/2012_06_18_01_world_spell_script_names.sql b/sql/old/3.3.5a/2012_06_18_01_world_spell_script_names.sql
index 5f227a887d7..5f227a887d7 100644
--- a/sql/updates/world/2012_06_18_01_world_spell_script_names.sql
+++ b/sql/old/3.3.5a/2012_06_18_01_world_spell_script_names.sql
diff --git a/sql/updates/world/2012_06_18_02_world_sai.sql b/sql/old/3.3.5a/2012_06_18_02_world_sai.sql
index 0c036d3d5f0..0c036d3d5f0 100644
--- a/sql/updates/world/2012_06_18_02_world_sai.sql
+++ b/sql/old/3.3.5a/2012_06_18_02_world_sai.sql
diff --git a/sql/updates/world/2012_06_18_03_world_sai.sql b/sql/old/3.3.5a/2012_06_18_03_world_sai.sql
index 833c64c8d9d..833c64c8d9d 100644
--- a/sql/updates/world/2012_06_18_03_world_sai.sql
+++ b/sql/old/3.3.5a/2012_06_18_03_world_sai.sql
diff --git a/sql/updates/world/2012_06_19_00_world_sai.sql b/sql/old/3.3.5a/2012_06_19_00_world_sai.sql
index fdfc5aec5f8..fdfc5aec5f8 100644
--- a/sql/updates/world/2012_06_19_00_world_sai.sql
+++ b/sql/old/3.3.5a/2012_06_19_00_world_sai.sql
diff --git a/sql/updates/world/2012_06_19_01_world_gossip.sql b/sql/old/3.3.5a/2012_06_19_01_world_gossip.sql
index 7800d2a9740..7800d2a9740 100644
--- a/sql/updates/world/2012_06_19_01_world_gossip.sql
+++ b/sql/old/3.3.5a/2012_06_19_01_world_gossip.sql
diff --git a/sql/updates/world/2012_06_19_02_world_misc.sql b/sql/old/3.3.5a/2012_06_19_02_world_misc.sql
index 32aa493f4f7..32aa493f4f7 100644
--- a/sql/updates/world/2012_06_19_02_world_misc.sql
+++ b/sql/old/3.3.5a/2012_06_19_02_world_misc.sql
diff --git a/sql/updates/world/2012_06_20_00_world_gossip.sql b/sql/old/3.3.5a/2012_06_20_00_world_gossip.sql
index b4d61887223..b4d61887223 100644
--- a/sql/updates/world/2012_06_20_00_world_gossip.sql
+++ b/sql/old/3.3.5a/2012_06_20_00_world_gossip.sql
diff --git a/sql/updates/world/2012_06_20_01_world_sai.sql b/sql/old/3.3.5a/2012_06_20_01_world_sai.sql
index 989550de185..989550de185 100644
--- a/sql/updates/world/2012_06_20_01_world_sai.sql
+++ b/sql/old/3.3.5a/2012_06_20_01_world_sai.sql
diff --git a/sql/updates/world/2012_06_20_02_world_gossip.sql b/sql/old/3.3.5a/2012_06_20_02_world_gossip.sql
index c20cb99aa4a..c20cb99aa4a 100644
--- a/sql/updates/world/2012_06_20_02_world_gossip.sql
+++ b/sql/old/3.3.5a/2012_06_20_02_world_gossip.sql
diff --git a/sql/updates/world/2012_06_24_00_world_gossip.sql b/sql/old/3.3.5a/2012_06_24_00_world_gossip.sql
index f8aa5213bf4..f8aa5213bf4 100644
--- a/sql/updates/world/2012_06_24_00_world_gossip.sql
+++ b/sql/old/3.3.5a/2012_06_24_00_world_gossip.sql
diff --git a/sql/updates/world/2012_06_24_01_world_quest.sql b/sql/old/3.3.5a/2012_06_24_01_world_quest.sql
index ec0d39b0c62..ec0d39b0c62 100644
--- a/sql/updates/world/2012_06_24_01_world_quest.sql
+++ b/sql/old/3.3.5a/2012_06_24_01_world_quest.sql
diff --git a/sql/updates/world/2012_06_24_02_world_gameobject.sql b/sql/old/3.3.5a/2012_06_24_02_world_gameobject.sql
index 4894365462e..4894365462e 100644
--- a/sql/updates/world/2012_06_24_02_world_gameobject.sql
+++ b/sql/old/3.3.5a/2012_06_24_02_world_gameobject.sql
diff --git a/sql/updates/world/2012_06_24_03_world_gameobject.sql b/sql/old/3.3.5a/2012_06_24_03_world_gameobject.sql
index b98ef4b6dbe..b98ef4b6dbe 100644
--- a/sql/updates/world/2012_06_24_03_world_gameobject.sql
+++ b/sql/old/3.3.5a/2012_06_24_03_world_gameobject.sql
diff --git a/sql/updates/world/2012_06_24_04_world_gameobject.sql b/sql/old/3.3.5a/2012_06_24_04_world_gameobject.sql
index 2fa34ee18c3..2fa34ee18c3 100644
--- a/sql/updates/world/2012_06_24_04_world_gameobject.sql
+++ b/sql/old/3.3.5a/2012_06_24_04_world_gameobject.sql
diff --git a/sql/updates/world/2012_06_25_00_world_spell_script_names.sql b/sql/old/3.3.5a/2012_06_25_00_world_spell_script_names.sql
index 51f3e19f5bc..51f3e19f5bc 100644
--- a/sql/updates/world/2012_06_25_00_world_spell_script_names.sql
+++ b/sql/old/3.3.5a/2012_06_25_00_world_spell_script_names.sql
diff --git a/sql/updates/world/2012_06_25_01_world_gameobject.sql b/sql/old/3.3.5a/2012_06_25_01_world_gameobject.sql
index 5cadd915990..5cadd915990 100644
--- a/sql/updates/world/2012_06_25_01_world_gameobject.sql
+++ b/sql/old/3.3.5a/2012_06_25_01_world_gameobject.sql
diff --git a/sql/updates/world/2012_06_25_02_world_gameobject.sql b/sql/old/3.3.5a/2012_06_25_02_world_gameobject.sql
index f526f071bac..f526f071bac 100644
--- a/sql/updates/world/2012_06_25_02_world_gameobject.sql
+++ b/sql/old/3.3.5a/2012_06_25_02_world_gameobject.sql
diff --git a/sql/updates/world/2012_06_26_00_world_sai.sql b/sql/old/3.3.5a/2012_06_26_00_world_sai.sql
index c6fe75be1e5..c6fe75be1e5 100644
--- a/sql/updates/world/2012_06_26_00_world_sai.sql
+++ b/sql/old/3.3.5a/2012_06_26_00_world_sai.sql
diff --git a/sql/updates/world/2012_06_26_01_world_creature.sql b/sql/old/3.3.5a/2012_06_26_01_world_creature.sql
index 1f0dfff0b04..1f0dfff0b04 100644
--- a/sql/updates/world/2012_06_26_01_world_creature.sql
+++ b/sql/old/3.3.5a/2012_06_26_01_world_creature.sql
diff --git a/sql/updates/world/2012_06_26_02_world_creature_loot_template.sql b/sql/old/3.3.5a/2012_06_26_02_world_creature_loot_template.sql
index 3a704e61bcf..3a704e61bcf 100644
--- a/sql/updates/world/2012_06_26_02_world_creature_loot_template.sql
+++ b/sql/old/3.3.5a/2012_06_26_02_world_creature_loot_template.sql
diff --git a/sql/updates/world/2012_06_27_00_world_spell_script_names.sql b/sql/old/3.3.5a/2012_06_27_00_world_spell_script_names.sql
index 8210225de6e..8210225de6e 100644
--- a/sql/updates/world/2012_06_27_00_world_spell_script_names.sql
+++ b/sql/old/3.3.5a/2012_06_27_00_world_spell_script_names.sql
diff --git a/sql/updates/world/2012_06_27_01_world_game_graveyard_zone.sql b/sql/old/3.3.5a/2012_06_27_01_world_game_graveyard_zone.sql
index 973a1dc5296..973a1dc5296 100644
--- a/sql/updates/world/2012_06_27_01_world_game_graveyard_zone.sql
+++ b/sql/old/3.3.5a/2012_06_27_01_world_game_graveyard_zone.sql
diff --git a/sql/updates/world/2012_07_01_00_world_creature_text.sql b/sql/old/3.3.5a/2012_07_01_00_world_creature_text.sql
index f59663ceab5..f59663ceab5 100644
--- a/sql/updates/world/2012_07_01_00_world_creature_text.sql
+++ b/sql/old/3.3.5a/2012_07_01_00_world_creature_text.sql
diff --git a/sql/updates/world/2012_05_09_02_achievement_criteria_data.sql b/sql/old/3.3.5a/2012_07_01_01_achievement_criteria_data.sql
index e1c0529fffe..e1c0529fffe 100644
--- a/sql/updates/world/2012_05_09_02_achievement_criteria_data.sql
+++ b/sql/old/3.3.5a/2012_07_01_01_achievement_criteria_data.sql
diff --git a/sql/updates/world/2012_07_02_00_world_creature_onkill_reputation.sql b/sql/old/3.3.5a/2012_07_02_00_world_creature_onkill_reputation.sql
index a9565d36934..a9565d36934 100644
--- a/sql/updates/world/2012_07_02_00_world_creature_onkill_reputation.sql
+++ b/sql/old/3.3.5a/2012_07_02_00_world_creature_onkill_reputation.sql
diff --git a/sql/updates/world/2012_07_02_01_world_sai.sql b/sql/old/3.3.5a/2012_07_02_01_world_sai.sql
index 323d9bddcb2..323d9bddcb2 100644
--- a/sql/updates/world/2012_07_02_01_world_sai.sql
+++ b/sql/old/3.3.5a/2012_07_02_01_world_sai.sql
diff --git a/sql/updates/world/2012_07_02_02_world_sai.sql b/sql/old/3.3.5a/2012_07_02_02_world_sai.sql
index 6b6b0eb587c..6b6b0eb587c 100644
--- a/sql/updates/world/2012_07_02_02_world_sai.sql
+++ b/sql/old/3.3.5a/2012_07_02_02_world_sai.sql
diff --git a/sql/updates/world/2012_07_02_03_world_gossip.sql b/sql/old/3.3.5a/2012_07_02_03_world_gossip.sql
index 0c158aa7511..0c158aa7511 100644
--- a/sql/updates/world/2012_07_02_03_world_gossip.sql
+++ b/sql/old/3.3.5a/2012_07_02_03_world_gossip.sql
diff --git a/sql/updates/world/2012_07_02_04_world_spell_script_names.sql b/sql/old/3.3.5a/2012_07_02_04_world_spell_script_names.sql
index 9054ea7ba82..9054ea7ba82 100644
--- a/sql/updates/world/2012_07_02_04_world_spell_script_names.sql
+++ b/sql/old/3.3.5a/2012_07_02_04_world_spell_script_names.sql
diff --git a/sql/updates/world/2012_07_04_world_spell_script_names.sql b/sql/old/3.3.5a/2012_07_04_00_world_spell_script_names.sql
index 9e157261409..9e157261409 100644
--- a/sql/updates/world/2012_07_04_world_spell_script_names.sql
+++ b/sql/old/3.3.5a/2012_07_04_00_world_spell_script_names.sql
diff --git a/sql/old/3.3.5a/2012_07_05_00_world_item_template.sql b/sql/old/3.3.5a/2012_07_05_00_world_item_template.sql
new file mode 100644
index 00000000000..d4240ca65a7
--- /dev/null
+++ b/sql/old/3.3.5a/2012_07_05_00_world_item_template.sql
@@ -0,0 +1 @@
+UPDATE `item_template` SET `flagsCustom` = `flagsCustom` | 4 WHERE `entry` IN (50226,50231,50274);
diff --git a/sql/old/3.3.5a/2012_07_06_00_world_spell_script_names.sql b/sql/old/3.3.5a/2012_07_06_00_world_spell_script_names.sql
new file mode 100644
index 00000000000..676ac430a9d
--- /dev/null
+++ b/sql/old/3.3.5a/2012_07_06_00_world_spell_script_names.sql
@@ -0,0 +1 @@
+UPDATE `spell_script_names` SET `spell_id` = 42787 WHERE `spell_id` = 42784;
diff --git a/sql/old/3.3.5a/2012_07_09_00_world_spell_script_names.sql b/sql/old/3.3.5a/2012_07_09_00_world_spell_script_names.sql
new file mode 100644
index 00000000000..c97695498b8
--- /dev/null
+++ b/sql/old/3.3.5a/2012_07_09_00_world_spell_script_names.sql
@@ -0,0 +1,3 @@
+DELETE FROM `spell_script_names` WHERE `spell_id` IN (42787,42784);
+INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
+(42783, 'spell_astromancer_wrath_of_the_astromancer');
diff --git a/sql/updates/characters/2012_06_13_00_characters_character_equipmentsets.sql b/sql/updates/characters/2012_06_13_00_characters_character_equipmentsets.sql
new file mode 100644
index 00000000000..ebf12062be3
--- /dev/null
+++ b/sql/updates/characters/2012_06_13_00_characters_character_equipmentsets.sql
@@ -0,0 +1,22 @@
+ALTER TABLE `character_equipmentsets`
+MODIFY COLUMN `item0` int(11) unsigned NOT NULL DEFAULT 0,
+MODIFY COLUMN `item1` int(11) unsigned NOT NULL DEFAULT 0,
+MODIFY COLUMN `item2` int(11) unsigned NOT NULL DEFAULT 0,
+MODIFY COLUMN `item3` int(11) unsigned NOT NULL DEFAULT 0,
+MODIFY COLUMN `item4` int(11) unsigned NOT NULL DEFAULT 0,
+MODIFY COLUMN `item5` int(11) unsigned NOT NULL DEFAULT 0,
+MODIFY COLUMN `item6` int(11) unsigned NOT NULL DEFAULT 0,
+MODIFY COLUMN `item7` int(11) unsigned NOT NULL DEFAULT 0,
+MODIFY COLUMN `item8` int(11) unsigned NOT NULL DEFAULT 0,
+MODIFY COLUMN `item9` int(11) unsigned NOT NULL DEFAULT 0,
+MODIFY COLUMN `item10` int(11) unsigned NOT NULL DEFAULT 0,
+MODIFY COLUMN `item11` int(11) unsigned NOT NULL DEFAULT 0,
+MODIFY COLUMN `item12` int(11) unsigned NOT NULL DEFAULT 0,
+MODIFY COLUMN `item13` int(11) unsigned NOT NULL DEFAULT 0,
+MODIFY COLUMN `item14` int(11) unsigned NOT NULL DEFAULT 0,
+MODIFY COLUMN `item15` int(11) unsigned NOT NULL DEFAULT 0,
+MODIFY COLUMN `item16` int(11) unsigned NOT NULL DEFAULT 0,
+MODIFY COLUMN `item17` int(11) unsigned NOT NULL DEFAULT 0,
+MODIFY COLUMN `item18` int(11) unsigned NOT NULL DEFAULT 0;
+
+ALTER TABLE `character_equipmentsets` ADD COLUMN `ignore_mask` int(11) unsigned NOT NULL DEFAULT 0 AFTER `iconname`;
diff --git a/sql/updates/world/2012_05_19_04_creature_loot_template.sql b/sql/updates/world/2012_05_19_04_creature_loot_template.sql
deleted file mode 100644
index ae996e01956..00000000000
--- a/sql/updates/world/2012_05_19_04_creature_loot_template.sql
+++ /dev/null
@@ -1 +0,0 @@
-DELETE FROM `creature_loot_template` WHERE `entry`=31813 AND `item`=36912; -- Saronite Ore
diff --git a/sql/updates/world/2012_05_19_05_gameobject_loot_template.sql b/sql/updates/world/2012_05_19_05_gameobject_loot_template.sql
deleted file mode 100644
index f95cb45efe4..00000000000
--- a/sql/updates/world/2012_05_19_05_gameobject_loot_template.sql
+++ /dev/null
@@ -1,93 +0,0 @@
--- Set Variables
-SET @Gunship10N := 28057; -- Data1 for 201872 & 202177
-SET @Gunship10H := 28045; -- Data1 for 201873 & 202178
-SET @Gunship25N := 28072; -- Data1 for 201874 & 202179
-SET @Gunship25H := 28090; -- Data1 for 201875 & 202180
-SET @emblem := 49426; -- Emblem of Frost
-SET @SfShard := 50274; -- Shadowfrost Shard
-SET @PriSar := 49908; -- Primordial Saronite
--- Dug up the old references i created for UP34:
-SET @Ref10J := 34329;
-SET @Ref25J := 34251;
-SET @RefJ10H := 34263;
-SET @RefJ25H := 34275;
--- Gunship_Armory10N_reference
-DELETE FROM `reference_loot_template` WHERE `entry` IN (@Ref10J,@Ref25J,@RefJ10H,@RefJ25H);
-INSERT INTO `reference_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES
-(@Ref10J,50791,0,1,1,1,1), -- Saronite Gargoyle Cloak
-(@Ref10J,50795,0,1,1,1,1), -- Cord of Dark Suffering
-(@Ref10J,50794,0,1,1,1,1), -- Neverending Winter
-(@Ref10J,50787,0,1,1,1,1), -- Frost Giant's Cleaver
-(@Ref10J,50793,0,1,1,1,1), -- Midnight Sun
-(@Ref10J,50788,0,1,1,1,1), -- Bone Drake's Enameled Boots
-(@Ref10J,50792,0,1,1,1,1), -- Pauldrons of Lost Hope
-(@Ref10J,50340,0,1,1,1,1), -- Muradin's Spyglass
-(@Ref10J,50797,0,1,1,1,1), -- Ice-Reinforced Vrykul Helm
-(@Ref10J,50790,0,1,1,1,1), -- Abomination's Bloody Ring
-(@Ref10J,50789,0,1,1,1,1), -- Icecrown Rampart Bracers
-(@Ref10J,50796,0,1,1,1,1), -- Bracers of Pale Illumination
--- Gunship_Armory25N_reference
-(@Ref25J,50011,0,1,1,1,1), -- Gunship Captain's Mittens
-(@Ref25J,50002,0,1,1,1,1), -- Polar Bear Claw Bracers
-(@Ref25J,50006,0,1,1,1,1), -- Corp'rethar Ceremonial Crown
-(@Ref25J,50010,0,1,1,1,1), -- Waistband of Righteous Fury
-(@Ref25J,50003,0,1,1,1,1), -- Boneguard Commander's Pauldrons
-(@Ref25J,50000,0,1,1,1,1), -- Scourge Hunter's Vambraces
-(@Ref25J,50359,0,1,1,1,1), -- Althor's Abacus
-(@Ref25J,50352,0,1,1,1,1), -- Corpse Tongue Coin
-(@Ref25J,49999,0,1,1,1,1), -- Skeleton Lord's Circle
-(@Ref25J,50009,0,1,1,1,1), -- Boots of Unnatural Growth
-(@Ref25J,50008,0,1,1,1,1), -- Ring of Rapid Ascent
-(@Ref25J,49998,0,1,1,1,1), -- Shadowvault Slayer's Cloak
-(@Ref25J,50005,0,1,1,1,1), -- Amulet of the Silent Eulogy
-(@Ref25J,50411,0,1,1,1,1), -- Scourgeborne Waraxe
-(@Ref25J,50001,0,1,1,1,1), -- Ikfirus's Sack of Wonder
--- Gunship_Armory10H_reference
-(@RefJ10H,51912,0,1,1,1,1), -- Saronite Gargoyle Cloak (heroic)
-(@RefJ10H,51908,0,1,1,1,1), -- Cord of Dark Suffering (heroic)
-(@RefJ10H,51909,0,1,1,1,1), -- Neverending Winter (heroic)
-(@RefJ10H,51916,0,1,1,1,1), -- Frost Giant's Cleaver (heroic)
-(@RefJ10H,51910,0,1,1,1,1), -- Midnight Sun (heroic)
-(@RefJ10H,51915,0,1,1,1,1), -- Bone Drake's Enameled Boots (heroic)
-(@RefJ10H,51911,0,1,1,1,1), -- Pauldrons of Lost Hope (heroic)
-(@RefJ10H,50345,0,1,1,1,1), -- Muradin's Spyglass (heroic)
-(@RefJ10H,51906,0,1,1,1,1), -- Ice-Reinforced Vrykul Helm (heroic)
-(@RefJ10H,51913,0,1,1,1,1), -- Abomination's Bloody Ring (heroic)
-(@RefJ10H,51914,0,1,1,1,1), -- Icecrown Rampart Bracers (heroic)
-(@RefJ10H,51907,0,1,1,1,1), -- Bracers of Pale Illumination (heroic)
--- Gunship_Armory25H_reference
-(@RefJ25H,50663,0,1,1,1,1), -- Gunship Captain's Mittens (heroic)
-(@RefJ25H,50659,0,1,1,1,1), -- Polar Bear Claw Bracers (heroic)
-(@RefJ25H,50661,0,1,1,1,1), -- Corp'rethar Ceremonial Crown (heroic)
-(@RefJ25H,50667,0,1,1,1,1), -- Waistband of Righteous Fury (heroic)
-(@RefJ25H,50660,0,1,1,1,1), -- Boneguard Commander's Pauldrons (heroic)
-(@RefJ25H,50655,0,1,1,1,1), -- Scourge Hunter's Vambraces (heroic)
-(@RefJ25H,50366,0,1,1,1,1), -- Althor's Abacus (heroic)
-(@RefJ25H,50349,0,1,1,1,1), -- Corpse Tongue Coin (heroic)
-(@RefJ25H,50657,0,1,1,1,1), -- Skeleton Lord's Circle (heroic)
-(@RefJ25H,50665,0,1,1,1,1), -- Boots of Unnatural Growth (heroic)
-(@RefJ25H,50664,0,1,1,1,1), -- Ring of Rapid Ascent (heroic)
-(@RefJ25H,50653,0,1,1,1,1), -- Shadowvault Slayer's Cloak (heroic)
-(@RefJ25H,50658,0,1,1,1,1), -- Amulet of the Silent Eulogy (heroic)
-(@RefJ25H,50654,0,1,1,1,1), -- Scourgeborne Waraxe (heroic)
-(@RefJ25H,50656,0,1,1,1,1); -- Ikfirus's Sack of Wonder (heroic)
--- Bind the refs to the objects
-DELETE FROM `gameobject_loot_template` WHERE `entry` IN (@Gunship10N,@Gunship10H,@Gunship25N,@Gunship25H);
-INSERT INTO `gameobject_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES
--- Gunship10N
-(@Gunship10N,@emblem,100,1,0,2,2), -- Gunship Armory 2xemblems 10N
-(@Gunship10N,1,100,1,0,-@Ref10J,2), -- 2 from reference 10Normal
--- Gunship25N
-(@Gunship25N,@emblem,100,1,0,2,2), -- Gunship Armory 2xemblems 25N
-(@Gunship25N,1,100,1,0,-@Ref25J,2), -- 3 from reference 25Normal
-(@Gunship25N,@SfShard,-35,1,0,1,1), -- Shadowfrost Shard @ 38% chance
-(@Gunship25N,@PriSar,38,1,0,1,1), -- Primordial Saronite @ 10% chance
--- Gunship10H
-(@Gunship10H,@emblem,100,1,0,2,2), -- Gunship Armory 2xemblems 10H
-(@Gunship10H,1,100,1,0,-@RefJ10H,2), -- 2 from reference 10Heroic
-(@Gunship10H,@PriSar,38,1,0,1,1), -- Primordial Saronite @ 38% chance
--- Gunship25H
-(@Gunship25H,@emblem,100,1,0,2,2), -- Gunship Armory 2xemblems 25H
-(@Gunship25H,1,100,1,0,-@RefJ25H,2), -- 3 from reference 25Heroic
-(@Gunship25H,@SfShard,-75,1,0,1,1), -- Shadowfrost Shard @ 75% chance
-(@Gunship25H,@PriSar,50,1,0,1,1); -- Primordial Saronite @ 50% chance
diff --git a/sql/updates/world/2012_05_19_06_gameobject_loot_template.sql b/sql/updates/world/2012_05_19_06_gameobject_loot_template.sql
deleted file mode 100644
index 9b2dcbb9363..00000000000
--- a/sql/updates/world/2012_05_19_06_gameobject_loot_template.sql
+++ /dev/null
@@ -1,13 +0,0 @@
-DELETE FROM `reference_loot_template` WHERE `entry`=34172;
-DELETE FROM `creature_loot_template` WHERE `entry`=38013;
-DELETE FROM `gameobject_loot_template` WHERE `entry`=28683;
-INSERT INTO `gameobject_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES
-(28683,35498,3,1,0,1,1), -- Formula: Enchant Weapon - Deathfrost
-(28683,35557,28,1,0,1,2), -- Huge Snowball
-(28683,35720,3,1,0,5,6), -- Lord of Frost's Private Label
-(28683,35723,12,1,0,1,1), -- Shards of Ahune
-(28683,54801,0,1,1,1,1), -- Icebound Cloak
-(28683,54802,0,1,1,1,1), -- The Frost Lord's War Cloak
-(28683,54803,0,1,1,1,1), -- The Frost Lord's Battle Shroud
-(28683,54804,0,1,1,1,1), -- Shroud of Winter's Chill
-(28683,54805,0,1,1,1,1); -- Cloak of the Frigid Winds
diff --git a/sql/updates/world/2012_05_28_03_waypoint_data.sql b/sql/updates/world/2012_05_28_03_waypoint_data.sql
deleted file mode 100644
index aa0e0ddd5ef..00000000000
--- a/sql/updates/world/2012_05_28_03_waypoint_data.sql
+++ /dev/null
@@ -1,3 +0,0 @@
--- correct waypointid to guid*10
-UPDATE `waypoint_data` SET `id`=2026020 WHERE `id`=2026060;
-UPDATE `creature_addon` SET `path_id`=2026020 WHERE `guid`=202602;
diff --git a/sql/updates/world/2012_07_12_00_world_version.sql b/sql/updates/world/2012_07_12_00_world_version.sql
new file mode 100644
index 00000000000..ce24fa54614
--- /dev/null
+++ b/sql/updates/world/2012_07_12_00_world_version.sql
@@ -0,0 +1 @@
+UPDATE `version` SET `db_version`='TDB 335.11.48', `cache_id`=48 LIMIT 1;
diff --git a/sql/updates/world/2012_07_13_00_world_spell_proc_event.sql b/sql/updates/world/2012_07_13_00_world_spell_proc_event.sql
new file mode 100644
index 00000000000..952a4502b30
--- /dev/null
+++ b/sql/updates/world/2012_07_13_00_world_spell_proc_event.sql
@@ -0,0 +1 @@
+UPDATE `spell_proc_event` SET `procFlags` = 16384 WHERE `entry` in (48492,48494,48495);
diff --git a/sql/updates/world/2012_07_13_00_world_spell_script_names.sql b/sql/updates/world/2012_07_13_00_world_spell_script_names.sql
new file mode 100644
index 00000000000..64500418871
--- /dev/null
+++ b/sql/updates/world/2012_07_13_00_world_spell_script_names.sql
@@ -0,0 +1,3 @@
+DELETE FROM `spell_script_names` WHERE (`spell_id`='-5570');
+INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
+(-5570, 'spell_dru_insect_swarm');
diff --git a/sql/updates/world/2012_07_14_00_world_creature_loot_template.sql b/sql/updates/world/2012_07_14_00_world_creature_loot_template.sql
new file mode 100644
index 00000000000..f76e5519594
--- /dev/null
+++ b/sql/updates/world/2012_07_14_00_world_creature_loot_template.sql
@@ -0,0 +1,6 @@
+-- Gorilla Fang should always be able to drop (Exodius)
+UPDATE `creature_loot_template` SET `ChanceOrQuestChance` = ABS(`ChanceOrQuestChance`) WHERE `item`=2799;
+-- Update "Count" Ungula's Mandible drop rate does not require quest to drop it starts one (gecko32)
+UPDATE `creature_loot_template` SET `ChanceOrQuestChance` = ABS(`ChanceOrQuestChance`) WHERE `item`=25459;
+-- Tainted Hellboar Meat fix (ZxBiohazardZx)
+UPDATE `quest_template` SET `RequiredSourceItemId1`=23270,`RequiredSourceItemCount1`=8 WHERE `Id`=9361;
diff --git a/sql/updates/world/2012_07_14_00_world_item_template_434.sql b/sql/updates/world/2012_07_14_00_world_item_template_434.sql
new file mode 100644
index 00000000000..cf0749243ce
--- /dev/null
+++ b/sql/updates/world/2012_07_14_00_world_item_template_434.sql
@@ -0,0 +1,4 @@
+ALTER TABLE `item_template`
+ ADD `Unk430_1` float unsigned NOT NULL DEFAULT '1' AFTER `FlagsExtra`,
+ ADD `Unk430_2` float NOT NULL DEFAULT '1' AFTER `Unk430_1`,
+ ADD `BuyCount` tinyint(3) unsigned NOT NULL DEFAULT '1' AFTER `Unk430_2`;
diff --git a/sql/updates/world/2012_07_14_01_world_creature_loot_template.sql b/sql/updates/world/2012_07_14_01_world_creature_loot_template.sql
new file mode 100644
index 00000000000..1b9c4f4448c
--- /dev/null
+++ b/sql/updates/world/2012_07_14_01_world_creature_loot_template.sql
@@ -0,0 +1,33 @@
+-- Hellboar shit always drops
+UPDATE `creature_loot_template` SET `ChanceOrQuestChance`= -100 WHERE `item`=23270;
+
+-- update Al'ar loot
+SET @gear := 34053; 
+SET @talon := 34377; 
+SET @Alar := 19514;
+
+DELETE FROM `creature_loot_template` WHERE `entry`=@Alar;
+INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES
+(@Alar,29434,100,1,0,2,2), -- Badge of Justice 2x
+(@Alar,1,100,1,0,-@gear,3), -- 3x Gear Reference
+(@Alar,2,10,1,0,-34052,1), -- Pattern Reference
+(@Alar,3,2,1,0,-34052,1); -- extra Pattern Reference (small chance)
+
+DELETE FROM `reference_loot_template` WHERE `entry` IN (@gear,@talon);
+INSERT INTO `reference_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES
+-- Gear Reference:
+(@gear,29918,0,1,1,1,1), -- Mindstorm Wristbands
+(@gear,29920,0,1,1,1,1), -- Phoenix-Ring of Rebirth
+(@gear,29921,0,1,1,1,1), -- Fire Crest Breastplate
+(@gear,29922,0,1,1,1,1), -- Band of Al'ar
+(@gear,29923,0,1,1,1,1), -- Talisman of the Sun King
+(@gear,29924,0,1,1,1,1), -- Netherbane
+(@gear,29925,0,1,1,1,1), -- Phoenix-Wing Cloak
+(@gear,29947,0,1,1,1,1), -- Gloves of the Searing Grip
+(@gear,29948,0,1,1,1,1), -- Claw of the Phoenix
+(@gear,29949,0,1,1,1,1), -- Arcanite Steam-Pistol
+(@gear,30447,0,1,1,1,1), -- Tome of Fiery Redemption
+(@gear,1,0,1,1,-@talon,1), -- Talonoption
+-- either of the claws is selected
+(@talon,30448,0,1,1,1,1), -- Talon of Al'ar
+(@talon,32944,0,1,1,1,1); -- Talon of the Phoenix