Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts: src/server/scripts/Spells/spell_dk.cpp src/server/scripts/Spells/spell_priest.cpp
This commit is contained in:
commit
cb8f159cea
29 files changed
+681
-707
No files matched your search
@@ -0,0 +1,2 @@
|
||||
UPDATE `instance_template` SET `script`="instance_drak_tharon_keep" WHERE `map`=600;
|
||||
UPDATE `creature_template` SET `ScriptName`="boss_king_dred" WHERE `entry`=27483;
|
||||
@@ -0,0 +1,3 @@
|
||||
DELETE FROM `spelldifficulty_dbc` WHERE `id` = 48849;
|
||||
INSERT INTO `spelldifficulty_dbc` (`id`, `spellid0`, `spellid1`) VALUES
|
||||
(48849, 48849, 59422);
|
||||
Reference in new issue
Block a user