nalc/witchcraft
1
0
Fork 1
forked from mtcontrib/witchcraft
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: nalc:0a06acc1d890d1c33438bec9a149f7f612348af6
Branches Tags
nalc:master nalc:nalc-old
nalc:nalc-1.2.0 nalc:nalc-1.0 mtcontrib:v0.2
...
compare: nalc:0cbc98900a5609d108c1af6ce22a22137ddcb4e2
Branches Tags
nalc:master nalc:nalc-old mtcontrib:master
nalc:nalc-1.2.0 nalc:nalc-1.0 mtcontrib:v0.2

1 Commits
0a06acc1d8 ... 0cbc98900a

Author SHA1 Message Date
sys4
0cbc98900a Fix a merge error 2021-03-15 21:02:18 +01:00
1 changed files with 0 additions and 1 deletions
Expand all files Collapse all files

1
init.lua
View File

@ -2879,7 +2879,6 @@ else
return itemstack return itemstack
end end
}) })
>>>>>>> upstream/master
end end
minetest.register_node("witchcraft:potion_magenta", { minetest.register_node("witchcraft:potion_magenta", {