Merge branch 'jesusalva/contentIV' into 'master'
Super Merge Request ContentIV (untested) Closes evol-all#7 See merge request evol/serverdata!280
No related branches found
No related tags found
Showing
- .mailmap 13 additions, 0 deletions.mailmap
- db/constants.conf 44 additions, 10 deletionsdb/constants.conf
- db/job_db2.txt 3 additions, 3 deletionsdb/job_db2.txt
- db/quest_db.conf 9 additions, 1 deletiondb/quest_db.conf
- db/re/item_db.conf 123 additions, 98 deletionsdb/re/item_db.conf
- db/re/job_db.conf 5 additions, 5 deletionsdb/re/job_db.conf
- db/re/skill_db.conf 1 addition, 1 deletiondb/re/skill_db.conf
- db/re/skill_tree.conf 5 additions, 5 deletionsdb/re/skill_tree.conf
- maps/re/020-2-15.mcache 0 additions, 0 deletionsmaps/re/020-2-15.mcache
- npc/000-0/sailors.txt 7 additions, 6 deletionsnpc/000-0/sailors.txt
- npc/000-1/_import.txt 1 addition, 0 deletionsnpc/000-1/_import.txt
- npc/000-1/_mobs.txt 0 additions, 1 deletionnpc/000-1/_mobs.txt
- npc/000-1/boss.txt 43 additions, 0 deletionsnpc/000-1/boss.txt
- npc/000-2-0/julia.txt 19 additions, 31 deletionsnpc/000-2-0/julia.txt
- npc/001-1/chelios.txt 82 additions, 63 deletionsnpc/001-1/chelios.txt
- npc/001-1/enora.txt 3 additions, 2 deletionsnpc/001-1/enora.txt
- npc/001-1/shop.txt 1 addition, 1 deletionnpc/001-1/shop.txt
- npc/001-1/wateranimation.txt 16 additions, 26 deletionsnpc/001-1/wateranimation.txt
- npc/001-2-2/moon.txt 3 additions, 1 deletionnpc/001-2-2/moon.txt
- npc/001-2-27/don.txt 73 additions, 58 deletionsnpc/001-2-27/don.txt
Loading
Please register or sign in to comment