mirror of
https://github.com/luanti-org/minetest_game.git
synced 2025-05-29 18:16:27 -04:00
Fix merge conflict
This commit is contained in:
parent
57c6d19efa
commit
edfdf2c9e8
1 changed files with 6 additions and 5 deletions
|
@ -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"},
|
||||
}
|
||||
})
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue