Commit 036d7066 authored by nanahira's avatar nanahira

Merge branch 'mc'

parents 98264569 b82fbccf
...@@ -23,9 +23,9 @@ ...@@ -23,9 +23,9 @@
"stop": false, "stop": false,
"side_timeout": false, "side_timeout": false,
"tag_duel_surrender": true, "tag_duel_surrender": true,
"replay_delay": false, "replay_delay": true,
"hide_name": false, "hide_name": false,
"display_watchers": true, "display_watchers": false,
"i18n": { "i18n": {
"auto_pick": false, "auto_pick": false,
"default": "zh-cn", "default": "zh-cn",
...@@ -184,7 +184,7 @@ ...@@ -184,7 +184,7 @@
"replay_archive_tool": "7z", "replay_archive_tool": "7z",
"block_replay_to_player": false, "block_replay_to_player": false,
"enable_recover": false, "enable_recover": false,
"show_ip": false, "show_ip": true,
"show_info": true, "show_info": true,
"log_save_path": "./config/", "log_save_path": "./config/",
"port": 7933 "port": 7933
...@@ -304,7 +304,7 @@ ...@@ -304,7 +304,7 @@
"port": 7922, "port": 7922,
"websocket_roomlist": false, "websocket_roomlist": false,
"public_roomlist": false, "public_roomlist": false,
"show_ip": false, "show_ip": true,
"show_info": true, "show_info": true,
"quick_death_rule": 2, "quick_death_rule": 2,
"ssl": { "ssl": {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment