Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts: src/server/game/AI/EventAI/CreatureEventAI.cpp src/server/game/AI/EventAI/CreatureEventAI.h src/server/game/Achievements/AchievementMgr.cpp
This commit is contained in:
@@ -192,6 +192,7 @@ void AddSC_boss_lorekeeperpolkelt();
|
||||
void AddSC_boss_rasfrost();
|
||||
void AddSC_boss_theravenian();
|
||||
void AddSC_boss_vectus();
|
||||
void AddSC_boss_kirtonos_the_herald();
|
||||
void AddSC_instance_scholomance();
|
||||
void AddSC_shadowfang_keep(); //Shadowfang keep
|
||||
void AddSC_instance_shadowfang_keep();
|
||||
@@ -824,6 +825,7 @@ void AddEasternKingdomsScripts()
|
||||
AddSC_boss_rasfrost();
|
||||
AddSC_boss_theravenian();
|
||||
AddSC_boss_vectus();
|
||||
AddSC_boss_kirtonos_the_herald();
|
||||
AddSC_instance_scholomance();
|
||||
AddSC_shadowfang_keep(); //Shadowfang keep
|
||||
AddSC_instance_shadowfang_keep();
|
||||
|
||||
Reference in New Issue
Block a user