From 4b033fed838de1f936b808d4ab6d10a70682c02c Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Sun, 25 Apr 2021 13:51:52 +0100 Subject: [PATCH 1/6] add new melon textures (thanks 7eventy7) --- crops/melon.lua | 7 ++++++- license.txt | 5 +++++ textures/farming_melon_bottom.png | Bin 0 -> 172 bytes textures/farming_melon_side.png | Bin 270 -> 179 bytes textures/farming_melon_top.png | Bin 272 -> 193 bytes 5 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 textures/farming_melon_bottom.png diff --git a/crops/melon.lua b/crops/melon.lua index 0549dd3..59f6190 100644 --- a/crops/melon.lua +++ b/crops/melon.lua @@ -74,14 +74,19 @@ minetest.register_node("farming:melon_7", table.copy(def)) -- stage 8 (final) def.drawtype = "nodebox" def.description = S("Melon") -def.tiles = {"farming_melon_top.png", "farming_melon_top.png", "farming_melon_side.png"} +def.tiles = { + "farming_melon_top.png", "farming_melon_bottom.png", "farming_melon_side.png" +} def.selection_box = {-.5, -.5, -.5, .5, .5, .5} def.walkable = true +def.buildable_to = false +def.paramtype2 = "facedir" def.groups = { food_melon = 1, snappy = 2, oddly_breakable_by_hand = 1, flammable = 2, plant = 1 } def.drop = "farming:melon_8" +def.on_place = minetest.rotate_node minetest.register_node("farming:melon_8", table.copy(def)) -- add to registered_plants diff --git a/license.txt b/license.txt index 7ef6164..074e59b 100644 --- a/license.txt +++ b/license.txt @@ -63,6 +63,11 @@ Created by VanessaE (License: CC BY 3.0): farming_cotton_7.png farming_cotton_8.png +Created by 7eventy7 (https://www.planetminecraft.com/member/7eventy7/) + farming_melon_top.png + farming_melon_side.png + farming_melon_bottom.png + Created by Doc (License: CC BY 3.0): farming_cucumber.png farming_cucumber_1.png diff --git a/textures/farming_melon_bottom.png b/textures/farming_melon_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..91d1e6cd443f4cd2590a6f88913b92c56cff8a13 GIT binary patch literal 172 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9JOMr-u7<@jL5(u`la*`ds`lDi zz6Od%d%8G=a9n2$U|9d3Vasc4Ifk{>mDLQdtIOUpSj|>m!r-^gFOcDA{ UmDelJ0Igy0boFyt=akR{0H%mLG5`Po literal 0 HcmV?d00001 diff --git a/textures/farming_melon_side.png b/textures/farming_melon_side.png index 88e40c6a08421585274e41b58ecd19c88cc0a567..07afb25d3d6fec12ab2e0e806c120ae153372003 100644 GIT binary patch delta 151 zcmV;I0BHY?0pu}1%Wy38 zZ)yGs*I0&$A^*3;pAgMsC{en5Q2v<7Ifg=pJq!JhD%@pgRBKwZK;xRid7#v~Ph3w8 z`WZ@;&wb#3>;Pi?f5dkc#4!GUNbZ@!K86y-_lu=o02xzM?k&qc?skr0i|hYmo;$*3 sF>H%?_bhvR+dhWrv;S_(KHYs50Lv3cFfLaFE&u=k07*qoM6N<$g21e8J^0B!3T3OjJcIT^TWR98!TCZ<8Z^oh6xxX?_3z0BuP`K~xCW4UNGO z0x=8&H8&IhxfFmM7XY>zz)Jr$k&k8{yCcxV$stq+BZCkREH!2&?^y;@$>ak&?_Rk! zYMWhy1uxCdO2_beyeT`mo>y^$dex~4vg+grjL0AF-3Y}ud>);zW~z@vSL)0kP%jqd TNi3`M00000NkvXXu0mjf2%0~> delta 244 zcmVbyH)^H%S5jT8hP9RRJ(+41`^He0BuwpeRME7yX*kD5k!(n z-7*{i?#d9WV-XZ40Pc7dz@QxcHUPOHUhwf3&TIg=1Yhy<0=}#O>Dumo?wDxo0NL&7 ue!H48oB+Q6`?>%8ddUFHySrM;yU*+?GEAu4rZoWo0000 Date: Mon, 3 May 2021 18:08:40 +0100 Subject: [PATCH 2/6] added tomato soup --- crops/tomato.lua | 18 ++++++++++++++++++ textures/farming_tomato_soup.png | Bin 0 -> 161 bytes 2 files changed, 18 insertions(+) create mode 100644 textures/farming_tomato_soup.png diff --git a/crops/tomato.lua b/crops/tomato.lua index 47879b6..4c10446 100644 --- a/crops/tomato.lua +++ b/crops/tomato.lua @@ -17,6 +17,24 @@ minetest.register_craftitem("farming:tomato", { on_use = minetest.item_eat(4) }) +-- tomato soup +minetest.register_craftitem("farming:tomato_soup", { + description = S("Tomato Soup"), + inventory_image = "farming_tomato_soup.png", + groups = {flammable = 2}, + on_use = minetest.item_eat(8, "farming:bowl") +}) + +minetest.register_craft({ + type = "shapeless", + output = "farming:tomato_soup", + recipe = { + "group:food_tomato", + "group:food_tomato", + "group:food_bowl" + } +}) + -- tomato definition local def = { drawtype = "plantlike", diff --git a/textures/farming_tomato_soup.png b/textures/farming_tomato_soup.png new file mode 100644 index 0000000000000000000000000000000000000000..d58d53db792760cc30a5b48db52df69d4e64d8e5 GIT binary patch literal 161 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^3h)VWWysF~GHasb-UsMT&sBY& zpsSo65(5-sED7=pW^j0RBMr#0^>lFz;kcfhut3Csi;JrvGx6~S2LbOJH%u%{1WpKu zuw80$XzN(KV8H|>kKXRdlY}C+F6f@5;Ie;#!lq0H<^OC Date: Mon, 3 May 2021 18:14:21 +0100 Subject: [PATCH 3/6] no shapeless craft for tomato soup --- crops/tomato.lua | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/crops/tomato.lua b/crops/tomato.lua index 4c10446..6eff7c6 100644 --- a/crops/tomato.lua +++ b/crops/tomato.lua @@ -26,12 +26,11 @@ minetest.register_craftitem("farming:tomato_soup", { }) minetest.register_craft({ - type = "shapeless", output = "farming:tomato_soup", recipe = { - "group:food_tomato", - "group:food_tomato", - "group:food_bowl" + {"group:food_tomato"}, + {"group:food_tomato"}, + {"group:food_bowl"} } }) From ebb5f98fae99ff40bac21b97f50472bcec4b3785 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Tue, 4 May 2021 09:06:08 +0100 Subject: [PATCH 4/6] simplify recipes --- crops/barley.lua | 5 ++--- crops/beans.lua | 4 +--- crops/beetroot.lua | 9 +++------ crops/blueberry.lua | 7 +++---- crops/carrot.lua | 5 +++-- crops/chili.lua | 9 +++------ crops/cocoa.lua | 8 ++------ crops/coffee.lua | 12 ++++++------ crops/corn.lua | 10 +++++----- crops/grapes.lua | 4 +--- crops/hemp.lua | 2 +- crops/lettuce.lua | 2 +- crops/melon.lua | 3 +-- crops/mint.lua | 14 +++++--------- crops/onion.lua | 9 ++++----- crops/peas.lua | 10 ++++++---- crops/pepper.lua | 26 ++++++++++++++------------ crops/pineapple.lua | 18 +++++++++--------- crops/pumpkin.lua | 8 ++++---- crops/rhubarb.lua | 2 +- crops/ryeoatrice.lua | 15 ++++++--------- crops/soy.lua | 37 +++++++++++++++++-------------------- crops/vanilla.lua | 22 +++++++++++----------- crops/wheat.lua | 12 ++++-------- food.lua | 38 +++++++++++++++----------------------- utensils.lua | 7 ++----- 26 files changed, 130 insertions(+), 168 deletions(-) diff --git a/crops/barley.lua b/crops/barley.lua index 65d1f03..e7f3840 100644 --- a/crops/barley.lua +++ b/crops/barley.lua @@ -28,11 +28,10 @@ minetest.register_craftitem("farming:barley", { -- flour minetest.register_craft({ - type = "shapeless", output = "farming:flour", recipe = { - "farming:barley", "farming:barley", "farming:barley", - "farming:barley", "farming:mortar_pestle" + {"farming:barley", "farming:barley", "farming:barley"}, + {"farming:barley", "farming:mortar_pestle", ""} }, replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}} }) diff --git a/crops/beans.lua b/crops/beans.lua index 38d8fa9..59ae2ea 100644 --- a/crops/beans.lua +++ b/crops/beans.lua @@ -81,9 +81,7 @@ minetest.register_craftitem("farming:beans", { -- beans can be used for green dye minetest.register_craft({ output = "dye:green", - recipe = { - {"farming:beans"} - } + recipe = {{"farming:beans"}} }) -- beanpole diff --git a/crops/beetroot.lua b/crops/beetroot.lua index ef57986..05e0b3a 100644 --- a/crops/beetroot.lua +++ b/crops/beetroot.lua @@ -21,20 +21,17 @@ minetest.register_craftitem("farming:beetroot_soup", { }) minetest.register_craft({ - type = "shapeless", output = "farming:beetroot_soup", recipe = { - "group:food_beetroot", "group:food_beetroot", - "group:food_beetroot", "group:food_beetroot", - "group:food_beetroot", "group:food_beetroot","group:food_bowl" + {"group:food_beetroot", "group:food_beetroot", "group:food_beetroot"}, + {"group:food_beetroot", "group:food_bowl", "group:food_beetroot"} } }) -- red dye minetest.register_craft({ - type = "shapeless", output = "dye:red", - recipe = {"group:food_beetroot"} + recipe = {{"group:food_beetroot"}} }) local def = { diff --git a/crops/blueberry.lua b/crops/blueberry.lua index e8d83c3..9ec14b6 100644 --- a/crops/blueberry.lua +++ b/crops/blueberry.lua @@ -36,10 +36,9 @@ minetest.register_craftitem("farming:blueberry_pie", { minetest.register_craft({ output = "farming:blueberry_pie", - type = "shapeless", recipe = { - "group:food_flour", "group:food_sugar", - "group:food_blueberries", "group:food_baking_tray" + {"group:food_flour", "group:food_sugar", "group:food_blueberries"}, + {"group:food_baking_tray", "", ""} }, replacements = {{"group:food_baking_tray", "farming:baking_tray"}} }) @@ -79,7 +78,7 @@ def.drop = { items = { {items = {"farming:blueberries 2"}, rarity = 1}, {items = {"farming:blueberries"}, rarity = 2}, - {items = {"farming:blueberries"}, rarity = 3}, + {items = {"farming:blueberries"}, rarity = 3} } } minetest.register_node("farming:blueberry_4", table.copy(def)) diff --git a/crops/carrot.lua b/crops/carrot.lua index 8be1f4e..2dd45f3 100644 --- a/crops/carrot.lua +++ b/crops/carrot.lua @@ -27,9 +27,10 @@ minetest.register_craftitem("farming:carrot_juice", { minetest.register_craft({ output = "farming:carrot_juice", - type = "shapeless", recipe = { - "vessels:drinking_glass", "group:food_carrot", "farming:juicer" + {"group:food_carrot"}, + {"farming:juicer"}, + {"vessels:drinking_glass"} }, replacements = { {"group:food_juicer", "farming:juicer"} diff --git a/crops/chili.lua b/crops/chili.lua index 4334556..95f3a30 100644 --- a/crops/chili.lua +++ b/crops/chili.lua @@ -20,20 +20,17 @@ minetest.register_craftitem("farming:chili_bowl", { }) minetest.register_craft({ - type = "shapeless", output = "farming:chili_bowl", recipe = { - "group:food_chili_pepper", "group:food_barley", - "group:food_tomato", "group:food_beans", "group:food_bowl" + {"group:food_chili_pepper", "group:food_rice", "group:food_tomato"}, + {"group:food_beans", "group:food_bowl", ""} } }) -- chili can be used for red dye minetest.register_craft({ output = "dye:red", - recipe = { - {"farming:chili_pepper"} - } + recipe = {{"farming:chili_pepper"}} }) -- chili definition diff --git a/crops/cocoa.lua b/crops/cocoa.lua index 72e37d0..1fc7875 100644 --- a/crops/cocoa.lua +++ b/crops/cocoa.lua @@ -75,9 +75,7 @@ minetest.register_craftitem("farming:cocoa_beans", { minetest.register_craft( { output = "dye:brown 2", - recipe = { - { "farming:cocoa_beans" } - } + recipe = {{"farming:cocoa_beans"}} }) -- chocolate cookie @@ -128,9 +126,7 @@ minetest.register_craft({ minetest.register_craft({ output = "farming:chocolate_dark 9", - recipe = { - {"farming:chocolate_block"} - } + recipe = {{"farming:chocolate_block"}} }) -- cocoa definition diff --git a/crops/coffee.lua b/crops/coffee.lua index f64369c..aa67c5e 100644 --- a/crops/coffee.lua +++ b/crops/coffee.lua @@ -34,10 +34,10 @@ minetest.register_alias("farming:drinking_cup", "vessels:drinking_glass") minetest.register_craft( { output = "farming:coffee_cup", - type = "shapeless", recipe = { - "vessels:drinking_glass", "group:food_coffee", - "group:water_bucket", "group:food_saucepan"}, + {"group:food_saucepan", "group:food_coffee", "group:water_bucket"}, + {"", "vessels:drinking_glass", ""} + }, replacements = { {"group:water_bucket", "bucket:bucket_empty"}, {"group:food_saucepan", "farming:saucepan"} @@ -47,10 +47,10 @@ minetest.register_craft( { if minetest.get_modpath("bucket_wooden") then minetest.register_craft( { output = "farming:coffee_cup", - type = "shapeless", recipe = { - "vessels:drinking_glass", "group:food_coffee", - "group:water_bucket_wooden", "group:food_saucepan"}, + {"group:food_saucepan", "group:food_coffee", "group:water_bucket_wooden"}, + {"", "vessels:drinking_glass", ""} + }, replacements = { {"group:water_bucket_wooden", "bucket_wooden:bucket_empty"}, {"group:food_saucepan", "farming:saucepan"} diff --git a/crops/corn.lua b/crops/corn.lua index ce000c4..e03c8ba 100644 --- a/crops/corn.lua +++ b/crops/corn.lua @@ -47,7 +47,7 @@ minetest.register_craft({ }, replacements = { {"group:food_mortar_pestle", "farming:mortar_pestle"}, - {"group:food_baking_tray", "farming:baking_tray"}, + {"group:food_baking_tray", "farming:baking_tray"} } }) @@ -72,9 +72,9 @@ minetest.register_node("farming:bottle_ethanol", { minetest.register_craft( { output = "farming:bottle_ethanol", recipe = { - { "vessels:glass_bottle", "group:food_corn", "group:food_corn"}, - { "group:food_corn", "group:food_corn", "group:food_corn"}, - { "group:food_corn", "group:food_corn", "group:food_corn"} + {"group:food_corn", "group:food_corn", "group:food_corn"}, + {"group:food_corn", "vessels:glass_bottle", "group:food_corn"}, + {"group:food_corn", "group:food_corn", "group:food_corn"} } }) @@ -82,7 +82,7 @@ minetest.register_craft({ type = "fuel", recipe = "farming:bottle_ethanol", burntime = 80, - replacements = {{ "farming:bottle_ethanol", "vessels:glass_bottle"}} + replacements = {{"farming:bottle_ethanol", "vessels:glass_bottle"}} }) -- corn definition diff --git a/crops/grapes.lua b/crops/grapes.lua index 8c5e458..e0c491d 100644 --- a/crops/grapes.lua +++ b/crops/grapes.lua @@ -76,9 +76,7 @@ minetest.register_craftitem("farming:grapes", { -- grapes can be used for violet dye minetest.register_craft({ output = "dye:violet", - recipe = { - {"farming:grapes"} - } + recipe = {{"farming:grapes"}} }) -- trellis diff --git a/crops/hemp.lua b/crops/hemp.lua index f8dfd0b..4cc05e5 100644 --- a/crops/hemp.lua +++ b/crops/hemp.lua @@ -65,7 +65,7 @@ minetest.register_craft({ type = "fuel", recipe = "farming:hemp_oil", burntime = 20, - replacements = {{ "farming:hemp_oil", "vessels:glass_bottle"}} + replacements = {{"farming:hemp_oil", "vessels:glass_bottle"}} }) -- hemp fibre diff --git a/crops/lettuce.lua b/crops/lettuce.lua index 07ef43a..bbd7138 100644 --- a/crops/lettuce.lua +++ b/crops/lettuce.lua @@ -48,7 +48,7 @@ def.groups.growing = nil def.drop = { items = { {items = {'farming:lettuce 2'}, rarity = 1}, - {items = {'farming:lettuce 1'}, rarity = 2}, + {items = {'farming:lettuce 1'}, rarity = 2} } } minetest.register_node("farming:lettuce_5", table.copy(def)) diff --git a/crops/melon.lua b/crops/melon.lua index 59f6190..4c199da 100644 --- a/crops/melon.lua +++ b/crops/melon.lua @@ -21,9 +21,8 @@ minetest.register_craft({ }) minetest.register_craft({ - type = "shapeless", output = "farming:melon_slice 4", - recipe = {"farming:melon_8", "farming:cutting_board"}, + recipe = {{"farming:cutting_board", "farming:melon_8"}}, replacements = {{"farming:cutting_board", "farming:cutting_board"}} }) diff --git a/crops/mint.lua b/crops/mint.lua index 5bc4021..eceaa16 100644 --- a/crops/mint.lua +++ b/crops/mint.lua @@ -29,11 +29,9 @@ minetest.register_craftitem("farming:mint_tea", { minetest.register_craft({ output = "farming:mint_tea", - type = "shapeless", recipe = { - "vessels:drinking_glass", "group:food_mint", - "group:food_mint", "group:food_mint", - "farming:juicer", "group:water_bucket" + {"group:food_mint", "group:food_mint", "group:food_mint"}, + {"group:water_bucket", "farming:juicer", "vessels:drinking_glass"} }, replacements = { {"group:food_juicer", "farming:juicer"}, @@ -44,11 +42,9 @@ minetest.register_craft({ if minetest.get_modpath("bucket_wooden") then minetest.register_craft({ output = "farming:mint_tea", - type = "shapeless", recipe = { - "vessels:drinking_glass", "group:food_mint", - "group:food_mint", "group:food_mint", - "farming:juicer", "group:water_bucket_wooden" + {"group:food_mint", "group:food_mint", "group:food_mint"}, + {"group:water_bucket_wooden", "farming:juicer", "vessels:drinking_glass"} }, replacements = { {"group:food_juicer", "farming:juicer"}, @@ -92,7 +88,7 @@ def.drop = { {items = {"farming:mint_leaf 2"}, rarity = 1}, {items = {"farming:mint_leaf 2"}, rarity = 2}, {items = {"farming:seed_mint 1"}, rarity = 1}, - {items = {"farming:seed_mint 2"}, rarity = 2}, + {items = {"farming:seed_mint 2"}, rarity = 2} } } minetest.register_node("farming:mint_4", table.copy(def)) diff --git a/crops/onion.lua b/crops/onion.lua index 2a8c63f..63cdbe5 100644 --- a/crops/onion.lua +++ b/crops/onion.lua @@ -27,12 +27,11 @@ minetest.register_craftitem("farming:onion_soup", { }) minetest.register_craft({ - type = "shapeless", output = "farming:onion_soup", recipe = { - "group:food_onion", "group:food_onion", "group:food_pot", - "group:food_onion", "group:food_onion", - "group:food_onion", "group:food_onion", "group:food_bowl" + {"group:food_onion", "group:food_onion", "group:food_onion"}, + {"group:food_onion", "group:food_pot", "group:food_onion"}, + {"", "group:food_bowl", ""} }, replacements = {{"farming:pot", "farming:pot"}} }) @@ -81,7 +80,7 @@ def.drop = { {items = {"farming:onion"}, rarity = 1}, {items = {"farming:onion"}, rarity = 2}, {items = {"farming:onion"}, rarity = 2}, - {items = {"farming:onion"}, rarity = 5}, + {items = {"farming:onion"}, rarity = 5} } } minetest.register_node("farming:onion_5", table.copy(def)) diff --git a/crops/peas.lua b/crops/peas.lua index 7c6a83d..7705889 100644 --- a/crops/peas.lua +++ b/crops/peas.lua @@ -21,9 +21,8 @@ minetest.register_craftitem("farming:peas", { }) minetest.register_craft({ - type = "shapeless", output = "farming:peas", - recipe = {"farming:pea_pod"} + recipe = {{"farming:pea_pod"}} }) -- pea soup @@ -35,9 +34,12 @@ minetest.register_craftitem("farming:pea_soup", { }) minetest.register_craft({ - type = "shapeless", output = "farming:pea_soup", - recipe = {"group:food_peas", "group:food_peas", "group:food_bowl"} + recipe = { + {"group:food_peas"}, + {"group:food_peas"}, + {"group:food_bowl"} + } }) local def = { diff --git a/crops/pepper.lua b/crops/pepper.lua index 086a0c6..bdf6287 100644 --- a/crops/pepper.lua +++ b/crops/pepper.lua @@ -30,7 +30,7 @@ minetest.register_craftitem("farming:pepper_yellow", { description = S("Yellow Pepper"), inventory_image = "crops_pepper_yellow.png", on_use = minetest.item_eat(3), - groups = {food_pepper = 1, flammable = 3}, + groups = {food_pepper = 1, flammable = 3} }) -- red pepper @@ -38,13 +38,12 @@ minetest.register_craftitem("farming:pepper_red", { description = S("Red Pepper"), inventory_image = "crops_pepper_red.png", on_use = minetest.item_eat(4), - groups = {food_pepper = 1, flammable = 3}, + groups = {food_pepper = 1, flammable = 3} }) minetest.register_craft({ - type = "shapeless", output = "farming:peppercorn", - recipe = {"group:food_pepper"} + recipe = {{"group:food_pepper"}} }) -- ground pepper @@ -69,8 +68,11 @@ minetest.register_node("farming:pepper_ground", { minetest.register_craft( { output = "farming:pepper_ground", - type = "shapeless", - recipe = {"group:food_peppercorn", "vessels:glass_bottle", "farming:mortar_pestle"}, + recipe = { + {"group:food_peppercorn"}, + {"farming:mortar_pestle"}, + {"vessels:glass_bottle"} + }, replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}} }) @@ -124,9 +126,9 @@ minetest.register_node("farming:pepper_5", table.copy(def)) def.tiles = {"crops_pepper_plant_6.png"} def.drop = { max_items = 2, items = { - {items = {'farming:pepper_yellow 2'}, rarity = 1}, - {items = {'farming:pepper_yellow'}, rarity = 2}, - {items = {'farming:pepper_yellow'}, rarity = 3}, + {items = {"farming:pepper_yellow 2"}, rarity = 1}, + {items = {"farming:pepper_yellow"}, rarity = 2}, + {items = {"farming:pepper_yellow"}, rarity = 3} } } minetest.register_node("farming:pepper_6", table.copy(def)) @@ -136,9 +138,9 @@ def.tiles = {"crops_pepper_plant_7.png"} def.groups.growing = nil def.drop = { max_items = 2, items = { - {items = {'farming:pepper_red 2'}, rarity = 1}, - {items = {'farming:pepper_red'}, rarity = 2}, - {items = {'farming:pepper_red'}, rarity = 3}, + {items = {"farming:pepper_red 2"}, rarity = 1}, + {items = {"farming:pepper_red"}, rarity = 2}, + {items = {"farming:pepper_red"}, rarity = 3} } } minetest.register_node("farming:pepper_7", table.copy(def)) diff --git a/crops/pineapple.lua b/crops/pineapple.lua index 839a627..6bb1918 100644 --- a/crops/pineapple.lua +++ b/crops/pineapple.lua @@ -38,8 +38,7 @@ minetest.register_craftitem("farming:pineapple_ring", { minetest.register_craft( { output = "farming:pineapple_ring 5", - type = "shapeless", - recipe = {"group:food_pineapple"}, + recipe = {{"group:food_pineapple"}}, replacements = {{"farming:pineapple", "farming:pineapple_top"}} }) @@ -53,11 +52,12 @@ minetest.register_craftitem("farming:pineapple_juice", { minetest.register_craft({ output = "farming:pineapple_juice", - type = "shapeless", recipe = { - "vessels:drinking_glass", "group:food_pineapple_ring", - "group:food_pineapple_ring", "group:food_pineapple_ring", - "farming:juicer"}, + {"group:food_pineapple_ring", "group:food_pineapple_ring", + "group:food_pineapple_ring"}, + {"", "farming:juicer", ""}, + {"", "vessels:drinking_glass", ""} + }, replacements = { {"group:food_juicer", "farming:juicer"} } @@ -65,10 +65,10 @@ minetest.register_craft({ minetest.register_craft({ output = "farming:pineapple_juice 2", - type = "shapeless", recipe = { - "vessels:drinking_glass", "vessels:drinking_glass", - "group:food_pineapple", "farming:juicer" + {"group:food_pineapple", ""}, + {"farming:juicer", ""}, + {"vessels:drinking_glass", "vessels:drinking_glass"} }, replacements = { {"group:food_juicer", "farming:juicer"} diff --git a/crops/pumpkin.lua b/crops/pumpkin.lua index 5e29c01..0007ac7 100644 --- a/crops/pumpkin.lua +++ b/crops/pumpkin.lua @@ -25,9 +25,8 @@ minetest.register_craft({ }) minetest.register_craft({ - type = "shapeless", output = "farming:pumpkin_slice 4", - recipe = {"farming:pumpkin", "farming:cutting_board"}, + recipe = {{"farming:cutting_board", "farming:pumpkin"}}, replacements = {{"farming:cutting_board", "farming:cutting_board"}} }) @@ -122,8 +121,9 @@ minetest.register_craftitem("farming:pumpkin_dough", { minetest.register_craft({ output = "farming:pumpkin_dough", - type = "shapeless", - recipe = {"group:food_flour", "group:food_pumpkin_slice", "group:food_pumpkin_slice"} + recipe = { + {"group:food_pumpkin_slice", "group:food_flour", "group:food_pumpkin_slice"} + } }) minetest.register_craft({ diff --git a/crops/rhubarb.lua b/crops/rhubarb.lua index 073cc18..d0ac58a 100644 --- a/crops/rhubarb.lua +++ b/crops/rhubarb.lua @@ -45,7 +45,7 @@ local def = { }, sounds = default.node_sound_leaves_defaults(), minlight = 10, - maxlight = 12, + maxlight = 12 } -- stage 1 diff --git a/crops/ryeoatrice.lua b/crops/ryeoatrice.lua index c565a65..e1f6a72 100644 --- a/crops/ryeoatrice.lua +++ b/crops/ryeoatrice.lua @@ -19,11 +19,10 @@ minetest.override_item("farming:rye", { }) minetest.register_craft({ - type = "shapeless", output = "farming:flour", recipe = { - "farming:rye", "farming:rye", "farming:rye", "farming:rye", - "farming:mortar_pestle" + {"farming:rye", "farming:rye", "farming:rye"}, + {"farming:rye", "farming:mortar_pestle", ""} }, replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}} }) @@ -44,11 +43,10 @@ minetest.override_item("farming:oat", { }) minetest.register_craft({ - type = "shapeless", output = "farming:flour", recipe = { - "farming:oat", "farming:oat", "farming:oat", "farming:oat", - "farming:mortar_pestle" + {"farming:oat", "farming:oat", "farming:oat"}, + {"farming:oat", "farming:mortar_pestle", ""} }, replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}} }) @@ -82,11 +80,10 @@ minetest.register_craftitem("farming:rice_flour", { }) minetest.register_craft({ - type = "shapeless", output = "farming:rice_flour", recipe = { - "farming:rice", "farming:rice", "farming:rice", "farming:rice", - "farming:mortar_pestle" + {"farming:rice", "farming:rice", "farming:rice"}, + {"farming:rice", "farming:mortar_pestle", ""} }, replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}} }) diff --git a/crops/soy.lua b/crops/soy.lua index fa184cb..053557d 100644 --- a/crops/soy.lua +++ b/crops/soy.lua @@ -19,9 +19,8 @@ minetest.register_craftitem("farming:soy_beans", { }) minetest.register_craft({ - type = "shapeless", output = "farming:soy_beans", - recipe = {"farming:soy_pod"} + recipe = {{"farming:soy_pod"}} }) -- soy sauce @@ -44,11 +43,11 @@ minetest.register_node("farming:soy_sauce", { }) 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" + {"group:food_soy", "group:food_salt", "group:food_soy"}, + {"", "group:food_juicer", ""}, + {"", "bucket:bucket_river_water", "vessels:glass_bottle"} }, replacements = { {"bucket:bucket_river_water", "bucket:bucket_empty"}, @@ -78,11 +77,10 @@ minetest.register_node("farming:soy_milk", { }) minetest.register_craft( { - type = "shapeless", output = "farming:soy_milk", recipe = { - "group:food_soy", "group:food_soy", "group:food_soy", - "farming:vanilla_extract", "bucket:bucket_water", "vessels:drinking_glass" + {"group:food_soy", "group:food_soy", "group:food_soy"}, + {"farming:vanilla_extract", "bucket:bucket_water", "vessels:drinking_glass"} }, replacements = { {"bucket:bucket_water", "bucket:bucket_empty"}, @@ -100,10 +98,9 @@ minetest.register_craftitem("farming:tofu", { minetest.register_craft({ output = "farming:tofu", - type = "shapeless", recipe = { - "farming:baking_tray", "group:food_soy", "group:food_soy", - "group:food_soy", "group:food_soy", "group:food_soy", + {"farming:baking_tray", "group:food_soy", "group:food_soy"}, + {"group:food_soy", "group:food_soy", "group:food_soy"} }, replacements = {{"farming:baking_tray", "farming:baking_tray"}} }) @@ -163,7 +160,7 @@ minetest.register_node("farming:soy_4", table.copy(def)) def.tiles = {"farming_soy_5.png"} def.drop = { max_items = 1, items = { - {items = {'farming:soy_pod'}, rarity = 1}, + {items = {"farming:soy_pod"}, rarity = 1}, } } minetest.register_node("farming:soy_5", table.copy(def)) @@ -172,9 +169,9 @@ minetest.register_node("farming:soy_5", table.copy(def)) def.tiles = {"farming_soy_6.png"} def.drop = { max_items = 3, items = { - {items = {'farming:soy_pod'}, rarity = 1}, - {items = {'farming:soy_pod'}, rarity = 2}, - {items = {'farming:soy_pod'}, rarity = 3}, + {items = {"farming:soy_pod"}, rarity = 1}, + {items = {"farming:soy_pod"}, rarity = 2}, + {items = {"farming:soy_pod"}, rarity = 3}, } } minetest.register_node("farming:soy_6", table.copy(def)) @@ -184,11 +181,11 @@ def.tiles = {"farming_soy_7.png"} def.groups.growing = nil def.drop = { max_items = 5, items = { - {items = {'farming:soy_pod'}, rarity = 1}, - {items = {'farming:soy_pod'}, rarity = 2}, - {items = {'farming:soy_pod'}, rarity = 3}, - {items = {'farming:soy_pod'}, rarity = 4}, - {items = {'farming:soy_pod'}, rarity = 5} + {items = {"farming:soy_pod"}, rarity = 1}, + {items = {"farming:soy_pod"}, rarity = 2}, + {items = {"farming:soy_pod"}, rarity = 3}, + {items = {"farming:soy_pod"}, rarity = 4}, + {items = {"farming:soy_pod"}, rarity = 5} } } minetest.register_node("farming:soy_7", table.copy(def)) diff --git a/crops/vanilla.lua b/crops/vanilla.lua index 17236a3..d17c8c3 100644 --- a/crops/vanilla.lua +++ b/crops/vanilla.lua @@ -8,7 +8,7 @@ minetest.register_craftitem("farming:vanilla", { on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:vanilla_1") end, - on_use = minetest.item_eat(1), + on_use = minetest.item_eat(1) }) -- crop definition @@ -49,8 +49,8 @@ minetest.register_node("farming:vanilla_extract", { minetest.register_craft( { output = "farming:vanilla_extract", recipe = { - { "group:food_vanilla", "group:food_vanilla", "group:food_vanilla"}, - { "group:food_vanilla", "farming:bottle_ethanol", "bucket:bucket_water"}, + {"group:food_vanilla", "group:food_vanilla", "group:food_vanilla"}, + {"group:food_vanilla", "farming:bottle_ethanol", "bucket:bucket_water"}, }, replacements = { {"bucket:bucket_water", "bucket:bucket_empty"}, @@ -61,7 +61,7 @@ minetest.register_craft({ type = "fuel", recipe = "farming:vanilla_extract", burntime = 25, - replacements = {{ "farming:vanilla_extract", "vessels:glass_bottle" }} + replacements = {{"farming:vanilla_extract", "vessels:glass_bottle"}} }) -- stage 1 @@ -92,9 +92,9 @@ minetest.register_node("farming:vanilla_6", table.copy(def)) def.tiles = {"farming_vanilla_7.png"} def.drop = { items = { - {items = {'farming:vanilla'}, rarity = 1}, - {items = {'farming:vanilla'}, rarity = 2}, - {items = {'farming:vanilla'}, rarity = 3} + {items = {"farming:vanilla"}, rarity = 1}, + {items = {"farming:vanilla"}, rarity = 2}, + {items = {"farming:vanilla"}, rarity = 3} } } minetest.register_node("farming:vanilla_7", table.copy(def)) @@ -104,10 +104,10 @@ def.tiles = {"farming_vanilla_8.png"} def.groups.growing = nil def.drop = { items = { - {items = {'farming:vanilla 2'}, rarity = 1}, - {items = {'farming:vanilla 2'}, rarity = 2}, - {items = {'farming:vanilla 2'}, rarity = 2}, - {items = {'farming:vanilla 2'}, rarity = 3} + {items = {"farming:vanilla 2"}, rarity = 1}, + {items = {"farming:vanilla 2"}, rarity = 2}, + {items = {"farming:vanilla 2"}, rarity = 2}, + {items = {"farming:vanilla 2"}, rarity = 3} } } minetest.register_node("farming:vanilla_8", table.copy(def)) diff --git a/crops/wheat.lua b/crops/wheat.lua index e21d7f6..1a7de8a 100644 --- a/crops/wheat.lua +++ b/crops/wheat.lua @@ -46,9 +46,7 @@ minetest.register_craft({ minetest.register_craft({ output = "farming:wheat 3", - recipe = { - {"farming:straw"} - } + recipe = {{"farming:straw"}} }) -- check and register stairs @@ -80,11 +78,10 @@ minetest.register_craftitem("farming:flour", { }) minetest.register_craft({ - type = "shapeless", output = "farming:flour", recipe = { - "farming:wheat", "farming:wheat", "farming:wheat", - "farming:wheat", "farming:mortar_pestle" + {"farming:wheat", "farming:wheat", "farming:wheat"}, + {"farming:wheat", "farming:mortar_pestle", ""} }, replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}} }) @@ -113,9 +110,8 @@ minetest.register_craftitem("farming:bread_slice", { }) minetest.register_craft({ - type = "shapeless", output = "farming:bread_slice 5", - recipe = {"farming:bread", "group:food_cutting_board"}, + recipe = {{"group:food_cutting_board", "farming:bread"}}, replacements = {{"group:food_cutting_board", "farming:cutting_board"}} }) diff --git a/food.lua b/food.lua index 0e80826..a7f5af1 100644 --- a/food.lua +++ b/food.lua @@ -318,7 +318,6 @@ minetest.register_craftitem("farming:apple_pie", { minetest.register_craft({ output = "farming:apple_pie", --- type = "shapeless", recipe = { {"group:food_flour", "group:food_sugar", "group:food_apple"}, {"", "group:food_baking_tray", ""} @@ -347,9 +346,10 @@ minetest.register_craftitem("farming:cactus_juice", { minetest.register_craft({ output = "farming:cactus_juice", --- type = "shapeless", recipe = { - {"default:cactus", "farming:juicer", "vessels:drinking_glass"} + {"default:cactus"}, + {"farming:juicer"}, + {"vessels:drinking_glass"} }, replacements = { {"group:food_juicer", "farming:juicer"} @@ -366,7 +366,6 @@ minetest.register_craftitem("farming:pasta", { minetest.register_craft({ output = "farming:pasta", --- type = "shapeless", recipe = { {"group:food_flour", "group:food_butter", "group:food_mixing_bowl"} }, @@ -375,7 +374,6 @@ minetest.register_craft({ minetest.register_craft({ output = "farming:pasta", --- type = "shapeless", recipe = { {"group:food_flour", "group:food_oil", "group:food_mixing_bowl"} }, @@ -395,7 +393,6 @@ minetest.register_craftitem("farming:spaghetti", { minetest.register_craft({ output = "farming:spaghetti", --- type = "shapeless", recipe = { {"group:food_pasta", "group:food_saucepan", "group:food_tomato"}, {"group:food_garlic_clove", "group:food_garlic_clove", ""} @@ -413,7 +410,6 @@ minetest.register_craftitem("farming:bibimbap", { minetest.register_craft({ output = "farming:bibimbap", --- type = "shapeless", recipe = { {"group:food_skillet", "group:food_bowl", "group:food_egg"}, {"group:food_rice", "group:food_chicken_raw", "group:food_cabbage"}, @@ -442,7 +438,6 @@ minetest.register_craftitem("farming:burger", { }) minetest.register_craft({ --- type = "shapeless", output = "farming:burger", recipe = { {"farming:bread", "group:food_meat", "group:food_cheese"}, @@ -550,7 +545,6 @@ minetest.register_craftitem("farming:flan", { }) minetest.register_craft({ --- type = "shapeless", output = "farming:flan", recipe = { {"group:food_sugar", "group:food_milk", "farming:caramel"}, @@ -574,7 +568,6 @@ minetest.register_craftitem("farming:cheese_vegan", { minetest.register_craft({ --- type = "shapeless", output = "farming:cheese_vegan", recipe = { {"farming:soy_milk", "farming:soy_milk", "farming:soy_milk"}, @@ -589,7 +582,6 @@ minetest.register_craft({ }) minetest.register_craft({ --- type = "shapeless", output = "farming:cheese_vegan", recipe = { {"farming:soy_milk", "farming:soy_milk", "farming:soy_milk"}, @@ -608,14 +600,14 @@ minetest.register_craftitem("farming:onigiri", { description = S("Onirigi"), inventory_image = "farming_onigiri.png", on_use = minetest.item_eat(2), - groups = {flammable = 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" + {"group:food_rice", "group:food_salt", "group:food_rice"}, + {"", "group:food_seaweed", ""} } }) @@ -625,16 +617,16 @@ minetest.register_craftitem("farming:gyoza", { description = S("Gyoza"), inventory_image = "farming_gyoza.png", on_use = minetest.item_eat(4), - groups = {flammable = 2}, + 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" + {"group:food_cabbage", "group:food_garlic_clove", "group:food_onion"}, + {"group:food_meat_raw", "group:food_salt", "group:food_flour"}, + {"", "group:food_skillet", ""} + }, replacements = { {"group:food_skillet", "farming:skillet"} @@ -647,15 +639,15 @@ minetest.register_craftitem("farming:mochi", { description = S("Mochi"), inventory_image = "farming_mochi.png", on_use = minetest.item_eat(3), - groups = {flammable = 2}, + groups = {flammable = 2} }) minetest.register_craft({ - type = "shapeless", output = "farming:mochi", recipe = { - "group:food_mortar_pestle", "group:food_rice", "group:food_rice", - "group:food_sugar", "bucket:bucket_river_water" + {"group:food_rice", "group:food_sugar", "group:food_rice"}, + {"", "group:food_mortar_pestle", ""}, + {"", "bucket:bucket_river_water", ""} }, replacements = { {"group:food_mortar_pestle", "farming:mortar_pestle"}, diff --git a/utensils.lua b/utensils.lua index 8224e7d..f9b2d29 100644 --- a/utensils.lua +++ b/utensils.lua @@ -20,7 +20,7 @@ minetest.register_craft({ minetest.register_craft({ type = "fuel", recipe = "farming:bowl", - burntime = 10, + burntime = 10 }) -- saucepan @@ -155,9 +155,6 @@ minetest.register_craft({ }) minetest.register_craft( { - type = "shapeless", output = "vessels:glass_fragments", - recipe = { - "farming:mixing_bowl" - } + recipe = {{"farming:mixing_bowl"}} }) From dedc33cc46ec65782a5b8ab573d1fb6bb6915b63 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Fri, 7 May 2021 20:29:45 +0100 Subject: [PATCH 5/6] added new gyoza and pineapple ring texture (thanks sirrobzeroone) --- license.txt | 4 ++++ textures/farming_gyoza.png | Bin 603 -> 266 bytes textures/farming_pineapple_ring.png | Bin 164 -> 449 bytes 3 files changed, 4 insertions(+) diff --git a/license.txt b/license.txt index 074e59b..c929fcc 100644 --- a/license.txt +++ b/license.txt @@ -169,3 +169,7 @@ Created by Felfa (CC0) Created by gorlock (CC0) farming_salt_crystal.png + +Created by sirrobzeroone (CC0) + farming_gyoza.png + farming_pineapple_ring.png diff --git a/textures/farming_gyoza.png b/textures/farming_gyoza.png index 2005e7991cde4c5898613b7db93ab00c1981a26c..c8f036f08864c67603f5100ad22c6c1ea095829a 100644 GIT binary patch delta 228 zcmcc3(#2%f8Q|y6%O%Cdz`(%k>ERLtqy<2jg&9b`z556xz*rpQ?!>U}oXkrg#~{Eb z#C4*MLH&HcM`uBjB|(0{3=Yq3q=7g|-tI089jvk*Kn`btM`SSr1Gg{;GcwGYBLNg- zFY)wsWq-=b&Y+>P&*ZK$P{_^G#W95AdUC=6b_)q9g%bbcoCe*G-}G;`Kfv_8Q9$EJ z;j?o$<)1h9yt7SzKaX*v#ep@u9YR$TuHBX9Nw_wXuY*xmwj!5>VP=Q&mg!}hM}S5$ Nc)I$ztaD0e0svy}L`?ty delta 568 zcmV-80>}M|0^0;EiBL{Q4GJ0x0000DNk~Le0000v0000v2m=5B0K3L>w*UYDGf+%a zML+-mkv1@YF{Hoa00001bW%=J06^y0W&i*I)=5M`R7l6|mP>ZSAPhwV2#Np+_P^Q+ zjBRjm+DzNL2~M1gK8SbnczpEHpODh3KN(}*BEdsjHTZzjwJGhvgRD%iverlx5x;B$ z$Xnh>S6ULN?@>oA6$a#738rn0Ep+Cf)ormZHG&(lYyTvL16sB0jzw4UtYH@dC5N>* zT!X<|?P&jDsTwyS>!b|}5~6g+V-LXtzV9F_*O=FYrJ;P3$X!GH+`A+(^mTB`Sly(3 zgL=q+4~sBg4sFjGpU{o2q11u}HjigIce}yDE z>S+(9tk617txM;qVNcr#QQd*c>j(eU@0q^}17=H)`0000V^Z#K00004VQb$4nuFf3k00006VoOIv0RI600RN!9 zr;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliruV0YOPbK~y-) z#gna$!ax*-zafZ9TAB@OnzRNCh6kuaZi3pU=;QDdC=wiXeSZLSF-%g!rs)rI94opr zw55w#u~*I9+;ei~oVoDF5<|_)*1Zq)gQyTM2{h35Dkk%d>EF(KCi4w4PM(NF8|<$` zux6mX9<06l?YyVX977^B*!C(ccY!rsfHgxNb{(mGav3KCQ6a{9pe|{oE Date: Sat, 8 May 2021 20:38:32 +0100 Subject: [PATCH 6/6] update mint textures (thanks sirrobzeroone) --- textures/farming_mint_1.png | Bin 114 -> 155 bytes textures/farming_mint_2.png | Bin 122 -> 172 bytes textures/farming_mint_3.png | Bin 132 -> 191 bytes textures/farming_mint_4.png | Bin 174 -> 233 bytes textures/farming_mint_leaf.png | Bin 158 -> 253 bytes textures/farming_mint_tea.png | Bin 166 -> 289 bytes 6 files changed, 0 insertions(+), 0 deletions(-) diff --git a/textures/farming_mint_1.png b/textures/farming_mint_1.png index 10ba563ded7966d2e1be61f52c047bfc362d7acd..1f303aeb8a037487865af3ddf3f0d1474a934b0a 100644 GIT binary patch delta 138 zcmXS#%{W1#o`so#f#L1lM?pYJG{7gsHNPk~qS`UO#VxhZw|J#@?OyNpi@qM~r-%a; zFqQ=Q1v5B2yO9Run0UH4hHzX@PFNt*;`lNo{2Gga@{t273_1rA5*S1c3|c)TB{nxK om6*Z1VAqVP3we|k6&M+WUb9}%GTSWz)X(7Q>gU3;&MBb@0G>H5bpQYW delta 96 zcmbQuSTsQ*iiw$lfgx$G_$MI68Q>G*3ZyM>`#b)M>iqbA4UofF666=m;PC858jvII v>Eal|aXmR<0fz>|MhE5z3Ctg7NJubnmND#X_^(_8RKnot>gTe~DWM4fL|Pok diff --git a/textures/farming_mint_2.png b/textures/farming_mint_2.png index b0d4324733bd96a63f87d78bf2a2ee27a9b779a5..cdcde54b5ada04179af48bea4553b00ca468303f 100644 GIT binary patch delta 155 zcmb;C>T!{vnj=2UxOj+!r46Lg;ZdUk4+W}2v@O1TaS?83{ F1OS4iF@XR8 delta 104 zcmZ3(ST#W+iHVtkfgx$G_$MI68Q>G*3ZyM>`#b)M>iqbA4UofF666=m;PC858jvIJ z>Eal|aXmRfLAJnzfs>z6L6IRz(}IE1Zvu-jGc$v#7~`D}{ZIb@l`?p``njxgN@xNA D*asY? diff --git a/textures/farming_mint_3.png b/textures/farming_mint_3.png index 3ae3d61bc9e070cfc760a6a4f48c03850836f9b8..4bfc43f255160098b56a580eda438756b225b383 100644 GIT binary patch delta 175 zcmZo++|M{cqMn7Bfq~)e-A6${N;JSH#5KPtH=^1xzQrxI&$oD`ckN#9_KUtA>!*kV z6)=_r`2{mLJiCzwFMGa!f`!0K|#pCvWU^sm646j@0y>&Y2gz|B00>RstlZA6QtbO*chyGnfkUp5u6Cr O#Ng@b=d#Wzp$Pz3Kp>w0 diff --git a/textures/farming_mint_4.png b/textures/farming_mint_4.png index 83c0e90161dc7ecf0ace3b46bb58831d8c8a1a89..a71a6e3394afc01f92f462e19d6b084a0eb0fdc4 100644 GIT binary patch delta 217 zcmV;~04D#g0qFsd7=Hu<0002(-QrRJ0016POjJbx003BfL0^PMWsXgvj;C{}OMSgd zhtW;S!OZFB>LT*=S^xk50d!JMQvg8b*k%9#0C`D7K~xCWEsRYH!Y~kpKNw8c)e9(I zV6Zf2=u!~kHXuW`1u-Y+rZ>oOorsIad%QoO0lR~(QkNAfR#NPcX%<>SJwP}1;*}cT z!;+j$a(sjpQ$gb=!|;0Q>`b`NsC--x_;~6i?abBvwCK37NA%J{aZy%#*_XU><=z|1D%Vsf?S~@d@B#U7;_+ILw zzCrk&MMg0oZIB}^kc8u#oLY)MW{Y8Oz)Z3<})T3=CE*W9nQP+<0Wm1s1kt9s(1kZXGya rY09(0#)Nr=(wfG`#H(B@3>h}fP)t-sApihD zLqSJLModmiQBzP^TUcOXUsQfQWtL2Dq(gP8NteZBtivzD(n8MA&C=gi(&0$e*VNqS zZ{OkG#3>+$sP|Ns9#lpwPJ0004WQchC