diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 468ba0514..2d92128b8 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -10,13 +10,13 @@ Contributions are welcome! Here's how you can help: ## Code -If you are planning to start some significant coding, you would benefit from asking first on [our IRC channel](http://www.minetest.net/irc/) before starting. +If you are planning to start some significant coding, you would benefit from asking first on [our IRC channel](http://www.minetest.org/irc/) before starting. 1. [Fork](https://help.github.com/articles/fork-a-repo/) the repository and [clone](https://help.github.com/articles/cloning-a-repository/) your fork. 2. Start coding! - - Refer to the [Lua API](https://github.com/minetest/minetest/blob/master/doc/lua_api.txt), [Developer Wiki](http://dev.minetest.net/Main_Page) and other [documentation](https://github.com/minetest/minetest/tree/master/doc). - - Follow the [C/C++](http://dev.minetest.net/Code_style_guidelines) and [Lua](http://dev.minetest.net/Lua_code_style_guidelines) code style guidelines. + - Refer to the [Lua API](https://github.com/minetest/minetest/blob/master/doc/lua_api.txt), [Developer Wiki](http://dev.minetest.org/Main_Page) and other [documentation](https://github.com/minetest/minetest/tree/master/doc). + - Follow the [C/C++](http://dev.minetest.org/Code_style_guidelines) and [Lua](http://dev.minetest.org/Lua_code_style_guidelines) code style guidelines. - Check your code works as expected and document any changes to the Lua API. 3. Commit & [push](https://help.github.com/articles/pushing-to-a-remote/) your changes to a new branch (not `master`, one change per branch) @@ -32,9 +32,9 @@ If you are planning to start some significant coding, you would benefit from ask ##### A pull-request is considered merge-able when: -1. It follows the [roadmap](https://forum.minetest.net/viewtopic.php?t=9177) in some way and fits the whole picture of the project. +1. It follows the [roadmap](https://forum.minetest.org/viewtopic.php?t=9177) in some way and fits the whole picture of the project. 2. It works. -3. It follows the code style for [C/C++](http://dev.minetest.net/Code_style_guidelines) or [Lua](http://dev.minetest.net/Lua_code_style_guidelines). +3. It follows the code style for [C/C++](http://dev.minetest.org/Code_style_guidelines) or [Lua](http://dev.minetest.org/Lua_code_style_guidelines). 4. The code's interfaces are well designed, regardless of other aspects that might need more work in the future. 5. It uses protocols and formats which include the required compatibility. @@ -43,7 +43,7 @@ If you are planning to start some significant coding, you would benefit from ask If you experience an issue, we would like to know the details - especially when a stable release is on the way. 1. Do a quick search on GitHub to check if the issue has already been reported. -2. Is it an issue with the Minetest *engine*? If not, report it [elsewhere](http://www.minetest.net/development/#reporting-issues). +2. Is it an issue with the Minetest *engine*? If not, report it [elsewhere](http://www.minetest.org/development/#reporting-issues). 3. [Open an issue](https://github.com/minetest/minetest/issues/new) and describe the issue you are having - you could include: - Error logs (check the bottom of the `debug.txt` file) - Screenshots @@ -55,7 +55,7 @@ After reporting you should aim to answer questions or clarifications as this hel ## Feature requests -Feature requests are welcome but take a moment to see if your idea follows the [roadmap](https://forum.minetest.net/viewtopic.php?t=9177) in some way and fits the whole picture of the project. You should provide a clear explanation with as much detail as possible. +Feature requests are welcome but take a moment to see if your idea follows the [roadmap](https://forum.minetest.org/viewtopic.php?t=9177) in some way and fits the whole picture of the project. You should provide a clear explanation with as much detail as possible. ## Translations @@ -63,15 +63,15 @@ Translations of Minetest are performed using Weblate. You can access the project ### Donations -If you'd like to monetarily support Minetest development, you can find donation methods on [our website](http://www.minetest.net/development/#donate). +If you'd like to monetarily support Minetest development, you can find donation methods on [our website](http://www.minetest.org/development/#donate). # Maintaining -*This is a concise version of the [Rules & Guidelines](http://dev.minetest.net/Category:Rules_and_Guidelines) on the developer wiki.* +*This is a concise version of the [Rules & Guidelines](http://dev.minetest.org/Category:Rules_and_Guidelines) on the developer wiki.* These notes are for those who have push access Minetest (core developers / maintainers). -- See the [project organisation](http://dev.minetest.net/Organisation) for the people involved. +- See the [project organisation](http://dev.minetest.org/Organisation) for the people involved. ## Reviewing pull requests @@ -103,4 +103,4 @@ Submit a :+1: (+1) or "Looks good" comment to show you believe the pull-request ## Releasing a new version -*Refer to [dev.minetest.net/Releasing_Minetest](http://dev.minetest.net/Releasing_Minetest)* +*Refer to [dev.minetest.org/Releasing_Minetest](http://dev.minetest.org/Releasing_Minetest)* diff --git a/README.txt b/README.txt index a627bde8d..98c00ecf1 100644 --- a/README.txt +++ b/README.txt @@ -10,22 +10,25 @@ In case you downloaded the source code: --------------------------------------- If you downloaded the Minetest Engine source code in which this file is contained, you probably want to download the minetest_game project too: - https://github.com/minetest/minetest_game/ -See the README.txt in it. + +* https://git.minetest.io/minenux/minetest-game-subnasa +* https://codeberg.org/minenux/minetest-game-minetest +* https://gitlab.com/minenux/minetest-game-minetest + +See the README in it. Further documentation ---------------------- -- Website: http://minetest.net/ -- Wiki: http://wiki.minetest.net/ -- Developer wiki: http://dev.minetest.net/ -- Forum: http://forum.minetest.net/ -- Github: https://github.com/minetest/minetest/ +- Website: http://minetest.org/ +- Wiki: http://wiki.minetest.org/ +- Developer wiki: http://dev.minetest.org/ +- Forum: https://t.me/venenux_minetest +- Github: https://gitlab.com/minenux/minetest-engine-minetest - doc/ directory of source distribution This game is not finished -------------------------- -- Don't expect it to work as well as a finished game will. -- Please report any bugs. When doing that, debug.txt is useful. +- Don't expect it to work as well as a finished game but seems is pretty stable Default controls ----------------- @@ -80,7 +83,7 @@ $bin = bin $share = . $user = . -Linux installed: +Linux distributions: $bin = /usr/bin $share = /usr/share/minetest $user = ~/.minetest @@ -268,7 +271,7 @@ Compiling on Windows: http://gnuwin32.sourceforge.net/downlinks/gettext.php - This is used for other UI languages. Feel free to leave it out. * And, of course, Minetest: - http://minetest.net/download + http://minetest.org/download - Steps: - Select a directory called DIR hereafter in which you will operate. - Make sure you have CMake and a compiler installed. diff --git a/builtin/mainmenu/dlg_create_world.lua b/builtin/mainmenu/dlg_create_world.lua index e9ca7799f..cdcb44868 100644 --- a/builtin/mainmenu/dlg_create_world.lua +++ b/builtin/mainmenu/dlg_create_world.lua @@ -66,11 +66,11 @@ local function create_world_formspec(dialogdata) if #gamemgr.games == 0 then retval = retval .. "box[2,4;8,1;#ff8800]label[2.25,4;" .. fgettext("You have no subgames installed.") .. "]label[2.25,4.4;" .. - fgettext("Download one from minetest.net") .. "]" + fgettext("Download one from minetest.org") .. "]" elseif #gamemgr.games == 1 and gamemgr.games[1].id == "minimal" then retval = retval .. "box[1.75,4;8.7,1;#ff8800]label[2,4;" .. fgettext("Warning: The minimal development test is meant for developers.") .. "]label[2,4.4;" .. - fgettext("Download a subgame, such as minetest_game, from minetest.net") .. "]" + fgettext("Download a subgame, such as minetest_game, from minetest.org") .. "]" end return retval diff --git a/builtin/mainmenu/generate_from_settingtypes.lua b/builtin/mainmenu/generate_from_settingtypes.lua index 6c9ba27fb..923ac460b 100644 --- a/builtin/mainmenu/generate_from_settingtypes.lua +++ b/builtin/mainmenu/generate_from_settingtypes.lua @@ -18,7 +18,7 @@ local minetest_example_header = [[ # to the program, eg. "minetest.exe --config ../minetest.conf.example". # Further documentation: -# http://wiki.minetest.net/ +# http://wiki.minetest.org/ ]] diff --git a/builtin/mainmenu/tab_credits.lua b/builtin/mainmenu/tab_credits.lua index b02352257..092e432b6 100644 --- a/builtin/mainmenu/tab_credits.lua +++ b/builtin/mainmenu/tab_credits.lua @@ -89,7 +89,7 @@ return { local version = core.get_version() return "image[0.5,1;" .. core.formspec_escape(logofile) .. "]" .. "label[0.5,3.2;" .. version.project .. " " .. version.string .. "]" .. - "label[0.5,3.5;http://minetest.net]" .. + "label[0.5,3.5;http://minetest.org]" .. "tablecolumns[color;text]" .. "tableoptions[background=#00000000;highlight=#00000000;border=false]" .. "table[3.5,-0.25;8.5,6.05;list_credits;" .. diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt index 0d382df70..f51d8b590 100644 --- a/builtin/settingtypes.txt +++ b/builtin/settingtypes.txt @@ -711,10 +711,10 @@ server_name (Server name) string Minetest server server_description (Server description) string mine here # Domain name of server, to be displayed in the serverlist. -server_address (Server address) string game.minetest.net +server_address (Server address) string game.minetest.org # Homepage of server, to be displayed in the serverlist. -server_url (Server URL) string http://minetest.net +server_url (Server URL) string http://minetest.org # Automaticaly report to the serverlist. server_announce (Announce server) bool false @@ -1499,11 +1499,11 @@ main_menu_game_mgr (Main menu game manager) int 0 main_menu_mod_mgr (Main menu mod manager) int 1 -modstore_download_url (Modstore download URL) string https://forum.minetest.net/media/ +modstore_download_url (Modstore download URL) string https://forum.minetest.org/media/ -modstore_listmods_url (Modstore mods list URL) string https://forum.minetest.net/mmdb/mods/ +modstore_listmods_url (Modstore mods list URL) string https://forum.minetest.org/mmdb/mods/ -modstore_details_url (Modstore details URL) string https://forum.minetest.net/mmdb/mod/*/ +modstore_details_url (Modstore details URL) string https://forum.minetest.org/mmdb/mod/*/ # Print the engine's profiling data in regular intervals (in seconds). 0 = disable. Useful for developers. profiler_print_interval (Engine profiling data print interval) int 0 diff --git a/doc/client_lua_api.md b/doc/client_lua_api.md index 8ef3bfb2e..3b472e0c3 100644 --- a/doc/client_lua_api.md +++ b/doc/client_lua_api.md @@ -1,7 +1,7 @@ Minetest Lua Client Modding API Reference 0.4.15 ================================================ -* More information at -* Developer Wiki: +* More information at +* Developer Wiki: Introduction ------------ diff --git a/doc/lua_api.txt b/doc/lua_api.txt index 728fd0a1c..f1f0edada 100644 --- a/doc/lua_api.txt +++ b/doc/lua_api.txt @@ -1,7 +1,7 @@ Minetest Lua Modding API Reference 0.4.17 ========================================= -* More information at -* Developer Wiki: +* More information at +* Developer Wiki: Introduction ------------ diff --git a/doc/minetest.6 b/doc/minetest.6 index a135e541c..5a9b32ff9 100644 --- a/doc/minetest.6 +++ b/doc/minetest.6 @@ -110,5 +110,5 @@ This man page was originally written by Juhani Numminen . .SH WWW -http://www.minetest.net/ +http://www.minetest.org/ diff --git a/minetest.conf.example b/minetest.conf.example index 52f8eef71..f36eaffa4 100644 --- a/minetest.conf.example +++ b/minetest.conf.example @@ -10,7 +10,7 @@ # to the program, eg. "minetest.exe --config ../minetest.conf.example". # Further documentation: -# http://wiki.minetest.net/ +# http://wiki.minetest.org/ # # Client @@ -332,7 +332,7 @@ # URL to the server list displayed in the Multiplayer Tab. # type: string -# serverlist_url = servers.minetest.net +# serverlist_url = servers.minetest.org # File in client/serverlist/ that contains your favorite servers displayed in the Multiplayer Tab. # type: string @@ -847,20 +847,20 @@ # Domain name of server, to be displayed in the serverlist. # type: string -# server_address = game.minetest.net +# server_address = game.minetest.org # Homepage of server, to be displayed in the serverlist. # type: string -# server_url = http://minetest.net +# server_url = http://minetest.org # Automaticaly report to the serverlist. # type: bool # server_announce = false # Announce to this serverlist. -# If you want to announce your ipv6 address, use serverlist_url = v6.servers.minetest.net. +# If you want to announce your ipv6 address, use serverlist_url = v6.servers.minetest.org. # type: string -# serverlist_url = servers.minetest.net +# serverlist_url = servers.minetest.org # Remove color codes from incoming chat messages # Use this to stop players from being able to use color in their messages @@ -1824,13 +1824,13 @@ # main_menu_mod_mgr = 1 # type: string -# modstore_download_url = https://forum.minetest.net/media/ +# modstore_download_url = https://forum.minetest.org/media/ # type: string -# modstore_listmods_url = https://forum.minetest.net/mmdb/mods/ +# modstore_listmods_url = https://forum.minetest.org/mmdb/mods/ # type: string -# modstore_details_url = https://forum.minetest.net/mmdb/mod/*/ +# modstore_details_url = https://forum.minetest.org/mmdb/mod/*/ # Print the engine's profiling data in regular intervals (in seconds). 0 = disable. Useful for developers. # type: int diff --git a/misc/net.minetest.minetest.appdata.xml b/misc/net.minetest.minetest.appdata.xml index 277225d4b..4e4fecb38 100644 --- a/misc/net.minetest.minetest.appdata.xml +++ b/misc/net.minetest.minetest.appdata.xml @@ -29,13 +29,13 @@ - http://www.minetest.net/media/gallery/1.jpg + http://www.minetest.org/media/gallery/1.jpg - http://www.minetest.net/media/gallery/3.jpg + http://www.minetest.org/media/gallery/3.jpg - http://www.minetest.net/media/gallery/5.jpg + http://www.minetest.org/media/gallery/5.jpg @@ -44,12 +44,12 @@ mining multiplayer - http://minetest.net - http://www.minetest.net/development/#reporting-issues - http://dev.minetest.net/Translation - http://www.minetest.net/development/#donate - http://wiki.minetest.net/FAQ - http://wiki.minetest.net + http://minetest.org + http://www.minetest.org/development/#reporting-issues + http://dev.minetest.org/Translation + http://www.minetest.org/development/#donate + http://wiki.minetest.org/FAQ + http://wiki.minetest.org minetest diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index 181a12b5e..d0c7f4700 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -221,9 +221,9 @@ void set_default_settings(Settings *settings) settings->setDefault("main_menu_path", ""); settings->setDefault("main_menu_mod_mgr", "1"); settings->setDefault("main_menu_game_mgr", "0"); - settings->setDefault("modstore_download_url", "https://forum.minetest.net/media/"); - settings->setDefault("modstore_listmods_url", "https://forum.minetest.net/mmdb/mods/"); - settings->setDefault("modstore_details_url", "https://forum.minetest.net/mmdb/mod/*/"); + settings->setDefault("modstore_download_url", "https://forum.minetest.org/media/"); + settings->setDefault("modstore_listmods_url", "https://forum.minetest.org/mmdb/mods/"); + settings->setDefault("modstore_details_url", "https://forum.minetest.org/mmdb/mod/*/"); settings->setDefault("serverlist_file", "favoriteservers.txt"); #if USE_FREETYPE diff --git a/src/serverenvironment.cpp b/src/serverenvironment.cpp index 8c3c34854..45a1f0298 100644 --- a/src/serverenvironment.cpp +++ b/src/serverenvironment.cpp @@ -394,7 +394,7 @@ ServerEnvironment::ServerEnvironment(ServerMap *map, warningstream << "/!\\ You are using old player file backend. " << "This backend is deprecated and will be removed in next release /!\\" << std::endl << "Switching to SQLite3 or PostgreSQL is advised, " - << "please read http://wiki.minetest.net/Database_backends." << std::endl; + << "please read http://wiki.minetest.org/Database_backends." << std::endl; if (!conf.updateConfigFile(conf_path.c_str())) { errorstream << "ServerEnvironment::ServerEnvironment(): "