minenux/minetest-engine-minetest
minenux/minetest-engine-minetest
1
0
Fork 0
Code Pull Requests Releases Activity

change all trolltest to finetest so set minetest.org place

Browse Source
This commit is contained in:
mckaygerhard 2023-09-12 21:15:04 -04:00
parent 8760885750
commit 7758ca0b71
13 changed files with 61 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
CONTRIBUTING.md
View File

@ -10,13 +10,13 @@ Contributions are welcome! Here's how you can help:
## Code ## 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. 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! 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). - 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.net/Code_style_guidelines) and [Lua](http://dev.minetest.net/Lua_code_style_guidelines) code style guidelines. - 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. - 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) 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: ##### 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. 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. 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. 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. 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. 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: 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) - Error logs (check the bottom of the `debug.txt` file)
- Screenshots - Screenshots
@ -55,7 +55,7 @@ After reporting you should aim to answer questions or clarifications as this hel
## Feature requests ## 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 ## Translations
@ -63,15 +63,15 @@ Translations of Minetest are performed using Weblate. You can access the project
### Donations ### 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 # 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). 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 ## 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 ## 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)*

25
README.txt
View File

@ -10,22 +10,25 @@ In case you downloaded the source code:
--------------------------------------- ---------------------------------------
If you downloaded the Minetest Engine source code in which this file is If you downloaded the Minetest Engine source code in which this file is
contained, you probably want to download the minetest_game project too: 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 Further documentation
---------------------- ----------------------
- Website: http://minetest.net/ - Website: http://minetest.org/
- Wiki: http://wiki.minetest.net/ - Wiki: http://wiki.minetest.org/
- Developer wiki: http://dev.minetest.net/ - Developer wiki: http://dev.minetest.org/
- Forum: http://forum.minetest.net/ - Forum: https://t.me/venenux_minetest
- Github: https://github.com/minetest/minetest/ - Github: https://gitlab.com/minenux/minetest-engine-minetest
- doc/ directory of source distribution - doc/ directory of source distribution
This game is not finished This game is not finished
-------------------------- --------------------------
- Don't expect it to work as well as a finished game will. - Don't expect it to work as well as a finished game but seems is pretty stable
- Please report any bugs. When doing that, debug.txt is useful.
Default controls Default controls
----------------- -----------------
@ -80,7 +83,7 @@ $bin = bin
$share = . $share = .
$user = . $user = .
Linux installed: Linux distributions:
$bin = /usr/bin $bin = /usr/bin
$share = /usr/share/minetest $share = /usr/share/minetest
$user = ~/.minetest $user = ~/.minetest
@ -268,7 +271,7 @@ Compiling on Windows:
http://gnuwin32.sourceforge.net/downlinks/gettext.php http://gnuwin32.sourceforge.net/downlinks/gettext.php
- This is used for other UI languages. Feel free to leave it out. - This is used for other UI languages. Feel free to leave it out.
* And, of course, Minetest: * And, of course, Minetest:
http://minetest.net/download http://minetest.org/download
- Steps: - Steps:
- Select a directory called DIR hereafter in which you will operate. - Select a directory called DIR hereafter in which you will operate.
- Make sure you have CMake and a compiler installed. - Make sure you have CMake and a compiler installed.

4
builtin/mainmenu/dlg_create_world.lua
View File

@ -66,11 +66,11 @@ local function create_world_formspec(dialogdata)
if #gamemgr.games == 0 then if #gamemgr.games == 0 then
retval = retval .. "box[2,4;8,1;#ff8800]label[2.25,4;" .. retval = retval .. "box[2,4;8,1;#ff8800]label[2.25,4;" ..
fgettext("You have no subgames installed.") .. "]label[2.25,4.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 elseif #gamemgr.games == 1 and gamemgr.games[1].id == "minimal" then
retval = retval .. "box[1.75,4;8.7,1;#ff8800]label[2,4;" .. 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("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 end
return retval return retval

2
builtin/mainmenu/generate_from_settingtypes.lua
View File

@ -18,7 +18,7 @@ local minetest_example_header = [[
# to the program, eg. "minetest.exe --config ../minetest.conf.example". # to the program, eg. "minetest.exe --config ../minetest.conf.example".
# Further documentation: # Further documentation:
# http://wiki.minetest.net/ # http://wiki.minetest.org/
]] ]]

