Skamiz/farlands
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/master' into 1.1

Browse Source
This commit is contained in:
D00Med 2017-10-14 06:36:14 +10:00
commit d29a76048e
5 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mods/decoblocks/nodes.lua
View File

@ -800,7 +800,7 @@ minetest.register_node("decoblocks:bone_pillar", {
minetest.register_node("decoblocks:framed_glass", { minetest.register_node("decoblocks:framed_glass", {
description = "Glass With Wooden Frame", description = "Glass With Wooden Frame",
drawtype = "glasslike", drawtype = "glasslike_framed_optional",
tiles = {"decoblocks_framed_glass.png", "decoblocks_framed_glass_detail.png"}, tiles = {"decoblocks_framed_glass.png", "decoblocks_framed_glass_detail.png"},
paramtype = "light", paramtype = "light",
sunlight_propagates = true, sunlight_propagates = true,

9
mods/farming/melon.lua
View File

@ -165,7 +165,14 @@ minetest.register_node("farming:melon_block", {
}) })
minetest.register_craft({ minetest.register_craft({
output = "default:melon_5 1", output = "farming:melon 9",
recipe = {
{"farming:melon_block"},
}
})
minetest.register_craft({
output = "farming:melon_block",
recipe = { recipe = {
{"farming:melon", "farming:melon", "farming:melon"}, {"farming:melon", "farming:melon", "farming:melon"},
{"farming:melon", "farming:melon", "farming:melon"}, {"farming:melon", "farming:melon", "farming:melon"},

12
mods/farming/pumpkin.lua
View File

@ -165,7 +165,7 @@ minetest.register_node("farming:pumpkin_block", {
}) })
minetest.register_craft({ minetest.register_craft({
output = "default:pumpkin_5 1", output = "farming:pumpkin_block",
recipe = { recipe = {
{"farming:pumpkin", "farming:pumpkin", "farming:pumpkin"}, {"farming:pumpkin", "farming:pumpkin", "farming:pumpkin"},
{"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", { minetest.register_node("farming:pumpkin_6", {
tiles = { tiles = {
"farming_pumpkin_6_top.png", "farming_pumpkin_6_top.png",
@ -339,7 +347,7 @@ minetest.register_node("farming:cut_pumpkin_5", {
}, },
drop = { drop = {
items = { 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}, groups = {snappy=3, flammable=2, plant=1, attached_node=1, not_in_creative_inventory=1},

8
mods/mapgen/crafts.lua
View File

@ -66,16 +66,16 @@ minetest.register_craft( {
}) })
minetest.register_craft( { minetest.register_craft( {
output = "mapgen:coconut", output = "fruit:coconut",
recipe = { recipe = {
{ "mapgen:palm_leaves_coconut",}, { "fruit:palm_leaves_coconut",},
} }
}) })
minetest.register_craft( { minetest.register_craft( {
output = "mapgen:coconut_open 2", output = "fruit:coconut_open 2",
recipe = { recipe = {
{ "mapgen:coconut",}, { "fruit:coconut",},
} }
}) })

3
mods/mapgen/nodes.lua
View File

@ -824,8 +824,9 @@ minetest.register_node("mapgen:bamboo", {
minetest.register_node("mapgen:bamboo_leaves", { minetest.register_node("mapgen:bamboo_leaves", {
description = "Bamboo Leaves", description = "Bamboo Leaves",
drawtype = "allfaces", drawtype = "allfaces_optional",
tiles = {"mapgen_bamboo_leaves.png"}, tiles = {"mapgen_bamboo_leaves.png"},
waving = 1,
paramtype = "light", paramtype = "light",
is_ground_content = false, is_ground_content = false,
sunlight_propagates = false, sunlight_propagates = false,