diff options
| author | Abdou-31 <abdou31.coding@gmail.com> | 2022-11-09 17:57:19 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-09 11:57:19 -0500 |
| commit | d1b80b462eaa74a8640cf132c21f74e4f924052a (patch) | |
| tree | d5804214487f339643ab6cdf74fbd113cb02cb2b /builtin | |
| parent | 6191bafcadc21277be5527ed1ac05f7902e710ad (diff) | |
| download | minetest-d1b80b462eaa74a8640cf132c21f74e4f924052a.tar.xz | |
Fix typos and en_US/en_GB inconsistency in various files (#12902)
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/common/filterlist.lua | 6 | ||||
| -rw-r--r-- | builtin/common/serialize.lua | 2 | ||||
| -rw-r--r-- | builtin/common/strict.lua | 2 | ||||
| -rw-r--r-- | builtin/common/vector.lua | 4 | ||||
| -rw-r--r-- | builtin/game/item.lua | 2 | ||||
| -rw-r--r-- | builtin/game/item_entity.lua | 4 | ||||
| -rw-r--r-- | builtin/game/knockback.lua | 2 | ||||
| -rw-r--r-- | builtin/game/misc.lua | 2 | ||||
| -rw-r--r-- | builtin/mainmenu/dlg_contentstore.lua | 2 | ||||
| -rw-r--r-- | builtin/settingtypes.txt | 2 |
10 files changed, 14 insertions, 14 deletions
diff --git a/builtin/common/filterlist.lua b/builtin/common/filterlist.lua index e30379f2f..092d19fbc 100644 --- a/builtin/common/filterlist.lua +++ b/builtin/common/filterlist.lua @@ -20,8 +20,8 @@ -- TODO code cleanup -- -- Generic implementation of a filter/sortable list -- -- Usage: -- --- Filterlist needs to be initialized on creation. To achieve this you need to -- --- pass following functions: -- +-- Filterlist needs to be initialized on creation. To achieve this you need -- +-- to pass following functions: -- -- raw_fct() (mandatory): -- -- function returning a table containing the elements to be filtered -- -- compare_fct(element1,element2) (mandatory): -- @@ -31,7 +31,7 @@ -- filter_fct(element,filtercriteria) (optional) -- -- function returning true/false if filtercriteria met to element -- -- fetch_param (optional) -- --- parameter passed to raw_fct to aquire correct raw data -- +-- parameter passed to raw_fct to acquire correct raw data -- -- -- -------------------------------------------------------------------------------- filterlist = {} diff --git a/builtin/common/serialize.lua b/builtin/common/serialize.lua index afa63b362..2ee2e5f02 100644 --- a/builtin/common/serialize.lua +++ b/builtin/common/serialize.lua @@ -8,7 +8,7 @@ local next, rawget, pairs, pcall, error, type, setfenv, loadstring local table_concat, string_dump, string_format, string_match, math_huge = table.concat, string.dump, string.format, string.match, math.huge --- Recursively counts occurences of objects (non-primitives including strings) in a table. +-- Recursively counts occurrences of objects (non-primitives including strings) in a table. local function count_objects(value) local counts = {} if value == nil then diff --git a/builtin/common/strict.lua b/builtin/common/strict.lua index 936ebb37b..6a385fa80 100644 --- a/builtin/common/strict.lua +++ b/builtin/common/strict.lua @@ -10,7 +10,7 @@ end local meta = {} local declared = {} --- Key is source file, line, and variable name; seperated by NULs +-- Key is source file, line, and variable name; separated by NULs local warned = {} function meta:__newindex(name, value) diff --git a/builtin/common/vector.lua b/builtin/common/vector.lua index cebc99580..5ea527708 100644 --- a/builtin/common/vector.lua +++ b/builtin/common/vector.lua @@ -81,7 +81,7 @@ metatable.__eq = vector.equals function vector.length(v) return math.sqrt(v.x * v.x + v.y * v.y + v.z * v.z) end --- Note: we can not use __len because it is already used for primitive table length +-- Note: we cannot use __len because it is already used for primitive table length function vector.normalize(v) local len = vector.length(v) @@ -356,7 +356,7 @@ function vector.dir_to_rotation(forward, up) -- Since vector.angle never returns a negative value or a value greater -- than math.pi, rot.z has to be inverted sometimes. - -- To determine wether this is the case, we rotate the up vector back around + -- To determine whether this is the case, we rotate the up vector back around -- the forward vector and check if it worked out. local back = vector.rotate_around_axis(up, forward, -rot.z) diff --git a/builtin/game/item.lua b/builtin/game/item.lua index 2e8fcc343..1d1d52860 100644 --- a/builtin/game/item.lua +++ b/builtin/game/item.lua @@ -243,7 +243,7 @@ function core.item_place_node(itemstack, placer, pointed_thing, param2, if core.get_item_group(def.name, "attached_node") ~= 0 and not builtin_shared.check_attached_node(place_to, newnode) then log("action", "attached node " .. def.name .. - " can not be placed at " .. core.pos_to_string(place_to)) + " cannot be placed at " .. core.pos_to_string(place_to)) return itemstack, nil end diff --git a/builtin/game/item_entity.lua b/builtin/game/item_entity.lua index f321bb1dd..1ca16a632 100644 --- a/builtin/game/item_entity.lua +++ b/builtin/game/item_entity.lua @@ -103,7 +103,7 @@ core.register_entity(":__builtin:item", { try_merge_with = function(self, own_stack, object, entity) if self.age == entity.age then - -- Can not merge with itself + -- Cannot merge with itself return false end @@ -113,7 +113,7 @@ core.register_entity(":__builtin:item", { own_stack:get_meta() ~= stack:get_meta() or own_stack:get_wear() ~= stack:get_wear() or own_stack:get_free_space() == 0 then - -- Can not merge different or full stack + -- Cannot merge different or full stack return false end diff --git a/builtin/game/knockback.lua b/builtin/game/knockback.lua index a937aa186..979d13a14 100644 --- a/builtin/game/knockback.lua +++ b/builtin/game/knockback.lua @@ -1,4 +1,4 @@ --- can be overriden by mods +-- can be overridden by mods function core.calculate_knockback(player, hitter, time_from_last_punch, tool_capabilities, dir, distance, damage) if damage == 0 or player:get_armor_groups().immortal then return 0.0 diff --git a/builtin/game/misc.lua b/builtin/game/misc.lua index 997b1894a..fd0cacc8f 100644 --- a/builtin/game/misc.lua +++ b/builtin/game/misc.lua @@ -121,7 +121,7 @@ function core.get_player_radius_area(player_name, radius) end --- To be overriden by protection mods +-- To be overridden by protection mods function core.is_protected(pos, name) return false diff --git a/builtin/mainmenu/dlg_contentstore.lua b/builtin/mainmenu/dlg_contentstore.lua index 9b73b526e..940eea172 100644 --- a/builtin/mainmenu/dlg_contentstore.lua +++ b/builtin/mainmenu/dlg_contentstore.lua @@ -278,7 +278,7 @@ local function resolve_dependencies_2(raw_deps, installed_mods, out) end end - -- Otherwise, find the first mod that fulfils it + -- Otherwise, find the first mod that fulfills it if fallback then return { is_optional = dep.is_optional, diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt index 2214b4dd6..cb6fee79d 100644 --- a/builtin/settingtypes.txt +++ b/builtin/settingtypes.txt @@ -994,7 +994,7 @@ mgv7_floatland_ymax (Floatland maximum Y) int 4096 -31000 31000 # Must be less than or equal to half the distance between the Y limits. mgv7_floatland_taper (Floatland tapering distance) int 256 0 32767 -# Exponent of the floatland tapering. Alters the tapering behaviour. +# Exponent of the floatland tapering. Alters the tapering behavior. # Value = 1.0 creates a uniform, linear tapering. # Values > 1.0 create a smooth tapering suitable for the default separated # floatlands. |
