From c9d8b13b00c15bd2b341044b2b8653d1dc6b7cc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=93=D0=B5=D1=80=D1=85=D0=B0=D1=80=D0=B4=20PICCORO=20Len?= =?UTF-8?q?z=20McKAY?= Date: Thu, 29 Dec 2022 13:20:57 -0400 Subject: [PATCH] changing references to real final minetest.org from oldcoder --- .github/SECURITY.md | 11 ++++------ README.md | 7 +++--- builtin/mainmenu/dlg_create_world.lua | 4 ++-- .../mainmenu/generate_from_settingtypes.lua | 2 +- builtin/mainmenu/tab_credits.lua | 2 +- builtin/settingtypes.txt | 4 ++-- doc/client_lua_api.txt | 3 +-- doc/lua_api.txt | 3 +-- doc/minetest.6 | 4 ++-- minetest.conf.example | 8 +++---- misc/net.minetest.minetest.appdata.xml | 22 ++++--------------- src/serverenvironment.cpp | 4 ++-- 12 files changed, 27 insertions(+), 47 deletions(-) diff --git a/.github/SECURITY.md b/.github/SECURITY.md index e2dd0432f..c89f17366 100644 --- a/.github/SECURITY.md +++ b/.github/SECURITY.md @@ -2,16 +2,13 @@ ## Supported Versions -We only support the latest stable version for security issues. -See the [releases page](https://github.com/minetest/minetest/releases). +We only support the minenux stable version for security issues. +See the [releases page](https://github.com/minenux/minetest-engine-minetest/releases). ## Reporting a Vulnerability -We ask that you report vulnerabilities privately, by contacting a core developer, -to give us time to fix them. You can do that by emailing one of the following addresses: - -* celeron55@gmail.com -* rubenwardy@minetest.net +We ask that you report vulnerabilities only using telegram group: https://t.me/venenux_minetest_bot +to give us time to fix them. Depending on severity, we will either create a private issue for the vulnerability and release a patch version of Minetest, or give you permission to file the issue publicly. diff --git a/README.md b/README.md index 61ae52a16..549586030 100644 --- a/README.md +++ b/README.md @@ -38,10 +38,9 @@ Further documentation - This sources https://codeberg.org/minenux/minetest-engine/src/branch/stable-5.2-namespace - Minetest4 sources https://codeberg.org/minenux/minetest-engine/src/branch/stable-4.0-namespace - Wiki of this project (minenux) https://codeberg.org/venenux/venenux-minetest/wiki -- Original Minetest Website: http://minetest.net/ -- Original Minetest Wiki: http://wiki.minetest.net/ -- Minetest Developer wiki: http://dev.minetest.net/ -- Minetest Forum: http://forum.minetest.net/ +- Original Minetest Website: http://minetest.org/ +- Original Minetest Wiki: http://wiki.minetest.org/ +- Minetest Forum: http://forum.minetest.org/ - Original Minetest GitHub: https://github.com/minetest/minetest/ - [doc/](doc/) directory of source distribution diff --git a/builtin/mainmenu/dlg_create_world.lua b/builtin/mainmenu/dlg_create_world.lua index f28ae6960..33c3062ba 100644 --- a/builtin/mainmenu/dlg_create_world.lua +++ b/builtin/mainmenu/dlg_create_world.lua @@ -100,11 +100,11 @@ local function create_world_formspec(dialogdata) if #pkgmgr.games == 0 then retval = retval .. "box[2,4;8,1;#ff8800]label[2.25,4;" .. fgettext("You have no games installed.") .. "]label[2.25,4.4;" .. - fgettext("Download one from minetest.net") .. "]" + fgettext("Download one from minetest.org") .. "]" elseif #pkgmgr.games == 1 and pkgmgr.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 game, such as Minetest Game, from minetest.net") .. "]" + fgettext("Download a game, 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 ea570a538..4ec9186c3 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 --config ../minetest5.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 4cc6a82fb..eb0d909c8 100644 --- a/builtin/mainmenu/tab_credits.lua +++ b/builtin/mainmenu/tab_credits.lua @@ -102,7 +102,7 @@ return { local version = core.get_version() return "image[0.5,1;" .. core.formspec_escape(logofile) .. "]" .. "label[0.5,3.2;" .. version.project .. " MinenuX fork" .. " " .. 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 ae9eda614..ca38f87b7 100644 --- a/builtin/settingtypes.txt +++ b/builtin/settingtypes.txt @@ -1002,10 +1002,10 @@ server_name (Server name) string Minetest5 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 https://minetest.net +server_url (Server URL) string https://minetest.org # Automatically report to the serverlist. server_announce (Announce server) bool false diff --git a/doc/client_lua_api.txt b/doc/client_lua_api.txt index c24de8d85..e23c8fced 100644 --- a/doc/client_lua_api.txt +++ b/doc/client_lua_api.txt @@ -1,7 +1,6 @@ Minetest Lua Client Modding API Reference 5.2.0 ================================================ -* More information at -* Developer Wiki: +* More information at Introduction ------------ diff --git a/doc/lua_api.txt b/doc/lua_api.txt index fa9faab1c..267fd9356 100644 --- a/doc/lua_api.txt +++ b/doc/lua_api.txt @@ -1,8 +1,7 @@ Minetest Lua Modding API Reference ================================== -* More information at -* Developer Wiki: +* More information at * (Unofficial) Minetest Modding Book by rubenwardy: Introduction diff --git a/doc/minetest.6 b/doc/minetest.6 index fe58258ca..f371a6cdc 100644 --- a/doc/minetest.6 +++ b/doc/minetest.6 @@ -121,7 +121,7 @@ Display an interactive terminal over ncurses during execution. Colon delimited list of directories to search for games. .SH BUGS -Please report all bugs at https://github.com/minetest/minetest/issues. +Please report all bugs at https://github.com/minenux/minetest-engine-minetest/issues. .SH AUTHOR .PP @@ -131,4 +131,4 @@ 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 def05b116..f7ff9dea5 100644 --- a/minetest.conf.example +++ b/minetest.conf.example @@ -10,7 +10,7 @@ # to the program, eg. "minetest --config ../minetest5.conf.example". # Further documentation: -# http://wiki.minetest.net/ +# http://wiki.minetest.org/ # # Controls @@ -1199,11 +1199,11 @@ server_name = Minetest5 server # 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 = https://minetest.net +# server_url = https://minetest.org # Automatically report to the serverlist. # type: bool @@ -1211,7 +1211,7 @@ server_name = Minetest5 server # Announce to this serverlist. # 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 diff --git a/misc/net.minetest.minetest.appdata.xml b/misc/net.minetest.minetest.appdata.xml index 8957b6287..60d12e11a 100644 --- a/misc/net.minetest.minetest.appdata.xml +++ b/misc/net.minetest.minetest.appdata.xml @@ -33,34 +33,20 @@
  • Beautiful lightning-fast map generator
    • - - - http://www.minetest.net/media/gallery/1.jpg - - - http://www.minetest.net/media/gallery/3.jpg - - - http://www.minetest.net/media/gallery/5.jpg - - sandbox world mining multiplayer - http://minetest.net - http://www.minetest.net/development/#reporting-issues + http://minetest.org + https://codeberg.org/minenux/minetest-engine-minetest/issues http://dev.minetest.net/Translation - http://www.minetest.net/development/#donate - http://wiki.minetest.net/FAQ - http://wiki.minetest.net + https://paypalme/mckaygerhard + https://t.me/venenux_minetest minetest5 - minetest5 - sfan5@live.de diff --git a/src/serverenvironment.cpp b/src/serverenvironment.cpp index 333d32ff5..1577a3da3 100644 --- a/src/serverenvironment.cpp +++ b/src/serverenvironment.cpp @@ -444,14 +444,14 @@ ServerEnvironment::ServerEnvironment(ServerMap *map, warningstream << "/!\\ You are using old player file backend. " << "This backend is deprecated and will be removed in a future 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 (auth_backend_name == "files") { warningstream << "/!\\ You are using old auth file backend. " << "This backend is deprecated and will be removed in a future release /!\\" << std::endl << "Switching to SQLite3 is advised, " - << "please read http://wiki.minetest.net/Database_backends." << std::endl; + << "please read http://wiki.minetest.org/Database_backends." << std::endl; } m_player_database = openPlayerDatabase(player_backend_name, path_world, conf);