Skip to content

Commit 9b067ef

Browse files
Calinouparamat
authored andcommittedJul 5, 2019
Improve grammar and formatting in the README
This also clarifies the fact that Minetest saves `minetest.conf` when closing Minetest for the first time, rather than when starting it for the first time. This also fixes the default key for the pitch move mode which is now P.
1 parent 95371c1 commit 9b067ef

File tree

1 file changed

+52
-54
lines changed

1 file changed

+52
-54
lines changed
 

‎README.md

+52-54
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ Minetest is a free open-source voxel game engine with easy modding and game crea
1010
Copyright (C) 2010-2019 Perttu Ahola <celeron55@gmail.com>
1111
and contributors (see source file comments and the version control log)
1212

13-
In case you downloaded the source code:
14-
---------------------------------------
13+
In case you downloaded the source code
14+
--------------------------------------
1515
If you downloaded the Minetest Engine source code in which this file is
1616
contained, you probably want to download the [Minetest Game](https://github.com/minetest/minetest_game/)
1717
project too. See its README.txt for more information.
@@ -65,7 +65,7 @@ Some can be changed in the key config dialog in the settings tab.
6565
| + | Increase view range |
6666
| - | Decrease view range |
6767
| K | Enable/disable fly mode (needs fly privilege) |
68-
| L | Enable/disable pitch move mode |
68+
| P | Enable/disable pitch move mode |
6969
| J | Enable/disable fast mode (needs fast privilege) |
7070
| H | Enable/disable noclip mode (needs noclip privilege) |
7171
| E | Move fast in fast mode |
@@ -98,7 +98,7 @@ Where each location is on each platform:
9898
* Windows installed:
9999
* $bin = `C:\Program Files\Minetest\bin (Depends on the install location)`
100100
* $share = `C:\Program Files\Minetest (Depends on the install location)`
101-
* $user = `%Appdata%\Minetest`
101+
* $user = `%APPDATA%\Minetest`
102102
* Linux installed:
103103
* `bin` = `/usr/bin`
104104
* `share` = `/usr/share/minetest`
@@ -110,18 +110,18 @@ Where each location is on each platform:
110110

111111
Worlds can be found as separate folders in: `user/worlds/`
112112

113-
Configuration file:
114-
-------------------
113+
Configuration file
114+
------------------
115115
- Default location:
116116
`user/minetest.conf`
117-
- It is created by Minetest when it is ran the first time.
117+
- This file is created by closing Minetest for the first time.
118118
- A specific file can be specified on the command line:
119119
`--config <path-to-file>`
120120
- A run-in-place build will look for the configuration file in
121121
`location_of_exe/../minetest.conf` and also `location_of_exe/../../minetest.conf`
122122

123-
Command-line options:
124-
---------------------
123+
Command-line options
124+
--------------------
125125
- Use `--help`
126126

127127
Compiling
@@ -140,7 +140,7 @@ Compiling
140140
| GMP | 5.0.0+ | Bundled mini-GMP is used if not present |
141141
| JsonCPP | 1.0.0+ | Bundled JsonCPP is used if not present |
142142

143-
For Debian/Ubuntu:
143+
For Debian/Ubuntu users:
144144

145145
sudo apt install build-essential libirrlicht-dev cmake libbz2-dev libpng-dev libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev
146146

@@ -194,15 +194,15 @@ Run it:
194194

195195
./bin/minetest
196196

197-
- Use `cmake . -LH` to see all CMake options and their current state
197+
- Use `cmake . -LH` to see all CMake options and their current state.
198198
- If you want to install it system-wide (or are making a distribution package),
199-
you will want to use `-DRUN_IN_PLACE=FALSE`
200-
- You can build a bare server by specifying `-DBUILD_SERVER=TRUE`
201-
- You can disable the client build by specifying `-DBUILD_CLIENT=FALSE`
202-
- You can select between Release and Debug build by `-DCMAKE_BUILD_TYPE=<Debug or Release>`
203-
- Debug build is slower, but gives much more useful output in a debugger
204-
- If you build a bare server, you don't need to have Irrlicht installed.
205-
- In that case use `-DIRRLICHT_SOURCE_DIR=/the/irrlicht/source`
199+
you will want to use `-DRUN_IN_PLACE=FALSE`.
200+
- You can build a bare server by specifying `-DBUILD_SERVER=TRUE`.
201+
- You can disable the client build by specifying `-DBUILD_CLIENT=FALSE`.
202+
- You can select between Release and Debug build by `-DCMAKE_BUILD_TYPE=<Debug or Release>`.
203+
- Debug build is slower, but gives much more useful output in a debugger.
204+
- If you build a bare server you don't need to have Irrlicht installed.
205+
- In that case use `-DIRRLICHT_SOURCE_DIR=/the/irrlicht/source`.
206206

207207
### CMake options
208208

@@ -291,109 +291,107 @@ Library specific options:
291291

292292
### Requirements
293293

294-
* Visual Studio 2015 or newer https://visualstudio.microsoft.com
295-
* CMake https://cmake.org/download/
296-
* vcpkg https://github.com/Microsoft/vcpkg
297-
* git https://git-scm.com/downloads
294+
- [Visual Studio 2015 or newer](https://visualstudio.microsoft.com)
295+
- [CMake](https://cmake.org/download/)
296+
- [vcpkg](https://github.com/Microsoft/vcpkg)
297+
- [Git](https://git-scm.com/downloads)
298298

299-
### Compiling and Installing the dependencies
299+
### Compiling and installing the dependencies
300300

301301
It is highly recommended to use vcpkg as package manager.
302302

303303
#### a) Using vcpkg to install dependencies
304304

305-
After you successfully built vcpkg you can easily install the required libaries.
305+
After you successfully built vcpkg you can easily install the required libraries:
306306
```powershell
307307
vcpkg install irrlicht zlib curl[winssl] openal-soft libvorbis libogg sqlite3 freetype luajit --triplet x64-windows
308308
```
309-
`curl` is optional, but required to read the serverlist, `curl[winssl]` is required to use the content store.
310-
311-
`openal-soft`, `libvorbis` and `libogg` are optional, but required to use sound.
312-
313-
`freetype` is optional, it allows true-type font rendering.
314309

315-
`luajit` is optional and replaces the integrated lua interpreter with a faster just in time interpreter
310+
- `curl` is optional, but required to read the serverlist, `curl[winssl]` is required to use the content store.
311+
- `openal-soft`, `libvorbis` and `libogg` are optional, but required to use sound.
312+
- `freetype` is optional, it allows true-type font rendering.
313+
- `luajit` is optional, it replaces the integrated Lua interpreter with a faster just-in-time interpreter.
316314

317-
There are other libaries that are optional, but are not tested if they can build and linked correctly.
315+
There are other optional libraries, but they are not tested if they can build and link correctly.
318316

319-
`--triplet` specify the target triplet e.g. x64-windows x86-windows
317+
Use `--triplet` to specify the target triplet, e.g. `x64-windows` or `x86-windows`.
320318

321319
#### b) Compile the dependencies on your own
322320

323321
This is outdated and not recommended. Follow the instructions on https://dev.minetest.net/Build_Win32_Minetest_including_all_required_libraries#VS2012_Build
324322

325323
### Compile Minetest
326324

327-
#### a) Using the vcpkg toolchain and CMakeGUI
325+
#### a) Using the vcpkg toolchain and CMake GUI
328326
1. Start up the CMake GUI
329-
2. Select "Browse Source..." and select DIR/minetest
330-
3. Select "Browse Build..." and select DIR/minetest-build
331-
4. Select "Configure"
327+
2. Select **Browse Source...** and select DIR/minetest
328+
3. Select **Browse Build...** and select DIR/minetest-build
329+
4. Select **Configure**
332330
5. Choose the right visual Studio version and target platform. It has to match the version of the installed dependencies
333-
6. Choose "Specify toolchain file for cross-compiling"
334-
7. Click "Next"
331+
6. Choose **Specify toolchain file for cross-compiling**
332+
7. Click **Next**
335333
8. Select the vcpkg toolchain file e.g. `D:/vcpkg/scripts/buildsystems/vcpkg.cmake`
336334
9. Click Finish
337335
10. Wait until cmake have generated the cash file
338-
11. If there are any errors, solve them and hit "Configure"
339-
12. Click "Generate"
340-
13. Click "Open Project"
336+
11. If there are any errors, solve them and hit **Configure**
337+
12. Click **Generate**
338+
13. Click **Open Project**
341339
14. Compile Minetest inside Visual studio.
342340

343341
#### b) Using the vcpkg toolchain and the commandline
344342

345-
Run the following script in Powershell:
343+
Run the following script in PowerShell:
346344

347345
```powershell
348346
cmake . -G"Visual Studio 15 2017 Win64" -DCMAKE_TOOLCHAIN_FILE=D:/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_GETTEXT=0 -DENABLE_CURSES=0
349347
cmake --build . --config Release
350348
```
351349
Make sure that the right compiler is selected and the path to the vcpkg toolchain is correct.
352350

353-
#### c) Using your own compiled libaries
351+
#### c) Using your own compiled libraries
354352

355353
**This is outdated and not recommended**
356354

357355
Follow the instructions on https://dev.minetest.net/Build_Win32_Minetest_including_all_required_libraries#VS2012_Build
358356

359-
### Windows Installer using WIX Toolset
357+
### Windows Installer using WiX Toolset
360358

361359
Requirements:
362-
* Visual Studio 2017
363-
* Wix Toolset
360+
* [Visual Studio 2017](https://visualstudio.microsoft.com/)
361+
* [WiX Toolset](https://wixtoolset.org/)
364362

365-
In Visual Studio 2017 Installer select "Optional Features" -> "Wix Toolset"
363+
In the Visual Studio 2017 Installer select **Optional Features -> WiX Toolset**.
366364

367-
Build the binaries like described above, but make sure you unselect "RUN_IN_PLACE".
365+
Build the binaries as described above, but make sure you unselect `RUN_IN_PLACE`.
368366

369-
Open the generated Project file with VS. Right click "PACKAGE" and choose "Generate".
367+
Open the generated project file with Visual Studio. Right-click **Package** and choose **Generate**.
370368
It may take some minutes to generate the installer.
371369

372370

373371
Docker
374372
------
375-
We provide Minetest server docker images using the Gitlab mirror registry.
373+
We provide Minetest server Docker images using the GitLab mirror registry.
376374

377375
Images are built on each commit and available using the following tag scheme:
378376

379377
* `registry.gitlab.com/minetest/minetest/server:latest` (latest build)
380378
* `registry.gitlab.com/minetest/minetest/server:<branch/tag>` (current branch or current tag)
381379
* `registry.gitlab.com/minetest/minetest/server:<commit-id>` (current commit id)
382380

383-
If you want to test it on a docker server, you can easily run:
381+
If you want to test it on a Docker server you can easily run:
384382

385383
sudo docker run registry.gitlab.com/minetest/minetest/server:<docker tag>
386384

387-
If you want to use it in a production environment you should use volumes bound to the docker host
385+
If you want to use it in a production environment you should use volumes bound to the Docker host
388386
to persist data and modify the configuration:
389387

390388
sudo docker create -v /home/minetest/data/:/var/lib/minetest/ -v /home/minetest/conf/:/etc/minetest/ registry.gitlab.com/minetest/minetest/server:master
391389

392390
Data will be written to `/home/minetest/data` on the host, and configuration will be read from `/home/minetest/conf/minetest.conf`.
393391

394-
Note: If you don't understand the previous commands, please read the official Docker documentation before use.
392+
**Note:** If you don't understand the previous commands please read the official Docker documentation before use.
395393

396-
You can also host your minetest server inside a Kubernetes cluster. See our example implementation in `misc/kubernetes.yml`.
394+
You can also host your Minetest server inside a Kubernetes cluster. See our example implementation in [`misc/kubernetes.yml`](misc/kubernetes.yml).
397395

398396

399397
Version scheme

0 commit comments

Comments
 (0)
Please sign in to comment.