mirror of
https://github.com/sys4-fr/server-nalc.git
synced 2025-07-08 02:40:25 +02:00
Merge http://github.com/Ataron/minetest-minetestforfun-server into Ataron-master
Conflicts: minetestforfun_game/mods/default/crafting.lua
This commit is contained in:
@ -505,6 +505,11 @@ minetest.register_craft({
|
||||
recipe = {{"default:bronzeblock"},}
|
||||
})
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
|
||||
|
||||
>>>>>>> 6af63a7e5d47ce158443a7a59da2954f046f7129
|
||||
minetest.register_craft({
|
||||
output = "default:goldblock",
|
||||
recipe = {
|
||||
|
Reference in New Issue
Block a user