Merge github.com:TrinityCore/TrinityCore

Conflicts: src/server/game/Scripting/ScriptLoader.cpp
maanuel · Mar 27, 2011 · 9dc3302 · 9dc3302
2 parents 6f7ec88 + c8ec491
commit 9dc3302
Show file tree

Hide file tree

Showing 787 changed files with 10,110 additions and 4,747 deletions.
diff --git a/THANKS b/THANKS
@@ -72,4 +72,5 @@ svannon, jurkovic.nikola, Willian Krueger, BioHazard, Ille000, Erocoloco,
 terrorbringer, antihrists, Havenard, scarymovie87, D3VIL, FaTe753, PrinceCreed,
 spgm, Dakeyras, sombre88, 19Maxx83, moriquendu, Ille, breakerfly,
 zthoreen, clement.roussel, p.alexej, Ceris, Nayre, Kiper, announce, thmarth,
-Ner'zhul, DarkXuan
+Ner'zhul, DarkXuan, leak, linencloth, SnakeIce, Supabad, Tome, Nay, Kaelima,
+Svannon
diff --git a/sql/base/characters_database.sql b/sql/base/characters_database.sql
@@ -724,7 +724,7 @@ CREATE TABLE `character_inventory` (
   `slot` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `item` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Item Global Unique Identifier',
   PRIMARY KEY (`item`),
-  UNIQUE KEY (`guid`,`bag`,`slot`),
+  UNIQUE KEY `guid` (`guid`,`bag`,`slot`),
   KEY `idx_guid` (`guid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Player System';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -1224,7 +1224,7 @@ CREATE TABLE `corpse` (
   `position_z` float NOT NULL DEFAULT '0',
   `orientation` float NOT NULL DEFAULT '0',
   `map` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'Map Identifier',
-  `phaseMask` tinyint(3) unsigned NOT NULL DEFAULT '1',
+  `phaseMask` smallint(5) unsigned NOT NULL DEFAULT '1',
   `displayId` int(10) unsigned NOT NULL DEFAULT '0',
   `itemCache` text NOT NULL,
   `bytes1` int(10) unsigned NOT NULL DEFAULT '0',
@@ -1285,10 +1285,10 @@ DROP TABLE IF EXISTS `game_event_condition_save`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `game_event_condition_save` (
-  `event_id` smallint(5) unsigned NOT NULL,
+  `eventEntry` tinyint(3) unsigned NOT NULL,
   `condition_id` int(10) unsigned NOT NULL DEFAULT '0',
   `done` float DEFAULT '0',
-  PRIMARY KEY (`event_id`,`condition_id`)
+  PRIMARY KEY (`eventEntry`,`condition_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -1309,10 +1309,10 @@ DROP TABLE IF EXISTS `game_event_save`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `game_event_save` (
-  `event_id` smallint(5) unsigned NOT NULL,
+  `eventEntry` tinyint(3) unsigned NOT NULL,
   `state` tinyint(3) unsigned NOT NULL DEFAULT '1',
   `next_start` int(10) unsigned NOT NULL DEFAULT '0',
-  PRIMARY KEY (`event_id`)
+  PRIMARY KEY (`eventEntry`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 

diff --git a/sql/base/world_database.sql b/sql/base/world_database.sql
@@ -18189,6 +18189,8 @@ INSERT INTO `spell_linked_spell` (`spell_trigger`,`spell_effect`,`type`,`comment
 ( 71480, 71483, 1, 'Blood-Queen: Bloodbolt Splash'),
 ( 71952, 70995, 1, 'Blood-Queen: Presence of the Darkfallen'),
 ( 70157, 69700, 2, 'Sindragosa - Ice Tomb resistance'),
+-- Eye Of Eternity
+( 56397, 63934, 1,'Arcane Barrage - Arcane Barrage'),
 -- Isle of Conquest
 ( 66548, 66550, 0, 'Isle of Conquest (IN>OUT)'),
 ( 66549, 66551, 0, 'Isle of Conquest (OUT>IN)'),
@@ -18212,6 +18214,7 @@ INSERT INTO `spell_linked_spell` (`spell_trigger`,`spell_effect`,`type`,`comment
 ( 50141, 50001, 0, 'Blood Oath to Blood Oath Aura'),
 ( 61263, 61267, 0, 'Intravenous Healing Effect'),
 ( 61263, 61268, 0, 'Intravenous Mana Regeneration Effect'),
+(-57350,60242,0, 'Darkmoon Card: Illusion'),
 -- PvP Trinket / Every Man for Himself / Will of the Forsaken
 (7744, 72757, 0, 'Will of the Forsaken Cooldown Trigger (WOTF)'),
 (42292, 72752, 0, 'Will of the Forsaken Cooldown Trigger'),
@@ -18380,6 +18383,11 @@ INSERT INTO `spell_proc_event` (`entry`,`SchoolMask`,`SpellFamilyName`,`SpellFam
 ( 11180, 0x10,   3, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,   0,   0,   0), -- Winter's Chill (Rank 1)
 ( 11185, 0x00,   3, 0x00000080, 0x00000000, 0x00000000, 0x00050000, 0x00000000,   0,   0,   0), -- Improved Blizzard (Rank 1)
 ( 11255, 0x00,   3, 0x00004000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,   0,   0,   0), -- Improved Counterspell (Rank 1)
+( 11213, 0x00,   3, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,   0,   0,   0), -- Arcane Concentration (Rank 1)
+( 12574, 0x00,   3, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,   0,   0,   0), -- Arcane Concentration (Rank 2)
+( 12575, 0x00,   3, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,   0,   0,   0), -- Arcane Concentration (Rank 3)
+( 12576, 0x00,   3, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,   0,   0,   0), -- Arcane Concentration (Rank 4)
+( 12577, 0x00,   3, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,   0,   0,   0), -- Arcane Concentration (Rank 5)
 ( 12169, 0x00,   0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000040,   0,   0,   0), -- Shield Block
 ( 12289, 0x00,   4, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000,   0,   0,   0), -- Improved Hamstring (Rank 1)
 ( 12298, 0x00,   0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000070,   0,   0,   0), -- Shield Specialization (Rank 1)
@@ -27806,7 +27814,7 @@ CREATE TABLE `vehicle_accessory` (
   `seat_id` TINYINT(1) SIGNED NOT NULL DEFAULT 0,
   `minion` TINYINT(1) UNSIGNED NOT NULL DEFAULT 0,
   `description` TEXT NOT NULL,
-  PRIMARY KEY (`entry`, `seat_id`)
+  PRIMARY KEY (`accessory_entry`, `seat_id`)
 )
 COLLATE=utf8_general_ci
 ENGINE=MyISAM

diff --git a/.../3.3.5a/2011_01_06_0_world_scriptname.sql → ...3.3.5a/2011_01_06_00_world_scriptname.sql b/.../3.3.5a/2011_01_06_0_world_scriptname.sql → ...3.3.5a/2011_01_06_00_world_scriptname.sql
diff --git a/.../3.3.5a/2011_01_06_1_world_scriptname.sql → ...3.3.5a/2011_01_06_01_world_scriptname.sql b/.../3.3.5a/2011_01_06_1_world_scriptname.sql → ...3.3.5a/2011_01_06_01_world_scriptname.sql
diff --git a/.../3.3.5a/2011_01_06_2_world_scriptname.sql → ...3.3.5a/2011_01_06_02_world_scriptname.sql b/.../3.3.5a/2011_01_06_2_world_scriptname.sql → ...3.3.5a/2011_01_06_02_world_scriptname.sql
diff --git a/...2011_01_08_0_world_spell_script_names.sql → ...011_01_08_00_world_spell_script_names.sql b/...2011_01_08_0_world_spell_script_names.sql → ...011_01_08_00_world_spell_script_names.sql
diff --git a/.../3.3.5a/2011_01_08_1_world_scriptname.sql → ...3.3.5a/2011_01_08_01_world_scriptname.sql b/.../3.3.5a/2011_01_08_1_world_scriptname.sql → ...3.3.5a/2011_01_08_01_world_scriptname.sql
diff --git a/.../3.3.5a/2011_01_08_2_world_scriptname.sql → ...3.3.5a/2011_01_08_02_world_scriptname.sql b/.../3.3.5a/2011_01_08_2_world_scriptname.sql → ...3.3.5a/2011_01_08_02_world_scriptname.sql
diff --git a/...5a/2011_01_08_3_world_trinity_strings.sql → ...a/2011_01_08_03_world_trinity_strings.sql b/...5a/2011_01_08_3_world_trinity_strings.sql → ...a/2011_01_08_03_world_trinity_strings.sql
diff --git a/...2011_01_08_4_world_spell_linked_spell.sql → ...011_01_08_04_world_spell_linked_spell.sql b/...2011_01_08_4_world_spell_linked_spell.sql → ...011_01_08_04_world_spell_linked_spell.sql
diff --git a/.../3.3.5a/2011_01_09_0_world_scriptname.sql → ...3.3.5a/2011_01_09_00_world_scriptname.sql b/.../3.3.5a/2011_01_09_0_world_scriptname.sql → ...3.3.5a/2011_01_09_00_world_scriptname.sql
diff --git a/...2011_01_10_0_world_spell_linked_spell.sql → ...011_01_10_00_world_spell_linked_spell.sql b/...2011_01_10_0_world_spell_linked_spell.sql → ...011_01_10_00_world_spell_linked_spell.sql
diff --git a/...2011_01_16_0_world_spell_script_names.sql → ...011_01_16_00_world_spell_script_names.sql b/...2011_01_16_0_world_spell_script_names.sql → ...011_01_16_00_world_spell_script_names.sql
diff --git a/.../2011_01_19_0_characters_account_data.sql → ...2011_01_19_00_characters_account_data.sql b/.../2011_01_19_0_characters_account_data.sql → ...2011_01_19_00_characters_account_data.sql
diff --git a/...3.3.5a/2011_01_19_0_characters_addons.sql → ....3.5a/2011_01_19_00_characters_addons.sql b/...3.3.5a/2011_01_19_0_characters_addons.sql → ....3.5a/2011_01_19_00_characters_addons.sql
diff --git a/...5a/2011_01_19_0_characters_arena_team.sql → ...a/2011_01_19_00_characters_arena_team.sql b/...5a/2011_01_19_0_characters_arena_team.sql → ...a/2011_01_19_00_characters_arena_team.sql
diff --git a/.../2011_01_19_0_characters_auctionhouse.sql → ...2011_01_19_00_characters_auctionhouse.sql b/.../2011_01_19_0_characters_auctionhouse.sql → ...2011_01_19_00_characters_auctionhouse.sql
diff --git a/....5a/2011_01_19_0_characters_bugreport.sql → ...5a/2011_01_19_00_characters_bugreport.sql b/....5a/2011_01_19_0_characters_bugreport.sql → ...5a/2011_01_19_00_characters_bugreport.sql
diff --git a/...3.5a/2011_01_19_0_characters_channels.sql → ....5a/2011_01_19_00_characters_channels.sql b/...3.5a/2011_01_19_0_characters_channels.sql → ....5a/2011_01_19_00_characters_channels.sql
diff --git a/...9_0_characters_character_account_data.sql → ..._00_characters_character_account_data.sql b/...9_0_characters_character_account_data.sql → ..._00_characters_character_account_data.sql
diff --git a/...19_0_characters_character_achievement.sql → ...9_00_characters_character_achievement.sql b/...19_0_characters_character_achievement.sql → ...9_00_characters_character_achievement.sql
diff --git a/...acters_character_achievement_progress.sql → ...acters_character_achievement_progress.sql b/...acters_character_achievement_progress.sql → ...acters_character_achievement_progress.sql
diff --git a/...1_01_19_0_characters_character_action.sql → ..._01_19_00_characters_character_action.sql b/...1_01_19_0_characters_character_action.sql → ..._01_19_00_characters_character_action.sql
diff --git a/...19_0_characters_character_arena_stats.sql → ...9_00_characters_character_arena_stats.sql b/...19_0_characters_character_arena_stats.sql → ...9_00_characters_character_arena_stats.sql
diff --git a/...011_01_19_0_characters_character_aura.sql → ...11_01_19_00_characters_character_aura.sql b/...011_01_19_0_characters_character_aura.sql → ...11_01_19_00_characters_character_aura.sql
diff --git a/...1_01_19_0_characters_character_banned.sql → ..._01_19_00_characters_character_banned.sql b/...1_01_19_0_characters_character_banned.sql → ..._01_19_00_characters_character_banned.sql
diff --git a/...haracters_character_battleground_data.sql → ...haracters_character_battleground_data.sql b/...haracters_character_battleground_data.sql → ...haracters_character_battleground_data.sql
diff --git a/...racters_character_battleground_random.sql → ...racters_character_battleground_random.sql b/...racters_character_battleground_random.sql → ...racters_character_battleground_random.sql
diff --git a/...9_0_characters_character_declinedname.sql → ..._00_characters_character_declinedname.sql b/...9_0_characters_character_declinedname.sql → ..._00_characters_character_declinedname.sql
diff --git a/..._0_characters_character_equipmentsets.sql → ...00_characters_character_equipmentsets.sql b/..._0_characters_character_equipmentsets.sql → ...00_characters_character_equipmentsets.sql
diff --git a/...11_01_19_0_characters_character_gifts.sql → ...1_01_19_00_characters_character_gifts.sql b/...11_01_19_0_characters_character_gifts.sql → ...1_01_19_00_characters_character_gifts.sql
diff --git a/...1_01_19_0_characters_character_glyphs.sql → ..._01_19_00_characters_character_glyphs.sql b/...1_01_19_0_characters_character_glyphs.sql → ..._01_19_00_characters_character_glyphs.sql
diff --git a/...01_19_0_characters_character_homebind.sql → ...1_19_00_characters_character_homebind.sql b/...01_19_0_characters_character_homebind.sql → ...1_19_00_characters_character_homebind.sql
diff --git a/...01_19_0_characters_character_instance.sql → ...1_19_00_characters_character_instance.sql b/...01_19_0_characters_character_instance.sql → ...1_19_00_characters_character_instance.sql
diff --git a/...1_19_0_characters_character_inventory.sql → ..._19_00_characters_character_inventory.sql b/...1_19_0_characters_character_inventory.sql → ..._19_00_characters_character_inventory.sql
diff --git a/...2011_01_19_0_characters_character_pet.sql → ...011_01_19_00_characters_character_pet.sql b/...2011_01_19_0_characters_character_pet.sql → ...011_01_19_00_characters_character_pet.sql
diff --git a/...characters_character_pet_declinedname.sql → ...characters_character_pet_declinedname.sql b/...characters_character_pet_declinedname.sql → ...characters_character_pet_declinedname.sql
diff --git a/...19_0_characters_character_queststatus.sql → ...9_00_characters_character_queststatus.sql b/...19_0_characters_character_queststatus.sql → ...9_00_characters_character_queststatus.sql
diff --git a/...haracters_character_queststatus_daily.sql → ...haracters_character_queststatus_daily.sql b/...haracters_character_queststatus_daily.sql → ...haracters_character_queststatus_daily.sql
diff --git a/...aracters_character_queststatus_weekly.sql → ...aracters_character_queststatus_weekly.sql b/...aracters_character_queststatus_weekly.sql → ...aracters_character_queststatus_weekly.sql
diff --git a/..._19_0_characters_character_reputation.sql → ...19_00_characters_character_reputation.sql b/..._19_0_characters_character_reputation.sql → ...19_00_characters_character_reputation.sql
diff --git a/...1_01_19_0_characters_character_skills.sql → ..._01_19_00_characters_character_skills.sql b/...1_01_19_0_characters_character_skills.sql → ..._01_19_00_characters_character_skills.sql
diff --git a/...1_01_19_0_characters_character_social.sql → ..._01_19_00_characters_character_social.sql b/...1_01_19_0_characters_character_social.sql → ..._01_19_00_characters_character_social.sql
diff --git a/...11_01_19_0_characters_character_spell.sql → ...1_01_19_00_characters_character_spell.sql b/...11_01_19_0_characters_character_spell.sql → ...1_01_19_00_characters_character_spell.sql
diff --git a/...0_characters_character_spell_cooldown.sql → ...0_characters_character_spell_cooldown.sql b/...0_characters_character_spell_cooldown.sql → ...0_characters_character_spell_cooldown.sql
diff --git a/...11_01_19_0_characters_character_stats.sql → ...1_01_19_00_characters_character_stats.sql b/...11_01_19_0_characters_character_stats.sql → ...1_01_19_00_characters_character_stats.sql
diff --git a/...1_01_19_0_characters_character_talent.sql → ..._01_19_00_characters_character_talent.sql b/...1_01_19_0_characters_character_talent.sql → ..._01_19_00_characters_character_talent.sql
diff --git a/...01_19_0_characters_character_tutorial.sql → ...1_19_00_characters_character_tutorial.sql b/...01_19_0_characters_character_tutorial.sql → ...1_19_00_characters_character_tutorial.sql
diff --git a/...5a/2011_01_19_0_characters_characters.sql → ...a/2011_01_19_00_characters_characters.sql b/...5a/2011_01_19_0_characters_characters.sql → ...a/2011_01_19_00_characters_characters.sql
diff --git a/...3.3.5a/2011_01_19_0_characters_corpse.sql → ....3.5a/2011_01_19_00_characters_corpse.sql b/...3.3.5a/2011_01_19_0_characters_corpse.sql → ....3.5a/2011_01_19_00_characters_corpse.sql
diff --git a/...1_01_19_0_characters_creature_respawn.sql → ..._01_19_00_characters_creature_respawn.sql b/...1_01_19_0_characters_creature_respawn.sql → ..._01_19_00_characters_creature_respawn.sql
diff --git a/..._characters_game_event_condition_save.sql → ..._characters_game_event_condition_save.sql b/..._characters_game_event_condition_save.sql → ..._characters_game_event_condition_save.sql
diff --git a/...11_01_20_0_characters_game_event_save.sql → ...1_01_20_00_characters_game_event_save.sql b/...11_01_20_0_characters_game_event_save.sql → ...1_01_20_00_characters_game_event_save.sql
diff --git a/...01_20_0_characters_gameobject_respawn.sql → ...1_20_00_characters_gameobject_respawn.sql b/...01_20_0_characters_gameobject_respawn.sql → ...1_20_00_characters_gameobject_respawn.sql
diff --git a/...2011_01_20_0_characters_gm_subsurveys.sql → ...011_01_20_00_characters_gm_subsurveys.sql b/...2011_01_20_0_characters_gm_subsurveys.sql → ...011_01_20_00_characters_gm_subsurveys.sql
diff --git a/...5a/2011_01_20_0_characters_gm_surveys.sql → ...a/2011_01_20_00_characters_gm_surveys.sql b/...5a/2011_01_20_0_characters_gm_surveys.sql → ...a/2011_01_20_00_characters_gm_surveys.sql
diff --git a/...5a/2011_01_20_0_characters_gm_tickets.sql → ...a/2011_01_20_00_characters_gm_tickets.sql b/...5a/2011_01_20_0_characters_gm_tickets.sql → ...a/2011_01_20_00_characters_gm_tickets.sql
diff --git a/...011_01_20_0_characters_group_instance.sql → ...11_01_20_00_characters_group_instance.sql b/...011_01_20_0_characters_group_instance.sql → ...11_01_20_00_characters_group_instance.sql
diff --git a/.../2011_01_20_0_characters_group_member.sql → ...2011_01_20_00_characters_group_member.sql b/.../2011_01_20_0_characters_group_member.sql → ...2011_01_20_00_characters_group_member.sql
diff --git a/...3.3.5a/2011_01_20_0_characters_groups.sql → ....3.5a/2011_01_20_00_characters_groups.sql b/...3.3.5a/2011_01_20_0_characters_groups.sql → ....3.5a/2011_01_20_00_characters_groups.sql
diff --git a/.../3.3.5a/2011_01_20_0_characters_guild.sql → ...3.3.5a/2011_01_20_00_characters_guild.sql b/.../3.3.5a/2011_01_20_0_characters_guild.sql → ...3.3.5a/2011_01_20_00_characters_guild.sql
diff --git a/...1_20_0_characters_guild_bank_eventlog.sql → ..._20_00_characters_guild_bank_eventlog.sql b/...1_20_0_characters_guild_bank_eventlog.sql → ..._20_00_characters_guild_bank_eventlog.sql
diff --git a/...11_01_20_0_characters_guild_bank_item.sql → ...1_01_20_00_characters_guild_bank_item.sql b/...11_01_20_0_characters_guild_bank_item.sql → ...1_01_20_00_characters_guild_bank_item.sql
diff --git a/...1_01_20_0_characters_guild_bank_right.sql → ..._01_20_00_characters_guild_bank_right.sql b/...1_01_20_0_characters_guild_bank_right.sql → ..._01_20_00_characters_guild_bank_right.sql
diff --git a/...011_01_20_0_characters_guild_bank_tab.sql → ...11_01_20_00_characters_guild_bank_tab.sql b/...011_01_20_0_characters_guild_bank_tab.sql → ...11_01_20_00_characters_guild_bank_tab.sql
diff --git a/...011_01_20_0_characters_guild_eventlog.sql → ...11_01_20_00_characters_guild_eventlog.sql b/...011_01_20_0_characters_guild_eventlog.sql → ...11_01_20_00_characters_guild_eventlog.sql
diff --git a/.../2011_01_20_0_characters_guild_member.sql → ...2011_01_20_00_characters_guild_member.sql b/.../2011_01_20_0_characters_guild_member.sql → ...2011_01_20_00_characters_guild_member.sql
diff --git a/...5a/2011_01_20_0_characters_guild_rank.sql → ...a/2011_01_20_00_characters_guild_rank.sql b/...5a/2011_01_20_0_characters_guild_rank.sql → ...a/2011_01_20_00_characters_guild_rank.sql
diff --git a/...3.5a/2011_01_20_0_characters_instance.sql → ....5a/2011_01_20_00_characters_instance.sql b/...3.5a/2011_01_20_0_characters_instance.sql → ....5a/2011_01_20_00_characters_instance.sql
diff --git a/...011_01_20_0_characters_instance_reset.sql → ...11_01_20_00_characters_instance_reset.sql b/...011_01_20_0_characters_instance_reset.sql → ...11_01_20_00_characters_instance_reset.sql
diff --git a/...2011_01_20_0_characters_item_instance.sql → ...011_01_20_00_characters_item_instance.sql b/...2011_01_20_0_characters_item_instance.sql → ...011_01_20_00_characters_item_instance.sql
diff --git a/..._20_0_characters_item_refund_instance.sql → ...20_00_characters_item_refund_instance.sql b/..._20_0_characters_item_refund_instance.sql → ...20_00_characters_item_refund_instance.sql
diff --git a/..._characters_item_soulbound_trace_data.sql → ..._characters_item_soulbound_trace_data.sql b/..._characters_item_soulbound_trace_data.sql → ..._characters_item_soulbound_trace_data.sql
diff --git a/...a/2011_01_20_0_characters_lag_reports.sql → .../2011_01_20_00_characters_lag_reports.sql b/...a/2011_01_20_0_characters_lag_reports.sql → .../2011_01_20_00_characters_lag_reports.sql
diff --git a/...d/3.3.5a/2011_01_20_0_characters_mail.sql → .../3.3.5a/2011_01_20_00_characters_mail.sql b/...d/3.3.5a/2011_01_20_0_characters_mail.sql → .../3.3.5a/2011_01_20_00_characters_mail.sql
diff --git a/...5a/2011_01_20_0_characters_mail_items.sql → ...a/2011_01_20_00_characters_mail_items.sql b/...5a/2011_01_20_0_characters_mail_items.sql → ...a/2011_01_20_00_characters_mail_items.sql
diff --git a/...3.5a/2011_01_20_0_characters_pet_aura.sql → ....5a/2011_01_20_00_characters_pet_aura.sql b/...3.5a/2011_01_20_0_characters_pet_aura.sql → ....5a/2011_01_20_00_characters_pet_aura.sql
diff --git a/....5a/2011_01_20_0_characters_pet_spell.sql → ...5a/2011_01_20_00_characters_pet_spell.sql b/....5a/2011_01_20_0_characters_pet_spell.sql → ...5a/2011_01_20_00_characters_pet_spell.sql
diff --git a/...01_20_0_characters_pet_spell_cooldown.sql → ...1_20_00_characters_pet_spell_cooldown.sql b/...01_20_0_characters_pet_spell_cooldown.sql → ...1_20_00_characters_pet_spell_cooldown.sql
diff --git a/...3.5a/2011_01_20_0_characters_petition.sql → ....5a/2011_01_20_00_characters_petition.sql b/...3.5a/2011_01_20_0_characters_petition.sql → ....5a/2011_01_20_00_characters_petition.sql
diff --git a/...2011_01_20_0_characters_petition_sign.sql → ...011_01_20_00_characters_petition_sign.sql b/...2011_01_20_0_characters_petition_sign.sql → ...011_01_20_00_characters_petition_sign.sql
diff --git a/...a/2011_01_20_0_characters_worldstates.sql → .../2011_01_20_00_characters_worldstates.sql b/...a/2011_01_20_0_characters_worldstates.sql → .../2011_01_20_00_characters_worldstates.sql
diff --git a/.../3.3.5a/2011_01_20_0_world_scriptname.sql → ...3.3.5a/2011_01_20_00_world_scriptname.sql b/.../3.3.5a/2011_01_20_0_world_scriptname.sql → ...3.3.5a/2011_01_20_00_world_scriptname.sql
diff --git a/...2011_01_22_0_world_spell_script_names.sql → ...011_01_22_00_world_spell_script_names.sql b/...2011_01_22_0_world_spell_script_names.sql → ...011_01_22_00_world_spell_script_names.sql
diff --git a/...1_22_1_characters_character_inventory.sql → ..._22_01_characters_character_inventory.sql b/...1_22_1_characters_character_inventory.sql → ..._22_01_characters_character_inventory.sql
diff --git a/...4_0_characters_account_instance_times.sql → ..._00_characters_account_instance_times.sql b/...4_0_characters_account_instance_times.sql → ..._00_characters_account_instance_times.sql
diff --git a/.../3.3.5a/2011_01_24_0_world_scriptname.sql → ...3.3.5a/2011_01_24_00_world_scriptname.sql b/.../3.3.5a/2011_01_24_0_world_scriptname.sql → ...3.3.5a/2011_01_24_00_world_scriptname.sql
diff --git a/.../3.3.5a/2011_01_26_0_world_scriptname.sql → ...3.3.5a/2011_01_26_00_world_scriptname.sql b/.../3.3.5a/2011_01_26_0_world_scriptname.sql → ...3.3.5a/2011_01_26_00_world_scriptname.sql
diff --git a/...2011_01_26_0_world_spell_script_names.sql → ...011_01_26_00_world_spell_script_names.sql b/...2011_01_26_0_world_spell_script_names.sql → ...011_01_26_00_world_spell_script_names.sql
diff --git a/...2011_01_28_0_world_spell_linked_spell.sql → ...011_01_28_00_world_spell_linked_spell.sql b/...2011_01_28_0_world_spell_linked_spell.sql → ...011_01_28_00_world_spell_linked_spell.sql
diff --git a/...2011_01_28_0_world_spell_script_names.sql → ...011_01_28_00_world_spell_script_names.sql b/...2011_01_28_0_world_spell_script_names.sql → ...011_01_28_00_world_spell_script_names.sql
diff --git a/...2011_01_28_1_world_spell_script_names.sql → ...011_01_28_01_world_spell_script_names.sql b/...2011_01_28_1_world_spell_script_names.sql → ...011_01_28_01_world_spell_script_names.sql
diff --git a/...2011_01_29_0_world_spell_linked_spell.sql → ...011_01_29_00_world_spell_linked_spell.sql b/...2011_01_29_0_world_spell_linked_spell.sql → ...011_01_29_00_world_spell_linked_spell.sql
diff --git a/...a/2011_01_30_0_world_spell_proc_event.sql → .../2011_01_30_00_world_spell_proc_event.sql b/...a/2011_01_30_0_world_spell_proc_event.sql → .../2011_01_30_00_world_spell_proc_event.sql
diff --git a/...2011_01_30_0_world_spell_script_names.sql → ...011_01_30_00_world_spell_script_names.sql b/...2011_01_30_0_world_spell_script_names.sql → ...011_01_30_00_world_spell_script_names.sql
diff --git a/...3.3.5a/2011_01_30_1_world_scriptnames.sql → ....3.5a/2011_01_30_01_world_scriptnames.sql b/...3.3.5a/2011_01_30_1_world_scriptnames.sql → ....3.5a/2011_01_30_01_world_scriptnames.sql
diff --git a/...a/2011_01_31_0_world_spell_bonus_data.sql → .../2011_01_31_00_world_spell_bonus_data.sql b/...a/2011_01_31_0_world_spell_bonus_data.sql → .../2011_01_31_00_world_spell_bonus_data.sql
diff --git a/...a/2011_01_31_0_world_spell_proc_event.sql → .../2011_01_31_00_world_spell_proc_event.sql b/...a/2011_01_31_0_world_spell_proc_event.sql → .../2011_01_31_00_world_spell_proc_event.sql
diff --git a/...2011_01_31_0_world_spell_script_names.sql → ...011_01_31_00_world_spell_script_names.sql b/...2011_01_31_0_world_spell_script_names.sql → ...011_01_31_00_world_spell_script_names.sql
diff --git a/...a/2011_01_31_1_world_spell_proc_event.sql → .../2011_01_31_01_world_spell_proc_event.sql b/...a/2011_01_31_1_world_spell_proc_event.sql → .../2011_01_31_01_world_spell_proc_event.sql
diff --git a/...2011_01_31_1_world_spell_script_names.sql → ...011_01_31_01_world_spell_script_names.sql b/...2011_01_31_1_world_spell_script_names.sql → ...011_01_31_01_world_spell_script_names.sql
diff --git a/...3.5a/2011_02_03_0_characters_instance.sql → ....5a/2011_02_03_00_characters_instance.sql b/...3.5a/2011_02_03_0_characters_instance.sql → ....5a/2011_02_03_00_characters_instance.sql
diff --git a/...011_02_03_0_world_instance_encounters.sql → ...11_02_03_00_world_instance_encounters.sql b/...011_02_03_0_world_instance_encounters.sql → ...11_02_03_00_world_instance_encounters.sql
diff --git a/...old/3.3.5a/2011_02_03_1_world_command.sql → ...ld/3.3.5a/2011_02_03_01_world_command.sql b/...old/3.3.5a/2011_02_03_1_world_command.sql → ...ld/3.3.5a/2011_02_03_01_world_command.sql
diff --git a/..._02_03_2_world_lfg_dungeon_encounters.sql → ...02_03_02_world_lfg_dungeon_encounters.sql b/..._02_03_2_world_lfg_dungeon_encounters.sql → ...02_03_02_world_lfg_dungeon_encounters.sql
diff --git a/...d/3.3.5a/2011_02_03_3_world_spell_dbc.sql → .../3.3.5a/2011_02_03_03_world_spell_dbc.sql b/...d/3.3.5a/2011_02_03_3_world_spell_dbc.sql → .../3.3.5a/2011_02_03_03_world_spell_dbc.sql
diff --git a/...0_world_battleground_isle_of_conquest.sql → ...0_world_battleground_isle_of_conquest.sql b/...0_world_battleground_isle_of_conquest.sql → ...0_world_battleground_isle_of_conquest.sql
diff --git a/.../3.3.5a/2011_02_04_0_world_conditions.sql → ...3.3.5a/2011_02_04_00_world_conditions.sql b/.../3.3.5a/2011_02_04_0_world_conditions.sql → ...3.3.5a/2011_02_04_00_world_conditions.sql
diff --git a/....3.5a/2011_02_04_0_world_creature_631.sql → ...3.5a/2011_02_04_00_world_creature_631.sql b/....3.5a/2011_02_04_0_world_creature_631.sql → ...3.5a/2011_02_04_00_world_creature_631.sql
diff --git a/..._02_04_0_world_creature_questrelation.sql → ...02_04_00_world_creature_questrelation.sql b/..._02_04_0_world_creature_questrelation.sql → ...02_04_00_world_creature_questrelation.sql
diff --git a/.../2011_02_04_0_world_creature_template.sql → ...2011_02_04_00_world_creature_template.sql b/.../2011_02_04_0_world_creature_template.sql → ...2011_02_04_00_world_creature_template.sql
diff --git a/.../3.3.5a/2011_02_04_0_world_game_event.sql → ...3.3.5a/2011_02_04_00_world_game_event.sql b/.../3.3.5a/2011_02_04_0_world_game_event.sql → ...3.3.5a/2011_02_04_00_world_game_event.sql
diff --git a/...2_04_0_world_gameobject_questrelation.sql → ..._04_00_world_gameobject_questrelation.sql b/...2_04_0_world_gameobject_questrelation.sql → ..._04_00_world_gameobject_questrelation.sql
diff --git a/...1_02_04_0_world_instance_pit_of_saron.sql → ..._02_04_00_world_instance_pit_of_saron.sql b/...1_02_04_0_world_instance_pit_of_saron.sql → ..._02_04_00_world_instance_pit_of_saron.sql
diff --git a/...2011_02_04_0_world_item_loot_template.sql → ...011_02_04_00_world_item_loot_template.sql b/...2011_02_04_0_world_item_loot_template.sql → ...011_02_04_00_world_item_loot_template.sql
diff --git a/...2011_02_04_0_world_mail_loot_template.sql → ...011_02_04_00_world_mail_loot_template.sql b/...2011_02_04_0_world_mail_loot_template.sql → ...011_02_04_00_world_mail_loot_template.sql
diff --git a/....5a/2011_02_04_0_world_quest_template.sql → ...5a/2011_02_04_00_world_quest_template.sql b/....5a/2011_02_04_0_world_quest_template.sql → ...5a/2011_02_04_00_world_quest_template.sql
diff --git a/sql/old/3.3.5a/2011_02_04_0_world_sai.sql → sql/old/3.3.5a/2011_02_04_00_world_sai.sql b/sql/old/3.3.5a/2011_02_04_0_world_sai.sql → sql/old/3.3.5a/2011_02_04_00_world_sai.sql
diff --git a/...2011_02_04_0_world_spell_script_names.sql → ...011_02_04_00_world_spell_script_names.sql b/...2011_02_04_0_world_spell_script_names.sql → ...011_02_04_00_world_spell_script_names.sql
diff --git a/...1_02_04_0_world_spell_target_position.sql → ..._02_04_00_world_spell_target_position.sql b/...1_02_04_0_world_spell_target_position.sql → ..._02_04_00_world_spell_target_position.sql
diff --git a/.../3.3.5a/2011_02_04_1_world_game_event.sql → ...3.3.5a/2011_02_04_01_world_game_event.sql b/.../3.3.5a/2011_02_04_1_world_game_event.sql → ...3.3.5a/2011_02_04_01_world_game_event.sql
diff --git a/....5a/2011_02_04_1_world_quest_template.sql → ...5a/2011_02_04_01_world_quest_template.sql b/....5a/2011_02_04_1_world_quest_template.sql → ...5a/2011_02_04_01_world_quest_template.sql
diff --git a/sql/old/3.3.5a/2011_02_04_1_world_sai.sql → sql/old/3.3.5a/2011_02_04_01_world_sai.sql b/sql/old/3.3.5a/2011_02_04_1_world_sai.sql → sql/old/3.3.5a/2011_02_04_01_world_sai.sql
diff --git a/....5a/2011_02_04_2_world_quest_template.sql → ...5a/2011_02_04_02_world_quest_template.sql b/....5a/2011_02_04_2_world_quest_template.sql → ...5a/2011_02_04_02_world_quest_template.sql
diff --git a/sql/old/3.3.5a/2011_02_04_2_world_sai.sql → sql/old/3.3.5a/2011_02_04_02_world_sai.sql b/sql/old/3.3.5a/2011_02_04_2_world_sai.sql → sql/old/3.3.5a/2011_02_04_02_world_sai.sql
diff --git a/....5a/2011_02_04_3_world_quest_template.sql → ...5a/2011_02_04_03_world_quest_template.sql b/....5a/2011_02_04_3_world_quest_template.sql → ...5a/2011_02_04_03_world_quest_template.sql
diff --git a/sql/old/3.3.5a/2011_02_04_3_world_sai.sql → sql/old/3.3.5a/2011_02_04_03_world_sai.sql b/sql/old/3.3.5a/2011_02_04_3_world_sai.sql → sql/old/3.3.5a/2011_02_04_03_world_sai.sql
diff --git a/....5a/2011_02_04_4_world_quest_template.sql → ...5a/2011_02_04_04_world_quest_template.sql b/....5a/2011_02_04_4_world_quest_template.sql → ...5a/2011_02_04_04_world_quest_template.sql
diff --git a/sql/old/3.3.5a/2011_02_04_4_world_sai.sql → sql/old/3.3.5a/2011_02_04_04_world_sai.sql b/sql/old/3.3.5a/2011_02_04_4_world_sai.sql → sql/old/3.3.5a/2011_02_04_04_world_sai.sql
diff --git a/sql/old/3.3.5a/2011_02_05_0_world_sai.sql → sql/old/3.3.5a/2011_02_05_00_world_sai.sql b/sql/old/3.3.5a/2011_02_05_0_world_sai.sql → sql/old/3.3.5a/2011_02_05_00_world_sai.sql
diff --git a/....5a/2011_02_05_1_world_quest_template.sql → ...5a/2011_02_05_01_world_quest_template.sql b/....5a/2011_02_05_1_world_quest_template.sql → ...5a/2011_02_05_01_world_quest_template.sql
diff --git a/.../2011_02_05_2_world_creature_template.sql → ...2011_02_05_02_world_creature_template.sql b/.../2011_02_05_2_world_creature_template.sql → ...2011_02_05_02_world_creature_template.sql
diff --git a/.../2011_02_05_3_world_creature_template.sql → ...2011_02_05_03_world_creature_template.sql b/.../2011_02_05_3_world_creature_template.sql → ...2011_02_05_03_world_creature_template.sql
diff --git a/.../3.3.5a/2011_02_05_4_world_game_event.sql → ...3.3.5a/2011_02_05_04_world_game_event.sql b/.../3.3.5a/2011_02_05_4_world_game_event.sql → ...3.3.5a/2011_02_05_04_world_game_event.sql
diff --git a/sql/old/3.3.5a/2011_02_05_5_world_sai.sql → sql/old/3.3.5a/2011_02_05_05_world_sai.sql b/sql/old/3.3.5a/2011_02_05_5_world_sai.sql → sql/old/3.3.5a/2011_02_05_05_world_sai.sql
diff --git a/...3.5a/2011_02_05_6_world_waypoint_data.sql → ....5a/2011_02_05_06_world_waypoint_data.sql b/...3.5a/2011_02_05_6_world_waypoint_data.sql → ....5a/2011_02_05_06_world_waypoint_data.sql
diff --git a/sql/old/3.3.5a/2011_02_05_7_world_sai.sql → sql/old/3.3.5a/2011_02_05_07_world_sai.sql b/sql/old/3.3.5a/2011_02_05_7_world_sai.sql → sql/old/3.3.5a/2011_02_05_07_world_sai.sql
diff --git a/sql/old/3.3.5a/2011_02_05_8_world_sai.sql → sql/old/3.3.5a/2011_02_05_08_world_sai.sql b/sql/old/3.3.5a/2011_02_05_8_world_sai.sql → sql/old/3.3.5a/2011_02_05_08_world_sai.sql
diff --git a/...2_06_0_world_instance_sindragosa_lair.sql → ..._06_00_world_instance_sindragosa_lair.sql b/...2_06_0_world_instance_sindragosa_lair.sql → ..._06_00_world_instance_sindragosa_lair.sql
diff --git a/..._02_06_1_world_creature_loot_template.sql → ...02_06_01_world_creature_loot_template.sql b/..._02_06_1_world_creature_loot_template.sql → ...02_06_01_world_creature_loot_template.sql
diff --git a/...2011_02_06_2_world_item_loot_template.sql → ...011_02_06_02_world_item_loot_template.sql b/...2011_02_06_2_world_item_loot_template.sql → ...011_02_06_02_world_item_loot_template.sql
diff --git a/..._07_0_world_achievement_criteria_data.sql → ...07_00_world_achievement_criteria_data.sql b/..._07_0_world_achievement_criteria_data.sql → ...07_00_world_achievement_criteria_data.sql
diff --git a/...011_02_07_0_world_areatrigger_scripts.sql → ...11_02_07_00_world_areatrigger_scripts.sql b/...011_02_07_0_world_areatrigger_scripts.sql → ...11_02_07_00_world_areatrigger_scripts.sql
diff --git a/.../2011_02_07_0_world_creature_template.sql → ...2011_02_07_00_world_creature_template.sql b/.../2011_02_07_0_world_creature_template.sql → ...2011_02_07_00_world_creature_template.sql
diff --git a/...3.5a/2011_02_07_0_world_creature_text.sql → ....5a/2011_02_07_00_world_creature_text.sql b/...3.5a/2011_02_07_0_world_creature_text.sql → ....5a/2011_02_07_00_world_creature_text.sql
diff --git a/.../3.3.5a/2011_02_07_0_world_scriptname.sql → ...3.3.5a/2011_02_07_00_world_scriptname.sql b/.../3.3.5a/2011_02_07_0_world_scriptname.sql → ...3.3.5a/2011_02_07_00_world_scriptname.sql
diff --git a/...2011_02_07_0_world_spell_linked_spell.sql → ...011_02_07_00_world_spell_linked_spell.sql b/...2011_02_07_0_world_spell_linked_spell.sql → ...011_02_07_00_world_spell_linked_spell.sql
diff --git a/...2011_02_07_0_world_spell_script_names.sql → ...011_02_07_00_world_spell_script_names.sql b/...2011_02_07_0_world_spell_script_names.sql → ...011_02_07_00_world_spell_script_names.sql
diff --git a/..._02_07_1_world_creature_questrelation.sql → ...02_07_01_world_creature_questrelation.sql b/..._02_07_1_world_creature_questrelation.sql → ...02_07_01_world_creature_questrelation.sql
diff --git a/sql/old/3.3.5a/2011_02_07_2_world_sai.sql → sql/old/3.3.5a/2011_02_07_02_world_sai.sql b/sql/old/3.3.5a/2011_02_07_2_world_sai.sql → sql/old/3.3.5a/2011_02_07_02_world_sai.sql
diff --git a/...02_08_0_world_instance_saurfang_traps.sql → ...2_080_0_world_instance_saurfang_traps.sql b/...02_08_0_world_instance_saurfang_traps.sql → ...2_080_0_world_instance_saurfang_traps.sql
diff --git a/...011_02_08_0_world_areatrigger_scripts.sql → ...11_02_08_00_world_areatrigger_scripts.sql b/...011_02_08_0_world_areatrigger_scripts.sql → ...11_02_08_00_world_areatrigger_scripts.sql
diff --git a/.../3.3.5a/2011_02_08_0_world_scriptname.sql → ...3.3.5a/2011_02_08_00_world_scriptname.sql b/.../3.3.5a/2011_02_08_0_world_scriptname.sql → ...3.3.5a/2011_02_08_00_world_scriptname.sql
diff --git a/.../2011_02_08_1_world_creature_template.sql → ...2011_02_08_01_world_creature_template.sql b/.../2011_02_08_1_world_creature_template.sql → ...2011_02_08_01_world_creature_template.sql
diff --git a/...a/2011_02_08_2_world_waypoint_scripts.sql → .../2011_02_08_02_world_waypoint_scripts.sql b/...a/2011_02_08_2_world_waypoint_scripts.sql → .../2011_02_08_02_world_waypoint_scripts.sql
diff --git a/sql/old/3.3.5a/2011_02_10_0_world_sai.sql → sql/old/3.3.5a/2011_02_10_00_world_sai.sql b/sql/old/3.3.5a/2011_02_10_0_world_sai.sql → sql/old/3.3.5a/2011_02_10_00_world_sai.sql
diff --git a/sql/old/3.3.5a/2011_02_10_1_world_sai.sql → sql/old/3.3.5a/2011_02_10_01_world_sai.sql b/sql/old/3.3.5a/2011_02_10_1_world_sai.sql → sql/old/3.3.5a/2011_02_10_01_world_sai.sql
diff --git a/...5a/2011_02_10_2_world_instance_oculus.sql → ...a/2011_02_10_02_world_instance_oculus.sql b/...5a/2011_02_10_2_world_instance_oculus.sql → ...a/2011_02_10_02_world_instance_oculus.sql
diff --git a/.../2011_02_10_3_world_creature_template.sql → ...2011_02_10_03_world_creature_template.sql b/.../2011_02_10_3_world_creature_template.sql → ...2011_02_10_03_world_creature_template.sql
diff --git a/.../3.3.5a/2011_02_10_4_world_scriptname.sql → ...3.3.5a/2011_02_10_04_world_scriptname.sql b/.../3.3.5a/2011_02_10_4_world_scriptname.sql → ...3.3.5a/2011_02_10_04_world_scriptname.sql
diff --git a/...3.3.5a/2011_02_11_0_world_coredevdata.sql → ....3.5a/2011_02_11_00_world_coredevdata.sql b/...3.3.5a/2011_02_11_0_world_coredevdata.sql → ....3.5a/2011_02_11_00_world_coredevdata.sql
diff --git a/...old/3.3.5a/2011_02_11_1_world_command.sql → ...ld/3.3.5a/2011_02_11_01_world_command.sql b/...old/3.3.5a/2011_02_11_1_world_command.sql → ...ld/3.3.5a/2011_02_11_01_world_command.sql
diff --git a/...3.3.5a/2011_02_11_1_world_coredevdata.sql → ....3.5a/2011_02_11_01_world_coredevdata.sql b/...3.3.5a/2011_02_11_1_world_coredevdata.sql → ....3.5a/2011_02_11_01_world_coredevdata.sql
diff --git a/.../3.3.5a/2011_02_11_2_world_npc_gossip.sql → ...3.3.5a/2011_02_11_02_world_npc_gossip.sql b/.../3.3.5a/2011_02_11_2_world_npc_gossip.sql → ...3.3.5a/2011_02_11_02_world_npc_gossip.sql
diff --git a/...011_02_11_3_creature_involvedrelation.sql → ...11_03_world_creature_involvedrelation.sql b/...011_02_11_3_creature_involvedrelation.sql → ...11_03_world_creature_involvedrelation.sql
diff --git a/...1_02_11_4_world_game_event_npc_gossip.sql → ..._02_11_04_world_game_event_npc_gossip.sql b/...1_02_11_4_world_game_event_npc_gossip.sql → ..._02_11_04_world_game_event_npc_gossip.sql
diff --git a/...2011_02_12_0_world_spell_script_names.sql → ...011_02_12_00_world_spell_script_names.sql b/...2011_02_12_0_world_spell_script_names.sql → ...011_02_12_00_world_spell_script_names.sql
diff --git a/sql/old/3.3.5a/2011_02_15_0_world_sai.sql → sql/old/3.3.5a/2011_02_15_00_world_sai.sql b/sql/old/3.3.5a/2011_02_15_0_world_sai.sql → sql/old/3.3.5a/2011_02_15_00_world_sai.sql
diff --git a/sql/old/3.3.5a/2011_02_15_1_world_sai.sql → sql/old/3.3.5a/2011_02_15_01_world_sai.sql b/sql/old/3.3.5a/2011_02_15_1_world_sai.sql → sql/old/3.3.5a/2011_02_15_01_world_sai.sql
diff --git a/...a/2011_02_15_2_world_game_event_liita.sql → .../2011_02_15_02_world_game_event_liita.sql b/...a/2011_02_15_2_world_game_event_liita.sql → .../2011_02_15_02_world_game_event_liita.sql
diff --git a/.../2011_02_15_3_world_creature_template.sql → ...2011_02_15_03_world_creature_template.sql b/.../2011_02_15_3_world_creature_template.sql → ...2011_02_15_03_world_creature_template.sql
diff --git a/...3.5a/2011_02_15_3_world_creature_text.sql → ....5a/2011_02_15_03_world_creature_text.sql b/...3.5a/2011_02_15_3_world_creature_text.sql → ....5a/2011_02_15_03_world_creature_text.sql
diff --git a/.../3.3.5a/2011_02_15_3_world_scriptname.sql → ...3.3.5a/2011_02_15_03_world_scriptname.sql b/.../3.3.5a/2011_02_15_3_world_scriptname.sql → ...3.3.5a/2011_02_15_03_world_scriptname.sql
diff --git a/...2011_02_15_3_world_spell_script_names.sql → ...011_02_15_03_world_spell_script_names.sql b/...2011_02_15_3_world_spell_script_names.sql → ...011_02_15_03_world_spell_script_names.sql
diff --git a/...2011_02_15_4_world_spell_linked_spell.sql → ...011_02_15_04_world_spell_linked_spell.sql b/...2011_02_15_4_world_spell_linked_spell.sql → ...011_02_15_04_world_spell_linked_spell.sql
diff --git a/...2011_02_15_4_world_spell_script_names.sql → ...011_02_15_04_world_spell_script_names.sql b/...2011_02_15_4_world_spell_script_names.sql → ...011_02_15_04_world_spell_script_names.sql
diff --git a/...2011_02_16_0_world_spell_script_names.sql → ...011_02_16_00_world_spell_script_names.sql b/...2011_02_16_0_world_spell_script_names.sql → ...011_02_16_00_world_spell_script_names.sql
diff --git a/.../3.3.5a/2011_02_16_1_world_conditions.sql → ...3.3.5a/2011_02_16_01_world_conditions.sql b/.../3.3.5a/2011_02_16_1_world_conditions.sql → ...3.3.5a/2011_02_16_01_world_conditions.sql
diff --git a/...ld/3.3.5a/2011_02_18_0_world_creature.sql → ...d/3.3.5a/2011_02_18_00_world_creature.sql b/...ld/3.3.5a/2011_02_18_0_world_creature.sql → ...d/3.3.5a/2011_02_18_00_world_creature.sql
diff --git a/...3.5a/2011_02_18_0_world_creature_text.sql → ....5a/2011_02_18_00_world_creature_text.sql b/...3.5a/2011_02_18_0_world_creature_text.sql → ....5a/2011_02_18_00_world_creature_text.sql
diff --git a/.../3.3.5a/2011_02_18_0_world_pool_quest.sql → ...3.3.5a/2011_02_18_00_world_pool_quest.sql b/.../3.3.5a/2011_02_18_0_world_pool_quest.sql → ...3.3.5a/2011_02_18_00_world_pool_quest.sql
diff --git a/.../3.3.5a/2011_02_18_0_world_scriptname.sql → ...3.3.5a/2011_02_18_00_world_scriptname.sql b/.../3.3.5a/2011_02_18_0_world_scriptname.sql → ...3.3.5a/2011_02_18_00_world_scriptname.sql
diff --git a/...2011_02_18_0_world_spell_linked_spell.sql → ...011_02_18_00_world_spell_linked_spell.sql b/...2011_02_18_0_world_spell_linked_spell.sql → ...011_02_18_00_world_spell_linked_spell.sql
diff --git a/...2011_02_18_1_world_spell_linked_spell.sql → ...011_02_18_01_world_spell_linked_spell.sql b/...2011_02_18_1_world_spell_linked_spell.sql → ...011_02_18_01_world_spell_linked_spell.sql
diff --git a/sql/old/3.3.5a/2011_02_18_2_world_misc.sql → sql/old/3.3.5a/2011_02_18_02_world_misc.sql b/sql/old/3.3.5a/2011_02_18_2_world_misc.sql → sql/old/3.3.5a/2011_02_18_02_world_misc.sql
diff --git a/...3.5a/2011_02_18_3_world_loot_template.sql → ....5a/2011_02_18_03_world_loot_template.sql b/...3.5a/2011_02_18_3_world_loot_template.sql → ....5a/2011_02_18_03_world_loot_template.sql
diff --git a/sql/old/3.3.5a/2011_02_18_4_world_eai.sql → sql/old/3.3.5a/2011_02_18_04_world_eai.sql b/sql/old/3.3.5a/2011_02_18_4_world_eai.sql → sql/old/3.3.5a/2011_02_18_04_world_eai.sql
diff --git a/sql/old/3.3.5a/2011_02_18_5_world_sai.sql → sql/old/3.3.5a/2011_02_18_05_world_sai.sql b/sql/old/3.3.5a/2011_02_18_5_world_sai.sql → sql/old/3.3.5a/2011_02_18_05_world_sai.sql
diff --git a/.../3.3.5a/2011_02_19_0_world_conditions.sql → ...3.3.5a/2011_02_19_00_world_conditions.sql b/.../3.3.5a/2011_02_19_0_world_conditions.sql → ...3.3.5a/2011_02_19_00_world_conditions.sql
diff --git a/.../2011_02_19_0_world_creature_template.sql → ...2011_02_19_00_world_creature_template.sql b/.../2011_02_19_0_world_creature_template.sql → ...2011_02_19_00_world_creature_template.sql
diff --git a/.../3.3.5a/2011_02_19_0_world_scriptname.sql → ...3.3.5a/2011_02_19_00_world_scriptname.sql b/.../3.3.5a/2011_02_19_0_world_scriptname.sql → ...3.3.5a/2011_02_19_00_world_scriptname.sql
diff --git a/...2011_02_19_0_world_spell_script_names.sql → ...011_02_19_00_world_spell_script_names.sql b/...2011_02_19_0_world_spell_script_names.sql → ...011_02_19_00_world_spell_script_names.sql
diff --git a/..._19_1_world_instance_icecrown_citadel.sql → ...19_01_world_instance_icecrown_citadel.sql b/..._19_1_world_instance_icecrown_citadel.sql → ...19_01_world_instance_icecrown_citadel.sql
diff --git a/...3.5a/2011_02_20_0_world_smart_scripts.sql → ....5a/2011_02_20_00_world_smart_scripts.sql b/...3.5a/2011_02_20_0_world_smart_scripts.sql → ....5a/2011_02_20_00_world_smart_scripts.sql
diff --git a/...3.5a/2011_02_20_1_world_smart_scripts.sql → ....5a/2011_02_20_01_world_smart_scripts.sql b/...3.5a/2011_02_20_1_world_smart_scripts.sql → ....5a/2011_02_20_01_world_smart_scripts.sql
diff --git a/..._20_2_world_instance_icecrown_citadel.sql → ...20_02_world_instance_icecrown_citadel.sql b/..._20_2_world_instance_icecrown_citadel.sql → ...20_02_world_instance_icecrown_citadel.sql
diff --git a/.../3.3.5a/2011_02_22_0_world_scriptname.sql → ...3.3.5a/2011_02_22_00_world_scriptname.sql b/.../3.3.5a/2011_02_22_0_world_scriptname.sql → ...3.3.5a/2011_02_22_00_world_scriptname.sql
diff --git a/...2011_02_22_1_world_spell_script_names.sql → ...011_02_22_01_world_spell_script_names.sql b/...2011_02_22_1_world_spell_script_names.sql → ...011_02_22_01_world_spell_script_names.sql
diff --git a/.../3.3.5a/2011_02_22_2_world_conditions.sql → ...3.3.5a/2011_02_22_02_world_conditions.sql b/.../3.3.5a/2011_02_22_2_world_conditions.sql → ...3.3.5a/2011_02_22_02_world_conditions.sql
diff --git a/.../2011_02_22_3_world_creature_template.sql → ...2011_02_22_03_world_creature_template.sql b/.../2011_02_22_3_world_creature_template.sql → ...2011_02_22_03_world_creature_template.sql
diff --git a/.../2011_02_22_4_world_vehicle_accessory.sql → ...2011_02_22_04_world_vehicle_accessory.sql b/.../2011_02_22_4_world_vehicle_accessory.sql → ...2011_02_22_04_world_vehicle_accessory.sql
diff --git a/.../2011_02_23_1_world_creature_template.sql → ...2011_02_23_01_world_creature_template.sql b/.../2011_02_23_1_world_creature_template.sql → ...2011_02_23_01_world_creature_template.sql
diff --git a/.../3.3.5a/2011_02_23_2_world_conditions.sql → ...3.3.5a/2011_02_23_02_world_conditions.sql b/.../3.3.5a/2011_02_23_2_world_conditions.sql → ...3.3.5a/2011_02_23_02_world_conditions.sql
diff --git a/.../2011_02_23_3_world_vehicle_accessory.sql → ...2011_02_23_03_world_vehicle_accessory.sql b/.../2011_02_23_3_world_vehicle_accessory.sql → ...2011_02_23_03_world_vehicle_accessory.sql
diff --git a/...2011_02_23_4_world_spell_script_names.sql → ...011_02_23_04_world_spell_script_names.sql b/...2011_02_23_4_world_spell_script_names.sql → ...011_02_23_04_world_spell_script_names.sql
diff --git a/.../2011_02_23_5_world_creature_template.sql → ...2011_02_23_05_world_creature_template.sql b/.../2011_02_23_5_world_creature_template.sql → ...2011_02_23_05_world_creature_template.sql
diff --git a/...d/3.3.5a/2011_02_23_6_world_creatures.sql → .../3.3.5a/2011_02_23_06_world_creatures.sql b/...d/3.3.5a/2011_02_23_6_world_creatures.sql → .../3.3.5a/2011_02_23_06_world_creatures.sql
diff --git a/sql/old/3.3.5a/2011_02_23_7_world_misc.sql → sql/old/3.3.5a/2011_02_23_07_world_misc.sql b/sql/old/3.3.5a/2011_02_23_7_world_misc.sql → sql/old/3.3.5a/2011_02_23_07_world_misc.sql
diff --git a/.../3.3.5a/2011_02_23_7_world_scriptname.sql → ...3.3.5a/2011_02_23_07_world_scriptname.sql b/.../3.3.5a/2011_02_23_7_world_scriptname.sql → ...3.3.5a/2011_02_23_07_world_scriptname.sql
diff --git a/sql/old/3.3.5a/2011_02_23_8_world_sai.sql → sql/old/3.3.5a/2011_02_23_08_world_sai.sql b/sql/old/3.3.5a/2011_02_23_8_world_sai.sql → sql/old/3.3.5a/2011_02_23_08_world_sai.sql
diff --git a/...2011_02_23_9_world_spell_linked_spell.sql → ...011_02_23_09_world_spell_linked_spell.sql b/...2011_02_23_9_world_spell_linked_spell.sql → ...011_02_23_09_world_spell_linked_spell.sql
diff --git a/.../2011_02_24_0_characters_account_data.sql → ...2011_02_24_00_characters_account_data.sql b/.../2011_02_24_0_characters_account_data.sql → ...2011_02_24_00_characters_account_data.sql
diff --git a/...02_24_1_characters_character_tutorial.sql → ...2_24_01_characters_character_tutorial.sql b/...02_24_1_characters_character_tutorial.sql → ...2_24_01_characters_character_tutorial.sql
diff --git a/...d/3.3.5a/2011_02_25_0_world_creatures.sql → .../3.3.5a/2011_02_25_00_world_creatures.sql b/...d/3.3.5a/2011_02_25_0_world_creatures.sql → .../3.3.5a/2011_02_25_00_world_creatures.sql
diff --git a/...2011_02_25_1_world_spell_script_names.sql → ...011_02_25_01_world_spell_script_names.sql b/...2011_02_25_1_world_spell_script_names.sql → ...011_02_25_01_world_spell_script_names.sql
diff --git a/...a/2011_02_25_2_world_spell_proc_event.sql → .../2011_02_25_02_world_spell_proc_event.sql b/...a/2011_02_25_2_world_spell_proc_event.sql → .../2011_02_25_02_world_spell_proc_event.sql
diff --git a/sql/old/3.3.5a/2011_02_26_0_world_sai.sql → sql/old/3.3.5a/2011_02_26_00_world_sai.sql b/sql/old/3.3.5a/2011_02_26_0_world_sai.sql → sql/old/3.3.5a/2011_02_26_00_world_sai.sql
diff --git a/sql/old/3.3.5a/2011_02_26_1_world_sai.sql → sql/old/3.3.5a/2011_02_26_01_world_sai.sql b/sql/old/3.3.5a/2011_02_26_1_world_sai.sql → sql/old/3.3.5a/2011_02_26_01_world_sai.sql
diff --git a/sql/old/3.3.5a/2011_02_26_2_world_sai.sql → sql/old/3.3.5a/2011_02_26_02_world_sai.sql b/sql/old/3.3.5a/2011_02_26_2_world_sai.sql → sql/old/3.3.5a/2011_02_26_02_world_sai.sql
diff --git a/...d/3.3.5a/2011_02_26_3_world_creatures.sql → .../3.3.5a/2011_02_26_03_world_creatures.sql b/...d/3.3.5a/2011_02_26_3_world_creatures.sql → .../3.3.5a/2011_02_26_03_world_creatures.sql
diff --git a/...2011_02_26_4_world_spell_linked_spell.sql → ...011_02_26_04_world_spell_linked_spell.sql b/...2011_02_26_4_world_spell_linked_spell.sql → ...011_02_26_04_world_spell_linked_spell.sql
diff --git a/...1_02_26_5_world_npc_spellclick_spells.sql → ..._02_26_05_world_npc_spellclick_spells.sql b/...1_02_26_5_world_npc_spellclick_spells.sql → ..._02_26_05_world_npc_spellclick_spells.sql
diff --git a/.../2011_02_27_0_world_creature_template.sql → ...2011_02_27_00_world_creature_template.sql b/.../2011_02_27_0_world_creature_template.sql → ...2011_02_27_00_world_creature_template.sql
diff --git a/.../2011_02_27_1_world_creature_template.sql → ...2011_02_27_01_world_creature_template.sql b/.../2011_02_27_1_world_creature_template.sql → ...2011_02_27_01_world_creature_template.sql
diff --git a/...1_02_27_2_world_npc_spellclick_spells.sql → ..._02_27_02_world_npc_spellclick_spells.sql b/...1_02_27_2_world_npc_spellclick_spells.sql → ..._02_27_02_world_npc_spellclick_spells.sql
diff --git a/...1_02_27_3_world_npc_spellclick_spells.sql → ..._02_27_03_world_npc_spellclick_spells.sql b/...1_02_27_3_world_npc_spellclick_spells.sql → ..._02_27_03_world_npc_spellclick_spells.sql
diff --git a/.../2011_02_27_4_world_creature_template.sql → ...2011_02_27_04_world_creature_template.sql b/.../2011_02_27_4_world_creature_template.sql → ...2011_02_27_04_world_creature_template.sql
diff --git a/...1_02_28_0_world_npc_spellclick_spells.sql → ..._02_28_00_world_npc_spellclick_spells.sql b/...1_02_28_0_world_npc_spellclick_spells.sql → ..._02_28_00_world_npc_spellclick_spells.sql
diff --git a/...011_02_28_1_world_quest_start_scripts.sql → ...11_02_28_01_world_quest_start_scripts.sql b/...011_02_28_1_world_quest_start_scripts.sql → ...11_02_28_01_world_quest_start_scripts.sql
diff --git a/sql/old/3.3.5a/2011_02_28_2_world_sai.sql → sql/old/3.3.5a/2011_02_28_02_world_sai.sql b/sql/old/3.3.5a/2011_02_28_2_world_sai.sql → sql/old/3.3.5a/2011_02_28_02_world_sai.sql
diff --git a/sql/old/3.3.5a/2011_02_28_3_world_sai.sql → sql/old/3.3.5a/2011_02_28_03_world_sai.sql b/sql/old/3.3.5a/2011_02_28_3_world_sai.sql → sql/old/3.3.5a/2011_02_28_03_world_sai.sql
diff --git a/sql/old/3.3.5a/2011_02_28_4_world_sai.sql → sql/old/3.3.5a/2011_02_28_04_world_sai.sql b/sql/old/3.3.5a/2011_02_28_4_world_sai.sql → sql/old/3.3.5a/2011_02_28_04_world_sai.sql
diff --git a/...ld/3.3.5a/2011_02_28_5_world_vehicles.sql → ...d/3.3.5a/2011_02_28_05_world_vehicles.sql b/...ld/3.3.5a/2011_02_28_5_world_vehicles.sql → ...d/3.3.5a/2011_02_28_05_world_vehicles.sql
diff --git a/.../3.3.5a/2011_02_28_6_world_gameobject.sql → ...3.3.5a/2011_02_28_06_world_gameobject.sql b/.../3.3.5a/2011_02_28_6_world_gameobject.sql → ...3.3.5a/2011_02_28_06_world_gameobject.sql
diff --git a/.../2011_02_28_7_world_creature_template.sql → ...2011_02_28_07_world_creature_template.sql b/.../2011_02_28_7_world_creature_template.sql → ...2011_02_28_07_world_creature_template.sql
diff --git a/.../3.3.5a/2011_03_01_1_world_conditions.sql → ...3.3.5a/2011_03_01_01_world_conditions.sql b/.../3.3.5a/2011_03_01_1_world_conditions.sql → ...3.3.5a/2011_03_01_01_world_conditions.sql
diff --git a/.../2011_03_01_2_world_creature_template.sql → ...2011_03_01_02_world_creature_template.sql b/.../2011_03_01_2_world_creature_template.sql → ...2011_03_01_02_world_creature_template.sql
diff --git a/sql/old/3.3.5a/2011_03_01_3_world_sai.sql → sql/old/3.3.5a/2011_03_01_03_world_sai.sql b/sql/old/3.3.5a/2011_03_01_3_world_sai.sql → sql/old/3.3.5a/2011_03_01_03_world_sai.sql
diff --git a/.../3.3.5a/2011_03_01_3_world_scriptname.sql → ...3.3.5a/2011_03_01_03_world_scriptname.sql b/.../3.3.5a/2011_03_01_3_world_scriptname.sql → ...3.3.5a/2011_03_01_03_world_scriptname.sql
diff --git a/sql/old/3.3.5a/2011_03_01_4_world_sai.sql → sql/old/3.3.5a/2011_03_01_04_world_sai.sql b/sql/old/3.3.5a/2011_03_01_4_world_sai.sql → sql/old/3.3.5a/2011_03_01_04_world_sai.sql
diff --git a/...3.3.5a/2011_03_01_5_world_npc_trainer.sql → ....3.5a/2011_03_01_05_world_npc_trainer.sql b/...3.3.5a/2011_03_01_5_world_npc_trainer.sql → ....3.5a/2011_03_01_05_world_npc_trainer.sql
diff --git a/.../2011_03_02_0_world_creature_template.sql → ...2011_03_02_00_world_creature_template.sql b/.../2011_03_02_0_world_creature_template.sql → ...2011_03_02_00_world_creature_template.sql
diff --git a/...2011_03_02_1_world_achievement_reward.sql → ...011_03_02_01_world_achievement_reward.sql b/...2011_03_02_1_world_achievement_reward.sql → ...011_03_02_01_world_achievement_reward.sql
diff --git a/...3.5a/2011_03_02_2_world_waypoint_data.sql → ....5a/2011_03_02_02_world_waypoint_data.sql b/...3.5a/2011_03_02_2_world_waypoint_data.sql → ....5a/2011_03_02_02_world_waypoint_data.sql
diff --git a/...3.3.5a/2011_03_02_3_world_gossip_menu.sql → ....3.5a/2011_03_02_03_world_gossip_menu.sql b/...3.3.5a/2011_03_02_3_world_gossip_menu.sql → ....3.5a/2011_03_02_03_world_gossip_menu.sql
diff --git a/...3.5a/2011_03_02_4_world_waypoint_data.sql → ....5a/2011_03_02_04_world_waypoint_data.sql b/...3.5a/2011_03_02_4_world_waypoint_data.sql → ....5a/2011_03_02_04_world_waypoint_data.sql
diff --git a/sql/old/3.3.5a/2011_03_02_5_world_sai.sql → sql/old/3.3.5a/2011_03_02_05_world_sai.sql b/sql/old/3.3.5a/2011_03_02_5_world_sai.sql → sql/old/3.3.5a/2011_03_02_05_world_sai.sql
diff --git a/sql/old/3.3.5a/2011_03_02_6_world_sai.sql → sql/old/3.3.5a/2011_03_02_06_world_sai.sql b/sql/old/3.3.5a/2011_03_02_6_world_sai.sql → sql/old/3.3.5a/2011_03_02_06_world_sai.sql
diff --git a/...3_04_0_world_skill_discovery_template.sql → ..._04_00_world_skill_discovery_template.sql b/...3_04_0_world_skill_discovery_template.sql → ..._04_00_world_skill_discovery_template.sql
diff --git a/...1_03_04_1_world_npc_spellclick_spells.sql → ..._03_04_01_world_npc_spellclick_spells.sql b/...1_03_04_1_world_npc_spellclick_spells.sql → ..._03_04_01_world_npc_spellclick_spells.sql
diff --git a/.../2011_03_04_1_world_vehicle_accessory.sql → ...2011_03_04_01_world_vehicle_accessory.sql b/.../2011_03_04_1_world_vehicle_accessory.sql → ...2011_03_04_01_world_vehicle_accessory.sql
diff --git a/...2011_03_04_2_world_spell_script_names.sql → ...011_03_04_02_world_spell_script_names.sql b/...2011_03_04_2_world_spell_script_names.sql → ...011_03_04_02_world_spell_script_names.sql
diff --git a/.../3.3.5a/2011_03_04_3_world_gameobject.sql → ...3.3.5a/2011_03_04_03_world_gameobject.sql b/.../3.3.5a/2011_03_04_3_world_gameobject.sql → ...3.3.5a/2011_03_04_03_world_gameobject.sql
diff --git a/.../3.3.5a/2011_03_04_4_world_scriptname.sql → ...3.3.5a/2011_03_04_04_world_scriptname.sql b/.../3.3.5a/2011_03_04_4_world_scriptname.sql → ...3.3.5a/2011_03_04_04_world_scriptname.sql
diff --git a/...2011_03_04_4_world_spell_script_names.sql → ...011_03_04_04_world_spell_script_names.sql b/...2011_03_04_4_world_spell_script_names.sql → ...011_03_04_04_world_spell_script_names.sql
diff --git a/...3.5a/2011_03_05_0_world_waypoint_data.sql → ....5a/2011_03_05_00_world_waypoint_data.sql b/...3.5a/2011_03_05_0_world_waypoint_data.sql → ....5a/2011_03_05_00_world_waypoint_data.sql
diff --git a/sql/scripts/world_scripts_full.sql b/sql/scripts/world_scripts_full.sql
@@ -630,6 +630,16 @@ UPDATE `creature_template` SET `ScriptName`='npc_apprentice_mirveda' WHERE `entr
 UPDATE `creature_template` SET `ScriptName`='npc_infused_crystal' WHERE `entry`=16364;
 UPDATE `gameobject_template` SET `ScriptName`='go_second_trial' WHERE `entry` IN (182052);
 
+/* EYE OF ETERNITY */
+UPDATE `instance_template` SET `script`='instance_eye_of_eternity' WHERE `map`=616;
+UPDATE `creature_template` SET `ScriptName`='boss_malygos' WHERE `entry`=28859;
+UPDATE `creature_template` SET `ScriptName`='npc_power_spark' WHERE `entry`=30084;
+UPDATE `creature_template` SET `ScriptName`='npc_portal_eoe' WHERE `entry`=30118;
+UPDATE `creature_template` SET `ScriptName`='npc_hover_disk' WHERE `entry` IN (30234,30248);
+UPDATE `creature_template` SET `ScriptName`='npc_arcane_overload' WHERE `entry`=30282;
+UPDATE `creature_template` SET `ScriptName`='npc_wyrmrest_skytalon' WHERE `entry`=30161;
+UPDATE `creature_template` SET `ScriptName`='npc_alexstrasza_eoe' WHERE `entry`=32295;
+
 /* FELWOOD */
 UPDATE `creature_template` SET `ScriptName`='npcs_riverbreeze_and_silversky' WHERE `entry` IN (9528,9529);
 
@@ -1514,6 +1524,8 @@ UPDATE `creature_template` SET `ScriptName`='boss_ignis' WHERE `entry`=33118;
 UPDATE `creature_template` SET `ScriptName`='npc_iron_construct' WHERE `entry`=33121;
 UPDATE `creature_template` SET `ScriptName`='npc_scorch_ground' WHERE `entry`=33221;
 UPDATE `creature_template` SET `ScriptName`='boss_razorscale' WHERE `entry`=33186;
+UPDATE `creature_template` SET `ScriptName`='boss_razorscale_controller' WHERE `entry`=33233;
+UPDATE `gameobject_template` SET `ScriptName`='go_razorscale_harpoon' WHERE `entry` IN(194519,194541,194542,194543);
 UPDATE `creature_template` SET `ScriptName`='npc_devouring_flame' WHERE `entry`=34188;
 UPDATE `creature_template` SET `ScriptName`='npc_mole_machine_trigger' WHERE `entry`=33245;
 UPDATE `creature_template` SET `ScriptName`='npc_expedition_commander' WHERE `entry`=33210;
@@ -1762,7 +1774,7 @@ UPDATE `outdoorpvp_template` SET `ScriptName`='outdoorpvp_si' WHERE `TypeId`=5;
 UPDATE `outdoorpvp_template` SET `ScriptName`='outdoorpvp_ep' WHERE `TypeId`=6;
 
 /* ACHIEVEMENTS */
-DELETE FROM `achievement_criteria_data` WHERE `criteria_id` IN (3693,6641,6642,6643,6644,3804,3805,3806,3807,3808,3809,3810,3811,3812,3813,1234,1239,5605,5606,12778,13036,13035,13037,12977,12967,12986,12982,12993,12780,13012,13011,13013,12062,12063,12064,12065,12183,12068,12060,12061,12822,12996,12972,12989) AND `type` IN (0,11);
+DELETE FROM `achievement_criteria_data` WHERE `criteria_id` IN (3693,6641,6642,6643,6644,3804,3805,3806,3807,3808,3809,3810,3811,3812,3813,1234,1239,5605,5606,12778,13036,13035,13037,12977,12967,12986,12982,12993,12780,13012,13011,13013,12062,12063,12064,12065,12183,12068,12060,12061,12822,12996,12972,12989,10062,10063,10054,10055,10046,10047,10048,10049,10050,10051,10044,10045) AND `type` IN (0,11);
 INSERT INTO `achievement_criteria_data` (`criteria_id`,`type`,`value1`,`value2`,`ScriptName`) VALUES
 (3693,11,0,0, 'achievement_storm_glory'),
 (6641,11,0,0, 'achievement_school_of_hard_knocks'),
@@ -1807,7 +1819,19 @@ INSERT INTO `achievement_criteria_data` (`criteria_id`,`type`,`value1`,`value2`,
 (12822,11,0,0, 'achievement_all_you_can_eat'),
 (12996,11,0,0, 'achievement_all_you_can_eat'),
 (12972,11,0,0, 'achievement_all_you_can_eat'),
-(12989,11,0,0, 'achievement_all_you_can_eat');
+(12989,11,0,0, 'achievement_all_you_can_eat'),
+(10044,11,0,0, 'achievement_unbroken'),
+(10045,11,0,0, 'achievement_unbroken'),
+(10054,11,0,0, 'achievement_shutout'),
+(10055,11,0,0, 'achievement_shutout'),
+(10046,11,0,0, 'achievement_three_car_garage_chopper'),
+(10047,11,0,0, 'achievement_three_car_garage_siege'),
+(10048,11,0,0, 'achievement_three_car_garage_demolisher'),
+(10049,11,0,0, 'achievement_three_car_garage_chopper'),
+(10050,11,0,0, 'achievement_three_car_garage_siege'),
+(10051,11,0,0, 'achievement_three_car_garage_demolisher'),
+(10062,11,0,0, 'achievement_quick_shave'),
+(10063,11,0,0, 'achievement_quick_shave');
 
 /* SPELLS */
 INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
@@ -2060,6 +2084,7 @@ INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
 ( 68646, 'spell_gen_leeching_swarm'),
 ( 68647, 'spell_gen_leeching_swarm'),
 -- Ulduar
+( 63308, 'spell_razorscale_devouring_flame'),
 ( 62717, 'spell_ignis_slag_pot'),
 ( 63477, 'spell_ignis_slag_pot'),
 ( 62521, 'spell_attuned_to_nature_dose_reduction'),
@@ -2074,6 +2099,9 @@ INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
 ( 62166, 'spell_ulduar_stone_grip_cast_target'),
 ( 63981, 'spell_ulduar_stone_grip_cast_target'),
 ( 64702, 'spell_ulduar_squeezed_lifeless'),
+-- Eye Of Eternity
+( 56105, 'spell_malygos_vortex_dummy'),
+( 55873, 'spell_malygos_vortex_visual'),
 -- quest
 (  8913, 'spell_q55_sacred_cleansing'),
 ( 17271, 'spell_q5206_test_fetid_skull'),

diff --git a/...char/2011_03_11_0_characters_channels.sql → ...har/2011_03_11_00_characters_channels.sql b/...char/2011_03_11_0_characters_channels.sql → ...har/2011_03_11_00_characters_channels.sql
diff --git a/sql/updates/auth_char/2011_03_17_00_characters_corpse.sql b/sql/updates/auth_char/2011_03_17_00_characters_corpse.sql
@@ -0,0 +1 @@
+ALTER TABLE `corpse` CHANGE COLUMN `phaseMask` `phaseMask` smallint(5) unsigned NOT NULL DEFAULT '1';
diff --git a/sql/updates/auth_char/2011_03_18_00_characters_game_event_misc.sql b/sql/updates/auth_char/2011_03_18_00_characters_game_event_misc.sql
@@ -0,0 +1,19 @@
+-- Create temporary table that holds the entry conversion data. (See corresponding world db update)
+CREATE TABLE `game_event_temp` (
+  `entryOld` TINYINT(3) UNSIGNED NOT NULL,
+  `entryNew` TINYINT(3) UNSIGNED NOT NULL
+) ENGINE=INNODB DEFAULT CHARSET=utf8;
+
+-- Renumbered entry data
+INSERT INTO `game_event_temp` (`entryOld`,`entryNew`) VALUES
+(1,1),(2,2),(3,3),(4,4),(5,5),(6,6),(7,7),(8,8),(9,9),(10,10),(11,11),(12,12),(13,13),(14,14),(15,15),(16,16),(17,17),(18,18),(19,19),(20,20),(21,21),(22,22),
+(23,23),(26,24),(27,25),(28,26),(29,27),(30,28),(31,29),(32,30),(33,31),(34,32),(35,33),(36,34),(37,35),(38,36),(39,37),(40,38),(41,39),(42,40),(43,41),(44,42),
+(45,43),(46,44),(47,45),(48,46),(49,47),(50,48),(51,49),(52,50),(53,51),(54,52),(124,53),(125,54),(126,55),(127,56),(128,57),(129,58),(130,59),(131,60);
+
+-- Update game_event_save
+UPDATE `game_event_save`, `game_event_temp` SET `game_event_save`.`event_id` = `game_event_temp`.`entryNew` WHERE `game_event_save`.`event_id` = `game_event_temp`.`entryOld`;
+ALTER TABLE `game_event_save` CHANGE `event_id` `eventEntry` TINYINT(3) UNSIGNED NOT NULL;
+
+-- Update game_event_condition_save
+UPDATE `game_event_condition_save`, `game_event_temp` SET `game_event_condition_save`.`event_id` = `game_event_temp`.`entryNew` WHERE `game_event_condition_save`.`event_id` = `game_event_temp`.`entryOld`;
+ALTER TABLE `game_event_condition_save` CHANGE `event_id` `eventEntry` TINYINT(3) UNSIGNED NOT NULL;
diff --git a/sql/updates/auth_char/2011_03_18_01_characters_game_event_misc.sql b/sql/updates/auth_char/2011_03_18_01_characters_game_event_misc.sql
@@ -0,0 +1,2 @@
+-- Remove temporary table
+DROP TABLE `game_event_temp`;
diff --git a/...d/2011_03_05_1_world_spell_proc_event.sql → .../2011_03_05_01_world_spell_proc_event.sql b/...d/2011_03_05_1_world_spell_proc_event.sql → .../2011_03_05_01_world_spell_proc_event.sql
diff --git a/...es/world/2011_03_05_2_world_creatures.sql → ...s/world/2011_03_05_02_world_creatures.sql b/...es/world/2011_03_05_2_world_creatures.sql → ...s/world/2011_03_05_02_world_creatures.sql
diff --git a/...s/world/2011_03_05_3_world_spell_area.sql → .../world/2011_03_05_03_world_spell_area.sql b/...s/world/2011_03_05_3_world_spell_area.sql → .../world/2011_03_05_03_world_spell_area.sql
diff --git a/...es/world/2011_03_05_4_world_creatures.sql → ...s/world/2011_03_05_04_world_creatures.sql b/...es/world/2011_03_05_4_world_creatures.sql → ...s/world/2011_03_05_04_world_creatures.sql
diff --git a/...es/world/2011_03_05_5_world_creatures.sql → ...s/world/2011_03_05_05_world_creatures.sql b/...es/world/2011_03_05_5_world_creatures.sql → ...s/world/2011_03_05_05_world_creatures.sql
diff --git a/...es/world/2011_03_06_0_world_creatures.sql → ...s/world/2011_03_06_00_world_creatures.sql b/...es/world/2011_03_06_0_world_creatures.sql → ...s/world/2011_03_06_00_world_creatures.sql
diff --git a/...orld/2011_03_06_1_world_loot_template.sql → ...rld/2011_03_06_01_world_loot_template.sql b/...orld/2011_03_06_1_world_loot_template.sql → ...rld/2011_03_06_01_world_loot_template.sql
diff --git a/...es/world/2011_03_06_2_world_creatures.sql → ...s/world/2011_03_06_02_world_creatures.sql b/...es/world/2011_03_06_2_world_creatures.sql → ...s/world/2011_03_06_02_world_creatures.sql
diff --git a/...es/world/2011_03_06_3_world_creatures.sql → ...s/world/2011_03_06_03_world_creatures.sql b/...es/world/2011_03_06_3_world_creatures.sql → ...s/world/2011_03_06_03_world_creatures.sql
diff --git a/...es/world/2011_03_06_4_world_creatures.sql → ...s/world/2011_03_06_04_world_creatures.sql b/...es/world/2011_03_06_4_world_creatures.sql → ...s/world/2011_03_06_04_world_creatures.sql
diff --git a/.../2011_03_06_5_world_vehicle_accessory.sql → ...2011_03_06_05_world_vehicle_accessory.sql b/.../2011_03_06_5_world_vehicle_accessory.sql → ...2011_03_06_05_world_vehicle_accessory.sql
diff --git a/...updates/world/2011_03_07_0_world_misc.sql → ...pdates/world/2011_03_07_00_world_misc.sql b/...updates/world/2011_03_07_0_world_misc.sql → ...pdates/world/2011_03_07_00_world_misc.sql
diff --git a/...d/2011_03_07_1_world_spell_proc_event.sql → .../2011_03_07_01_world_spell_proc_event.sql b/...d/2011_03_07_1_world_spell_proc_event.sql → .../2011_03_07_01_world_spell_proc_event.sql
diff --git a/.../world/2011_03_07_2_world_achievement.sql → ...world/2011_03_07_02_world_achievement.sql b/.../world/2011_03_07_2_world_achievement.sql → ...world/2011_03_07_02_world_achievement.sql
diff --git a/.../2011_03_07_3_world_creature_template.sql → ...2011_03_07_03_world_creature_template.sql b/.../2011_03_07_3_world_creature_template.sql → ...2011_03_07_03_world_creature_template.sql
diff --git a/...ates/world/2011_03_07_4_world_command.sql → ...tes/world/2011_03_07_04_world_command.sql b/...ates/world/2011_03_07_4_world_command.sql → ...tes/world/2011_03_07_04_world_command.sql
diff --git a/...es/world/2011_03_07_5_world_creatures.sql → ...s/world/2011_03_07_05_world_creatures.sql b/...es/world/2011_03_07_5_world_creatures.sql → ...s/world/2011_03_07_05_world_creatures.sql
diff --git a/...2011_03_07_6_world_spell_script_names.sql → ...011_03_07_06_world_spell_script_names.sql b/...2011_03_07_6_world_spell_script_names.sql → ...011_03_07_06_world_spell_script_names.sql
diff --git a/sql/updates/world/2011_03_08_0_world_sai.sql → ...updates/world/2011_03_08_00_world_sai.sql b/sql/updates/world/2011_03_08_0_world_sai.sql → ...updates/world/2011_03_08_00_world_sai.sql
diff --git a/...rld/2011_03_09_0_world_creature_addon.sql → ...ld/2011_03_09_00_world_creature_addon.sql b/...rld/2011_03_09_0_world_creature_addon.sql → ...ld/2011_03_09_00_world_creature_addon.sql
diff --git a/...updates/world/2011_03_09_1_world_misc.sql → ...pdates/world/2011_03_09_01_world_misc.sql b/...updates/world/2011_03_09_1_world_misc.sql → ...pdates/world/2011_03_09_01_world_misc.sql
diff --git a/...es/world/2011_03_09_2_world_page_text.sql → ...s/world/2011_03_09_02_world_page_text.sql b/...es/world/2011_03_09_2_world_page_text.sql → ...s/world/2011_03_09_02_world_page_text.sql
diff --git a/...updates/world/2011_03_09_3_world_misc.sql → ...pdates/world/2011_03_09_03_world_misc.sql b/...updates/world/2011_03_09_3_world_misc.sql → ...pdates/world/2011_03_09_03_world_misc.sql
diff --git a/...es/world/2011_03_10_0_world_creatures.sql → ...s/world/2011_03_10_00_world_creatures.sql b/...es/world/2011_03_10_0_world_creatures.sql → ...s/world/2011_03_10_00_world_creatures.sql
diff --git a/...s/world/2011_03_10_1_world_pool_quest.sql → .../world/2011_03_10_01_world_pool_quest.sql b/...s/world/2011_03_10_1_world_pool_quest.sql → .../world/2011_03_10_01_world_pool_quest.sql
diff --git a/.../2011_03_10_2_world_creature_template.sql → ...2011_03_10_02_world_creature_template.sql b/.../2011_03_10_2_world_creature_template.sql → ...2011_03_10_02_world_creature_template.sql
diff --git a/..._03_10_3_world_creature_loot_template.sql → ...03_10_03_world_creature_loot_template.sql b/..._03_10_3_world_creature_loot_template.sql → ...03_10_03_world_creature_loot_template.sql
diff --git a/...tes/world/2011_03_10_4_world_disables.sql → ...es/world/2011_03_10_04_world_disables.sql b/...tes/world/2011_03_10_4_world_disables.sql → ...es/world/2011_03_10_04_world_disables.sql
diff --git a/..._03_10_5_world_creature_questrelation.sql → ...03_10_05_world_creature_questrelation.sql b/..._03_10_5_world_creature_questrelation.sql → ...03_10_05_world_creature_questrelation.sql
diff --git a/...s/world/2011_03_10_6_world_conditions.sql → .../world/2011_03_10_06_world_conditions.sql b/...s/world/2011_03_10_6_world_conditions.sql → .../world/2011_03_10_06_world_conditions.sql
diff --git a/...s/world/2011_03_10_7_world_conditions.sql → .../world/2011_03_10_07_world_conditions.sql b/...s/world/2011_03_10_7_world_conditions.sql → .../world/2011_03_10_07_world_conditions.sql
diff --git a/...2011_03_10_8_world_spell_script_names.sql → ...011_03_10_08_world_spell_script_names.sql b/...2011_03_10_8_world_spell_script_names.sql → ...011_03_10_08_world_spell_script_names.sql
diff --git a/sql/updates/world/2011_03_10_9_world_sai.sql → ...updates/world/2011_03_10_09_world_sai.sql b/sql/updates/world/2011_03_10_9_world_sai.sql → ...updates/world/2011_03_10_09_world_sai.sql
diff --git a/sql/updates/world/2011_03_11_0_world_sai.sql → ...updates/world/2011_03_11_00_world_sai.sql b/sql/updates/world/2011_03_11_0_world_sai.sql → ...updates/world/2011_03_11_00_world_sai.sql
diff --git a/...s/world/2011_03_11_0_world_scriptname.sql → .../world/2011_03_11_00_world_scriptname.sql b/...s/world/2011_03_11_0_world_scriptname.sql → .../world/2011_03_11_00_world_scriptname.sql
diff --git a/sql/updates/world/2011_03_11_1_world_sai.sql → ...updates/world/2011_03_11_01_world_sai.sql b/sql/updates/world/2011_03_11_1_world_sai.sql → ...updates/world/2011_03_11_01_world_sai.sql
diff --git a/...rld/2011_03_11_2_world_trinity_string.sql → ...ld/2011_03_11_02_world_trinity_string.sql b/...rld/2011_03_11_2_world_trinity_string.sql → ...ld/2011_03_11_02_world_trinity_string.sql
diff --git a/.../2011_03_12_0_world_creature_template.sql → ...2011_03_12_00_world_creature_template.sql b/.../2011_03_12_0_world_creature_template.sql → ...2011_03_12_00_world_creature_template.sql