[technic] Update to Git patch bb388d5:

https://github.com/AntumMT/mp-technic/tree/bb388d5
This commit is contained in:
AntumDeluge 2017-07-08 14:05:35 -07:00
parent 110d388d06
commit db42427fed
8 changed files with 16 additions and 8 deletions

View File

@ -580,7 +580,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m
[patch.simple_protection]: https://github.com/AntumMT/mod-simple_protection/tree/1b924d0
[patch.snowdrift]: https://github.com/AntumMT/mtmod-snowdrift/tree/1b9da4f
[patch.spawneggs]: https://github.com/AntumMT/mtmod-spawneggs/tree/f2cc4cc
[patch.technic]: https://github.com/AntumMT/mp-technic/tree/28875c7
[patch.technic]: https://github.com/AntumMT/mp-technic/tree/bb388d5
[patch.throwing]: https://github.com/AntumMT/mtmod-throwing/tree/b33ffde
[patch.tools_obsidian]: https://github.com/AntumMT/mtmod-tools_obsidian/tree/2d19297
[patch.trash_can]: https://github.com/AntumMT/mtmod-trash_can/tree/5a92bf4

View File

@ -5,7 +5,7 @@ local technic = rawget(_G, "technic") or {}
technic.concrete_posts = {}
-- Boilerplate to support localized strings if intllib mod is installed.
local S = rawget(_G, "intllib") and intllib.Getter() or function(s) return s end
local S = rawget(_G, "intllib") and intllib.make_gettext_pair() or intllib.Getter() or function(s) return s end
for i = 0, 31 do
minetest.register_alias("technic:concrete_post"..i,

View File

@ -1,7 +1,7 @@
-- Minetest 0.4.6 mod: extranodes
-- namespace: technic
-- Boilerplate to support localized strings if intllib mod is installed.
local S = rawget(_G, "intllib") and intllib.Getter() or function(s) return s end
local S = rawget(_G, "intllib") and intllib.make_gettext_pair() or intllib.Getter() or function(s) return s end
if minetest.get_modpath("moreblocks") then

View File

@ -14,7 +14,11 @@ technic.modpath = modpath
-- Boilerplate to support intllib
if rawget(_G, "intllib") then
technic.getter = intllib.Getter()
if intllib.make_gettext_pair then
technic.getter = intllib.make_gettext_pair()
else
technic.getter = intllib.Getter()
end
else
technic.getter = function(s,a,...)if a==nil then return s end a={a,...}return s:gsub("(@?)@(%(?)(%d+)(%)?)",function(e,o,n,c)if e==""then return a[tonumber(n)]..(o==""and c or"")else return"@"..o..n..c end end) end
end

View File

@ -7,7 +7,11 @@
local S
if (minetest.get_modpath("intllib")) then
dofile(minetest.get_modpath("intllib").."/intllib.lua")
S = intllib.Getter(minetest.get_current_modname())
if (intllib.make_gettext_pair) then
S = intllib.make_gettext_pair(minetest.get_current_modname())
else
S = intllib.Getter(minetest.get_current_modname())
end
else
S = function (s) return s end
end

View File

@ -1,4 +1,4 @@
local S = rawget(_G, "intllib") and intllib.Getter() or function(s) return s end
local S = rawget(_G, "intllib") and intllib.make_gettext_pair() or intllib.Getter() or function(s) return s end
local pipeworks = rawget(_G, "pipeworks")
local fs_helpers = rawget(_G, "fs_helpers")

View File

@ -2,7 +2,7 @@ local modpath = minetest.get_modpath("technic_worldgen")
technic = rawget(_G, "technic") or {}
technic.worldgen = {
gettext = rawget(_G, "intllib") and intllib.Getter() or function(s) return s end,
gettext = rawget(_G, "intllib") and intllib.make_gettext_pair() or intllib.Getter() or function(s) return s end,
}
dofile(modpath.."/config.lua")

View File

@ -20,7 +20,7 @@ dofile(modpath.."/support.lua")
dofile(modpath.."/technic.lua")
-- Boilerplate to support localized strings if intllib mod is installed.
local S = rawget(_G, "intllib") and intllib.Getter() or function(s) return s end
local S = rawget(_G, "intllib") and intllib.make_gettext_pair() or intllib.Getter() or function(s) return s end
local function get_meta_type(name, metaname)
local def = wrench.registered_nodes[name]