Merge branch 'master' into 4.3.4

Conflicts:
	src/server/game/Spells/Spell.cpp
	src/server/shared/Logging/Appender.h

4 files changed, 40 insertions, 17 deletions

diff --git a/sql/updates/world/2012_10_14_00_world_creature.sql b/sql/updates/world/2012_10_14_00_world_creature.sql
new file mode 100644
index 00000000000..dd650f37aef
--- /dev/null
+++ b/sql/updates/world/2012_10_14_00_world_creature.sql
@@ -0,0 +1,10 @@
+-- Spawnmask updates
+UPDATE `creature` SET `spawnMask`=15 WHERE `id` IN(40091, 40081);
+
+-- Auras updates (Now in script, can't be used in creature_addon because dynamically spawned)
+DELETE FROM `creature_template_addon` WHERE `entry` IN(39863, 40142);
+
+-- Blazing Aura
+-- NOTE: This still does not work, no clue why. Probably a core-side bug ?
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(13,2,75886,0,0,31,0,3,40683,0,0,0, '', 'Blazing Aura can only target Living Embers');
diff --git a/sql/updates/world/2012_10_18_00_world_trinity_string.sql b/sql/updates/world/2012_10_18_00_world_trinity_string.sql
deleted file mode 100644
index a12b20388eb..00000000000
--- a/sql/updates/world/2012_10_18_00_world_trinity_string.sql
+++ /dev/null
@@ -1,17 +0,0 @@
-DELETE FROM `trinity_string` WHERE `entry` IN (9986, 9987, 9989, 9990, 9991, 9992, 9993, 9994, 9995, 9996, 9997, 9998, 9999);
-INSERT INTO `trinity_string` (`entry`, `content_default`, `content_loc1`, `content_loc2`, `content_loc3`, `content_loc4`, `content_loc5`, `content_loc6`, `content_loc7`, `content_loc8`)
-VALUES
-  (9986, 'Error', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
-  (9987, 'None', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
-  (9988, 'Leader', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
-  (9989, 'Dps', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
-  (9990, 'Healer', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
-  (9991, 'Tank', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
-  (9992, 'Raid browser', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
-  (9993, 'Finished dungeon', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
-  (9994, 'In dungeon', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
-  (9995, 'Vote kick', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
-  (9996, 'Proposal', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
-  (9997, 'Queued', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
-  (9998, 'Role check', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
-  (9999, 'None', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
diff --git a/sql/updates/world/2012_10_23_00_world_trinity_string.sql b/sql/updates/world/2012_10_23_00_world_trinity_string.sql
new file mode 100644
index 00000000000..60318667fbc
--- /dev/null
+++ b/sql/updates/world/2012_10_23_00_world_trinity_string.sql
@@ -0,0 +1,22 @@
+DELETE FROM `trinity_string` WHERE `entry` IN (9980, 9981, 9982, 9983, 9984, 9985, 9986, 9987, 9988, 9989, 9990, 9991, 9992, 9993, 9994, 9995, 9996, 9997, 9998, 9999);
+INSERT INTO `trinity_string` (`entry`, `content_default`, `content_loc1`, `content_loc2`, `content_loc3`, `content_loc4`, `content_loc5`, `content_loc6`, `content_loc7`, `content_loc8`) VALUES
+  (9980, 'Player name: %s, State: %s, Dungeons: %u (%s), Roles: %s, Comment: %s', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+  (9981, 'LfgGroup?: %u, State: %s, Dungeon: %u', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+  (9982, 'Not in group', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+  (9983, 'Queues cleared', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+  (9984, 'Lfg options: %u', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+  (9985, 'Lfg options changed', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+  (9986, 'None', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+  (9987, 'Role check', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+  (9988, 'Queued', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+  (9989, 'Proposal', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+  (9990, 'Vote kick', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+  (9991, 'In dungeon', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+  (9992, 'Finished dungeon', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+  (9993, 'Raid browser', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+  (9994, 'Tank', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+  (9995, 'Healer', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+  (9996, 'Dps', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+  (9997, 'Leader', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+  (9998, 'None', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+  (9999, 'Error', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
diff --git a/sql/updates/world/2012_10_23_01_world_command.sql b/sql/updates/world/2012_10_23_01_world_command.sql
new file mode 100644
index 00000000000..b46882c5949
--- /dev/null
+++ b/sql/updates/world/2012_10_23_01_world_command.sql
@@ -0,0 +1,8 @@
+DELETE FROM `command` WHERE `name` LIKE 'lfg%';
+
+INSERT INTO `command` (`name`, `security`, `help`) VALUES
+('lfg player', 2, 'Syntax: .lfg player\n Shows information about player (state, roles, comment, dungeons selected).'),
+('lfg group', 2, 'Syntax: .lfg group\n Shows information about all players in the group  (state, roles, comment, dungeons selected).'),
+('lfg queue', 2, 'Syntax: .lfg queue\n Shows info about current lfg queues.'),
+('lfg clean', 3, 'Syntax: .flg clean\n Cleans current queue, only for debugging purposes.'),
+('lfg options', 3, 'Syntax: .lfg options [new value]\n Shows current lfg options. New value is set if extra param is present.');