Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Resolve merge conflicts

Browse source
This commit is contained in:
Griatch 2020-09-16 23:49:05 +02:00
commit 9cdc37355c
25 changed files with 726 additions and 444 deletions
Download patch file Download diff file Expand all files Collapse all files

4
evennia/settings_default.py
View file

@ -740,9 +740,9 @@ CHANNEL_CONNECTINFO = None
GAME_INDEX_ENABLED = False
# This dict
GAME_INDEX_LISTING = {
"game_name": SERVERNAME,
"game_name": "Mygame", # usually SERVERNAME
"game_status": "pre-alpha", # pre-alpha, alpha, beta or launched
"short_description": GAME_SLOGAN,
"short_description": "", # could be GAME_SLOGAN
"long_description": "",
"listing_contact": "", # email
"telnet_hostname": "", # mygame.com