Merge remote-tracking branch 'upstream/master' into nalc-1.2-dev

This commit is contained in:
2020-06-14 22:55:56 +02:00
13 changed files with 405 additions and 57 deletions

View File

@ -337,7 +337,7 @@ unified_inventory.register_page("craftguide", {
else
-- Error
fs[#fs + 1] = string.format("label[2,%f;%s]",
formspecy, F(S("This recipe is too\nlarge to be displayed.")))
formspecy, F(S("This recipe is too@nlarge to be displayed.")))
end
if craft_type.uses_crafting_grid and display_size.width <= 3 then