minetest/minetest
1
0
Fork 0
mirror of https://github.com/minetest/minetest.git synced 2025-01-09 09:30:23 +01:00
Code Issues Releases Wiki Activity

Fix typos and en_US/en_GB inconsistency in files inside doc directory (#12882)

Browse Source
This commit is contained in:
Abdou-31 2022-10-21 16:12:39 +01:00 committed by GitHub
parent c78d565e01
commit 7e11b8eb72
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/builtin_entities.txt
View File

@ -10,7 +10,7 @@ artificially with `minetest.spawn_falling_node`.
Needs manual initialization when spawned using `/spawnentity`. Needs manual initialization when spawned using `/spawnentity`.
Default behaviour: Default behavior:
* Falls down in a straight line (gravity = `movement_gravity` setting) * Falls down in a straight line (gravity = `movement_gravity` setting)
* Collides with `walkable` node * Collides with `walkable` node
@ -94,7 +94,7 @@ Needs manual initialization when spawned using `/spawnentity`.
* `set_item(self, item)`: * `set_item(self, item)`:
* Function to initialize the dropped item * Function to initialize the dropped item
* `item` (type `ItemStack`) specifies the item to represent * `item` (type `ItemStack`) specifies the item to represent
* `age`: Age in seconds. Behaviour according to the setting `item_entity_ttl` * `age`: Age in seconds. Behavior according to the setting `item_entity_ttl`
* `itemstring`: Itemstring of the item that this item entity represents. * `itemstring`: Itemstring of the item that this item entity represents.
Read-only. Read-only.

22
doc/client_lua_api.txt
View File

@ -342,7 +342,7 @@ examples.
#### `bgcolor[<color>;<fullscreen>]` #### `bgcolor[<color>;<fullscreen>]`
* Sets background color of formspec as `ColorString` * Sets background color of formspec as `ColorString`
* If `true`, the background color is drawn fullscreen (does not effect the size of the formspec) * If `true`, the background color is drawn fullscreen (does not affect the size of the formspec)
#### `background[<X>,<Y>;<W>,<H>;<texture name>]` #### `background[<X>,<Y>;<W>,<H>;<texture name>]`
* Use a background. Inventory rectangles are not drawn then. * Use a background. Inventory rectangles are not drawn then.
@ -364,7 +364,7 @@ examples.
of this field. of this field.
* `x` and `y` position the field relative to the top left of the menu * `x` and `y` position the field relative to the top left of the menu
* `w` and `h` are the size of the field * `w` and `h` are the size of the field
* Fields are a set height, but will be vertically centred on `h` * Fields are a set height, but will be vertically centered on `h`
* Position and size units are inventory slots * Position and size units are inventory slots
* `name` is the name of the field as returned in fields to `on_receive_fields` * `name` is the name of the field as returned in fields to `on_receive_fields`
* `label`, if not blank, will be text printed on the top left above the field * `label`, if not blank, will be text printed on the top left above the field
@ -376,7 +376,7 @@ examples.
of this field. of this field.
* `x` and `y` position the field relative to the top left of the menu * `x` and `y` position the field relative to the top left of the menu
* `w` and `h` are the size of the field * `w` and `h` are the size of the field
* Fields are a set height, but will be vertically centred on `h` * Fields are a set height, but will be vertically centered on `h`
* Position and size units are inventory slots * Position and size units are inventory slots
* `name` is the name of the field as returned in fields to `on_receive_fields` * `name` is the name of the field as returned in fields to `on_receive_fields`
* `label`, if not blank, will be text printed on the top left above the field * `label`, if not blank, will be text printed on the top left above the field
@ -418,7 +418,7 @@ examples.
* Clickable button. When clicked, fields will be sent. * Clickable button. When clicked, fields will be sent.
* `x`, `y` and `name` work as per field * `x`, `y` and `name` work as per field
* `w` and `h` are the size of the button * `w` and `h` are the size of the button
* Fixed button height. It will be vertically centred on `h` * Fixed button height. It will be vertically centered on `h`
* `label` is the text on the button * `label` is the text on the button
* Position and size units are inventory slots * Position and size units are inventory slots
@ -565,7 +565,7 @@ examples.
* `color` column options: * `color` column options:
* `span=<value>`: number of following columns to affect (default: infinite) * `span=<value>`: number of following columns to affect (default: infinite)
**Note**: do _not_ use a element name starting with `key_`; those names are reserved to **Note**: do _not_ use an element name starting with `key_`; those names are reserved to
pass key press events to formspec! pass key press events to formspec!
Spatial Vectors Spatial Vectors
@ -684,7 +684,7 @@ Call these functions only at load time!
* Called always when a client receive a message * Called always when a client receive a message
* Return `true` to mark the message as handled, which means that it will not be shown to chat * Return `true` to mark the message as handled, which means that it will not be shown to chat
* `minetest.register_on_sending_chat_message(function(message))` * `minetest.register_on_sending_chat_message(function(message))`
* Called always when a client send a message from chat * Called always when a client sends a message from chat
* Return `true` to mark the message as handled, which means that it will not be sent to server * Return `true` to mark the message as handled, which means that it will not be sent to server
* `minetest.register_chatcommand(cmd, chatcommand definition)` * `minetest.register_chatcommand(cmd, chatcommand definition)`
* Adds definition to minetest.registered_chatcommands * Adds definition to minetest.registered_chatcommands
@ -692,7 +692,7 @@ Call these functions only at load time!
* Unregisters a chatcommands registered with register_chatcommand. * Unregisters a chatcommands registered with register_chatcommand.
* `minetest.register_on_chatcommand(function(command, params))` * `minetest.register_on_chatcommand(function(command, params))`
* Called always when a chatcommand is triggered, before `minetest.registered_chatcommands` * Called always when a chatcommand is triggered, before `minetest.registered_chatcommands`
is checked to see if that the command exists, but after the input is parsed. is checked to see if the command exists, but after the input is parsed.
* Return `true` to mark the command as handled, which means that the default * Return `true` to mark the command as handled, which means that the default
handlers will be prevented. handlers will be prevented.
* `minetest.register_on_death(function())` * `minetest.register_on_death(function())`
@ -879,7 +879,7 @@ Call these functions only at load time!
* Unserializable things like functions and userdata are saved as null. * Unserializable things like functions and userdata are saved as null.
* **Warning**: JSON is more strict than the Lua table format. * **Warning**: JSON is more strict than the Lua table format.
1. You can only use strings and positive integers of at least one as keys. 1. You can only use strings and positive integers of at least one as keys.
2. You can not mix string and integer keys. 2. You cannot mix string and integer keys.
This is due to the fact that JSON has two distinct array and object values. This is due to the fact that JSON has two distinct array and object values.
* Example: `write_json({10, {a = false}})`, returns `"[10, {\"a\": false}]"` * Example: `write_json({10, {a = false}})`, returns `"[10, {\"a\": false}]"`
* `minetest.serialize(table)`: returns a string * `minetest.serialize(table)`: returns a string
@ -911,7 +911,7 @@ Call these functions only at load time!
methods. methods.
* `...` indicates method-specific arguments. Currently, no methods use this * `...` indicates method-specific arguments. Currently, no methods use this
* `minetest.rgba(red, green, blue[, alpha])`: returns a string * `minetest.rgba(red, green, blue[, alpha])`: returns a string
* Each argument is a 8 Bit unsigned integer * Each argument is an 8 Bit unsigned integer
* Returns the ColorString from rgb or rgba values * Returns the ColorString from rgb or rgba values
* Example: `minetest.rgba(10, 20, 30, 40)`, returns `"#0A141E28"` * Example: `minetest.rgba(10, 20, 30, 40)`, returns `"#0A141E28"`
* `minetest.encode_base64(string)`: returns string encoded in base64 * `minetest.encode_base64(string)`: returns string encoded in base64
@ -1216,7 +1216,7 @@ It can be created via `Raycast(pos1, pos2, objects, liquids)` or
paramtype = string, -- Paramtype of the node paramtype = string, -- Paramtype of the node
paramtype2 = string, -- ParamType2 of the node paramtype2 = string, -- ParamType2 of the node
drawtype = string, -- Drawtype of the node drawtype = string, -- Drawtype of the node
mesh = <string>, -- Mesh name if existant mesh = <string>, -- Mesh name if existent
minimap_color = <Color>, -- Color of node on minimap *May not exist* minimap_color = <Color>, -- Color of node on minimap *May not exist*
visual_scale = number, -- Visual scale of node visual_scale = number, -- Visual scale of node
alpha = number, -- Alpha of the node. Only used for liquids alpha = number, -- Alpha of the node. Only used for liquids
@ -1336,7 +1336,7 @@ It can be created via `Raycast(pos1, pos2, objects, liquids)` or
Escape sequences Escape sequences
---------------- ----------------
Most text can contain escape sequences, that can for example color the text. Most text can contain escape sequences that can for example color the text.
There are a few exceptions: tab headers, dropdowns and vertical labels can't. There are a few exceptions: tab headers, dropdowns and vertical labels can't.
The following functions provide escape sequences: The following functions provide escape sequences:
* `minetest.get_color_escape_sequence(color)`: * `minetest.get_color_escape_sequence(color)`:

4
doc/direction.md
View File

@ -19,10 +19,10 @@ These goals were created from the top points in a
[roadmap brainstorm](https://github.com/minetest/minetest/issues/10461). [roadmap brainstorm](https://github.com/minetest/minetest/issues/10461).
This should be reviewed approximately yearly, or when goals are achieved. This should be reviewed approximately yearly, or when goals are achieved.
Pull requests that address one of these goals will be labelled as "Roadmap". Pull requests that address one of these goals will be labeled as "Roadmap".
PRs that are not on the roadmap will be closed unless they receive a concept PRs that are not on the roadmap will be closed unless they receive a concept
approval within a week, issues can be used for preapproval. approval within a week, issues can be used for preapproval.
Bug fixes are exempt for this, and are always accepted and prioritised. Bug fixes are exempt for this, and are always accepted and prioritized.
See [CONTRIBUTING.md](../.github/CONTRIBUTING.md) for more info. See [CONTRIBUTING.md](../.github/CONTRIBUTING.md) for more info.
### 2.1 Rendering/Graphics improvements ### 2.1 Rendering/Graphics improvements

2
doc/fst_api.txt
View File

@ -59,7 +59,7 @@ methods:
x, -- x width x, -- x width
y -- y height y -- y height
}, -- special size for this tab (only relevant if no parent for tabview set) }, -- special size for this tab (only relevant if no parent for tabview set)
on_change = function(type,old_tab,new_tab) -- called on tab chang, type is "ENTER" or "LEAVE" on_change = function(type,old_tab,new_tab) -- called on tab change, type is "ENTER" or "LEAVE"
} }
- set_autosave_tab(value) - set_autosave_tab(value)
^ tell tabview to automatically save current tabname as "tabview_name"_LAST ^ tell tabview to automatically save current tabname as "tabview_name"_LAST

