diff options
| author | Weblate <42@minetest.ru> | 2013-05-13 18:19:51 +0200 |
|---|---|---|
| committer | Weblate <42@minetest.ru> | 2013-05-13 18:19:51 +0200 |
| commit | e0564d5de01dd26f7b4f4d188415f5cf5a47b5d0 (patch) | |
| tree | 79a5a18634069822b84b9c878d8d26742567c4a3 /doc | |
| parent | be96fa2fb884fca571b92f63d33e0c5a592a2aad (diff) | |
| parent | 822723c2468ea763cdef447218059a5586e8e033 (diff) | |
| download | minetest-e0564d5de01dd26f7b4f4d188415f5cf5a47b5d0.tar.gz minetest-e0564d5de01dd26f7b4f4d188415f5cf5a47b5d0.tar.bz2 minetest-e0564d5de01dd26f7b4f4d188415f5cf5a47b5d0.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/lua_api.txt | 11 | ||||
| -rw-r--r-- | doc/minetest.6 | 3 |
2 files changed, 14 insertions, 0 deletions
diff --git a/doc/lua_api.txt b/doc/lua_api.txt index 597f98c2c..02ca7cba3 100644 --- a/doc/lua_api.txt +++ b/doc/lua_api.txt @@ -120,6 +120,17 @@ depends.txt: List of mods that have to be loaded before loading this mod. A single line contains a single modname. + Optional dependencies can be defined by appending a question mark + to a single modname. Their meaning is that if the specified mod + is missing, that does not prevent this mod from being loaded. + +optdepends.txt: + An alternative way of specifying optional dependencies. + Like depends.txt, a single line contains a single modname. + + NOTE: This file exists for compatibility purposes only and + support for it will be removed from the engine by the end of 2013. + init.lua: The main Lua script. Running this script should register everything it wants to register. Subsequent execution depends on minetest calling the diff --git a/doc/minetest.6 b/doc/minetest.6 index b3fdd94d9..64dfdd149 100644 --- a/doc/minetest.6 +++ b/doc/minetest.6 @@ -61,6 +61,9 @@ Run dedicated server \-\-speedtests Run speed tests .TP +\-\-videomodes +List available video modes +.TP \-\-info Print more information to console .TP |