2
builtin/mainmenu/tab_credits.lua
View File

@ -89,7 +89,7 @@ return {
local version = core.get_version() local version = core.get_version()
return "image[0.5,1;" .. core.formspec_escape(logofile) .. "]" .. return "image[0.5,1;" .. core.formspec_escape(logofile) .. "]" ..
"label[0.5,3.2;" .. version.project .. " " .. version.string .. "]" .. "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]" .. "tablecolumns[color;text]" ..
"tableoptions[background=#00000000;highlight=#00000000;border=false]" .. "tableoptions[background=#00000000;highlight=#00000000;border=false]" ..
"table[3.5,-0.25;8.5,6.05;list_credits;" .. "table[3.5,-0.25;8.5,6.05;list_credits;" ..

10
builtin/settingtypes.txt
View File

@ -711,10 +711,10 @@ server_name (Server name) string Minetest server
server_description (Server description) string mine here server_description (Server description) string mine here
# Domain name of server, to be displayed in the serverlist. # 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. # 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. # Automaticaly report to the serverlist.
server_announce (Announce server) bool false 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 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. # 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 profiler_print_interval (Engine profiling data print interval) int 0

4
doc/client_lua_api.md
View File

@ -1,7 +1,7 @@
Minetest Lua Client Modding API Reference 0.4.15 Minetest Lua Client Modding API Reference 0.4.15
================================================ ================================================
* More information at <http://www.minetest.net/> * More information at <http://www.minetest.org/>
* Developer Wiki: <http://dev.minetest.net/> * Developer Wiki: <http://dev.minetest.org/>
Introduction Introduction
------------ ------------

4
doc/lua_api.txt
View File

@ -1,7 +1,7 @@
Minetest Lua Modding API Reference 0.4.17 Minetest Lua Modding API Reference 0.4.17
========================================= =========================================
* More information at <http://www.minetest.net/> * More information at <http://www.minetest.org/>
* Developer Wiki: <http://dev.minetest.net/> * Developer Wiki: <http://dev.minetest.org/>
Introduction Introduction
------------ ------------

2
doc/minetest.6
View File

@ -110,5 +110,5 @@ This man page was originally written by
Juhani Numminen <juhaninumminen0@gmail.com>. Juhani Numminen <juhaninumminen0@gmail.com>.
.SH WWW .SH WWW
http://www.minetest.net/ http://www.minetest.org/

18
minetest.conf.example
View File

@ -10,7 +10,7 @@
# to the program, eg. "minetest.exe --config ../minetest.conf.example". # to the program, eg. "minetest.exe --config ../minetest.conf.example".
# Further documentation: # Further documentation:
# http://wiki.minetest.net/ # http://wiki.minetest.org/
# #
# Client # Client
@ -332,7 +332,7 @@
# URL to the server list displayed in the Multiplayer Tab. # URL to the server list displayed in the Multiplayer Tab.
# type: string # 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. # File in client/serverlist/ that contains your favorite servers displayed in the Multiplayer Tab.
# type: string # type: string
@ -847,20 +847,20 @@
# Domain name of server, to be displayed in the serverlist. # Domain name of server, to be displayed in the serverlist.
# type: string # type: string
# server_address = game.minetest.net # server_address = game.minetest.org
# Homepage of server, to be displayed in the serverlist. # Homepage of server, to be displayed in the serverlist.
# type: string # type: string
# server_url = http://minetest.net # server_url = http://minetest.org
# Automaticaly report to the serverlist. # Automaticaly report to the serverlist.
# type: bool # type: bool
# server_announce = false # server_announce = false
# Announce to this serverlist. # 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 # type: string
# serverlist_url = servers.minetest.net # serverlist_url = servers.minetest.org
# Remove color codes from incoming chat messages # Remove color codes from incoming chat messages
# Use this to stop players from being able to use color in their messages # Use this to stop players from being able to use color in their messages
@ -1824,13 +1824,13 @@
# main_menu_mod_mgr = 1 # main_menu_mod_mgr = 1
# type: string # type: string
# modstore_download_url = https://forum.minetest.net/media/ # modstore_download_url = https://forum.minetest.org/media/
# type: string # type: string
# modstore_listmods_url = https://forum.minetest.net/mmdb/mods/ # modstore_listmods_url = https://forum.minetest.org/mmdb/mods/
# type: string # 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. # Print the engine's profiling data in regular intervals (in seconds). 0 = disable. Useful for developers.
# type: int # type: int

18
misc/net.minetest.minetest.appdata.xml
View File

@ -29,13 +29,13 @@
</description> </description>
<screenshots> <screenshots>
<screenshot type="default"> <screenshot type="default">
<image width="1920" height="1080">http://www.minetest.net/media/gallery/1.jpg</image> <image width="1920" height="1080">http://www.minetest.org/media/gallery/1.jpg</image>
</screenshot> </screenshot>
<screenshot> <screenshot>
<image width="1920" height="1080">http://www.minetest.net/media/gallery/3.jpg</image> <image width="1920" height="1080">http://www.minetest.org/media/gallery/3.jpg</image>
</screenshot> </screenshot>
<screenshot> <screenshot>
<image width="1920" height="1080">http://www.minetest.net/media/gallery/5.jpg</image> <image width="1920" height="1080">http://www.minetest.org/media/gallery/5.jpg</image>
</screenshot> </screenshot>
</screenshots> </screenshots>
<keywords> <keywords>
@ -44,12 +44,12 @@
<keyword>mining</keyword> <keyword>mining</keyword>
<keyword>multiplayer</keyword> <keyword>multiplayer</keyword>
</keywords> </keywords>
<url type="homepage">http://minetest.net</url> <url type="homepage">http://minetest.org</url>
<url type="bugtracker">http://www.minetest.net/development/#reporting-issues</url> <url type="bugtracker">http://www.minetest.org/development/#reporting-issues</url>
<url type="translate">http://dev.minetest.net/Translation</url> <url type="translate">http://dev.minetest.org/Translation</url>
<url type="donation">http://www.minetest.net/development/#donate</url> <url type="donation">http://www.minetest.org/development/#donate</url>
<url type="faq">http://wiki.minetest.net/FAQ</url> <url type="faq">http://wiki.minetest.org/FAQ</url>
<url type="help">http://wiki.minetest.net</url> <url type="help">http://wiki.minetest.org</url>
<provides> <provides>
<binary>minetest</binary> <binary>minetest</binary>
</provides> </provides>

6
src/defaultsettings.cpp
View File

@ -221,9 +221,9 @@ void set_default_settings(Settings *settings)
settings->setDefault("main_menu_path", ""); settings->setDefault("main_menu_path", "");
settings->setDefault("main_menu_mod_mgr", "1"); settings->setDefault("main_menu_mod_mgr", "1");
settings->setDefault("main_menu_game_mgr", "0"); settings->setDefault("main_menu_game_mgr", "0");
settings->setDefault("modstore_download_url", "https://forum.minetest.net/media/"); settings->setDefault("modstore_download_url", "https://forum.minetest.org/media/");
settings->setDefault("modstore_listmods_url", "https://forum.minetest.net/mmdb/mods/"); settings->setDefault("modstore_listmods_url", "https://forum.minetest.org/mmdb/mods/");
settings->setDefault("modstore_details_url", "https://forum.minetest.net/mmdb/mod/*/"); settings->setDefault("modstore_details_url", "https://forum.minetest.org/mmdb/mod/*/");
settings->setDefault("serverlist_file", "favoriteservers.txt"); settings->setDefault("serverlist_file", "favoriteservers.txt");
#if USE_FREETYPE #if USE_FREETYPE

2
src/serverenvironment.cpp
View File

@ -394,7 +394,7 @@ ServerEnvironment::ServerEnvironment(ServerMap *map,
warningstream << "/!\\ You are using old player file backend. " warningstream << "/!\\ You are using old player file backend. "
<< "This backend is deprecated and will be removed in next release /!\\" << "This backend is deprecated and will be removed in next release /!\\"
<< std::endl << "Switching to SQLite3 or PostgreSQL is advised, " << 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())) { if (!conf.updateConfigFile(conf_path.c_str())) {
errorstream << "ServerEnvironment::ServerEnvironment(): " errorstream << "ServerEnvironment::ServerEnvironment(): "