Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts: src/server/scripts/EasternKingdoms/CMakeLists.txt src/server/scripts/Kalimdor/zone_durotar.cpp src/server/scripts/Spells/spell_generic.cpp
This commit is contained in:
commit
2daa8ed56f
74 files changed
+630
-186
No files matched your search
@@ -129,6 +129,7 @@ void AddSC_boss_gyth();
|
||||
void AddSC_boss_rend_blackhand();
|
||||
void AddSC_boss_gizrul_the_slavener();
|
||||
void AddSC_boss_urok_doomhowl();
|
||||
void AddSC_boss_lord_valthalak();
|
||||
void AddSC_instance_blackrock_spire();
|
||||
void AddSC_boss_razorgore(); //Blackwing lair
|
||||
void AddSC_boss_vaelastrasz();
|
||||
@@ -777,6 +778,7 @@ void AddEasternKingdomsScripts()
|
||||
AddSC_boss_rend_blackhand();
|
||||
AddSC_boss_gizrul_the_slavener();
|
||||
AddSC_boss_urok_doomhowl();
|
||||
AddSC_boss_lord_valthalak();
|
||||
AddSC_instance_blackrock_spire();
|
||||
AddSC_boss_razorgore(); //Blackwing lair
|
||||
AddSC_boss_vaelastrasz();
|
||||
|
||||
Reference in new issue
Block a user