diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 5c2718366..7d33ddade 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -25,16 +25,16 @@ Contributions are welcome! Here's how you can help: the work, to avoid disappointment. You may also benefit from discussing on our IRC development channel - [#luanti-dev](http://www.luanti.org/irc/). Note that a proper IRC client + [#luanti-dev](https://docs.luanti.org/about/irc/). Note that a proper IRC client is required to speak on this channel. 3. Start coding! - Refer to the [Lua API](https://github.com/luanti-org/luanti/blob/master/doc/lua_api.md), - [Developer Wiki](https://dev.luanti.org/) and other + [Luanti Documentation](https://docs.luanti.org/) and other [documentation](https://github.com/luanti-org/luanti/tree/master/doc). - - Follow the [C/C++](https://dev.luanti.org/Code_style_guidelines) and - [Lua](https://dev.luanti.org/Lua_code_style_guidelines) code style guidelines. + - Follow the [C/C++](https://docs.luanti.org/for-engine-devs/code-style-guidelines/) and + [Lua](https://docs.luanti.org/for-engine-devs/lua-code-style-guidelines/) code style guidelines. - Check your code works as expected and document any changes to the Lua API. - To avoid conflicting changes between contributions, do not do the following manually. They will be done before each release. - Run `updatepo.sh` or update `luanti.po{,t}` even if your code adds new translatable strings. @@ -64,8 +64,8 @@ Contributions are welcome! Here's how you can help: picture of the project. 2. It works. 3. It follows the code style for - [C/C++](https://dev.luanti.org/Code_style_guidelines) or - [Lua](https://dev.luanti.org/Lua_code_style_guidelines). + [C/C++](https://docs.luanti.org/for-engine-devs/code-style-guidelines/) or + [Lua](https://docs.luanti.org/for-engine-devs/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. @@ -106,7 +106,7 @@ the project page with a list of current languages Builtin (the component which contains things like server messages, chat command descriptions, privilege descriptions) is translated separately; it needs to be translated by editing a `.tr` text file. See -[Translation](https://dev.luanti.org/Translation) for more information. +[Translation](https://docs.luanti.org/for-creators/translation/) for more information. ## Donations @@ -116,11 +116,11 @@ methods on [our website](http://www.luanti.org/development/#donate). # Maintaining * This is a concise version of the - [Rules & Guidelines](https://dev.luanti.org/engine-dev-process/) on the developer wiki.* + [Rules & Guidelines](https://docs.luanti.org/for-engine-devs/) on the Luanti Documentation.* These notes are for those who have push access Luanti (core developers / maintainers). -- See the [project organisation](https://dev.luanti.org/Organisation) for the people involved. +- See the [project organisation](https://docs.luanti.org/for-engine-devs/organization/) for the people involved. ## Concept approvals and roadmaps @@ -169,4 +169,4 @@ Submit a :+1: (+1) or "Looks good" comment to show you believe the pull-request ## Releasing a new version -*Refer to [dev.luanti.org/Releasing_Luanti](https://dev.luanti.org/Releasing_Luanti)* +*Refer to [docs.luanti.org/for-engine-devs/releasing-luanti](https://docs.luanti.org/for-engine-devs/releasing-luanti/)* diff --git a/README.md b/README.md index 6abd6d22c..9e5e7e7c4 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ Table of Contents Further documentation ---------------------- - Website: https://www.luanti.org/ -- Wiki: https://wiki.luanti.org/ +- Luanti Documentation: https://docs.luanti.org/ - Forum: https://forum.luanti.org/ - GitHub: https://github.com/luanti-org/luanti/ - [Developer documentation](doc/developing/) diff --git a/builtin/common/settings/generate_from_settingtypes.lua b/builtin/common/settings/generate_from_settingtypes.lua index 13b3035ce..1c1535a17 100644 --- a/builtin/common/settings/generate_from_settingtypes.lua +++ b/builtin/common/settings/generate_from_settingtypes.lua @@ -16,7 +16,7 @@ local minetest_example_header = [[ # to the program, eg. "luanti.exe --config ../minetest.conf.example". # Further documentation: -# https://wiki.luanti.org/ +# https://docs.luanti.org/ ]] diff --git a/doc/android.md b/doc/android.md index 353a7d1c8..f51bce3ee 100644 --- a/doc/android.md +++ b/doc/android.md @@ -42,7 +42,7 @@ configuration file can usually be found at: * After 5.4.2: * `/sdcard/Android/data/net.minetest.minetest/` or `/storage/emulated/0/Android/data/net.minetest.minetest/` if stored on the device * `/storage/emulated/(varying folder name)/Android/data/net.minetest.minetest/` if stored on the SD card -* [Learn more about Android directory](https://wiki.luanti.org/Accessing_Android_Data_Directory) +* [Learn more about Android directory](https://docs.luanti.org/for-players/mobile/) ## Useful settings diff --git a/doc/developing/README.md b/doc/developing/README.md index 419e41edd..80e531bea 100644 --- a/doc/developing/README.md +++ b/doc/developing/README.md @@ -1,16 +1,16 @@ # Developer documentation -## Wiki +## Luanti Documentation -Some important development docs are found in the wiki: https://dev.luanti.org/ +Some important development docs are found in the Luanti Documentation: https://docs.luanti.org/ Notable pages: -- [Releasing Luanti](https://dev.luanti.org/Releasing_Luanti) -- [Engine translations](https://dev.luanti.org/Translation#Maintaining_engine_translations) -- [Changelog](https://dev.luanti.org/Changelog) -- [Organisation](https://dev.luanti.org/Organisation) -- [Code style guidelines](https://dev.luanti.org/Code_style_guidelines) +- [Releasing Luanti](https://docs.luanti.org/for-engine-devs/releasing-luanti/) +- [Engine translations](https://docs.luanti.org/for-creators/translation/) +- [Changelog](https://docs.luanti.org/about/changelog/) +- [Organisation](https://docs.luanti.org/for-engine-devs/organization/) +- [Code style guidelines](https://docs.luanti.org/for-engine-devs/code-style-guidelines/) ## In this folder @@ -23,4 +23,4 @@ Notable pages: Oftentimes knowledge hasn't been written down (yet) and your best bet is to ask someone experienced and/or the core developers. -Feel free to join the [#minetest-dev IRC](https://wiki.luanti.org/IRC) and ask questions related to **engine development**. +Feel free to join the [#luanti-dev IRC](https://docs.luanti.org/about/irc/) and ask questions related to **engine development**. diff --git a/doc/direction.md b/doc/direction.md index bd70003d1..4119f7d8f 100644 --- a/doc/direction.md +++ b/doc/direction.md @@ -37,7 +37,7 @@ Examples include [general view distance](https://github.com/luanti-org/luanti/issues/7222). This includes work on maintaining -[our Irrlicht fork](https://github.com/minetest/irrlicht), and switching to +[our Irrlicht fork](https://github.com/luanti-org/luanti/tree/master/irr), and switching to alternative libraries to replace Irrlicht functionality as needed ### 2.2 Internal code refactoring diff --git a/doc/lua_api.md b/doc/lua_api.md index ca3a5fee7..ae0533d7e 100644 --- a/doc/lua_api.md +++ b/doc/lua_api.md @@ -10,7 +10,7 @@ safely without breaking backwards compatibility. * More information at * Additional documentation: -* (Unofficial) Minetest Modding Book by rubenwardy: +* (Unofficial) Luanti Modding Book by rubenwardy: * Modding tools: Introduction diff --git a/irr/README.md b/irr/README.md index 449903cfe..eb7f14809 100644 --- a/irr/README.md +++ b/irr/README.md @@ -1,9 +1,9 @@ IrrlichtMt version 1.9 ====================== -IrrlichtMt is the 3D engine of [Minetest](https://github.com/minetest). +IrrlichtMt is the 3D engine of [Luanti](https://github.com/luanti-org). It is based on the [Irrlicht Engine](https://irrlicht.sourceforge.io/) but is now developed independently. -It is intentionally not compatible to upstream and is planned to be eventually absorbed into Minetest. +It is intentionally not compatible to upstream and is planned to be eventually absorbed into Luanti. Build ----- diff --git a/misc/org.luanti.luanti.metainfo.xml b/misc/org.luanti.luanti.metainfo.xml index 3e99aa36b..6759cdc1f 100644 --- a/misc/org.luanti.luanti.metainfo.xml +++ b/misc/org.luanti.luanti.metainfo.xml @@ -158,10 +158,10 @@ https://www.luanti.org https://www.luanti.org/get-involved/#reporting-issues - https://dev.luanti.org/Translation/ + https://docs.luanti.org/for-creators/translation/ https://www.luanti.org/get-involved/#donate - https://wiki.luanti.org/FAQ - https://wiki.luanti.org + https://docs.luanti.org/about/faq + https://docs.luanti.org https://github.com/luanti-org/luanti https://www.luanti.org/get-involved diff --git a/misc/redirect.html b/misc/redirect.html index f08a49ae1..4a219f7f0 100644 --- a/misc/redirect.html +++ b/misc/redirect.html @@ -4,11 +4,11 @@ Luanti API documentation - - + +

Redirecting…

- Click here if you are not redirected. + Click here if you are not redirected. diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1231f49ba..bc87ca070 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -953,7 +953,7 @@ else() set(MATH_FLAGS "-fno-math-errno -fno-trapping-math -fno-signed-zeros") # Enable SSE for floating point math on 32-bit x86 by default - # reasoning see minetest issue #11810 and https://gcc.gnu.org/wiki/FloatingPointMath + # reasoning see luanti issue #11810 and https://gcc.gnu.org/wiki/FloatingPointMath if(CMAKE_SIZEOF_VOID_P EQUAL 4) check_c_source_compiles("#ifndef __i686__\n#error\n#endif\nint main(){}" IS_I686) if(IS_I686) diff --git a/src/server.cpp b/src/server.cpp index 89bba75fb..e3854802d 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -4285,7 +4285,7 @@ ModStorageDatabase *Server::openModStorageDatabase(const std::string &world_path warningstream << "/!\\ You are using the old mod storage files backend. " << "This backend is deprecated and may be removed in a future release /!\\" << std::endl << "Switching to SQLite3 is advised, " - << "please read https://wiki.luanti.org/Database_backends." << std::endl; + << "please read https://docs.luanti.org/for-server-hosts/database-backends." << std::endl; return openModStorageDatabase(backend, world_path, world_mt); } diff --git a/src/serverenvironment.cpp b/src/serverenvironment.cpp index 6368f4f8f..3914ef364 100644 --- a/src/serverenvironment.cpp +++ b/src/serverenvironment.cpp @@ -257,14 +257,14 @@ void ServerEnvironment::init() 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 https://wiki.luanti.org/Database_backends." << std::endl; + << "please read https://docs.luanti.org/for-server-hosts/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 https://wiki.luanti.org/Database_backends." << std::endl; + << "please read https://docs.luanti.org/for-server-hosts/database-backends." << std::endl; } m_player_database = openPlayerDatabase(player_backend_name, world_path, conf);