From 44624d39d4addc1b31f77862461bd9366a212b75 Mon Sep 17 00:00:00 2001 From: samuel-p Date: Wed, 1 Apr 2020 16:54:56 +0200 Subject: [PATCH 1/3] fixed farming:pumpkin added farming:pumpkin_slice added ethereal:coconut_slice --- init.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/init.lua b/init.lua index f8ae747..edeb2f9 100644 --- a/init.lua +++ b/init.lua @@ -132,7 +132,8 @@ if minetest.get_modpath('farming') then drinks.juiceable['carrot'] = true drinks.juiceable['cucumber'] = true drinks.juiceable['grapes'] = true - drinks.juiceable['pumpkin'] = true + drinks.juiceable['pumpkin_8'] = true + drinks.juiceable['pumpkin_slice'] = true drinks.juiceable['raspberries'] = true drinks.juiceable['rhubarb'] = true table.insert(drinks.drink_table, {'melon', 'Melon', '#ef4646'}) @@ -159,6 +160,7 @@ end if minetest.get_modpath('ethereal') then drinks.juiceable['banana'] = true drinks.juiceable['coconut'] = true + drinks.juiceable['coconut_slice'] = true drinks.juiceable['orange'] = true drinks.juiceable['strawberry'] = true table.insert(drinks.drink_table, {'banana', 'Banana', '#eced9f'}) From 0683eb2c6f6bfeee9ac6a88c833cf3b90d223a5e Mon Sep 17 00:00:00 2001 From: samuel-p Date: Wed, 1 Apr 2020 22:34:26 +0200 Subject: [PATCH 2/3] added farming:blueberries, farming:pineapple, farming:pineapple_ring and default:blueberries --- init.lua | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/init.lua b/init.lua index edeb2f9..3a8b102 100644 --- a/init.lua +++ b/init.lua @@ -77,8 +77,10 @@ longname = { if minetest.get_modpath('default') then drinks.juiceable['apple'] = true -- Name of fruit to make juiceable. drinks.juiceable['cactus'] = true + drinks.juiceable['blueberries'] = true table.insert(drinks.drink_table, {'apple', 'Apple', '#ecff56'}) table.insert(drinks.drink_table, {'cactus', 'Cactus', '#96F97B'}) + table.insert(drinks.drink_table, {'blueberries', 'Blueberry', '#521dcb'}) end if minetest.get_modpath('bushes_classic') then @@ -136,6 +138,9 @@ if minetest.get_modpath('farming') then drinks.juiceable['pumpkin_slice'] = true drinks.juiceable['raspberries'] = true drinks.juiceable['rhubarb'] = true + drinks.juiceable['blueberries'] = true + drinks.juiceable['pineapple'] = true + drinks.juiceable['pineapple_ring'] = true table.insert(drinks.drink_table, {'melon', 'Melon', '#ef4646'}) table.insert(drinks.drink_table, {'tomato', 'Tomato', '#990000'}) table.insert(drinks.drink_table, {'carrot', 'Carrot', '#ed9121'}) @@ -144,6 +149,8 @@ if minetest.get_modpath('farming') then table.insert(drinks.drink_table, {'pumpkin', 'Pumpkin', '#ffc04c'}) table.insert(drinks.drink_table, {'raspberries', 'Raspberry', '#C70039'}) table.insert(drinks.drink_table, {'rhubarb', 'Rhubarb', '#fb8461'}) + table.insert(drinks.drink_table, {'blueberries', 'Blueberry', '#521dcb'}) + table.insert(drinks.drink_table, {'pineapple', 'Pineapple', '#dcd611'}) end if minetest.get_modpath('fruit') then From 9dff07965ceb1c9783b669f1a7055704045cab51 Mon Sep 17 00:00:00 2001 From: samuel-p Date: Wed, 1 Apr 2020 23:32:48 +0200 Subject: [PATCH 3/3] added aliases for farming:carrot_juice and farming:pineapple_juice --- init.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/init.lua b/init.lua index 3a8b102..987c341 100644 --- a/init.lua +++ b/init.lua @@ -151,6 +151,8 @@ if minetest.get_modpath('farming') then table.insert(drinks.drink_table, {'rhubarb', 'Rhubarb', '#fb8461'}) table.insert(drinks.drink_table, {'blueberries', 'Blueberry', '#521dcb'}) table.insert(drinks.drink_table, {'pineapple', 'Pineapple', '#dcd611'}) + minetest.register_alias_force('farming:carrot_juice', 'drinks:jcu_carrot') + minetest.register_alias_force('farming:pineapple_juice', 'drinks:jcu_pineapple') end if minetest.get_modpath('fruit') then