Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- jason@jason-AY597AA-ABA-HPE-110f:~/Downloads/tmwa-server-data$ git branch --set-upstream-to=origin/master master
- Branch master set up to track remote branch master from origin.
- jason@jason-AY597AA-ABA-HPE-110f:~/Downloads/tmwa-server-data$ git pull
- remote: Counting objects: 166, done.
- remote: Compressing objects: 100% (116/116), done.
- remote: Total 135 (delta 85), reused 68 (delta 19)
- Receiving objects: 100% (135/135), 28.56 KiB | 0 bytes/s, done.
- Resolving deltas: 100% (85/85), completed with 29 local objects.
- From https://github.com/themanaworld/tmwa-server-data
- 0d99b1b..be4eeff master -> origin/master
- d60cec6..c994dbf stable -> origin/stable
- * [new tag] v2013.10.02 -> v2013.10.02
- From https://github.com/themanaworld/tmwa-server-data
- * [new tag] v2013.09.27 -> v2013.09.27
- * [new tag] v2013.09.28 -> v2013.09.28
- * [new tag] v2013.09.29 -> v2013.09.29
- * [new tag] v2013.10.01 -> v2013.10.01
- Updating 683aa1a..be4eeff
- Fast-forward
- GNUmakefile | 6 +-
- char-server | 4 +-
- client-data | 2 +-
- login-server | 4 +-
- login/conf/login_local.conf.example | 7 +-
- map-server | 4 +-
- run-all | 8 +-
- tools/_news_colors.py | 63 ++-
- tools/bin/restart-login | 2 +-
- tools/bin/restart-world | 4 +-
- world/map/conf/magic.conf.template | 16 +-
- world/map/conf/msg_athena.conf | 528 ---------------------
- world/map/db/const.txt | 18 +-
- world/map/news.d/24-code-release.txt | 57 +++
- world/map/news.html | 60 +++
- world/map/news.txt | 59 +++
- world/map/npc/002-4/underground_palace_barrier.txt | 2 +-
- world/map/npc/007-1/witch.txt | 2 +-
- world/map/npc/013-1/flowerpentagram.txt | 3 +-
- world/map/npc/017-4/guardingspirit.txt | 3 +-
- world/map/npc/021-2/kylian.txt | 4 +-
- world/map/npc/items/require_stat.txt | 1 +
- world/map/npc/xmas/2012/helpersSaddleRug.txt | 3 +
- world/map/npc/xmas/2012/helpersTalisman.txt | 1 +
- world/map/npc/xmas/2012/santa.txt | 1 +
- 25 files changed, 269 insertions(+), 593 deletions(-)
- delete mode 100644 world/map/conf/msg_athena.conf
- create mode 100644 world/map/news.d/24-code-release.txt
- jason@jason-AY597AA-ABA-HPE-110f:~/Downloads/tmwa-server-data$
Advertisement
Add Comment
Please, Sign In to add comment
