mirror of
https://github.com/TrinityCore/TrinityCore.git
synced 2026-01-17 08:00:48 +01:00
Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps
Conflicts: src/server/game/Movement/Spline/MoveSplineInit.h
This commit is contained in:
@@ -580,6 +580,9 @@ void AddSC_instance_arcatraz();
|
||||
void AddSC_boss_high_botanist_freywinn(); //TK Botanica
|
||||
void AddSC_boss_laj();
|
||||
void AddSC_boss_warp_splinter();
|
||||
void AddSC_boss_thorngrin_the_tender();
|
||||
void AddSC_boss_commander_sarannis();
|
||||
void AddSC_instance_the_botanica();
|
||||
void AddSC_boss_alar(); //TK The Eye
|
||||
void AddSC_boss_kaelthas();
|
||||
void AddSC_boss_void_reaver();
|
||||
@@ -1060,6 +1063,9 @@ void AddOutlandScripts()
|
||||
AddSC_boss_high_botanist_freywinn(); //TK Botanica
|
||||
AddSC_boss_laj();
|
||||
AddSC_boss_warp_splinter();
|
||||
AddSC_boss_thorngrin_the_tender();
|
||||
AddSC_boss_commander_sarannis();
|
||||
AddSC_instance_the_botanica();
|
||||
AddSC_boss_alar(); //TK The Eye
|
||||
AddSC_boss_kaelthas();
|
||||
AddSC_boss_void_reaver();
|
||||
|
||||
Reference in New Issue
Block a user