nalc/server-nalc
1
0
Fork 0
mirror of https://github.com/sys4-fr/server-nalc.git synced 2025-07-08 02:40:25 +02:00
Code Issues Releases Wiki Activity

Merge http://github.com/Ataron/minetest-minetestforfun-server into Ataron-master

Browse Source 
Conflicts:
	minetestforfun_game/mods/default/crafting.lua
This commit is contained in:
LeMagnesium
2014-11-14 22:23:57 +01:00
parent ebae847132 6af63a7e5d
commit 05086b77d7
18 changed files with 5 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
minetestforfun_game/mods/default/crafting.lua
View File

@ -505,6 +505,11 @@ minetest.register_craft({
recipe = {{"default:bronzeblock"},}
})
<<<<<<< HEAD
=======
>>>>>>> 6af63a7e5d47ce158443a7a59da2954f046f7129
minetest.register_craft({
output = "default:goldblock",
recipe = {