From ba370d984146ee5041dbf46b256be76d19577608 Mon Sep 17 00:00:00 2001 From: rubenwardy Date: Sat, 2 Nov 2024 20:40:33 +0000 Subject: [PATCH] Use content.luanti.org (#15360) --- .github/ISSUE_TEMPLATE/bug_report.yaml | 3 ++- .github/ISSUE_TEMPLATE/config.yml | 2 +- .github/ISSUE_TEMPLATE/feature_request.yaml | 2 +- builtin/settingtypes.txt | 4 ++-- src/defaultsettings.cpp | 2 +- src/main.cpp | 4 +++- 6 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml index aab024d7d..828d29b59 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yaml +++ b/.github/ISSUE_TEMPLATE/bug_report.yaml @@ -6,8 +6,9 @@ body: attributes: value: | Please note the following: + 1. **Please update Luanti to the latest stable or dev version** before submitting bug reports. Make sure the bug is still reproducible on the latest version. - 2. This page is for reporting the bugs of **the engine itself**. For bugs in a particular game, please [search for the game in the ContentDB](https://content.minetest.net/packages/?type=game) and submit a bug report in their issue trackers. + 2. This page is for reporting the bugs of **the engine itself**. For bugs in a particular game, please [search for the game in the ContentDB](https://content.luanti.org/packages/?type=game) and submit a bug report in their issue trackers. * For example, you can submit issues about the Minetest Game [in its own repository](https://github.com/minetest/minetest_game/issues). 3. Please provide as many details as possible for us to spot the problem quicker. - type: textarea diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 414391773..502e8e1d7 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -4,5 +4,5 @@ contact_links: url: https://github.com/minetest/minetest_game/issues/new/choose about: Only submit issues of the engine in this repository's issue tracker. Submit those of Minetest Game in its own issue tracker. - name: Search for issue trackers of third-party games - url: https://content.minetest.net/packages/?type=game + url: https://content.luanti.org/packages/?type=game about: For issues of third-party games, search for the game in the ContentDB and then submit an issue in their issue tracker. diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml index 5a16b24fe..265fea67f 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.yaml +++ b/.github/ISSUE_TEMPLATE/feature_request.yaml @@ -7,7 +7,7 @@ body: value: | Please note the following: 1. Only submit a feature request if the feature does not exist on the latest dev version. - 2. This page is for suggesting changes to **the engine itself**. To suggest changes to games, please [search for the game in the ContentDB](https://content.minetest.net/packages/?type=game) and submit a feature request in their issue trackers. + 2. This page is for suggesting changes to **the engine itself**. To suggest changes to games, please [search for the game in the ContentDB](https://content.luanti.org/packages/?type=game) and submit a feature request in their issue trackers. - type: textarea attributes: label: Problem diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt index ec739b700..a5b6d6303 100644 --- a/builtin/settingtypes.txt +++ b/builtin/settingtypes.txt @@ -762,7 +762,7 @@ chat_font_size (Chat font size) int 0 0 72 [**Content Repository] # The URL for the content repository -contentdb_url (ContentDB URL) string https://content.minetest.net +contentdb_url (ContentDB URL) string https://content.luanti.org # If enabled and you have ContentDB packages installed, Luanti may contact ContentDB to # check for package updates when opening the mainmenu. @@ -773,7 +773,7 @@ contentdb_enable_updates_indicator (Enable updates available indicator on conten # as defined by the Free Software Foundation. # You can also specify content ratings. # These flags are independent from Luanti versions, -# so see a full list at https://content.minetest.net/help/content_flags/ +# so see a full list at https://content.luanti.org/help/content_flags/ contentdb_flag_blacklist (ContentDB Flag Blacklist) string nonfree, desktop_default # Maximum number of concurrent downloads. Downloads exceeding this limit will be queued. diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index 4d9120fd1..67622024b 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -397,7 +397,7 @@ void set_default_settings() settings->setDefault("chat_font_size", "0"); // Default "font_size" // ContentDB - settings->setDefault("contentdb_url", "https://content.minetest.net"); + settings->setDefault("contentdb_url", "https://content.luanti.org"); settings->setDefault("contentdb_enable_updates_indicator", "true"); settings->setDefault("contentdb_max_concurrent_downloads", "3"); diff --git a/src/main.cpp b/src/main.cpp index 97ba63033..6d30b2f07 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1015,10 +1015,12 @@ static bool determine_subgame(GameParams *game_params) infostream << "Using commanded gameid [" << gamespec.id << "]" << std::endl; } else { if (game_params->is_dedicated_server) { + std::string contentdb_url = g_settings->get("contentdb_url"); + // If this is a dedicated server and no gamespec has been specified, // print a friendly error pointing to ContentDB. errorstream << "To run a " PROJECT_NAME_C " server, you need to select a game using the '--gameid' argument." << std::endl - << "Check out https://content.minetest.net for a selection of games to pick from and download." << std::endl; + << "Check out " << contentdb_url << " for a selection of games to pick from and download." << std::endl; } return false;