From edfdf2c9e82fd62eddca2dda79ffbdfe703c4567 Mon Sep 17 00:00:00 2001 From: An0n3m0us Date: Tue, 20 Aug 2019 15:40:34 +0100 Subject: [PATCH] Fix merge conflict --- mods/default/crafting.lua | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/mods/default/crafting.lua b/mods/default/crafting.lua index 910b3c81..b26062a7 100644 --- a/mods/default/crafting.lua +++ b/mods/default/crafting.lua @@ -755,17 +755,18 @@ minetest.register_craft({ }) minetest.register_craft({ - output = 'default:snowblock', + output = "default:snowblock", recipe = { - {'default:snow', 'default:snow'}, - {'default:snow', 'default:snow'}, + {"default:snow", "default:snow", "default:snow"}, + {"default:snow", "default:snow", "default:snow"}, + {"default:snow", "default:snow", "default:snow"}, } }) minetest.register_craft({ - output = 'default:snow 4', + output = "default:snow 9", recipe = { - {'default:snowblock'}, + {"default:snowblock"}, } })