mirror of
https://github.com/TrinityCore/TrinityCore.git
synced 2026-01-19 08:55:32 +01:00
*Merge.
--HG-- branch : trunk
This commit is contained in:
@@ -1,9 +1,9 @@
|
||||
ALTER TABLE db_version CHANGE COLUMN required_7544_01_mangos_uptime required_7558_01_mangos_mangos_string bit;
|
||||
/*ALTER TABLE db_version CHANGE COLUMN required_7544_01_mangos_uptime required_7558_01_mangos_mangos_string bit;*/
|
||||
|
||||
DELETE FROM mangos_string WHERE entry IN (1123,1124,1125,1126,1127);
|
||||
INSERT INTO mangos_string VALUES
|
||||
DELETE FROM `trinity_string` WHERE `entry` IN (1123,1124,1125,1126,1127);
|
||||
INSERT INTO `trinity_string` VALUES
|
||||
(1123,'Not pet found',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
|
||||
(1124,'Wrong pet type',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
|
||||
(1125,'Your pet learned all talents',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
|
||||
(1126,'Your pet talents have been reset.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
|
||||
(1127,'Talents of %s\'s pet reset.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
|
||||
(1127,'Talents of %s\'s pet reset.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
|
||||
@@ -1,6 +1,5 @@
|
||||
ALTER TABLE db_version CHANGE COLUMN required_7558_01_mangos_mangos_string required_7558_02_mangos_command bit;
|
||||
/*ALTER TABLE db_version CHANGE COLUMN required_7558_01_mangos_mangos_string required_7558_02_mangos_command bit;*/
|
||||
|
||||
DELETE FROM `command` WHERE `name` IN ('learn all_mypettalents');
|
||||
|
||||
INSERT INTO `command` VALUES
|
||||
('learn all_mypettalents',3,'Syntax: .learn all_mypettalents\r\n\r\nLearn all talents for your pet available for his creature type (only for hunter pets).');
|
||||
('learn all_mypettalents',3,'Syntax: .learn all_mypettalents\r\n\r\nLearn all talents for your pet available for his creature type (only for hunter pets).');
|
||||
@@ -0,0 +1,4 @@
|
||||
/*ALTER TABLE db_version CHANGE COLUMN required_7558_02_mangos_command required_7560_01_mangos_gameobject_template bit;*/
|
||||
|
||||
ALTER TABLE gameobject_template
|
||||
ADD COLUMN IconName varchar(100) NOT NULL default '' AFTER name;
|
||||
@@ -1,4 +0,0 @@
|
||||
ALTER TABLE db_version CHANGE COLUMN required_7558_02_mangos_command required_7560_01_mangos_gameobject_template bit;
|
||||
|
||||
ALTER TABLE gameobject_template
|
||||
ADD COLUMN IconName varchar(100) NOT NULL default '' AFTER name;
|
||||
Reference in New Issue
Block a user