From f51c8c75bac89bc5a398e9493e177453f97441d5 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Tue, 19 Sep 2017 17:20:47 +0200 Subject: [PATCH] Update hudbars mod to 1.10.0 --- mods/HUD/hudbars/README.md | 19 ++++++++++--------- mods/HUD/hudbars/init.lua | 10 +++++++--- mods/HUD/hudbars/locale/it.txt | 5 +++++ mods/HUD/hudbars/locale/nl.txt | 5 +++++ 4 files changed, 27 insertions(+), 12 deletions(-) create mode 100644 mods/HUD/hudbars/locale/it.txt create mode 100644 mods/HUD/hudbars/locale/nl.txt diff --git a/mods/HUD/hudbars/README.md b/mods/HUD/hudbars/README.md index 4f723400..a3a1a96c 100644 --- a/mods/HUD/hudbars/README.md +++ b/mods/HUD/hudbars/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 1.9.0. +The current version is 1.10.0. This software uses [semantic versioning](http://semver.org), as defined by version 2.0.0 of the SemVer standard. @@ -35,23 +35,24 @@ Translations: * German: Wuzzy * Portuguese: BrunoMine * Turkish: admicos +* Dutch: kingoscargames +* Italian: Hamlet This program is free software. It comes without any warranty, to the extent permitted by applicable law. You can redistribute it -and/or modify it under the terms of the Do What The Fuck You Want -To Public License (WTFPL), version 2, as published by Sam Hocevar. +and/or modify it under the terms of the MIT License. ### Licenses of textures * `hudbars_icon_health.png`—celeron55 (CC BY-SA 3.0), modified by BlockMen * `hudbars_bgicon_health.png`—celeron55 (CC BY-SA 3.0), modified by BlockMen -* `hudbars_icon_breath.png`—kaeza (WTFPL), modified by BlockMen, modified again by Wuzzy -* `hudbars_bgicon_breath.png`—based on previous image, edited by Wuzzy (WTFPL) -* `hudbars_bar_health.png`—Wuzzy (WTFPL) -* `hudbars_bar_breath.png`—Wuzzy (WTFPL) -* `hudbars_bar_background.png`—Wuzzy (WTFPL) +* `hudbars_icon_breath.png`—kaeza (MIT License), modified by BlockMen, modified again by Wuzzy +* `hudbars_bgicon_breath.png`—based on previous image, edited by Wuzzy (MIT License) +* `hudbars_bar_health.png`—Wuzzy (MIT License) +* `hudbars_bar_breath.png`—Wuzzy (MIT License) +* `hudbars_bar_background.png`—Wuzzy (MIT License) ### License references * [CC-BY-SA 3.0](https://creativecommons.org/licenses/by-sa/3.0/) -* [WTFPL](http://sam.zoy.org/wtfpl/COPYING) +* [MIT License](https://opensource.org/licenses/MIT) diff --git a/mods/HUD/hudbars/init.lua b/mods/HUD/hudbars/init.lua index 4e9294b0..fc43f85b 100644 --- a/mods/HUD/hudbars/init.lua +++ b/mods/HUD/hudbars/init.lua @@ -1,6 +1,10 @@ local S -if (minetest.get_modpath("intllib")) then - S = intllib.Getter() +if minetest.global_exists("intllib") then + if intllib.make_gettext_pair then + S = intllib.make_gettext_pair() + else + S = intllib.Getter() + end else S = function ( s ) return s end end @@ -191,7 +195,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 - bar_size = {x=2, y=16} + 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} diff --git a/mods/HUD/hudbars/locale/it.txt b/mods/HUD/hudbars/locale/it.txt new file mode 100644 index 00000000..40558ac3 --- /dev/null +++ b/mods/HUD/hudbars/locale/it.txt @@ -0,0 +1,5 @@ +Health = Salute +Breath = Ossigeno + +# Default format string for progress bar-style HUD bars, e.g. “Health 5/20” +%s: %d/%d diff --git a/mods/HUD/hudbars/locale/nl.txt b/mods/HUD/hudbars/locale/nl.txt new file mode 100644 index 00000000..33e161e0 --- /dev/null +++ b/mods/HUD/hudbars/locale/nl.txt @@ -0,0 +1,5 @@ +Health = Gezondheid +Breath = Adem + +# Default format string for progress bar-style HUD bars, e.g. “Health 5/20” +%s: %d/%d