Merge remote-tracking branch 'upstream/master'

compatibility.lua

@@ -33,9 +33,9 @@ else
 	minetest.register_node(":ethereal:banana", {
 		description = S("Banana"),
 		drawtype = "torchlike",
-		tiles = {"banana_single.png"},
-		inventory_image = "banana_single.png",
-		wield_image = "banana_single.png",
+		tiles = {"farming_banana_single.png"},
+		inventory_image = "farming_banana_single.png",
+		wield_image = "farming_banana_single.png",
 		paramtype = "light",
 		sunlight_propagates = true,
 		walkable = false,
@@ -50,9 +50,9 @@ else
 
 	minetest.register_node(":ethereal:bananaleaves", {
 		description = S("Banana Leaves"),
-		tiles = {"banana_leaf.png"},
-		inventory_image = "banana_leaf.png",
-		wield_image = "banana_leaf.png",
+		tiles = {"farming_banana_leaf.png"},
+		inventory_image = "farming_banana_leaf.png",
+		wield_image = "farming_banana_leaf.png",
 		paramtype = "light",
 		waving = 1,
 		groups = {snappy = 3, leafdecay = 3, leaves = 1, flammable = 2},
@@ -148,8 +148,8 @@ if eth then
 else
 	minetest.register_craftitem(":ethereal:strawberry", {
 		description = S("Strawberry"),
-		inventory_image = "strawberry.png",
-		wield_image = "strawberry.png",
+		inventory_image = "farming_strawberry.png",
+		wield_image = "farming_strawberry.png",
 		groups = {food_strawberry = 1, flammable = 2},
 		on_use = minetest.item_eat(1)
 	})

crops/garlic.lua

@@ -46,6 +46,7 @@ minetest.register_node("farming:garlic_braid", {
 	inventory_image = "crops_garlic_braid.png",
 	wield_image = "crops_garlic_braid.png",
 	drawtype = "nodebox",
+	use_texture_alpha = "clip",
 	paramtype = "light",
 	paramtype2 = "facedir",
 	tiles = {

crops/soy.lua

@@ -24,6 +24,38 @@ minetest.register_craft({
 	recipe = {"farming:soy_pod"}
 })
 
+-- soy sauce
+minetest.register_node("farming:soy_sauce", {
+	description = S("Soy Sauce"),
+	drawtype = "plantlike",
+	tiles = {"farming_soy_sauce.png"},
+	inventory_image = "farming_soy_sauce.png",
+	wield_image = "farming_soy_sauce.png",
+	paramtype = "light",
+	walkable = false,
+	selection_box = {
+		type = "fixed",
+		fixed = {-0.3, -0.5, -0.3, 0.3, 0.5, 0.3}
+	},
+	groups = {
+		vessel = 1, food_soy_sauce = 1, dig_immediate = 3, attached_node = 1
+	},
+	sounds = default.node_sound_glass_defaults()
+})
+
+minetest.register_craft( {
+	type = "shapeless",
+	output = "farming:soy_sauce",
+	recipe = {
+		"group:food_soy", "group:food_soy", "group:food_juicer",
+		"bucket:bucket_river_water", "vessels:glass_bottle", "group:food_salt"
+	},
+	replacements = {
+		{"bucket:bucket_river_water", "bucket:bucket_empty"},
+		{"group:food_juicer", "farming:juicer"}
+	}
+})
+
 -- soy milk
 minetest.register_node("farming:soy_milk", {
 	description = S("Soy Milk"),

food.lua

@@ -556,6 +556,7 @@ minetest.register_craft({
 		"group:food_egg", "group:food_egg", "farming:vanilla_extract"
 	},
 	replacements = {
+		{"cucina_vegana:soy_milk", "vessels:drinking_glass"},
 		{"group:food_milk", "bucket:bucket_empty"},
 		{"farming:vanilla_extract", "vessels:glass_bottle"}
 	}
@@ -599,3 +600,42 @@ minetest.register_craft({
 		{"farming:pot", "farming:pot"},
 	}
 })
+
+-- Onigiri
+
+minetest.register_craftitem("farming:onigiri", {
+	description = S("Onirigi"),
+	inventory_image = "farming_onigiri.png",
+	on_use = minetest.item_eat(2),
+	groups = {flammable = 2},
+})
+
+minetest.register_craft({
+	type = "shapeless",
+	output = "farming:onigiri",
+	recipe = {
+		"group:food_rice", "group:food_rice", "group:food_seaweed", "group:food_salt"
+	}
+})
+
+-- Gyoza
+
+minetest.register_craftitem("farming:gyoza", {
+	description = S("Gyoza"),
+	inventory_image = "farming_gyoza.png",
+	on_use = minetest.item_eat(4),
+	groups = {flammable = 2},
+})
+
+minetest.register_craft({
+	type = "shapeless",
+	output = "farming:gyoza 4",
+	recipe = {
+		"group:food_cabbage", "group:food_garlic_clove", "group:food_onion",
+		"group:food_meat_raw", "group:food_salt", "group:food_skillet",
+		"group:food_flour"
+	},
+	replacements = {
+		{"group:food_skillet", "farming:skillet"}
+	}
+})