diff --git a/builtin/mainmenu/serverlistmgr.lua b/builtin/mainmenu/serverlistmgr.lua index cb6b3574f..28407f795 100644 --- a/builtin/mainmenu/serverlistmgr.lua +++ b/builtin/mainmenu/serverlistmgr.lua @@ -72,11 +72,9 @@ function serverlistmgr.sync() core.handle_async( function(param) local http = core.get_http_api() - local url = ("%s%s?proto_version_min=%d&proto_version_max=%d"):format( + local url = ("%s/list%s?proto_version_min=%d&proto_version_max=%d"):format( core.settings:get("serverlist_url"), - (PLATFORM == "Android" or PLATFORM == "iOS") and - core.decode_base64("OjMwMDAvc2VydmVybGlzdC5qc29u") or - core.decode_base64("L2xpc3Q"), + (PLATFORM == "Android" or PLATFORM == "iOS" or PLATFORM == "OSX") and "_prod" or "", core.get_min_supp_proto(), core.get_max_supp_proto()) diff --git a/src/gettext.cpp b/src/gettext.cpp index 3cc3b7656..75b2b0a16 100644 --- a/src/gettext.cpp +++ b/src/gettext.cpp @@ -136,7 +136,7 @@ void init_gettext(const char *path, const std::string &configured_language, // Add user specified locale to environment setenv("LANGUAGE", configured_language.c_str(), 1); -#ifdef __ANDROID__ +#if defined(__ANDROID__) || defined(__APPLE__) setenv("LANG", configured_language.c_str(), 1); #endif diff --git a/src/main.cpp b/src/main.cpp index 78c2167fe..150e6aecf 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -804,7 +804,7 @@ static bool determine_subgame(GameParams *game_params) gamespec = findSubgame(g_settings->get("default_game")); infostream << "Using default gameid [" << gamespec.id << "]" << std::endl; if (!gamespec.isValid()) { - errorstream << "Game specified in default_game [" + warningstream << "Game specified in default_game [" << g_settings->get("default_game") << "] is invalid." << std::endl; return false; diff --git a/textures/base/pack/creative_bg_ru.png b/textures/base/pack/creative_bg_ru.png index 7a32cd792..601e5040b 100644 Binary files a/textures/base/pack/creative_bg_ru.png and b/textures/base/pack/creative_bg_ru.png differ