Merge remote-tracking branch 'origin/master' into 4.3.4

Conflicts: sql/old/3.3.5a/2012_08_06_00_world_command.sql sql/old/3.3.5a/2012_08_07_00_characters_characters.sql sql/old/4.3.4/2012_08_06_00_world_command_434.sql sql/updates/characters/2012_08_07_00_characters_characters.sql sql/updates/characters/2012_08_07_00_characters_characters_434.sql sql/updates/world/2012_08_06_00_world_command.sql
2026-01-15 23:20:36 +01:00 · 2012-09-15 21:13:35 +01:00
parent a51ab0abc4 0d3554d4bf
commit 06f96f47e7
96 changed files with 1 additions and 0 deletions
--- a/sql/updates/characters/2012_06_13_00_characters_character_equipmentsets.sql
+++ b/sql/updates/characters/2012_06_13_00_characters_character_equipmentsets.sql
--- a/sql/updates/auth/2012_08_06_00_auth_logs.sql
+++ b/sql/updates/auth/2012_08_06_00_auth_logs.sql
--- a/sql/updates/world/2012_08_16_00_world_creature_template.sql
+++ b/sql/updates/world/2012_08_16_00_world_creature_template.sql
--- a/sql/updates/world/2012_08_16_00_world_spell_dbc.sql
+++ b/sql/updates/world/2012_08_16_00_world_spell_dbc.sql
--- a/sql/updates/world/2012_08_17_00_world_spell_dbc.sql
+++ b/sql/updates/world/2012_08_17_00_world_spell_dbc.sql
--- a/sql/updates/world/2012_08_19_00_world_pickpocketing_loot_template.sql
+++ b/sql/updates/world/2012_08_19_00_world_pickpocketing_loot_template.sql
--- a/sql/updates/world/2012_08_19_01_world_spell_dbc.sql
+++ b/sql/updates/world/2012_08_19_01_world_spell_dbc.sql
--- a/sql/updates/world/2012_08_20_00_world_spell_script_names.sql
+++ b/sql/updates/world/2012_08_20_00_world_spell_script_names.sql
--- a/sql/updates/world/2012_08_20_01_world_wintergrasp_conditions.sql
+++ b/sql/updates/world/2012_08_20_01_world_wintergrasp_conditions.sql
--- a/sql/updates/world/2012_08_20_02_world_wintergrasp_creatures.sql
+++ b/sql/updates/world/2012_08_20_02_world_wintergrasp_creatures.sql
--- a/sql/updates/world/2012_08_20_03_world_wintergrasp_gameobjects.sql
+++ b/sql/updates/world/2012_08_20_03_world_wintergrasp_gameobjects.sql
--- a/sql/updates/world/2012_08_20_04_world_wintergrasp_gossips.sql
+++ b/sql/updates/world/2012_08_20_04_world_wintergrasp_gossips.sql
--- a/sql/updates/world/2012_08_20_05_world_wintergrasp_quests.sql
+++ b/sql/updates/world/2012_08_20_05_world_wintergrasp_quests.sql
--- a/sql/updates/world/2012_08_20_06_world_wintergrasp_spells.sql
+++ b/sql/updates/world/2012_08_20_06_world_wintergrasp_spells.sql
--- a/sql/updates/world/2012_08_20_07_world_wintergrasp_texts.sql
+++ b/sql/updates/world/2012_08_20_07_world_wintergrasp_texts.sql
--- a/sql/updates/world/2012_08_20_08_world_achievement_criteria_data.sql
+++ b/sql/updates/world/2012_08_20_08_world_achievement_criteria_data.sql
--- a/sql/updates/world/2012_08_20_09_world_disables.sql
+++ b/sql/updates/world/2012_08_20_09_world_disables.sql
--- a/sql/updates/world/2012_08_21_00_world_spell_proc_event.sql
+++ b/sql/updates/world/2012_08_21_00_world_spell_proc_event.sql
--- a/sql/updates/world/2012_08_21_01_world_command.sql
+++ b/sql/updates/world/2012_08_21_01_world_command.sql
--- a/sql/updates/world/2012_08_21_02_world_wintergrasp_conditions.sql
+++ b/sql/updates/world/2012_08_21_02_world_wintergrasp_conditions.sql
--- a/sql/updates/world/2012_08_23_00_world_wintergrasp_spell_script_names.sql
+++ b/sql/updates/world/2012_08_23_00_world_wintergrasp_spell_script_names.sql
--- a/sql/updates/world/2012_08_23_01_world_wintergrasp_gameobject.sql
+++ b/sql/updates/world/2012_08_23_01_world_wintergrasp_gameobject.sql
--- a/sql/updates/world/2012_08_25_00_world_creature_template.sql
+++ b/sql/updates/world/2012_08_25_00_world_creature_template.sql
--- a/sql/updates/world/2012_08_25_01_world_creature_template.sql
+++ b/sql/updates/world/2012_08_25_01_world_creature_template.sql
--- a/sql/updates/world/2012_08_26_00_world_conditions.sql
+++ b/sql/updates/world/2012_08_26_00_world_conditions.sql
--- a/sql/updates/world/2012_08_26_01_world_creature.sql
+++ b/sql/updates/world/2012_08_26_01_world_creature.sql
--- a/sql/updates/world/2012_08_26_02_world_spell_area.sql
+++ b/sql/updates/world/2012_08_26_02_world_spell_area.sql
--- a/sql/updates/world/2012_08_26_03_world_spell_area.sql
+++ b/sql/updates/world/2012_08_26_03_world_spell_area.sql
--- a/sql/updates/world/2012_08_27_00_world_creature_template.sql
+++ b/sql/updates/world/2012_08_27_00_world_creature_template.sql
--- a/sql/updates/world/2012_08_27_00_world_spell_script_name.sql
+++ b/sql/updates/world/2012_08_27_00_world_spell_script_name.sql
--- a/sql/updates/world/2012_08_27_01_world_sai.sql
+++ b/sql/updates/world/2012_08_27_01_world_sai.sql
--- a/sql/updates/world/2012_08_27_02_world_creature.sql
+++ b/sql/updates/world/2012_08_27_02_world_creature.sql
--- a/sql/updates/world/2012_08_27_02_world_playercreateinfo_spell.sql
+++ b/sql/updates/world/2012_08_27_02_world_playercreateinfo_spell.sql
--- a/sql/updates/world/2012_08_27_03_world_gameobject.sql
+++ b/sql/updates/world/2012_08_27_03_world_gameobject.sql
--- a/sql/updates/world/2012_08_27_04_world_quest_template.sql
+++ b/sql/updates/world/2012_08_27_04_world_quest_template.sql
--- a/sql/updates/world/2012_08_27_05_world_sai.sql
+++ b/sql/updates/world/2012_08_27_05_world_sai.sql
--- a/sql/updates/world/2012_08_27_06_world_sai.sql
+++ b/sql/updates/world/2012_08_27_06_world_sai.sql
--- a/sql/updates/world/2012_08_27_07_world_spell_area.sql
+++ b/sql/updates/world/2012_08_27_07_world_spell_area.sql
--- a/sql/updates/world/2012_08_27_08_world_misc.sql
+++ b/sql/updates/world/2012_08_27_08_world_misc.sql
--- a/sql/updates/world/2012_08_27_09_world_conditions.sql
+++ b/sql/updates/world/2012_08_27_09_world_conditions.sql
--- a/sql/updates/world/2012_08_27_10_world_spell_script_names.sql
+++ b/sql/updates/world/2012_08_27_10_world_spell_script_names.sql
--- a/sql/updates/world/2012_08_28_00_world_spell_script_name.sql
+++ b/sql/updates/world/2012_08_28_00_world_spell_script_name.sql
--- a/sql/updates/world/2012_08_28_01_world_achievement_criteria_data.sql
+++ b/sql/updates/world/2012_08_28_01_world_achievement_criteria_data.sql
--- a/sql/updates/world/2012_08_29_00_world_blood_furnace.sql
+++ b/sql/updates/world/2012_08_29_00_world_blood_furnace.sql
--- a/sql/updates/world/2012_08_30_00_world_creature_template.sql
+++ b/sql/updates/world/2012_08_30_00_world_creature_template.sql
--- a/sql/updates/world/2012_08_30_00_world_spell_script_names.sql
+++ b/sql/updates/world/2012_08_30_00_world_spell_script_names.sql
--- a/sql/updates/world/2012_08_31_00_world_command.sql
+++ b/sql/updates/world/2012_08_31_00_world_command.sql
--- a/sql/updates/world/2012_08_31_00_world_sai.sql
+++ b/sql/updates/world/2012_08_31_00_world_sai.sql
--- a/sql/updates/world/2012_09_01_00_world_spell_script_names.sql
+++ b/sql/updates/world/2012_09_01_00_world_spell_script_names.sql
--- a/sql/updates/world/2012_09_02_00_world_quest_template.sql
+++ b/sql/updates/world/2012_09_02_00_world_quest_template.sql
--- a/sql/updates/world/2012_09_02_01_world_sai.sql
+++ b/sql/updates/world/2012_09_02_01_world_sai.sql
--- a/sql/updates/world/2012_09_03_00_world_misc.sql
+++ b/sql/updates/world/2012_09_03_00_world_misc.sql
--- a/sql/updates/world/2012_09_03_01_world_gameobject_template.sql
+++ b/sql/updates/world/2012_09_03_01_world_gameobject_template.sql
--- a/sql/updates/world/2012_09_03_02_world_quest_template.sql
+++ b/sql/updates/world/2012_09_03_02_world_quest_template.sql
--- a/sql/updates/characters/2012_09_07_00_characters_characters.sql
+++ b/sql/updates/characters/2012_09_07_00_characters_characters.sql
--- a/sql/updates/world/2012_09_07_00_world_spell_bonus_data.sql
+++ b/sql/updates/world/2012_09_07_00_world_spell_bonus_data.sql
--- a/sql/updates/world/2012_09_07_01_world_creature_template.sql
+++ b/sql/updates/world/2012_09_07_01_world_creature_template.sql
--- a/sql/updates/world/2012_09_07_02_world_spell_script_names.sql
+++ b/sql/updates/world/2012_09_07_02_world_spell_script_names.sql
--- a/sql/updates/world/2012_09_08_00_world_achievement_criteria_data.sql
+++ b/sql/updates/world/2012_09_08_00_world_achievement_criteria_data.sql
--- a/sql/updates/world/2012_09_08_01_world_creature_template.sql
+++ b/sql/updates/world/2012_09_08_01_world_creature_template.sql
--- a/sql/updates/world/2012_09_08_02_world_achievement_criteria_data.sql
+++ b/sql/updates/world/2012_09_08_02_world_achievement_criteria_data.sql
--- a/sql/updates/world/2012_09_09_00_world_command.sql
+++ b/sql/updates/world/2012_09_09_00_world_command.sql
--- a/sql/updates/world/2012_09_09_01_world_trinity_string.sql
+++ b/sql/updates/world/2012_09_09_01_world_trinity_string.sql
--- a/sql/updates/world/2012_09_09_02_world_spell_script_names.sql
+++ b/sql/updates/world/2012_09_09_02_world_spell_script_names.sql
--- a/sql/updates/world/2012_09_09_03_world_spell_bonus_data.sql
+++ b/sql/updates/world/2012_09_09_03_world_spell_bonus_data.sql
--- a/sql/updates/world/2012_09_09_04_world_quest_template.sql
+++ b/sql/updates/world/2012_09_09_04_world_quest_template.sql
--- a/sql/updates/world/2012_09_10_00_world_game_event.sql
+++ b/sql/updates/world/2012_09_10_00_world_game_event.sql
--- a/sql/updates/world/2012_09_10_01_world_quest_template.sql
+++ b/sql/updates/world/2012_09_10_01_world_quest_template.sql
--- a/sql/updates/world/2012_09_10_02_world_creature_text.sql
+++ b/sql/updates/world/2012_09_10_02_world_creature_text.sql
--- a/sql/updates/world/2012_09_10_03_world_quest_template.sql
+++ b/sql/updates/world/2012_09_10_03_world_quest_template.sql
--- a/sql/updates/world/2012_09_10_04_world_quest_template.sql
+++ b/sql/updates/world/2012_09_10_04_world_quest_template.sql
--- a/sql/updates/world/2012_09_10_06_world_creature_template.sql
+++ b/sql/updates/world/2012_09_10_06_world_creature_template.sql
--- a/sql/updates/world/2012_09_10_07_world_go_loot_template.sql
+++ b/sql/updates/world/2012_09_10_07_world_go_loot_template.sql
--- a/sql/updates/world/2012_09_10_08_world_spell_area.sql
+++ b/sql/updates/world/2012_09_10_08_world_spell_area.sql
--- a/sql/updates/world/2012_09_10_09_world_creature_involvedrelation.sql
+++ b/sql/updates/world/2012_09_10_09_world_creature_involvedrelation.sql
--- a/sql/updates/world/2012_09_10_10_world_gossips.sql
+++ b/sql/updates/world/2012_09_10_10_world_gossips.sql
--- a/sql/updates/world/2012_09_10_11_world_event_scripts.sql
+++ b/sql/updates/world/2012_09_10_11_world_event_scripts.sql
--- a/sql/updates/world/2012_09_10_12_world_sai.sql
+++ b/sql/updates/world/2012_09_10_12_world_sai.sql
--- a/sql/updates/world/2012_09_10_13_world_creature_model_info.sql
+++ b/sql/updates/world/2012_09_10_13_world_creature_model_info.sql
--- a/sql/updates/world/2012_09_11_00_world_misc.sql
+++ b/sql/updates/world/2012_09_11_00_world_misc.sql
--- a/sql/updates/world/2012_09_12_00_world_misc.sql
+++ b/sql/updates/world/2012_09_12_00_world_misc.sql
--- a/sql/updates/world/2012_09_12_01_world_creature.sql
+++ b/sql/updates/world/2012_09_12_01_world_creature.sql
--- a/sql/updates/world/2012_09_13_00_world_item_template.sql
+++ b/sql/updates/world/2012_09_13_00_world_item_template.sql
--- a/sql/updates/world/2012_09_13_01_world_fires_over_skettis.sql
+++ b/sql/updates/world/2012_09_13_01_world_fires_over_skettis.sql
--- a/sql/updates/world/2012_09_13_01_world_ogrila.sql
+++ b/sql/updates/world/2012_09_13_01_world_ogrila.sql
--- a/sql/updates/world/2012_09_13_01_world_spell_script_name.sql
+++ b/sql/updates/world/2012_09_13_01_world_spell_script_name.sql
--- a/sql/updates/world/2012_09_13_01_world_spell_target_position.sql
+++ b/sql/updates/world/2012_09_13_01_world_spell_target_position.sql
--- a/sql/updates/world/2012_09_13_02_world_trinity_string.sql
+++ b/sql/updates/world/2012_09_13_02_world_trinity_string.sql
--- a/sql/updates/world/2012_09_14_00_world_creature_template.sql
+++ b/sql/updates/world/2012_09_14_00_world_creature_template.sql
--- a/sql/updates/world/2012_09_14_00_world_sai.sql
+++ b/sql/updates/world/2012_09_14_00_world_sai.sql
--- a/sql/updates/world/2012_09_14_01_world_creature_loot_template.sql
+++ b/sql/updates/world/2012_09_14_01_world_creature_loot_template.sql
--- a/sql/updates/world/2012_09_15_00_world_achievement_criteria_data.sql
+++ b/sql/updates/world/2012_09_15_00_world_achievement_criteria_data.sql
--- a/sql/updates/world/2012_09_15_00_world_creature_template.sql
+++ b/sql/updates/world/2012_09_15_00_world_creature_template.sql
--- a/sql/updates/world/2012_09_15_00_world_disables.sql
+++ b/sql/updates/world/2012_09_15_00_world_disables.sql
--- a/sql/updates/world/2012_09_15_01_world_creature_loot_template.sql
+++ b/sql/updates/world/2012_09_15_01_world_creature_loot_template.sql
--- a/sql/updates/world/2012_09_16_00_world_version.sql
+++ b/sql/updates/world/2012_09_16_00_world_version.sql
@@ -0,0 +1 @@
+UPDATE `version` SET `db_version`='TDB 335.49', `cache_id`=49 LIMIT 1;
				`@@ -0,0 +1 @@`
				UPDATE `version` SET `db_version`='TDB 335.49', `cache_id`=49 LIMIT 1;