Skip to content

Commit

Permalink
upodated minetest -> luanti on more things (#204)
Browse files Browse the repository at this point in the history
* rename a bunch of things

* Apply suggestions from code review

Co-authored-by: Mark Wiemer <[email protected]>

* fix url

---------

Co-authored-by: Mark Wiemer <[email protected]>
  • Loading branch information
siliconsniffer and mark-wiemer authored Feb 28, 2025
1 parent 5ba3a20 commit 07d87b0
Show file tree
Hide file tree
Showing 9 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion content/for-creators/licensing.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ The legal text behind this is in [section 4](https://www.gnu.org/licenses/lgpl.h

## What to do if I spot a program that is possibly infringing Luanti's license?

If you think that a certain program is infringing on Luanti's LGPL 2.1 license, please check with the program's website to see if it is licensed under similar terms, and if the source code is being distributed.If the license seems to be proprietary, and if the developer alleges that the program is their own work, then contact [celeron55](mailto:[email protected]). Alternatively, join the [Luanti IRC channel](http://webchat.freenode.net/?channels=#minetest) and report it there. It doesn't matter if anyone replies or not, it will be logged and the community will check on it themselves. There is also an attempt to list forks of Luanti at the "[Making a list of Luanti forks for Android](https://forum.luanti.org/viewtopic.php?p=242219#p242219)" thread in the forums. If the program you discovered is missing there you could add it.
If you think that a certain program is infringing on Luanti's LGPL 2.1 license, please check with the program's website to see if it is licensed under similar terms, and if the source code is being distributed.If the license seems to be proprietary, and if the developer alleges that the program is their own work, then contact [celeron55](mailto:[email protected]). Alternatively, join the [Luanti IRC channel](https://web.libera.chat/?channels=#luanti) and report it there. It doesn't matter if anyone replies or not, it will be logged and the community will check on it themselves. There is also an attempt to list forks of Luanti at the "[Making a list of Luanti forks for Android](https://forum.luanti.org/viewtopic.php?p=242219#p242219)" thread in the forums. If the program you discovered is missing there you could add it.

### What not to do if a program is infringing Luanti's license

Expand Down
4 changes: 2 additions & 2 deletions content/for-engine-devs/compiling/linux-server.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,15 +59,15 @@ cd luajit
make amalg
```

(`luajit` should be a sibling directory to the `minetest` directory cloned below)
(`luajit` should be a sibling directory to the `luanti` directory cloned below)

## Download

Clone Luanti with Git. `-b stable-5` will checkout the latest stable version to build, which may be recommended to run a server for stability reasons over the latest development version. Omitting this will clone the latest development version instead.

```bash
git clone -b stable-5 --depth 1 https://github.com/luanti-org/luanti.git
cd minetest
cd luanti
```

## Build
Expand Down
8 changes: 4 additions & 4 deletions content/for-engine-devs/git-guidelines.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ For guidelines about overall pull request quality, see [Merging core pull reques

Feature freezes take effect in the master branch, and while the freeze is active, a separate development branch ("dev" or some other suitable name) is made into which pull requests are merged. It is then rebased onto master once the freeze is over. However, creating the branch may be skipped (**it usually is!**) when nobody feels like merging features during a feature freeze.

The `minetest` and `minetest_game` repositories contain the stable-0.4 branch, which has to be updated to the latest stable 0.4 series version at each release.
The `luanti` and `minetest_game` repositories contain the stable-0.4 branch, which has to be updated to the latest stable 0.4 series version at each release.

### Upstream pull requests

Expand All @@ -41,15 +41,15 @@ The `minetest` and `minetest_game` repositories contain the stable-0.4 branch, w

Tell people openly what you do, and if someone finds a problem in what you do, allow resolving to take its time.

If you have a **small patch**, fixing some compiler error or other trivial mistake, notify about fixing it on #minetest-dev, wait for 5...15 minutes and push it. To save time, you should notify when _finding_ the problem, not when _having it fixed_. If someone asks something about it, delay pushing and link the patch \[4\] or tell whatever else people want to know.
If you have a **small patch**, fixing some compiler error or other trivial mistake, notify about fixing it on #luanti-dev, wait for 5...15 minutes and push it. To save time, you should notify when _finding_ the problem, not when _having it fixed_. If someone asks something about it, delay pushing and link the patch \[4\] or tell whatever else people want to know.

Rule 1 is **only** applied to the `minetest/minetest` and `minetest/minetest_game` repositories. For the other repos apply some common sense: Check who last worked on it or who wrote most of the code (if applicable), consider consulting them for changes especially if they're large. If nobody has cared about a repo for a long time you don't have to worry either.
Rule 1 is **only** applied to the [luanti-org/luanti](https://github.com/luanti-org/luanti) and [luanti-org/minetest_game](https://github.com/luanti-org/minetest_game) repositories. For the other repos apply some common sense: Check who last worked on it or who wrote most of the code (if applicable), consider consulting them for changes especially if they're large. If nobody has cared about a repo for a long time you don't have to worry either.

#### Notes

\[1\] Upstream is at [https://github.com/luanti-org/luanti](https://github.com/luanti-org/luanti)

\[2\] The team: [https://github.com/orgs/minetest/people](https://github.com/orgs/minetest/people)
\[2\] The team: [https://github.com/orgs/luanti-org/people](https://github.com/orgs/luanti-org/people)

\[3\] On Github, press the "Rebase and merge" button. Of course you can rebase a remote branch in a local repository for more in-depth tools. There's also the ancient workflow of appending .patch to the pull request URL, getting into your project directory and doing `git am <patch>`. Similarly for single commits.

Expand Down
4 changes: 2 additions & 2 deletions content/for-engine-devs/meetings.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ aliases:

# Meetings

Core developer meetings are held when needed. They take place in the #minetest-dev [IRC](/about/irc) channel.
Core developer meetings are held when needed. They take place in the #luanti-dev [IRC](/about/irc) channel.

This Wiki page contains the meeting plans for upcoming meetings, and meeting notes for previous meetings.

Expand All @@ -18,7 +18,7 @@ This Wiki page contains the meeting plans for upcoming meetings, and meeting not

## 2025-03-02

**Remember to post meetings in the [GitHub discussions](https://github.com/orgs/minetest/discussions) in advance**
**Remember to post meetings in the [GitHub discussions](https://github.com/orgs/luanti-org/discussions) in advance**

Add your points here. Most important comes first.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Also see:

## Requirements

There are five major requirements that each pull request must fulfill in order to be mergeable to upstream Minetest.
There are five major requirements that each pull request must fulfill in order to be mergeable to upstream Luanti.

1. It should follow a roadmap in some way, to make sure it fits the whole picture of the project. Different roadmaps and project guidance is managed in [https://github.com/luanti-org/luanti/blob/master/doc/direction.md](https://github.com/luanti-org/luanti/blob/master/doc/direction.md). A core dev can decide to review and merge something that doesn't follow direction.md if they consider it to be beneficial to the project.
2. It must work in the first place. Compile it and test it in game, or write mod code that uses it.
Expand Down
2 changes: 1 addition & 1 deletion content/for-players/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Welcome to Luanti! This page explains what Luanti is all about, how to get it, a
- The 64-bit build is extremely recommended. Always use this unless you are absolutely sure you're on an old machine that doesn't have a 64-bit processor.
- Luanti on Windows is distributed in a portable archive. Extract it as a whole where you want, whether it be on your desktop or in your documents folder.
- Keep in mind you need write permissions to the folder. **Do NOT save to `C:\Program Files\` or similar, as it will cause problems (no write access).**
- To run Luanti, open the extracted directory and look for the `bin` (binary) directory. Inside the `bin` directory is the Luanti executable, `minetest.exe`.
- To run Luanti, open the extracted directory and look for the `bin` (binary) directory. Inside the `bin` directory is the Luanti executable, `luanti.exe`.
- If you want a desktop shortcut or the like, just make create a shortcut to this executable.

### macOS
Expand Down
4 changes: 2 additions & 2 deletions content/for-players/installing-client-side-mods.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ If one of the below mentioned directories does not exist, create it.

## Installation directory

The common place to install them is `$path_user/clientmods/`. That is `minetest-install-directory/clientmods/` in the official Windows releases and on GNU/Linux with `RUN_IN_PLACE` enabled and **`~/.minetest/clientmods/`** in globally installed Luanti versions.
The common place to install them is `$path_user/clientmods/`. That is `luanti-install-directory/clientmods/` in the official Windows releases and on GNU/Linux with `RUN_IN_PLACE` enabled and **`~/.minetest/clientmods/`** in globally installed Luanti versions.

- Location of the clientmods folder within the folder structure of a run-in-place installation of Luanti, including some of the folders Luanti adds after some usage as client and server, as well as the positions (…) that custom-made content goes. Irrelevant folders are not expanded.

```
minetest/
luanti/
├── bin/
├── builtin/
├── cache/
Expand Down
4 changes: 2 additions & 2 deletions content/for-players/reporting-bugs.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ A bug might already be reported or even fixed by the time you are having problem

- [Newest Luanti version](https://www.luanti.org/downloads/) - are you using the most recent one?
- [GitHub issue tracker](https://github.com/luanti-org/luanti/issues?q=is%3Aissue)
- [Libera IRC (English)](https://kiwiirc.com/nextclient/irc.libera.chat:+6697/#minetest) (answers might take a while)
- [Libera IRC (English)](https://kiwiirc.com/nextclient/irc.libera.chat:+6697/#luanti) (answers might take a while)
- [Luanti Forums: 'Problems'](https://forum.luanti.org/viewforum.php?f=6)

### Gathering information
Expand All @@ -26,7 +26,7 @@ If you cannot find any similar reported bug, please collect as much relevant inf

- Luanti version (ex. "0.4.17.1", "5.1.1", "5.1.0-dev-numbers")
- This is displayed in the window title bar.
- For advanced users: provide the output of `minetest --version`
- For advanced users: provide the output of `luanti --version`
- Operating system and version (ex. "Ubuntu 18.04", "Windows 10", "Android 9")
- Please be as precise as possible.

Expand Down
2 changes: 1 addition & 1 deletion content/for-server-hosts/domain.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ My IP address only changes if the modem disconnects, which is pretty rare, so I

(Note: the description for FreeDNS Update warns that if you use this app, you must enter your username in lowercase, and the password is case sensitive with a maximum length of 16 characters)

## Step 5: Let your minetest server know its domain name
## Step 5: Let your Luanti server know its domain name

Edit your server's minetest.conf file, and set address to be your domain:

Expand Down

0 comments on commit 07d87b0

Please sign in to comment.