From 7f9cd33dcd1fbf8a3c34b6c1e5415ee7d5348ac5 Mon Sep 17 00:00:00 2001 From: luk3yx Date: Tue, 8 Feb 2022 19:20:27 +1300 Subject: [PATCH] Enable multiline by default and update submodules MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit • Enable the "one element per line" option by default • Update formspec_ast and fs51 • Export formspecs with formspec_version 5 --- formspec_ast | 2 +- fs51 | 2 +- index.lua | 2 +- renderer.lua | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/formspec_ast b/formspec_ast index 8b18059..1d92fcf 160000 --- a/formspec_ast +++ b/formspec_ast @@ -1 +1 @@ -Subproject commit 8b18059cdf701d8942ec5e0602b60726b2a9d869 +Subproject commit 1d92fcf28b1bb136abdd04cd2582a4c4d25f0c24 diff --git a/fs51 b/fs51 index 382fd4c..329056c 160000 --- a/fs51 +++ b/fs51 @@ -1 +1 @@ -Subproject commit 382fd4cc311a99898ee1d7f74765ecbf8d322a28 +Subproject commit 329056cbea8c65e5bce00337cbe4ab4944335149 diff --git a/index.lua b/index.lua index 79b120b..1e5d641 100644 --- a/index.lua +++ b/index.lua @@ -456,7 +456,7 @@ local function render_into(base, formspec, callbacks) end local element_dialog -local load_save_opts = {} +local load_save_opts = {multiline = true} local function show_load_save_dialog() local callbacks = {} local formspec = [[ diff --git a/renderer.lua b/renderer.lua index a565c0e..4f588d0 100644 --- a/renderer.lua +++ b/renderer.lua @@ -379,7 +379,7 @@ function renderer.elem_to_ast(elem) local w = tonumber(elem:getAttribute('data-w')) local h = tonumber(elem:getAttribute('data-h')) local res = { - formspec_version = 4, + formspec_version = 5, { type = 'size', w = w or 0,