oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-09-30 19:22:14 +00:00
Code Wiki Activity

add keyring_file

Browse source
This commit is contained in:
Abdurahman Elmawi 2025-06-28 21:50:57 +03:00
parent 587acbaa5d
commit 1b29568096
4 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
builtin/settingtypes.txt
View file

@ -2436,6 +2436,9 @@ enable_remote_media_server (Connect to external media server) [client] bool true
# Multiplayer Tab. # Multiplayer Tab.
serverlist_file (Serverlist file) [client] string favoriteservers.json serverlist_file (Serverlist file) [client] string favoriteservers.json
# File in client/ that contains your saved usernames and passwords for Multiplayer
keyring_file (Keyring file) [client] string keyring.json
[*Gamepads] [client] [*Gamepads] [client]

4
minetest.conf.example
View file

@ -3627,6 +3627,10 @@
# type: string # type: string
# serverlist_file = favoriteservers.json # serverlist_file = favoriteservers.json
# File in client/ that contains your saved usernames and passwords for Multiplayer
# type: string
# keyring_file = keyring.json
## Gamepads ## Gamepads
# Enable joysticks. Requires a restart to take effect # Enable joysticks. Requires a restart to take effect

1
src/defaultsettings.cpp
View file

@ -380,6 +380,7 @@ void set_default_settings()
// Main menu // Main menu
settings->setDefault("main_menu_path", ""); settings->setDefault("main_menu_path", "");
settings->setDefault("serverlist_file", "favoriteservers.json"); settings->setDefault("serverlist_file", "favoriteservers.json");
settings->setDefault("keyring_file", "keyring.json");
// General font settings // General font settings
settings->setDefault("font_path", porting::getDataPath("fonts" DIR_DELIM "Arimo-Regular.ttf")); settings->setDefault("font_path", porting::getDataPath("fonts" DIR_DELIM "Arimo-Regular.ttf"));

2
src/script/lua_api/l_settings.cpp
View file

@ -48,7 +48,7 @@ static inline int checkSettingSecurity(lua_State* L, const std::string &name)
const char *disallowed[] = { const char *disallowed[] = {
"main_menu_script", "shader_path", "texture_path", "screenshot_path", "main_menu_script", "shader_path", "texture_path", "screenshot_path",
"serverlist_file", "serverlist_url", "map-dir", "contentdb_url", "serverlist_file", "keyring_file", "serverlist_url", "map-dir", "contentdb_url",
}; };
for (const char *name2 : disallowed) { for (const char *name2 : disallowed) {
if (name == name2) if (name == name2)