jason@jason-AY597AA-ABA-HPE-110f:~/Downloads/tmwa-server-data$ git pull upstream master
remote: Counting objects: 172, done.
remote: Compressing objects: 100% (107/107), done.
remote: Total 118 (delta 79), reused 43 (delta 10)
Receiving objects: 100% (118/118), 23.36 KiB, done.
Resolving deltas: 100% (79/79), completed with 46 local objects.
From https://github.com/themanaworld/tmwa-server-data
 * branch            master     -> FETCH_HEAD
Updating 4fb3586..683aa1a
Fast-forward
 client-data                                 |   2 +-
 login/conf/ladmin_athena.conf               |  23 +-
 login/conf/ladmin_local.conf.example        |   5 +-
 login/conf/lan_support.conf                 |  31 +-
 login/conf/login_athena.conf                | 143 ++++----
 login/conf/login_local.conf.example         |  45 ++-
 world/conf/char_athena.conf                 | 128 +++----
 world/conf/char_local.conf.example          |   1 -
 world/conf/inter_athena.conf                |  24 +-
 world/conf/lan_support.conf                 |  27 +-
 world/map/conf/atcommand_athena.conf        | 139 +++++++-
 world/map/conf/atcommand_local.conf.example | 520 +---------------------------
 world/map/conf/battle_athena.conf           | 436 +----------------------
 world/map/conf/battle_local.conf.example    |  17 +-
 world/map/conf/grf-files.txt                |   0
 world/map/conf/help.txt.example             |  30 +-
 world/map/conf/magic.conf.template          |  28 +-
 world/map/conf/map_local.conf.example       |   7 +-
 world/map/conf/motd.txt.example             |   4 +-
 world/map/conf/script_athena.conf           |   2 -
 world/map/conf/water.txt                    |  54 ---
 world/map/conf/water_height.txt             |  68 ----
 world/map/db/item_db.txt                    |   6 +-
 world/map/news.d/23-astral-extension.txt    |  11 +
 world/map/news.html                         |  16 +-
 world/map/news.txt                          |  15 +-
 world/map/npc/001-1/gossip.txt              |   2 +-
 world/map/npc/007-1/witch.txt               |   1 +
 world/map/npc/008-1/annualeaster.txt        |   5 +-
 world/map/npc/008-1/diryn.txt               |   4 +-
 world/map/npc/009-1/milly.txt               |   2 +-
 world/map/npc/009-4/torches.txt             |  20 +-
 world/map/npc/017-4/orum.txt                |   4 +-
 world/map/npc/018-2/caul.txt                |  10 +-
 world/map/npc/021-1/_import.txt             |   1 +
 world/map/npc/021-1/npcs.txt                |  14 +-
 world/map/npc/021-1/pauline.txt             | 296 ++++++++++++++++
 world/map/npc/027-1/graves.txt              |   5 +-
 world/map/npc/027-1/monsters.txt            |  15 +-
 world/map/npc/052-1/channelling.txt         |   3 +-
 world/map/npc/052-2/partyroom.txt           |  13 +-
 world/map/npc/functions/dailyquest.txt      |   5 +-
 world/map/npc/functions/game_rules.txt      |   5 +-
 world/map/npc/functions/mob_points.txt      |  10 +-
 world/map/npc/items/magic_gm_top_hat.txt    |   5 +-
 world/map/npc/items/require_stat.txt        |  26 +-
 world/map/npc/items/restricted_item.txt     |   7 +-
 47 files changed, 808 insertions(+), 1427 deletions(-)
 delete mode 100644 world/map/conf/grf-files.txt
 delete mode 100644 world/map/conf/script_athena.conf
 delete mode 100644 world/map/conf/water.txt
 delete mode 100644 world/map/conf/water_height.txt
 create mode 100644 world/map/news.d/23-astral-extension.txt
 create mode 100644 world/map/npc/021-1/pauline.txt
jason@jason-AY597AA-ABA-HPE-110f:~/Downloads/tmwa-server-data$