Merge remote-tracking branch 'refs/remotes/origin/master' into 1.1
This commit is contained in:
commit
ab8210fe19
@ -165,7 +165,14 @@ minetest.register_node("farming:melon_block", {
|
||||
})
|
||||
|
||||
minetest.register_craft({
|
||||
output = "farming:melon_5 1",
|
||||
output = "farming:melon 9",
|
||||
recipe = {
|
||||
{"farming:melon_block"},
|
||||
}
|
||||
})
|
||||
|
||||
minetest.register_craft({
|
||||
output = "farming:melon_block",
|
||||
recipe = {
|
||||
{"farming:melon", "farming:melon", "farming:melon"},
|
||||
{"farming:melon", "farming:melon", "farming:melon"},
|
||||
|
@ -165,7 +165,7 @@ minetest.register_node("farming:pumpkin_block", {
|
||||
})
|
||||
|
||||
minetest.register_craft({
|
||||
output = "farming:pumpkin_5 1",
|
||||
output = "farming:pumpkin_block",
|
||||
recipe = {
|
||||
{"farming:pumpkin", "farming:pumpkin", "farming:pumpkin"},
|
||||
{"farming:pumpkin", "farming:pumpkin", "farming:pumpkin"},
|
||||
@ -173,6 +173,14 @@ minetest.register_craft({
|
||||
}
|
||||
})
|
||||
|
||||
minetest.register_craft({
|
||||
output = "farming:pumpkin 9",
|
||||
recipe = {
|
||||
{"farming:pumpkin_block"},
|
||||
|
||||
}
|
||||
})
|
||||
|
||||
minetest.register_node("farming:pumpkin_6", {
|
||||
tiles = {
|
||||
"farming_pumpkin_6_top.png",
|
||||
@ -339,7 +347,7 @@ minetest.register_node("farming:cut_pumpkin_5", {
|
||||
},
|
||||
drop = {
|
||||
items = {
|
||||
{items = {'farming:pumpkin'}, rarity = 1},
|
||||
{items = {'farming:pumpkin_block'}, rarity = 1},
|
||||
}
|
||||
},
|
||||
groups = {snappy=3, flammable=2, plant=1, attached_node=1, not_in_creative_inventory=1},
|
||||
|
Loading…
x
Reference in New Issue
Block a user