From 9fbf8ffecc22cad7f3bf1b6227bd9a2485d93d6b Mon Sep 17 00:00:00 2001 From: flux <25628292+fluxionary@users.noreply.github.com> Date: Fri, 27 Dec 2019 01:45:28 +0000 Subject: [PATCH 1/2] Fix replacement #s in recipes --- recipes.lua | 52 ++++++++++++++++++++++++------------------------- recipes_5xx.lua | 2 +- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/recipes.lua b/recipes.lua index 617928a..46cb0f8 100644 --- a/recipes.lua +++ b/recipes.lua @@ -171,8 +171,8 @@ minetest.register_craft({ {"default:cobble", "default:cobble", "default:cobble"} }, replacements = { - {"default:stone", "default:stone 3"}, - {"default:cobble", "default:cobble 3"} + {"default:stone", "default:stone"}, + {"default:cobble", "default:cobble"} } }) @@ -184,8 +184,8 @@ minetest.register_craft({ {"default:desert_cobble", "default:desert_cobble", "default:desert_cobble"} }, replacements = { - {"default:stone", "default:stone 3"}, - {"default:desert_cobble", "default:desert_cobble 3"} + {"default:stone", "default:stone"}, + {"default:desert_cobble", "default:desert_cobble"} } }) @@ -197,8 +197,8 @@ minetest.register_craft({ {"default:cobble", "default:cobble", "default:cobble"} }, replacements = { - {"default:desert_stone", "default:desert_stone 3"}, - {"default:cobble", "default:cobble 3"} + {"default:desert_stone", "default:desert_stone"}, + {"default:cobble", "default:cobble"} } }) @@ -210,8 +210,8 @@ minetest.register_craft({ {"default:desert_cobble", "default:desert_cobble", "default:desert_cobble"} }, replacements = { - {"default:desert_stone", "default:desert_stone 3"}, - {"default:desert_cobble", "default:desert_cobble 3"} + {"default:desert_stone", "default:desert_stone"}, + {"default:desert_cobble", "default:desert_cobble"} } }) @@ -223,8 +223,8 @@ minetest.register_craft({ {"default:cobble", "default:cobble", "default:cobble"} }, replacements = { - {"default:stone", "default:stone 3"}, - {"default:cobble", "default:cobble 3"} + {"default:stone", "default:stone"}, + {"default:cobble", "default:cobble"} } }) @@ -236,8 +236,8 @@ minetest.register_craft({ {"default:cobble", "default:cobble", "default:cobble"} }, replacements = { - {"default:desert_stone", "default:desert_stone 3"}, - {"default:cobble", "default:cobble 3"} + {"default:desert_stone", "default:desert_stone"}, + {"default:cobble", "default:cobble"} } }) @@ -249,8 +249,8 @@ minetest.register_craft({ {"default:desert_cobble", "default:desert_cobble", "default:desert_cobble"} }, replacements = { - {"default:desert_stone", "default:desert_stone 3"}, - {"default:desert_cobble", "default:desert_cobble 3"} + {"default:desert_stone", "default:desert_stone"}, + {"default:desert_cobble", "default:desert_cobble"} } }) @@ -262,8 +262,8 @@ minetest.register_craft({ {"default:desert_cobble", "default:desert_cobble", "default:desert_cobble"} }, replacements = { - {"default:stone", "default:stone 3"}, - {"default:cobble", "default:cobble 3"} + {"default:stone", "default:stone"}, + {"default:cobble", "default:cobble"} } }) @@ -283,7 +283,7 @@ minetest.register_craft({ output = "cucina_vegana:imitation_butter", recipe = { {"group:dye,color_yellow", "cucina_vegana:soy_milk", "cucina_vegana:soy_milk"} }, - replacements = {{"cucina_vegana:soy_milk", "vessels:drinking_glass 2"} + replacements = {{"cucina_vegana:soy_milk", "vessels:drinking_glass"} } }) @@ -349,7 +349,7 @@ minetest.register_craft({ }, replacements = { {"cucina_vegana:blueberry_pot_cooked", "bucket:bucket_empty"}, - {"group:wool", "farming:cotton 2"} + {"group:wool", "farming:cotton"} } }) @@ -608,7 +608,7 @@ minetest.register_craft({ {"", "bucket:bucket_water", ""}, }, replacements = { - {"default:stone", "default:stone 4"}, + {"default:stone", "default:stone"}, {"bucket:bucket_water", "bucket:bucket_empty"}, } }) @@ -620,7 +620,7 @@ minetest.register_craft({ {"", "bucket:bucket_water", ""}, }, replacements = { - {"default:desert_stone", "default:desert_stone 4"}, + {"default:desert_stone", "default:desert_stone"}, {"bucket:bucket_water", "bucket:bucket_empty"}, } }) @@ -632,7 +632,7 @@ minetest.register_craft({ {"", "bucket:bucket_water", ""}, }, replacements = { - {"default:cobble", "default:cobble 4"}, + {"default:cobble", "default:cobble"}, {"bucket:bucket_water", "bucket:bucket_empty"}, } }) @@ -644,7 +644,7 @@ minetest.register_craft({ {"", "bucket:bucket_water", ""}, }, replacements = { - {"default:desert_cobble", "default:desert_cobble 4"}, + {"default:desert_cobble", "default:desert_cobble"}, {"bucket:bucket_water", "bucket:bucket_empty"}, } }) @@ -656,7 +656,7 @@ minetest.register_craft({ {"", "bucket:bucket_river_water", ""}, }, replacements = { - {"default:stone", "default:stone 4"}, + {"default:stone", "default:stone"}, {"bucket:bucket_river_water", "bucket:bucket_empty"}, } }) @@ -668,7 +668,7 @@ minetest.register_craft({ {"", "bucket:bucket_river_water", ""}, }, replacements = { - {"default:desert_stone", "default:desert_stone 4"}, + {"default:desert_stone", "default:desert_stone"}, {"bucket:bucket_river_water", "bucket:bucket_empty"}, } }) @@ -680,7 +680,7 @@ minetest.register_craft({ {"", "bucket:bucket_river_water", ""}, }, replacements = { - {"default:cobble", "default:cobble 4"}, + {"default:cobble", "default:cobble"}, {"bucket:bucket_river_water", "bucket:bucket_empty"}, } }) @@ -692,7 +692,7 @@ minetest.register_craft({ {"", "bucket:bucket_river_water", ""}, }, replacements = { - {"default:desert_cobble", "default:desert_cobble 4"}, + {"default:desert_cobble", "default:desert_cobble"}, {"bucket:bucket_river_water", "bucket:bucket_empty"}, } }) diff --git a/recipes_5xx.lua b/recipes_5xx.lua index de71060..7cbf3f6 100644 --- a/recipes_5xx.lua +++ b/recipes_5xx.lua @@ -56,7 +56,7 @@ for bkey,berry in ipairs(berries) do {mat, berry, berry}, }, replacements = { - {mat, mat .. " 3"} + {mat, mat} } }) -- minetest.register_craft From ed610cef4e164b3548d1bd75c4bb135b8c4507e6 Mon Sep 17 00:00:00 2001 From: "A.C.M" Date: Sat, 28 Dec 2019 03:46:36 +0100 Subject: [PATCH 2/2] Fixed Whitespaces. --- init.lua | 6 +++--- recipes_support.lua | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/init.lua b/init.lua index 88f942f..37d84ef 100644 --- a/init.lua +++ b/init.lua @@ -26,12 +26,12 @@ local S if(minetest.get_modpath("intllib")) then S = dofile(modpath .."/intllib.lua") - print("[MOD] " .. modname .. ": translating in intllib-mode.") - + print("[MOD] " .. modname .. ": translating in intllib-mode." + else S = minetest.get_translator("cucina_vegana") print("[MOD] " .. modname .. ": translating in minetest-mode.") - + end -- if(minetest.get_modpath( cucina_vegana.get_translator = S diff --git a/recipes_support.lua b/recipes_support.lua index 1415650..c8c0a74 100644 --- a/recipes_support.lua +++ b/recipes_support.lua @@ -569,7 +569,7 @@ if minetest.get_modpath("petz") then {"petz:ducky_feather", "petz:ducky_feather", "petz:ducky_feather"}, } }) - + minetest.register_craft({ type = "shaped", output = "petz:ducky_feather", @@ -582,8 +582,7 @@ if minetest.get_modpath("petz") then cucina_vegana.add_group("petz:cheese", {food_cheese = 1, eatable = 1}) cucina_vegana.add_group("petz:milk", {food_milk = 1, eatable = 1}) - - + end -- if minetest.get_modpath("petz" cucina_vegana.add_group("default:blueberries", {food_blueberry = 1, food_blueberries = 1})