Merge remote-tracking branch 'upstream/master'

Conflicts:
	conf/plugins.conf
	db/pre-re/skill_tree.txt
	db/re/skill_tree.txt
	db/sc_config.txt
	npc/mobs/citycleaners.txt
	src/map/atcommand.c
	src/map/battle.c
	src/map/clif.c
	src/map/map.c
	src/map/packets.h
	src/map/pc.c
	src/map/script.c
	src/map/skill.c
	src/map/status.c
	src/map/storage.c
	src/map/trade.h

Merged master.

2 files changed, 8 insertions, 2 deletions

diff --git a/sql-files/tools/convert_engine_innodb.sql b/sql-files/tools/convert_engine_innodb.sql
index fcb240bb1..5d74b9309 100644
--- a/sql-files/tools/convert_engine_innodb.sql
+++ b/sql-files/tools/convert_engine_innodb.sql
@@ -1,11 +1,12 @@
 --
--- rAthena Database Converter ( MyISAM -> InnoDB )
+-- Hercules Database Converter ( MyISAM -> InnoDB )
 --
 
 ALTER TABLE `auction` ENGINE = InnoDB;
 ALTER TABLE `cart_inventory` ENGINE = InnoDB;
 ALTER TABLE `char` ENGINE = InnoDB;
 ALTER TABLE `charlog` ENGINE = InnoDB;
+ALTER TABLE `elemental` ENGINE = InnoDB;
 ALTER TABLE `friends` ENGINE = InnoDB;
 ALTER TABLE `global_reg_value` ENGINE = InnoDB;
 ALTER TABLE `guild` ENGINE = InnoDB;
@@ -19,6 +20,7 @@ ALTER TABLE `guild_storage` ENGINE = InnoDB;
 ALTER TABLE `homunculus` ENGINE = InnoDB;
 ALTER TABLE `hotkey` ENGINE = InnoDB;
 ALTER TABLE `interlog` ENGINE = InnoDB;
+ALTER TABLE `intereg` ENGINE = InnoDB;
 ALTER TABLE `inventory` ENGINE = InnoDB;
 ALTER TABLE `ipbanlist` ENGINE = InnoDB;
 #ALTER TABLE `item_db` ENGINE = InnoDB;
@@ -38,5 +40,6 @@ ALTER TABLE `ragsrvinfo` ENGINE = InnoDB;
 ALTER TABLE `sc_data` ENGINE = InnoDB;
 ALTER TABLE `skill` ENGINE = InnoDB;
 ALTER TABLE `skill_homunculus` ENGINE = InnoDB;
+ALTER TABLE `sql_updates` ENGINE = InnoDB;
 ALTER TABLE `sstatus` ENGINE = InnoDB;
 ALTER TABLE `storage` ENGINE = InnoDB;
diff --git a/sql-files/tools/convert_engine_myisam.sql b/sql-files/tools/convert_engine_myisam.sql
index 5af878f65..a05163f85 100644
--- a/sql-files/tools/convert_engine_myisam.sql
+++ b/sql-files/tools/convert_engine_myisam.sql
@@ -1,11 +1,12 @@
 --
--- rAthena Database Converter ( InnoDB -> MyISAM )
+-- Hercules Database Converter ( InnoDB -> MyISAM )
 --
 
 ALTER TABLE `auction` ENGINE = MyISAM;
 ALTER TABLE `cart_inventory` ENGINE = MyISAM;
 ALTER TABLE `char` ENGINE = MyISAM;
 ALTER TABLE `charlog` ENGINE = MyISAM;
+ALTER TABLE `elemental` ENGINE = MyISAM;
 ALTER TABLE `friends` ENGINE = MyISAM;
 ALTER TABLE `global_reg_value` ENGINE = MyISAM;
 ALTER TABLE `guild` ENGINE = MyISAM;
@@ -19,6 +20,7 @@ ALTER TABLE `guild_storage` ENGINE = MyISAM;
 ALTER TABLE `homunculus` ENGINE = MyISAM;
 ALTER TABLE `hotkey` ENGINE = MyISAM;
 ALTER TABLE `interlog` ENGINE = MyISAM;
+ALTER TABLE `intereg` ENGINE = MyISAM;
 ALTER TABLE `inventory` ENGINE = MyISAM;
 ALTER TABLE `ipbanlist` ENGINE = MyISAM;
 #ALTER TABLE `item_db` ENGINE = MyISAM;
@@ -38,5 +40,6 @@ ALTER TABLE `ragsrvinfo` ENGINE = MyISAM;
 ALTER TABLE `sc_data` ENGINE = MyISAM;
 ALTER TABLE `skill` ENGINE = MyISAM;
 ALTER TABLE `skill_homunculus` ENGINE = MyISAM;
+ALTER TABLE `sql_updates` ENGINE = MyISAM;
 ALTER TABLE `sstatus` ENGINE = MyISAM;
 ALTER TABLE `storage` ENGINE = MyISAM;