From 5afa7f4a2320af04623766d53cf35b16b94fa1b2 Mon Sep 17 00:00:00 2001 From: sys4 Date: Sun, 1 Apr 2018 05:25:24 +0200 Subject: [PATCH] Fix nether guide crash with last minetest backport-0.4 branch --- mods/bonemeal | 2 +- mods/coloredwood | 2 +- mods/digilines | 2 +- mods/homedecor_modpack | 2 +- mods/mapfix | 2 +- mods/mesecons | 2 +- mods/moreblocks | 2 +- mods/morefarming | 2 +- mods/nether/nether/guide.lua | 2 +- mods/pipeworks | 2 +- mods/technic | 2 +- mods/toolranks | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/mods/bonemeal b/mods/bonemeal index 85499b1c..a3cf3fd5 160000 --- a/mods/bonemeal +++ b/mods/bonemeal @@ -1 +1 @@ -Subproject commit 85499b1c096701cd5a0881ab04ddebda42747fb4 +Subproject commit a3cf3fd5550948e53d8e37b4a0b90256b4b08c75 diff --git a/mods/coloredwood b/mods/coloredwood index 1af554e7..86a177fb 160000 --- a/mods/coloredwood +++ b/mods/coloredwood @@ -1 +1 @@ -Subproject commit 1af554e7669969abb42e6d2669a8abed30ddacfe +Subproject commit 86a177fbec7d548a1b8a83a927832c5678343347 diff --git a/mods/digilines b/mods/digilines index fceb4bb6..8b73f9e1 160000 --- a/mods/digilines +++ b/mods/digilines @@ -1 +1 @@ -Subproject commit fceb4bb696b68e9236e884e98c001302df11ec43 +Subproject commit 8b73f9e11de14aa6871b1e8944777da5f602ee70 diff --git a/mods/homedecor_modpack b/mods/homedecor_modpack index 4d9c4c24..bfda7c49 160000 --- a/mods/homedecor_modpack +++ b/mods/homedecor_modpack @@ -1 +1 @@ -Subproject commit 4d9c4c2410cac3d7f3ab83d66121f830f826cc0c +Subproject commit bfda7c49fdde4ef9f48fc73976ef2193541173d0 diff --git a/mods/mapfix b/mods/mapfix index d4e9de50..ca4b20dd 160000 --- a/mods/mapfix +++ b/mods/mapfix @@ -1 +1 @@ -Subproject commit d4e9de50a98544923be71f5be49139ed25e52cfc +Subproject commit ca4b20ddcc5bf55115c16760af76db023c1d86f3 diff --git a/mods/mesecons b/mods/mesecons index d8f82e67..f70a308b 160000 --- a/mods/mesecons +++ b/mods/mesecons @@ -1 +1 @@ -Subproject commit d8f82e6771dc21122a59b3f65dbeb102dab2c372 +Subproject commit f70a308bb0bddefe963a6b82016f67d3be122069 diff --git a/mods/moreblocks b/mods/moreblocks index f6e0db21..8ff1cb59 160000 --- a/mods/moreblocks +++ b/mods/moreblocks @@ -1 +1 @@ -Subproject commit f6e0db21b2e6dcd895cd81a8c3cb665e2f22f0a8 +Subproject commit 8ff1cb598f79d5b34957b40b4c9ad6afcf7376a7 diff --git a/mods/morefarming b/mods/morefarming index 99a57d45..e5086260 160000 --- a/mods/morefarming +++ b/mods/morefarming @@ -1 +1 @@ -Subproject commit 99a57d45d88796e0e5b2148ac3f90962dfa09a68 +Subproject commit e50862606ed359ce132bfefa2f7e7752961b0aae diff --git a/mods/nether/nether/guide.lua b/mods/nether/nether/guide.lua index 6cef6898..8e1c3076 100755 --- a/mods/nether/nether/guide.lua +++ b/mods/nether/nether/guide.lua @@ -317,7 +317,7 @@ for n,data in ipairs(guide_infos) do elseif typ == "text" then local wrap_func = minetest.wrap_text if not wrap_func then wrap_func = minetest.splittext end - local tab = wrap_func(content, guide_size.fx) + local tab = wrap_func(content, guide_size.fx, true) local l = guide_size.cx for _,str in ipairs(tab) do form = form.."label["..guide_size.cx ..","..guide_size.cy+y..";"..str.."]" diff --git a/mods/pipeworks b/mods/pipeworks index cb692d21..cb5530c6 160000 --- a/mods/pipeworks +++ b/mods/pipeworks @@ -1 +1 @@ -Subproject commit cb692d21881541df2fca011ecdfbc43c127787ea +Subproject commit cb5530c6c82a4e3409780d93d513dd32c68c4dec diff --git a/mods/technic b/mods/technic index 215de548..689766f1 160000 --- a/mods/technic +++ b/mods/technic @@ -1 +1 @@ -Subproject commit 215de5487bd9888efc3723e3926fcf0d8a0e6ae4 +Subproject commit 689766f15aad5186b35d21942ff853a7c2fc65bf diff --git a/mods/toolranks b/mods/toolranks index 3f94d76e..84467b0f 160000 --- a/mods/toolranks +++ b/mods/toolranks @@ -1 +1 @@ -Subproject commit 3f94d76e53608cf7cc0a48faf9a0cccbb74a1eb3 +Subproject commit 84467b0f7433db7370877e11d40181b236ff6db8