Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-29 05:11:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	src/server/scripts/Spells/spell_dk.cpp
	src/server/scripts/Spells/spell_priest.cpp
This commit is contained in:
Vincent-Michael
2013-07-29 17:11:25 +02:00
parent a08b52aa19 1bb3c4a2b4
commit cb8f159cea
29 changed files with 681 additions and 707 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/updates/world/2013_07_29_00_world_drak_tharon_keep.sql Normal file
View File

@@ -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;

3
sql/updates/world/2013_07_29_01_world_spelldifficulty_dbc.sql Normal file
View File

@@ -0,0 +1,3 @@
DELETE FROM `spelldifficulty_dbc` WHERE `id` = 48849;
INSERT INTO `spelldifficulty_dbc` (`id`, `spellid0`, `spellid1`) VALUES
(48849, 48849, 59422);