Merge branch 'master' into nalc-1.2

API.md

@@ -70,8 +70,6 @@ for more information.
 * `format_string_config`: Required if `format_string` is set. This allows to change which parameters to use in the format string. It's a table with these fields:
  * `textdomain`: Text domain of the format string, used by `minetest.translate`
  * `order`: Table that contains the order of the placeholders. It's also possible to remove placeholders. Default order: `{ "label", "value", "max_value" }`
- * `format_value`: Format string to apply when displaying `value`. Syntax is same as in `string.format`. Default: `"%d"`
- * `format_max_value`: Same as `format_value` but is applied to `max_value`
 
 #### Example
 Example (mostly) from `hbarmor` mod:

README.md

@@ -11,7 +11,7 @@ this mod will place them accordingly.
 position should be displayed correctly on every screen size.
 
 ## Current version
-The current version is 2.2.0.
+The current version is 2.0.0.
 
 This software uses [semantic versioning](http://semver.org), as defined by version 2.0.0 of the SemVer
 standard.
@@ -38,8 +38,6 @@ Translations:
 * Dutch: kingoscargames
 * Italian: Hamlet
 * Malay: muhdnurhidayat
-* Russian: Imk
-* Spanish: wuniversales
 
 This program is free software. It comes without any warranty, to
 the extent permitted by applicable law. You can redistribute it

init.lua

@@ -58,17 +58,9 @@ local function make_label(format_string, format_string_config, label, start_valu
 		if order[o] == "label" then
 			table.insert(params, label)
 		elseif order[o] == "value" then
-			if format_string_config.format_value then
+			table.insert(params, start_value)
-				table.insert(params, string.format(format_string_config.format_value, start_value))
-			else
-				table.insert(params, start_value)
-			end
 		elseif order[o] == "max_value" then
-			if format_string_config.format_max_value then
+			table.insert(params, max_value)
-				table.insert(params, string.format(format_string_config.format_max_value, max_value))
-			else
-				table.insert(params, max_value)
-			end
 		end
 	end
 	local ret
@@ -156,16 +148,7 @@ function hb.register_hudbar(identifier, text_color, label, textures, default_sta
 		format_string = N("@1: @2/@3")
 	end
 	if format_string_config == nil then
-		format_string_config = {}
+		format_string_config = { order = { "label", "value", "max_value" } }
-	end
-	if format_string_config.order == nil then
-		format_string_config.order = { "label", "value", "max_value" }
-	end
-	if format_string_config.format_value == nil then
-		format_string_config.format_value = "%d"
-	end
-	if format_string_config.format_max_value == nil then
-		format_string_config.format_max_value = "%d"
 	end
 
 	hudtable.add_all = function(player, hudtable, start_value, start_max, start_hidden)
@@ -228,13 +211,7 @@ function hb.register_hudbar(identifier, text_color, label, textures, default_sta
 		local bar_image, bar_size
 		if hb.settings.bar_type == "progress_bar" then
 			bar_image = textures.bar
-			-- NOTE: Intentionally set to nil. For some reason, on some systems,
+			bar_size = {x=2, y=16}
-			-- the progress bar is displaced when the bar_size is set explicitly here.
-			-- On the other hand, setting this to nil is deprecated in MT 5.0.0 due to
-			-- a debug log warning, but nothing is explained in lua_api.txt.
-			-- This section is a potential bug magnet, please watch with care!
-			-- The size of the bar image is expected to be exactly 2×16 pixels.
-			bar_size = nil
 		elseif hb.settings.bar_type == "statbar_classic" or hb.settings.bar_type == "statbar_modern" then
 			bar_image = textures.icon
 			bar_size = {x=24, y=24}
@@ -567,3 +544,5 @@ minetest.register_globalstep(function(dtime)
 	end
 	if timer > 4 then timer = 0 end
 end)
+
+minetest.log("action", "[hudbars] loaded.")

locale/hudbars.es.tr

@@ -1,4 +0,0 @@
-# textdomain: hudbars
-Health=Salud
-Breath=Aliento
-@1: @2/@3=@1: @2/@3

locale/hudbars.ru.tr

@@ -1,4 +0,0 @@
-# textdomain: hudbars
-Health=HP
-Breath=дыхание
-@1: @2/@3=@1: @2/@3