Cydh 3369b00a79 Merge branch 'master' into feature/lapine_synthesis_and_upgrade ...

# Conflicts:
#	conf/msg_conf/map_msg.conf
#	db/re/item_db_usable.yml
#	db/re/item_package.txt
#	src/map/itemdb.hpp
#	src/map/script_constants.hpp

2021-10-13 14:10:05 +07:00

..

achievements.txt

Suggestion: NPC name as parameter in enablenpc (#6233)

2021-09-09 14:50:24 +02:00

adven_boards.txt

Fixed place names and other typos (#4475)

2019-12-15 20:55:19 +01:00

bulletin_boards.txt

Changed all "Compatible With" fields to "rAthena Project".

2014-01-12 16:24:38 -05:00

CashShop_Functions.txt

Fixed vip_status command (#2184)

2017-06-20 19:22:46 +02:00

clans.txt

Fixed place names and other typos (#4475)

2019-12-15 20:55:19 +01:00

dimensional_gap.txt

Fixed place names and other typos (#4475)

2019-12-15 20:55:19 +01:00

Global_Functions.txt

Merged Faceworm Instance from idathena https://github.com/idathena/tr… (#1889)

2017-05-09 13:34:19 +02:00

global_npcs.txt

Suggestion: NPC name as parameter in enablenpc (#6233)

2021-09-09 14:50:24 +02:00

item_merge.txt

Corrected guid implementation of item package in 51074a0

2014-11-30 13:52:52 +07:00

LapineEnchants.txt

Corrected the rates of the boxes IG_Costume_Exchange_Box and IG_Shadow_Exchange_Box

2021-04-22 23:20:24 +02:00

mail.txt

Changed all "Compatible With" fields to "rAthena Project".

2014-01-12 16:24:38 -05:00

mercenary_rent.txt

Fixes some bug in npc/cities folder and corrected syntax

2016-02-11 02:06:10 +01:00

pvp.txt

Changed all "Compatible With" fields to "rAthena Project".

2014-01-12 16:24:38 -05:00

resetskill.txt

Minor bug fixes.

2014-02-18 19:09:37 -05:00

stone_change.txt

Bug fixes and clean-up :

2014-07-13 21:48:09 +02:00

turbo_track.txt

Changed all "Compatible With" fields to "rAthena Project".

2014-01-12 16:24:38 -05:00