6
doc/menu_lua_api.txt
View File

@ -24,7 +24,7 @@ The "gamedata" table is read when calling core.start(). It should contain:
{ {
playername = <name>, playername = <name>,
password = <password>, password = <password>,
address = <IP/adress>, address = <IP/address>,
port = <port>, port = <port>,
selected_world = <index>, -- 0 for client mode selected_world = <index>, -- 0 for client mode
singleplayer = <true/false>, singleplayer = <true/false>,
@ -64,7 +64,7 @@ core.create_dir(absolute_path) (possible in async calls)
core.delete_dir(absolute_path) (possible in async calls) core.delete_dir(absolute_path) (possible in async calls)
^ absolute_path to directory to delete (needs to be absolute) ^ absolute_path to directory to delete (needs to be absolute)
^ returns true/false ^ returns true/false
core.copy_dir(source,destination,keep_soure) (possible in async calls) core.copy_dir(source,destination,keep_source) (possible in async calls)
^ source folder ^ source folder
^ destination folder ^ destination folder
^ keep_source DEFAULT true --> if set to false source is deleted after copying ^ keep_source DEFAULT true --> if set to false source is deleted after copying
@ -76,7 +76,7 @@ core.extract_zip(zipfile,destination) [unzip within path required]
^ destination folder to extract to ^ destination folder to extract to
^ returns true/false ^ returns true/false
core.sound_play(spec, looped) -> handle core.sound_play(spec, looped) -> handle
^ spec = SimpleSoundSpec (see lua-api.txt) ^ spec = SimpleSoundSpec (see lua_api.txt)
^ looped = bool ^ looped = bool
core.sound_stop(handle) core.sound_stop(handle)
core.get_video_drivers() core.get_video_drivers()

4
doc/texture_packs.txt
View File

@ -44,7 +44,7 @@ Any other PNG files will be interpreted as textures. They must have the same
names as the textures they are supposed to override. For example, to override names as the textures they are supposed to override. For example, to override
the apple texture of Minetest Game, add a PNG file named `default_apple.png`. the apple texture of Minetest Game, add a PNG file named `default_apple.png`.
The custom textures do not necceessarily require the same size as their The custom textures do not necessarily require the same size as their
originals, but this might be required for a few particular textures. When originals, but this might be required for a few particular textures. When
unsure, just test your texture pack in-game. unsure, just test your texture pack in-game.
@ -204,7 +204,7 @@ Here are targets you can choose from:
| special6 | The sixth entry in the special_tiles list | | special6 | The sixth entry in the special_tiles list |
| inventory | The inventory texture | | inventory | The inventory texture |
| wield | The texture used when held by the player | | wield | The texture used when held by the player |
| align_world=N | Overrides the "world align" behaviour of tiles ¹ | | align_world=N | Overrides the "world align" behavior of tiles ¹ |
Nodes support all targets, but other items only support 'inventory' Nodes support all targets, but other items only support 'inventory'
and 'wield'. and 'wield'.

4
doc/world_format.txt
View File

@ -311,7 +311,7 @@ NOTE: Since version 29 zstd is used instead of zlib. In addition the entire
block is first serialized and then compressed (except the version byte). block is first serialized and then compressed (except the version byte).
u8 version u8 version
- map format version number, see serialisation.h for the latest number - map format version number, see serialization.h for the latest number
u8 flags u8 flags
- Flag bitmasks: - Flag bitmasks:
@ -367,7 +367,7 @@ if map format version >= 29:
u16 name_len u16 name_len
u8[name_len] name u8[name_len] name
if map format version < 29: if map format version < 29:
-- Nothing right here, timpstamp and node id mappings are serialized later -- Nothing right here, timestamp and node id mappings are serialized later
u8 content_width u8 content_width
- Number of bytes in the content (param0) fields of nodes - Number of bytes in the content (param0) fields of nodes