From e6ea2877094dba5a4d747d52a9fa5eae18f8de73 Mon Sep 17 00:00:00 2001 From: Ombridride Date: Mon, 15 Dec 2014 00:41:13 +0100 Subject: [PATCH] MAJ plantlife_modpack MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (garde les modifs antérieur sur les « mushrooms » et sur les bugfixs liés au mod « areas ») --- mods/plantlife_modpack/.gitignore | 0 mods/plantlife_modpack/API.txt | 4 +- mods/plantlife_modpack/LICENSE | 0 mods/plantlife_modpack/README | 0 .../plantlife_modpack/along_shore/depends.txt | 0 mods/plantlife_modpack/along_shore/init.lua | 0 .../textures/along_shore_seaweed_1Darker.png | Bin .../along_shore/textures/credit_textures.txt | 0 .../along_shore/textures/old/LillyPad3x16.png | Bin .../textures/old/MultiLilly16x.png | Bin .../textures/old/along_shore_empty.png | Bin .../textures/old/along_shore_lilypads_1.png | Bin .../textures/old/along_shore_lilypads_2.png | Bin .../textures/old/along_shore_lilypads_3.png | Bin .../textures/old/along_shore_lilypads_4.png | Bin .../textures/old/along_shore_pondscum_1.png | Bin .../textures/old/along_shore_seaweed_1.png | Bin .../textures/old/along_shore_seaweed_2.png | Bin .../textures/old/along_shore_seaweed_3.png | Bin .../textures/old/along_shore_seaweed_4.png | Bin .../textures/old/flowers_seaweed.png | Bin .../textures/old/flowers_waterlily.png | Bin .../textures/old/flowers_waterlily_22.5.png | Bin .../textures/old/flowers_waterlily_45.png | Bin .../textures/old/flowers_waterlily_67.5.png | Bin .../along_shore/textures/old/lillyPad5x16.png | Bin .../textures/old/lillypad3Flower16x.png | Bin .../along_shore/textures/old/pondscum16xc.png | Bin mods/plantlife_modpack/bushes/depends.txt | 0 mods/plantlife_modpack/bushes/init.lua | 3 +- .../textures/bushes_branches_center_1.png | Bin .../textures/bushes_branches_center_2.png | Bin .../textures/bushes_branches_left_1.png | Bin .../textures/bushes_branches_left_2.png | Bin .../textures/bushes_branches_right_1.png | Bin .../textures/bushes_branches_right_2.png | Bin .../bushes/textures/bushes_leaves_1.png | Bin .../bushes/textures/bushes_leaves_2.png | Bin .../textures/bushes_youngtree2trunk.png | Bin .../textures/bushes_youngtree2trunk_inv.png | Bin .../textures/old & unused/BlockBranch1.png | Bin .../textures/old & unused/BlockBranch1L.png | Bin .../textures/old & unused/BlockBranch1R.png | Bin .../textures/old & unused/BushBranches1.png | Bin .../textures/old & unused/BushBranches1sm.png | Bin .../old & unused/BushBranches1sm2.png | Bin .../old & unused/BushBranches1sm3.png | Bin .../old & unused/BushBranches1sm4.png | Bin .../old & unused/BushBranchesCenter.png | Bin .../old & unused/BushBranchesSide1.png | Bin .../old & unused/BushBranchesSide2.png | Bin .../bushes/textures/old & unused/blank.png | Bin .../old & unused/moretrees_pine_leaves3.png | Bin .../bushes_classic/depends.txt | 0 .../bushes_classic/image_credits.txt | 0 .../plantlife_modpack/bushes_classic/init.lua | 0 .../bushes_classic/locale/de.txt | 0 .../bushes_classic/locale/template.txt | 0 .../bushes_classic/nodes.lua | 0 .../textures/bushes_basket_blackberry_top.png | Bin .../textures/bushes_basket_blueberry_top.png | Bin .../textures/bushes_basket_bottom.png | Bin .../textures/bushes_basket_empty_top.png | Bin .../textures/bushes_basket_gooseberry_top.png | Bin .../bushes_basket_mixed_berry_top.png | Bin .../textures/bushes_basket_raspberry_top.png | Bin .../textures/bushes_basket_side.png | Bin .../textures/bushes_basket_strawberry_top.png | Bin .../textures/bushes_blackberry.png | Bin .../textures/bushes_blackberry_bush.png | Bin .../textures/bushes_blackberry_pie_cooked.png | Bin .../textures/bushes_blackberry_pie_raw.png | Bin .../textures/bushes_blackberry_pie_slice.png | Bin .../textures/bushes_blueberry.png | Bin .../textures/bushes_blueberry_bush.png | Bin .../textures/bushes_blueberry_pie_cooked.png | Bin .../textures/bushes_blueberry_pie_raw.png | Bin .../textures/bushes_blueberry_pie_slice.png | Bin .../textures/bushes_bush_bottom.png | Bin .../textures/bushes_bush_top.png | Bin .../textures/bushes_fruitless_bush.png | Bin .../textures/bushes_fruitless_bush_bottom.png | Bin .../textures/bushes_fruitless_bush_top.png | Bin .../textures/bushes_gooseberry.png | Bin .../textures/bushes_gooseberry_bush.png | Bin .../textures/bushes_gooseberry_pie_cooked.png | Bin .../textures/bushes_gooseberry_pie_raw.png | Bin .../textures/bushes_gooseberry_pie_slice.png | Bin .../bushes_mixed_berry_pie_cooked.png | Bin .../textures/bushes_mixed_berry_pie_raw.png | Bin .../textures/bushes_mixed_berry_pie_slice.png | Bin .../textures/bushes_raspberry.png | Bin .../textures/bushes_raspberry_bush.png | Bin .../textures/bushes_raspberry_pie_cooked.png | Bin .../textures/bushes_raspberry_pie_raw.png | Bin .../textures/bushes_raspberry_pie_slice.png | Bin .../textures/bushes_strawberry.png | Bin .../textures/bushes_strawberry_bush.png | Bin .../textures/bushes_strawberry_pie_cooked.png | Bin .../textures/bushes_strawberry_pie_raw.png | Bin .../textures/bushes_strawberry_pie_slice.png | Bin .../bushes_classic/textures/bushes_sugar.png | Bin mods/plantlife_modpack/cavestuff/depends.txt | 0 mods/plantlife_modpack/cavestuff/init.lua | 0 mods/plantlife_modpack/cavestuff/mapgen.lua | 0 mods/plantlife_modpack/cavestuff/nodes.lua | 0 .../textures/undergrowth_desert_pebble.png | Bin .../cavestuff/textures/undergrowth_pebble.png | Bin mods/plantlife_modpack/copyright.txt | 0 mods/plantlife_modpack/dryplants/crafting.lua | 0 mods/plantlife_modpack/dryplants/depends.txt | 2 +- mods/plantlife_modpack/dryplants/init.lua | 0 mods/plantlife_modpack/dryplants/juncus.lua | 0 .../dryplants/meadowvariation.lua | 0 .../dryplants/models/plantlike.obj | 56 ++ .../plantlife_modpack/dryplants/moregrass.lua | 0 mods/plantlife_modpack/dryplants/reed.lua | 0 mods/plantlife_modpack/dryplants/reedmace.lua | 43 +- mods/plantlife_modpack/dryplants/settings.txt | 0 .../dryplants/textures/default_grass_1.png | Bin .../dryplants/textures/default_grass_2.png | Bin .../dryplants/textures/default_grass_3.png | Bin .../dryplants/textures/default_grass_4.png | Bin .../dryplants/textures/default_grass_5.png | Bin .../dryplants/textures/dryplants_grass.png | Bin .../textures/dryplants_grass_short.png | Bin .../textures/dryplants_grass_short_side.png | Bin .../dryplants/textures/dryplants_hay.png | Bin .../textures/dryplants_juncus_02.png | Bin 929 -> 850 bytes .../textures/dryplants_juncus_03.png | Bin 963 -> 904 bytes .../textures/dryplants_juncus_inv.png | Bin .../dryplants/textures/dryplants_reed.png | Bin .../dryplants/textures/dryplants_reed_wet.png | Bin .../dryplants/textures/dryplants_reedmace.png | Bin .../textures/dryplants_reedmace_bottom.png | Bin .../textures/dryplants_reedmace_height_2.png | Bin 1544 -> 1309 bytes .../textures/dryplants_reedmace_height_3.png | Bin 2368 -> 1940 bytes .../dryplants_reedmace_height_3_spikes.png | Bin 2543 -> 2137 bytes .../textures/dryplants_reedmace_sapling.png | Bin .../textures/dryplants_reedmace_spikes.png | Bin .../textures/dryplants_reedmace_top.png | Bin .../textures/dryplants_reedmace_water.png | Bin .../dryplants/textures/dryplants_sickle.png | Bin .../textures/not_in_use/big_pic_8.png | Bin .../textures/not_in_use/big_pic_9.png | Bin .../not_in_use/dryplants_cattailsG_m2.png | Bin .../not_in_use/dryplants_juncus_02_left.png | Bin .../not_in_use/dryplants_juncus_02_right.png | Bin .../not_in_use/dryplants_juncus_02_whole2.png | Bin .../not_in_use/dryplants_juncus_03_left.png | Bin .../not_in_use/dryplants_juncus_03_right.png | Bin .../not_in_use/dryplants_juncus_03_whole2.png | Bin .../not_in_use/dryplants_reedmace_01.png | Bin .../not_in_use/dryplants_reedmace_02.png | Bin .../not_in_use/dryplants_reedmace_03.png | Bin .../not_in_use/dryplants_reedmace_04.png | Bin .../dryplants_reedmace_bottom_left.png | Bin .../dryplants_reedmace_bottom_right.png | Bin .../not_in_use/dryplants_reedmace_left.png | Bin .../not_in_use/dryplants_reedmace_right.png | Bin .../dryplants_reedmace_top_left.png | Bin .../dryplants_reedmace_top_right.png | Bin .../textures/not_in_use/reedmace2.png | Bin .../textures/not_in_use/reedmace3.png | Bin .../textures/not_in_use/reedmace4.png | Bin .../textures/not_in_use/reedtest.png | Bin .../textures/not_in_use/texturing.png | Bin .../old/dryplants_grass_short_old3.png | Bin .../old/dryplants_grass_short_old4.png | Bin .../old/dryplants_juncus_02_left_old.png | Bin .../old/dryplants_juncus_02_right_old.png | Bin .../old/dryplants_juncus_03_left_old.png | Bin .../old/dryplants_juncus_03_right_old.png | Bin .../dryplants_reedmace_bottom_left_old2.png | Bin .../old/dryplants_reedmace_bottom_old4.png | Bin .../dryplants_reedmace_bottom_right_old2.png | Bin .../old/dryplants_reedmace_left_old2.png | Bin .../textures/old/dryplants_reedmace_old8.png | Bin .../old/dryplants_reedmace_right_old2.png | Bin .../old/dryplants_reedmace_spikes_old3.png | Bin .../old/dryplants_reedmace_top_left_old2.png | Bin .../old/dryplants_reedmace_top_old3.png | Bin .../old/dryplants_reedmace_top_right_old2.png | Bin .../old/dryplants_reedmace_water_old2.png | Bin mods/plantlife_modpack/ferns/crafting.lua | 0 mods/plantlife_modpack/ferns/depends.txt | 0 mods/plantlife_modpack/ferns/fern.lua | 0 .../plantlife_modpack/ferns/gianttreefern.lua | 2 +- mods/plantlife_modpack/ferns/horsetail.lua | 0 mods/plantlife_modpack/ferns/init.lua | 0 mods/plantlife_modpack/ferns/settings.lua | 0 .../ferns/textures/ferns_5.png | Bin .../ferns/textures/ferns_6.png | Bin .../ferns/textures/ferns_7.png | Bin .../ferns/textures/ferns_8.png | Bin .../ferns/textures/ferns_fern.png | Bin .../ferns/textures/ferns_fern_big.png | Bin 1431 -> 1279 bytes .../ferns/textures/ferns_fern_mid.png | Bin 969 -> 784 bytes .../ferns/textures/ferns_fern_tree.png | Bin 1650 -> 1484 bytes .../ferns/textures/ferns_fern_tree_giant.png | Bin 3771 -> 4493 bytes .../ferns/textures/ferns_fern_tree_inv.png | Bin .../ferns/textures/ferns_fern_tree_tl.png | Bin .../ferns/textures/ferns_fern_tree_tr.png | Bin .../ferns/textures/ferns_fern_trunk.png | Bin .../ferns/textures/ferns_fern_trunk_big.png | Bin .../textures/ferns_fern_trunk_big_top.png | Bin .../ferns/textures/ferns_fern_trunk_top.png | Bin .../ferns/textures/ferns_ferntuber.png | Bin .../textures/ferns_ferntuber_roasted.png | Bin .../ferns/textures/ferns_fiddlehead.png | Bin .../textures/ferns_fiddlehead_roasted.png | Bin .../ferns/textures/ferns_horsetail_01.png | Bin .../ferns/textures/ferns_horsetail_02.png | Bin .../ferns/textures/ferns_horsetail_03.png | Bin .../ferns/textures/ferns_horsetail_04.png | Bin .../textures/ferns_sapling_tree_fern.png | Bin .../ferns_sapling_tree_fern_giant.png | Bin .../textures/ferns_tree_fern_leave_big.png | Bin .../ferns_tree_fern_leave_big_cross.png | Bin .../ferns_tree_fern_leave_big_end.png | Bin .../not_in_use/archaeplantae_horsetails.png | Bin .../textures/not_in_use/big picture 3.png | Bin .../not_in_use/ferns_fern_big_left.png | Bin .../not_in_use/ferns_fern_big_right.png | Bin .../not_in_use/ferns_fern_mid_left.png | Bin .../not_in_use/ferns_fern_mid_right.png | Bin .../not_in_use/ferns_fern_tree_bl.png | Bin .../not_in_use/ferns_fern_tree_br.png | Bin .../not_in_use/ferns_fern_trunk_big_crown.png | Bin .../textures/old/archaeplantae_fern_old4.png | Bin .../ferns/textures/old/comb.png | Bin .../ferns/textures/old/ferns_5_old.png | Bin .../ferns/textures/old/ferns_6_old.png | Bin .../ferns/textures/old/ferns_7_old.png | Bin .../ferns/textures/old/ferns_fern_big_old.png | Bin .../ferns/textures/old/ferns_fern_mid_old.png | Bin .../textures/old/ferns_fern_tree_old.png | Bin .../old/ferns_fern_trunk_big_old2.png | Bin .../old/ferns_fern_trunk_big_top_old.png | Bin .../old/ferns_fern_trunk_big_top_old2.png | Bin .../textures/old/ferns_fern_trunk_top_old.png | Bin .../textures/old/ferns_horsetail_01_old2.png | Bin .../textures/old/ferns_horsetail_02_old2.png | Bin .../textures/old/ferns_horsetail_03_old2.png | Bin .../textures/old/ferns_horsetail_04_old2.png | Bin .../ferns_tree_fern_leave_big_cross_old.png | Bin .../old/ferns_tree_fern_leave_big_end_old.png | Bin .../old/ferns_tree_fern_leave_big_old.png | Bin mods/plantlife_modpack/ferns/treefern.lua | 4 +- .../flowers_plus/depends.txt | 0 .../flowers_plus/flowers-changelog.txt | 0 mods/plantlife_modpack/flowers_plus/init.lua | 4 +- .../flowers_plus/locale/de.txt | 0 .../flowers_plus/locale/template.txt | 0 .../textures/flowers_flowerpot.png | Bin .../textures/flowers_potted_bonsai.png | Bin .../textures/flowers_potted_cactus.png | Bin .../flowers_potted_dandelion_white.png | Bin .../flowers_potted_dandelion_yellow.png | Bin .../textures/flowers_potted_geranium.png | Bin .../textures/flowers_potted_rose.png | Bin .../textures/flowers_potted_tulip.png | Bin .../textures/flowers_potted_viola.png | Bin .../flowers_plus/textures/flowers_seaweed.png | Bin .../textures/flowers_seaweedLight.png | Bin .../textures/flowers_seaweed_2.png | Bin .../textures/flowers_seaweed_3.png | Bin .../textures/flowers_seaweed_4.png | Bin .../textures/flowers_waterlily.png | Bin .../textures/flowers_waterlily_22.5.png | Bin .../textures/flowers_waterlily_45.png | Bin .../textures/flowers_waterlily_67.5.png | Bin .../textures/flowers_waterlily_small_1.png | Bin .../textures/flowers_waterlily_small_2.png | Bin .../textures/flowers_waterlily_small_3.png | Bin .../textures/flowers_waterlily_small_4.png | Bin mods/plantlife_modpack/junglegrass/init.lua | 0 mods/plantlife_modpack/modpack.txt | 0 mods/plantlife_modpack/molehills/depends.txt | 0 mods/plantlife_modpack/molehills/init.lua | 0 .../molehills/molehills_settings.txt | 0 .../molehills/textures/molehills_dirt.png | Bin .../molehills/textures/molehills_side.png | Bin .../textures/old & unused/molehill_side.png | Bin .../textures/old & unused/molehill_top.png | Bin mods/plantlife_modpack/mushroom/compat.lua | 0 mods/plantlife_modpack/mushroom/crafting.lua | 0 mods/plantlife_modpack/mushroom/depends.txt | 0 mods/plantlife_modpack/mushroom/init.lua | 0 .../mushroom/textures/mushroom_brown.png | Bin .../mushroom/textures/mushroom_essence.png | Bin .../mushroom/textures/mushroom_identifier.png | Bin .../mushroom/textures/mushroom_poison.png | Bin .../mushroom/textures/mushroom_red.png | Bin .../mushroom/textures/mushroom_spore.png | Bin .../textures/mushroom_spore_brown.png | Bin .../mushroom/textures/mushroom_spore_red.png | Bin .../nature_classic/blossom.lua | 0 .../nature_classic/config.lua | 0 .../nature_classic/depends.txt | 0 .../nature_classic/global_function.lua | 41 +- .../plantlife_modpack/nature_classic/init.lua | 0 .../textures/nature_blossom.png | Bin mods/plantlife_modpack/plants_lib/depends.txt | 0 mods/plantlife_modpack/plants_lib/init.lua | 497 ++++++++---------- .../plants_lib/locale/de.txt | 0 .../plants_lib/locale/template.txt | 0 mods/plantlife_modpack/poisonivy/depends.txt | 0 mods/plantlife_modpack/poisonivy/init.lua | 0 .../plantlife_modpack/poisonivy/locale/de.txt | 0 .../poisonivy/locale/template.txt | 0 .../poisonivy/textures/poisonivy_climbing.png | Bin .../poisonivy/textures/poisonivy_seedling.png | Bin .../textures/poisonivy_sproutling.png | Bin mods/plantlife_modpack/trunks/crafting.lua | 0 mods/plantlife_modpack/trunks/depends.txt | 0 mods/plantlife_modpack/trunks/generating.lua | 4 +- mods/plantlife_modpack/trunks/init.lua | 0 mods/plantlife_modpack/trunks/nodes.lua | 0 .../trunks/textures/credit_textures.txt | 0 .../textures/old & unused/comboSticks.png | Bin .../textures/old & unused/comboSticks_2.png | Bin .../old & unused/trunks_root_mask_old.png | Bin .../textures/old & unused/trunks_twig_1e.png | Bin .../textures/old & unused/trunks_twig_1n.png | Bin .../textures/old & unused/trunks_twig_2n.png | Bin .../textures/old & unused/trunks_twig_3n.png | Bin .../textures/old & unused/trunks_twig_4n.png | Bin .../textures/old & unused/trunks_twig_5-8.png | Bin .../old & unused/trunks_twig_9-12.png | Bin .../trunks/textures/trunks_moss.png | Bin .../trunks/textures/trunks_moss_fungus.png | Bin .../trunks/textures/trunks_root_mask.png | Bin .../trunks/textures/trunks_twig_1.png | Bin .../trunks/textures/trunks_twig_10.png | Bin .../trunks/textures/trunks_twig_11.png | Bin .../trunks/textures/trunks_twig_12.png | Bin .../trunks/textures/trunks_twig_13.png | Bin .../trunks/textures/trunks_twig_2.png | Bin .../trunks/textures/trunks_twig_3.png | Bin .../trunks/textures/trunks_twig_4.png | Bin .../trunks/textures/trunks_twig_5.png | Bin .../trunks/textures/trunks_twig_6.png | Bin .../trunks/textures/trunks_twig_7.png | Bin .../trunks/textures/trunks_twig_8.png | Bin .../trunks/textures/trunks_twig_9.png | Bin .../trunks/textures/trunks_twigs.png | Bin .../trunks/textures/trunks_twigs_corner.png | Bin .../trunks/textures/trunks_twigs_top.png | Bin .../trunks/trunks_settings.txt | 0 mods/plantlife_modpack/vines/depends.txt | 0 mods/plantlife_modpack/vines/init.lua | 4 +- mods/plantlife_modpack/vines/readme.txt | 0 .../vines/textures/new/bottomvine.png | Bin .../vines/textures/new/sidevine.png | Bin .../vines/textures/new/vinesdead.png | Bin .../vines/textures/new/vineslive.png | Bin .../vines/textures/old/vines_vine2.png | Bin .../vines/textures/old/vines_vine_rotten2.png | Bin .../vines/textures/shears.png | Bin .../vines/textures/vines_item.png | Bin .../vines/textures/vines_root.png | Bin .../vines/textures/vines_rope.png | Bin .../vines/textures/vines_rope_end.png | Bin .../vines/textures/vines_side.png | Bin .../vines/textures/vines_side_rotten.png | Bin .../vines/textures/vines_vine.png | Bin .../vines/textures/vines_vine_rotten.png | Bin .../vines/textures/vines_willow.png | Bin .../vines/textures/vines_willow_rotten.png | Bin mods/plantlife_modpack/woodsoils/depends.txt | 0 .../woodsoils/generating.lua | 0 mods/plantlife_modpack/woodsoils/init.lua | 0 mods/plantlife_modpack/woodsoils/nodes.lua | 0 .../woodsoils/textures/credit_textures.txt | 0 .../textures/not in use/woodsoils.png | Bin .../woodsoils/textures/woodsoils_ground.png | Bin .../textures/woodsoils_ground_cover.png | Bin .../textures/woodsoils_ground_cover2.png | Bin .../textures/woodsoils_ground_cover_side.png | Bin .../textures/woodsoils_ground_cover_side2.png | Bin .../textures/woodsoils_ground_side.png | Bin mods/plantlife_modpack/youngtrees/depends.txt | 0 mods/plantlife_modpack/youngtrees/init.lua | 0 .../youngtrees/textures/bamboo.png | Bin .../youngtrees/textures/unused/sapling.png | Bin .../youngtrees/textures/unused/sapling16x.png | Bin .../youngtrees/textures/youngtree16xa.png | Bin .../youngtrees/textures/youngtree16xb.png | Bin .../youngtrees/textures/youngtree16xc.png | Bin .../youngtrees/textures/youngtree2branch.png | Bin 391 files changed, 347 insertions(+), 317 deletions(-) mode change 100755 => 100644 mods/plantlife_modpack/.gitignore mode change 100755 => 100644 mods/plantlife_modpack/API.txt mode change 100755 => 100644 mods/plantlife_modpack/LICENSE mode change 100755 => 100644 mods/plantlife_modpack/README mode change 100755 => 100644 mods/plantlife_modpack/along_shore/depends.txt mode change 100755 => 100644 mods/plantlife_modpack/along_shore/init.lua mode change 100755 => 100644 mods/plantlife_modpack/along_shore/textures/along_shore_seaweed_1Darker.png mode change 100755 => 100644 mods/plantlife_modpack/along_shore/textures/credit_textures.txt mode change 100755 => 100644 mods/plantlife_modpack/along_shore/textures/old/LillyPad3x16.png mode change 100755 => 100644 mods/plantlife_modpack/along_shore/textures/old/MultiLilly16x.png mode change 100755 => 100644 mods/plantlife_modpack/along_shore/textures/old/along_shore_empty.png mode change 100755 => 100644 mods/plantlife_modpack/along_shore/textures/old/along_shore_lilypads_1.png mode change 100755 => 100644 mods/plantlife_modpack/along_shore/textures/old/along_shore_lilypads_2.png mode change 100755 => 100644 mods/plantlife_modpack/along_shore/textures/old/along_shore_lilypads_3.png mode change 100755 => 100644 mods/plantlife_modpack/along_shore/textures/old/along_shore_lilypads_4.png mode change 100755 => 100644 mods/plantlife_modpack/along_shore/textures/old/along_shore_pondscum_1.png mode change 100755 => 100644 mods/plantlife_modpack/along_shore/textures/old/along_shore_seaweed_1.png mode change 100755 => 100644 mods/plantlife_modpack/along_shore/textures/old/along_shore_seaweed_2.png mode change 100755 => 100644 mods/plantlife_modpack/along_shore/textures/old/along_shore_seaweed_3.png mode change 100755 => 100644 mods/plantlife_modpack/along_shore/textures/old/along_shore_seaweed_4.png mode change 100755 => 100644 mods/plantlife_modpack/along_shore/textures/old/flowers_seaweed.png mode change 100755 => 100644 mods/plantlife_modpack/along_shore/textures/old/flowers_waterlily.png mode change 100755 => 100644 mods/plantlife_modpack/along_shore/textures/old/flowers_waterlily_22.5.png mode change 100755 => 100644 mods/plantlife_modpack/along_shore/textures/old/flowers_waterlily_45.png mode change 100755 => 100644 mods/plantlife_modpack/along_shore/textures/old/flowers_waterlily_67.5.png mode change 100755 => 100644 mods/plantlife_modpack/along_shore/textures/old/lillyPad5x16.png mode change 100755 => 100644 mods/plantlife_modpack/along_shore/textures/old/lillypad3Flower16x.png mode change 100755 => 100644 mods/plantlife_modpack/along_shore/textures/old/pondscum16xc.png mode change 100755 => 100644 mods/plantlife_modpack/bushes/depends.txt mode change 100755 => 100644 mods/plantlife_modpack/bushes/init.lua mode change 100755 => 100644 mods/plantlife_modpack/bushes/textures/bushes_branches_center_1.png mode change 100755 => 100644 mods/plantlife_modpack/bushes/textures/bushes_branches_center_2.png mode change 100755 => 100644 mods/plantlife_modpack/bushes/textures/bushes_branches_left_1.png mode change 100755 => 100644 mods/plantlife_modpack/bushes/textures/bushes_branches_left_2.png mode change 100755 => 100644 mods/plantlife_modpack/bushes/textures/bushes_branches_right_1.png mode change 100755 => 100644 mods/plantlife_modpack/bushes/textures/bushes_branches_right_2.png mode change 100755 => 100644 mods/plantlife_modpack/bushes/textures/bushes_leaves_1.png mode change 100755 => 100644 mods/plantlife_modpack/bushes/textures/bushes_leaves_2.png mode change 100755 => 100644 mods/plantlife_modpack/bushes/textures/bushes_youngtree2trunk.png mode change 100755 => 100644 mods/plantlife_modpack/bushes/textures/bushes_youngtree2trunk_inv.png mode change 100755 => 100644 mods/plantlife_modpack/bushes/textures/old & unused/BlockBranch1.png mode change 100755 => 100644 mods/plantlife_modpack/bushes/textures/old & unused/BlockBranch1L.png mode change 100755 => 100644 mods/plantlife_modpack/bushes/textures/old & unused/BlockBranch1R.png mode change 100755 => 100644 mods/plantlife_modpack/bushes/textures/old & unused/BushBranches1.png mode change 100755 => 100644 mods/plantlife_modpack/bushes/textures/old & unused/BushBranches1sm.png mode change 100755 => 100644 mods/plantlife_modpack/bushes/textures/old & unused/BushBranches1sm2.png mode change 100755 => 100644 mods/plantlife_modpack/bushes/textures/old & unused/BushBranches1sm3.png mode change 100755 => 100644 mods/plantlife_modpack/bushes/textures/old & unused/BushBranches1sm4.png mode change 100755 => 100644 mods/plantlife_modpack/bushes/textures/old & unused/BushBranchesCenter.png mode change 100755 => 100644 mods/plantlife_modpack/bushes/textures/old & unused/BushBranchesSide1.png mode change 100755 => 100644 mods/plantlife_modpack/bushes/textures/old & unused/BushBranchesSide2.png mode change 100755 => 100644 mods/plantlife_modpack/bushes/textures/old & unused/blank.png mode change 100755 => 100644 mods/plantlife_modpack/bushes/textures/old & unused/moretrees_pine_leaves3.png mode change 100755 => 100644 mods/plantlife_modpack/bushes_classic/depends.txt mode change 100755 => 100644 mods/plantlife_modpack/bushes_classic/image_credits.txt mode change 100755 => 100644 mods/plantlife_modpack/bushes_classic/init.lua mode change 100755 => 100644 mods/plantlife_modpack/bushes_classic/locale/de.txt mode change 100755 => 100644 mods/plantlife_modpack/bushes_classic/locale/template.txt mode change 100755 => 100644 mods/plantlife_modpack/bushes_classic/nodes.lua mode change 100755 => 100644 mods/plantlife_modpack/bushes_classic/textures/bushes_basket_blackberry_top.png mode change 100755 => 100644 mods/plantlife_modpack/bushes_classic/textures/bushes_basket_blueberry_top.png mode change 100755 => 100644 mods/plantlife_modpack/bushes_classic/textures/bushes_basket_bottom.png mode change 100755 => 100644 mods/plantlife_modpack/bushes_classic/textures/bushes_basket_empty_top.png mode change 100755 => 100644 mods/plantlife_modpack/bushes_classic/textures/bushes_basket_gooseberry_top.png mode change 100755 => 100644 mods/plantlife_modpack/bushes_classic/textures/bushes_basket_mixed_berry_top.png mode change 100755 => 100644 mods/plantlife_modpack/bushes_classic/textures/bushes_basket_raspberry_top.png mode change 100755 => 100644 mods/plantlife_modpack/bushes_classic/textures/bushes_basket_side.png mode change 100755 => 100644 mods/plantlife_modpack/bushes_classic/textures/bushes_basket_strawberry_top.png mode change 100755 => 100644 mods/plantlife_modpack/bushes_classic/textures/bushes_blackberry.png mode change 100755 => 100644 mods/plantlife_modpack/bushes_classic/textures/bushes_blackberry_bush.png mode change 100755 => 100644 mods/plantlife_modpack/bushes_classic/textures/bushes_blackberry_pie_cooked.png mode change 100755 => 100644 mods/plantlife_modpack/bushes_classic/textures/bushes_blackberry_pie_raw.png mode change 100755 => 100644 mods/plantlife_modpack/bushes_classic/textures/bushes_blackberry_pie_slice.png mode change 100755 => 100644 mods/plantlife_modpack/bushes_classic/textures/bushes_blueberry.png mode change 100755 => 100644 mods/plantlife_modpack/bushes_classic/textures/bushes_blueberry_bush.png mode change 100755 => 100644 mods/plantlife_modpack/bushes_classic/textures/bushes_blueberry_pie_cooked.png mode change 100755 => 100644 mods/plantlife_modpack/bushes_classic/textures/bushes_blueberry_pie_raw.png mode change 100755 => 100644 mods/plantlife_modpack/bushes_classic/textures/bushes_blueberry_pie_slice.png mode change 100755 => 100644 mods/plantlife_modpack/bushes_classic/textures/bushes_bush_bottom.png mode change 100755 => 100644 mods/plantlife_modpack/bushes_classic/textures/bushes_bush_top.png mode change 100755 => 100644 mods/plantlife_modpack/bushes_classic/textures/bushes_fruitless_bush.png mode change 100755 => 100644 mods/plantlife_modpack/bushes_classic/textures/bushes_fruitless_bush_bottom.png mode change 100755 => 100644 mods/plantlife_modpack/bushes_classic/textures/bushes_fruitless_bush_top.png mode change 100755 => 100644 mods/plantlife_modpack/bushes_classic/textures/bushes_gooseberry.png mode change 100755 => 100644 mods/plantlife_modpack/bushes_classic/textures/bushes_gooseberry_bush.png mode change 100755 => 100644 mods/plantlife_modpack/bushes_classic/textures/bushes_gooseberry_pie_cooked.png mode change 100755 => 100644 mods/plantlife_modpack/bushes_classic/textures/bushes_gooseberry_pie_raw.png mode change 100755 => 100644 mods/plantlife_modpack/bushes_classic/textures/bushes_gooseberry_pie_slice.png mode change 100755 => 100644 mods/plantlife_modpack/bushes_classic/textures/bushes_mixed_berry_pie_cooked.png mode change 100755 => 100644 mods/plantlife_modpack/bushes_classic/textures/bushes_mixed_berry_pie_raw.png mode change 100755 => 100644 mods/plantlife_modpack/bushes_classic/textures/bushes_mixed_berry_pie_slice.png mode change 100755 => 100644 mods/plantlife_modpack/bushes_classic/textures/bushes_raspberry.png mode change 100755 => 100644 mods/plantlife_modpack/bushes_classic/textures/bushes_raspberry_bush.png mode change 100755 => 100644 mods/plantlife_modpack/bushes_classic/textures/bushes_raspberry_pie_cooked.png mode change 100755 => 100644 mods/plantlife_modpack/bushes_classic/textures/bushes_raspberry_pie_raw.png mode change 100755 => 100644 mods/plantlife_modpack/bushes_classic/textures/bushes_raspberry_pie_slice.png mode change 100755 => 100644 mods/plantlife_modpack/bushes_classic/textures/bushes_strawberry.png mode change 100755 => 100644 mods/plantlife_modpack/bushes_classic/textures/bushes_strawberry_bush.png mode change 100755 => 100644 mods/plantlife_modpack/bushes_classic/textures/bushes_strawberry_pie_cooked.png mode change 100755 => 100644 mods/plantlife_modpack/bushes_classic/textures/bushes_strawberry_pie_raw.png mode change 100755 => 100644 mods/plantlife_modpack/bushes_classic/textures/bushes_strawberry_pie_slice.png mode change 100755 => 100644 mods/plantlife_modpack/bushes_classic/textures/bushes_sugar.png mode change 100755 => 100644 mods/plantlife_modpack/cavestuff/depends.txt mode change 100755 => 100644 mods/plantlife_modpack/cavestuff/init.lua mode change 100755 => 100644 mods/plantlife_modpack/cavestuff/mapgen.lua mode change 100755 => 100644 mods/plantlife_modpack/cavestuff/nodes.lua mode change 100755 => 100644 mods/plantlife_modpack/cavestuff/textures/undergrowth_desert_pebble.png mode change 100755 => 100644 mods/plantlife_modpack/cavestuff/textures/undergrowth_pebble.png mode change 100755 => 100644 mods/plantlife_modpack/copyright.txt mode change 100755 => 100644 mods/plantlife_modpack/dryplants/crafting.lua mode change 100755 => 100644 mods/plantlife_modpack/dryplants/depends.txt mode change 100755 => 100644 mods/plantlife_modpack/dryplants/init.lua mode change 100755 => 100644 mods/plantlife_modpack/dryplants/juncus.lua mode change 100755 => 100644 mods/plantlife_modpack/dryplants/meadowvariation.lua create mode 100644 mods/plantlife_modpack/dryplants/models/plantlike.obj mode change 100755 => 100644 mods/plantlife_modpack/dryplants/moregrass.lua mode change 100755 => 100644 mods/plantlife_modpack/dryplants/reed.lua mode change 100755 => 100644 mods/plantlife_modpack/dryplants/reedmace.lua mode change 100755 => 100644 mods/plantlife_modpack/dryplants/settings.txt mode change 100755 => 100644 mods/plantlife_modpack/dryplants/textures/default_grass_1.png mode change 100755 => 100644 mods/plantlife_modpack/dryplants/textures/default_grass_2.png mode change 100755 => 100644 mods/plantlife_modpack/dryplants/textures/default_grass_3.png mode change 100755 => 100644 mods/plantlife_modpack/dryplants/textures/default_grass_4.png mode change 100755 => 100644 mods/plantlife_modpack/dryplants/textures/default_grass_5.png mode change 100755 => 100644 mods/plantlife_modpack/dryplants/textures/dryplants_grass.png mode change 100755 => 100644 mods/plantlife_modpack/dryplants/textures/dryplants_grass_short.png mode change 100755 => 100644 mods/plantlife_modpack/dryplants/textures/dryplants_grass_short_side.png mode change 100755 => 100644 mods/plantlife_modpack/dryplants/textures/dryplants_hay.png mode change 100755 => 100644 mods/plantlife_modpack/dryplants/textures/dryplants_juncus_02.png mode change 100755 => 100644 mods/plantlife_modpack/dryplants/textures/dryplants_juncus_03.png mode change 100755 => 100644 mods/plantlife_modpack/dryplants/textures/dryplants_juncus_inv.png mode change 100755 => 100644 mods/plantlife_modpack/dryplants/textures/dryplants_reed.png mode change 100755 => 100644 mods/plantlife_modpack/dryplants/textures/dryplants_reed_wet.png mode change 100755 => 100644 mods/plantlife_modpack/dryplants/textures/dryplants_reedmace.png mode change 100755 => 100644 mods/plantlife_modpack/dryplants/textures/dryplants_reedmace_bottom.png mode change 100755 => 100644 mods/plantlife_modpack/dryplants/textures/dryplants_reedmace_height_2.png mode change 100755 => 100644 mods/plantlife_modpack/dryplants/textures/dryplants_reedmace_height_3.png mode change 100755 => 100644 mods/plantlife_modpack/dryplants/textures/dryplants_reedmace_height_3_spikes.png mode change 100755 => 100644 mods/plantlife_modpack/dryplants/textures/dryplants_reedmace_sapling.png mode change 100755 => 100644 mods/plantlife_modpack/dryplants/textures/dryplants_reedmace_spikes.png mode change 100755 => 100644 mods/plantlife_modpack/dryplants/textures/dryplants_reedmace_top.png mode change 100755 => 100644 mods/plantlife_modpack/dryplants/textures/dryplants_reedmace_water.png mode change 100755 => 100644 mods/plantlife_modpack/dryplants/textures/dryplants_sickle.png mode change 100755 => 100644 mods/plantlife_modpack/dryplants/textures/not_in_use/big_pic_8.png mode change 100755 => 100644 mods/plantlife_modpack/dryplants/textures/not_in_use/big_pic_9.png mode change 100755 => 100644 mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_cattailsG_m2.png mode change 100755 => 100644 mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_juncus_02_left.png mode change 100755 => 100644 mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_juncus_02_right.png mode change 100755 => 100644 mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_juncus_02_whole2.png mode change 100755 => 100644 mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_juncus_03_left.png mode change 100755 => 100644 mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_juncus_03_right.png mode change 100755 => 100644 mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_juncus_03_whole2.png mode change 100755 => 100644 mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_reedmace_01.png mode change 100755 => 100644 mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_reedmace_02.png mode change 100755 => 100644 mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_reedmace_03.png mode change 100755 => 100644 mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_reedmace_04.png mode change 100755 => 100644 mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_reedmace_bottom_left.png mode change 100755 => 100644 mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_reedmace_bottom_right.png mode change 100755 => 100644 mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_reedmace_left.png mode change 100755 => 100644 mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_reedmace_right.png mode change 100755 => 100644 mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_reedmace_top_left.png mode change 100755 => 100644 mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_reedmace_top_right.png mode change 100755 => 100644 mods/plantlife_modpack/dryplants/textures/not_in_use/reedmace2.png mode change 100755 => 100644 mods/plantlife_modpack/dryplants/textures/not_in_use/reedmace3.png mode change 100755 => 100644 mods/plantlife_modpack/dryplants/textures/not_in_use/reedmace4.png mode change 100755 => 100644 mods/plantlife_modpack/dryplants/textures/not_in_use/reedtest.png mode change 100755 => 100644 mods/plantlife_modpack/dryplants/textures/not_in_use/texturing.png mode change 100755 => 100644 mods/plantlife_modpack/dryplants/textures/old/dryplants_grass_short_old3.png mode change 100755 => 100644 mods/plantlife_modpack/dryplants/textures/old/dryplants_grass_short_old4.png mode change 100755 => 100644 mods/plantlife_modpack/dryplants/textures/old/dryplants_juncus_02_left_old.png mode change 100755 => 100644 mods/plantlife_modpack/dryplants/textures/old/dryplants_juncus_02_right_old.png mode change 100755 => 100644 mods/plantlife_modpack/dryplants/textures/old/dryplants_juncus_03_left_old.png mode change 100755 => 100644 mods/plantlife_modpack/dryplants/textures/old/dryplants_juncus_03_right_old.png mode change 100755 => 100644 mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_bottom_left_old2.png mode change 100755 => 100644 mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_bottom_old4.png mode change 100755 => 100644 mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_bottom_right_old2.png mode change 100755 => 100644 mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_left_old2.png mode change 100755 => 100644 mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_old8.png mode change 100755 => 100644 mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_right_old2.png mode change 100755 => 100644 mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_spikes_old3.png mode change 100755 => 100644 mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_top_left_old2.png mode change 100755 => 100644 mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_top_old3.png mode change 100755 => 100644 mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_top_right_old2.png mode change 100755 => 100644 mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_water_old2.png mode change 100755 => 100644 mods/plantlife_modpack/ferns/crafting.lua mode change 100755 => 100644 mods/plantlife_modpack/ferns/depends.txt mode change 100755 => 100644 mods/plantlife_modpack/ferns/fern.lua mode change 100755 => 100644 mods/plantlife_modpack/ferns/gianttreefern.lua mode change 100755 => 100644 mods/plantlife_modpack/ferns/horsetail.lua mode change 100755 => 100644 mods/plantlife_modpack/ferns/init.lua mode change 100755 => 100644 mods/plantlife_modpack/ferns/settings.lua mode change 100755 => 100644 mods/plantlife_modpack/ferns/textures/ferns_5.png mode change 100755 => 100644 mods/plantlife_modpack/ferns/textures/ferns_6.png mode change 100755 => 100644 mods/plantlife_modpack/ferns/textures/ferns_7.png mode change 100755 => 100644 mods/plantlife_modpack/ferns/textures/ferns_8.png mode change 100755 => 100644 mods/plantlife_modpack/ferns/textures/ferns_fern.png mode change 100755 => 100644 mods/plantlife_modpack/ferns/textures/ferns_fern_big.png mode change 100755 => 100644 mods/plantlife_modpack/ferns/textures/ferns_fern_mid.png mode change 100755 => 100644 mods/plantlife_modpack/ferns/textures/ferns_fern_tree.png mode change 100755 => 100644 mods/plantlife_modpack/ferns/textures/ferns_fern_tree_giant.png mode change 100755 => 100644 mods/plantlife_modpack/ferns/textures/ferns_fern_tree_inv.png mode change 100755 => 100644 mods/plantlife_modpack/ferns/textures/ferns_fern_tree_tl.png mode change 100755 => 100644 mods/plantlife_modpack/ferns/textures/ferns_fern_tree_tr.png mode change 100755 => 100644 mods/plantlife_modpack/ferns/textures/ferns_fern_trunk.png mode change 100755 => 100644 mods/plantlife_modpack/ferns/textures/ferns_fern_trunk_big.png mode change 100755 => 100644 mods/plantlife_modpack/ferns/textures/ferns_fern_trunk_big_top.png mode change 100755 => 100644 mods/plantlife_modpack/ferns/textures/ferns_fern_trunk_top.png mode change 100755 => 100644 mods/plantlife_modpack/ferns/textures/ferns_ferntuber.png mode change 100755 => 100644 mods/plantlife_modpack/ferns/textures/ferns_ferntuber_roasted.png mode change 100755 => 100644 mods/plantlife_modpack/ferns/textures/ferns_fiddlehead.png mode change 100755 => 100644 mods/plantlife_modpack/ferns/textures/ferns_fiddlehead_roasted.png mode change 100755 => 100644 mods/plantlife_modpack/ferns/textures/ferns_horsetail_01.png mode change 100755 => 100644 mods/plantlife_modpack/ferns/textures/ferns_horsetail_02.png mode change 100755 => 100644 mods/plantlife_modpack/ferns/textures/ferns_horsetail_03.png mode change 100755 => 100644 mods/plantlife_modpack/ferns/textures/ferns_horsetail_04.png mode change 100755 => 100644 mods/plantlife_modpack/ferns/textures/ferns_sapling_tree_fern.png mode change 100755 => 100644 mods/plantlife_modpack/ferns/textures/ferns_sapling_tree_fern_giant.png mode change 100755 => 100644 mods/plantlife_modpack/ferns/textures/ferns_tree_fern_leave_big.png mode change 100755 => 100644 mods/plantlife_modpack/ferns/textures/ferns_tree_fern_leave_big_cross.png mode change 100755 => 100644 mods/plantlife_modpack/ferns/textures/ferns_tree_fern_leave_big_end.png mode change 100755 => 100644 mods/plantlife_modpack/ferns/textures/not_in_use/archaeplantae_horsetails.png mode change 100755 => 100644 mods/plantlife_modpack/ferns/textures/not_in_use/big picture 3.png mode change 100755 => 100644 mods/plantlife_modpack/ferns/textures/not_in_use/ferns_fern_big_left.png mode change 100755 => 100644 mods/plantlife_modpack/ferns/textures/not_in_use/ferns_fern_big_right.png mode change 100755 => 100644 mods/plantlife_modpack/ferns/textures/not_in_use/ferns_fern_mid_left.png mode change 100755 => 100644 mods/plantlife_modpack/ferns/textures/not_in_use/ferns_fern_mid_right.png mode change 100755 => 100644 mods/plantlife_modpack/ferns/textures/not_in_use/ferns_fern_tree_bl.png mode change 100755 => 100644 mods/plantlife_modpack/ferns/textures/not_in_use/ferns_fern_tree_br.png mode change 100755 => 100644 mods/plantlife_modpack/ferns/textures/not_in_use/ferns_fern_trunk_big_crown.png mode change 100755 => 100644 mods/plantlife_modpack/ferns/textures/old/archaeplantae_fern_old4.png mode change 100755 => 100644 mods/plantlife_modpack/ferns/textures/old/comb.png mode change 100755 => 100644 mods/plantlife_modpack/ferns/textures/old/ferns_5_old.png mode change 100755 => 100644 mods/plantlife_modpack/ferns/textures/old/ferns_6_old.png mode change 100755 => 100644 mods/plantlife_modpack/ferns/textures/old/ferns_7_old.png mode change 100755 => 100644 mods/plantlife_modpack/ferns/textures/old/ferns_fern_big_old.png mode change 100755 => 100644 mods/plantlife_modpack/ferns/textures/old/ferns_fern_mid_old.png mode change 100755 => 100644 mods/plantlife_modpack/ferns/textures/old/ferns_fern_tree_old.png mode change 100755 => 100644 mods/plantlife_modpack/ferns/textures/old/ferns_fern_trunk_big_old2.png mode change 100755 => 100644 mods/plantlife_modpack/ferns/textures/old/ferns_fern_trunk_big_top_old.png mode change 100755 => 100644 mods/plantlife_modpack/ferns/textures/old/ferns_fern_trunk_big_top_old2.png mode change 100755 => 100644 mods/plantlife_modpack/ferns/textures/old/ferns_fern_trunk_top_old.png mode change 100755 => 100644 mods/plantlife_modpack/ferns/textures/old/ferns_horsetail_01_old2.png mode change 100755 => 100644 mods/plantlife_modpack/ferns/textures/old/ferns_horsetail_02_old2.png mode change 100755 => 100644 mods/plantlife_modpack/ferns/textures/old/ferns_horsetail_03_old2.png mode change 100755 => 100644 mods/plantlife_modpack/ferns/textures/old/ferns_horsetail_04_old2.png mode change 100755 => 100644 mods/plantlife_modpack/ferns/textures/old/ferns_tree_fern_leave_big_cross_old.png mode change 100755 => 100644 mods/plantlife_modpack/ferns/textures/old/ferns_tree_fern_leave_big_end_old.png mode change 100755 => 100644 mods/plantlife_modpack/ferns/textures/old/ferns_tree_fern_leave_big_old.png mode change 100755 => 100644 mods/plantlife_modpack/ferns/treefern.lua mode change 100755 => 100644 mods/plantlife_modpack/flowers_plus/depends.txt mode change 100755 => 100644 mods/plantlife_modpack/flowers_plus/flowers-changelog.txt mode change 100755 => 100644 mods/plantlife_modpack/flowers_plus/init.lua mode change 100755 => 100644 mods/plantlife_modpack/flowers_plus/locale/de.txt mode change 100755 => 100644 mods/plantlife_modpack/flowers_plus/locale/template.txt mode change 100755 => 100644 mods/plantlife_modpack/flowers_plus/textures/flowers_flowerpot.png mode change 100755 => 100644 mods/plantlife_modpack/flowers_plus/textures/flowers_potted_bonsai.png mode change 100755 => 100644 mods/plantlife_modpack/flowers_plus/textures/flowers_potted_cactus.png mode change 100755 => 100644 mods/plantlife_modpack/flowers_plus/textures/flowers_potted_dandelion_white.png mode change 100755 => 100644 mods/plantlife_modpack/flowers_plus/textures/flowers_potted_dandelion_yellow.png mode change 100755 => 100644 mods/plantlife_modpack/flowers_plus/textures/flowers_potted_geranium.png mode change 100755 => 100644 mods/plantlife_modpack/flowers_plus/textures/flowers_potted_rose.png mode change 100755 => 100644 mods/plantlife_modpack/flowers_plus/textures/flowers_potted_tulip.png mode change 100755 => 100644 mods/plantlife_modpack/flowers_plus/textures/flowers_potted_viola.png mode change 100755 => 100644 mods/plantlife_modpack/flowers_plus/textures/flowers_seaweed.png mode change 100755 => 100644 mods/plantlife_modpack/flowers_plus/textures/flowers_seaweedLight.png mode change 100755 => 100644 mods/plantlife_modpack/flowers_plus/textures/flowers_seaweed_2.png mode change 100755 => 100644 mods/plantlife_modpack/flowers_plus/textures/flowers_seaweed_3.png mode change 100755 => 100644 mods/plantlife_modpack/flowers_plus/textures/flowers_seaweed_4.png mode change 100755 => 100644 mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily.png mode change 100755 => 100644 mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily_22.5.png mode change 100755 => 100644 mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily_45.png mode change 100755 => 100644 mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily_67.5.png mode change 100755 => 100644 mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily_small_1.png mode change 100755 => 100644 mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily_small_2.png mode change 100755 => 100644 mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily_small_3.png mode change 100755 => 100644 mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily_small_4.png mode change 100755 => 100644 mods/plantlife_modpack/junglegrass/init.lua mode change 100755 => 100644 mods/plantlife_modpack/modpack.txt mode change 100755 => 100644 mods/plantlife_modpack/molehills/depends.txt mode change 100755 => 100644 mods/plantlife_modpack/molehills/init.lua mode change 100755 => 100644 mods/plantlife_modpack/molehills/molehills_settings.txt mode change 100755 => 100644 mods/plantlife_modpack/molehills/textures/molehills_dirt.png mode change 100755 => 100644 mods/plantlife_modpack/molehills/textures/molehills_side.png mode change 100755 => 100644 mods/plantlife_modpack/molehills/textures/old & unused/molehill_side.png mode change 100755 => 100644 mods/plantlife_modpack/molehills/textures/old & unused/molehill_top.png mode change 100755 => 100644 mods/plantlife_modpack/mushroom/compat.lua mode change 100755 => 100644 mods/plantlife_modpack/mushroom/crafting.lua mode change 100755 => 100644 mods/plantlife_modpack/mushroom/depends.txt mode change 100755 => 100644 mods/plantlife_modpack/mushroom/init.lua mode change 100755 => 100644 mods/plantlife_modpack/mushroom/textures/mushroom_brown.png mode change 100755 => 100644 mods/plantlife_modpack/mushroom/textures/mushroom_essence.png mode change 100755 => 100644 mods/plantlife_modpack/mushroom/textures/mushroom_identifier.png mode change 100755 => 100644 mods/plantlife_modpack/mushroom/textures/mushroom_poison.png mode change 100755 => 100644 mods/plantlife_modpack/mushroom/textures/mushroom_red.png mode change 100755 => 100644 mods/plantlife_modpack/mushroom/textures/mushroom_spore.png mode change 100755 => 100644 mods/plantlife_modpack/mushroom/textures/mushroom_spore_brown.png mode change 100755 => 100644 mods/plantlife_modpack/mushroom/textures/mushroom_spore_red.png mode change 100755 => 100644 mods/plantlife_modpack/nature_classic/blossom.lua mode change 100755 => 100644 mods/plantlife_modpack/nature_classic/config.lua mode change 100755 => 100644 mods/plantlife_modpack/nature_classic/depends.txt mode change 100755 => 100644 mods/plantlife_modpack/nature_classic/global_function.lua mode change 100755 => 100644 mods/plantlife_modpack/nature_classic/init.lua mode change 100755 => 100644 mods/plantlife_modpack/nature_classic/textures/nature_blossom.png mode change 100755 => 100644 mods/plantlife_modpack/plants_lib/depends.txt mode change 100755 => 100644 mods/plantlife_modpack/plants_lib/init.lua mode change 100755 => 100644 mods/plantlife_modpack/plants_lib/locale/de.txt mode change 100755 => 100644 mods/plantlife_modpack/plants_lib/locale/template.txt mode change 100755 => 100644 mods/plantlife_modpack/poisonivy/depends.txt mode change 100755 => 100644 mods/plantlife_modpack/poisonivy/init.lua mode change 100755 => 100644 mods/plantlife_modpack/poisonivy/locale/de.txt mode change 100755 => 100644 mods/plantlife_modpack/poisonivy/locale/template.txt mode change 100755 => 100644 mods/plantlife_modpack/poisonivy/textures/poisonivy_climbing.png mode change 100755 => 100644 mods/plantlife_modpack/poisonivy/textures/poisonivy_seedling.png mode change 100755 => 100644 mods/plantlife_modpack/poisonivy/textures/poisonivy_sproutling.png mode change 100755 => 100644 mods/plantlife_modpack/trunks/crafting.lua mode change 100755 => 100644 mods/plantlife_modpack/trunks/depends.txt mode change 100755 => 100644 mods/plantlife_modpack/trunks/generating.lua mode change 100755 => 100644 mods/plantlife_modpack/trunks/init.lua mode change 100755 => 100644 mods/plantlife_modpack/trunks/nodes.lua mode change 100755 => 100644 mods/plantlife_modpack/trunks/textures/credit_textures.txt mode change 100755 => 100644 mods/plantlife_modpack/trunks/textures/old & unused/comboSticks.png mode change 100755 => 100644 mods/plantlife_modpack/trunks/textures/old & unused/comboSticks_2.png mode change 100755 => 100644 mods/plantlife_modpack/trunks/textures/old & unused/trunks_root_mask_old.png mode change 100755 => 100644 mods/plantlife_modpack/trunks/textures/old & unused/trunks_twig_1e.png mode change 100755 => 100644 mods/plantlife_modpack/trunks/textures/old & unused/trunks_twig_1n.png mode change 100755 => 100644 mods/plantlife_modpack/trunks/textures/old & unused/trunks_twig_2n.png mode change 100755 => 100644 mods/plantlife_modpack/trunks/textures/old & unused/trunks_twig_3n.png mode change 100755 => 100644 mods/plantlife_modpack/trunks/textures/old & unused/trunks_twig_4n.png mode change 100755 => 100644 mods/plantlife_modpack/trunks/textures/old & unused/trunks_twig_5-8.png mode change 100755 => 100644 mods/plantlife_modpack/trunks/textures/old & unused/trunks_twig_9-12.png mode change 100755 => 100644 mods/plantlife_modpack/trunks/textures/trunks_moss.png mode change 100755 => 100644 mods/plantlife_modpack/trunks/textures/trunks_moss_fungus.png mode change 100755 => 100644 mods/plantlife_modpack/trunks/textures/trunks_root_mask.png mode change 100755 => 100644 mods/plantlife_modpack/trunks/textures/trunks_twig_1.png mode change 100755 => 100644 mods/plantlife_modpack/trunks/textures/trunks_twig_10.png mode change 100755 => 100644 mods/plantlife_modpack/trunks/textures/trunks_twig_11.png mode change 100755 => 100644 mods/plantlife_modpack/trunks/textures/trunks_twig_12.png mode change 100755 => 100644 mods/plantlife_modpack/trunks/textures/trunks_twig_13.png mode change 100755 => 100644 mods/plantlife_modpack/trunks/textures/trunks_twig_2.png mode change 100755 => 100644 mods/plantlife_modpack/trunks/textures/trunks_twig_3.png mode change 100755 => 100644 mods/plantlife_modpack/trunks/textures/trunks_twig_4.png mode change 100755 => 100644 mods/plantlife_modpack/trunks/textures/trunks_twig_5.png mode change 100755 => 100644 mods/plantlife_modpack/trunks/textures/trunks_twig_6.png mode change 100755 => 100644 mods/plantlife_modpack/trunks/textures/trunks_twig_7.png mode change 100755 => 100644 mods/plantlife_modpack/trunks/textures/trunks_twig_8.png mode change 100755 => 100644 mods/plantlife_modpack/trunks/textures/trunks_twig_9.png mode change 100755 => 100644 mods/plantlife_modpack/trunks/textures/trunks_twigs.png mode change 100755 => 100644 mods/plantlife_modpack/trunks/textures/trunks_twigs_corner.png mode change 100755 => 100644 mods/plantlife_modpack/trunks/textures/trunks_twigs_top.png mode change 100755 => 100644 mods/plantlife_modpack/trunks/trunks_settings.txt mode change 100755 => 100644 mods/plantlife_modpack/vines/depends.txt mode change 100755 => 100644 mods/plantlife_modpack/vines/init.lua mode change 100755 => 100644 mods/plantlife_modpack/vines/readme.txt mode change 100755 => 100644 mods/plantlife_modpack/vines/textures/new/bottomvine.png mode change 100755 => 100644 mods/plantlife_modpack/vines/textures/new/sidevine.png mode change 100755 => 100644 mods/plantlife_modpack/vines/textures/new/vinesdead.png mode change 100755 => 100644 mods/plantlife_modpack/vines/textures/new/vineslive.png mode change 100755 => 100644 mods/plantlife_modpack/vines/textures/old/vines_vine2.png mode change 100755 => 100644 mods/plantlife_modpack/vines/textures/old/vines_vine_rotten2.png mode change 100755 => 100644 mods/plantlife_modpack/vines/textures/shears.png mode change 100755 => 100644 mods/plantlife_modpack/vines/textures/vines_item.png mode change 100755 => 100644 mods/plantlife_modpack/vines/textures/vines_root.png mode change 100755 => 100644 mods/plantlife_modpack/vines/textures/vines_rope.png mode change 100755 => 100644 mods/plantlife_modpack/vines/textures/vines_rope_end.png mode change 100755 => 100644 mods/plantlife_modpack/vines/textures/vines_side.png mode change 100755 => 100644 mods/plantlife_modpack/vines/textures/vines_side_rotten.png mode change 100755 => 100644 mods/plantlife_modpack/vines/textures/vines_vine.png mode change 100755 => 100644 mods/plantlife_modpack/vines/textures/vines_vine_rotten.png mode change 100755 => 100644 mods/plantlife_modpack/vines/textures/vines_willow.png mode change 100755 => 100644 mods/plantlife_modpack/vines/textures/vines_willow_rotten.png mode change 100755 => 100644 mods/plantlife_modpack/woodsoils/depends.txt mode change 100755 => 100644 mods/plantlife_modpack/woodsoils/generating.lua mode change 100755 => 100644 mods/plantlife_modpack/woodsoils/init.lua mode change 100755 => 100644 mods/plantlife_modpack/woodsoils/nodes.lua mode change 100755 => 100644 mods/plantlife_modpack/woodsoils/textures/credit_textures.txt mode change 100755 => 100644 mods/plantlife_modpack/woodsoils/textures/not in use/woodsoils.png mode change 100755 => 100644 mods/plantlife_modpack/woodsoils/textures/woodsoils_ground.png mode change 100755 => 100644 mods/plantlife_modpack/woodsoils/textures/woodsoils_ground_cover.png mode change 100755 => 100644 mods/plantlife_modpack/woodsoils/textures/woodsoils_ground_cover2.png mode change 100755 => 100644 mods/plantlife_modpack/woodsoils/textures/woodsoils_ground_cover_side.png mode change 100755 => 100644 mods/plantlife_modpack/woodsoils/textures/woodsoils_ground_cover_side2.png mode change 100755 => 100644 mods/plantlife_modpack/woodsoils/textures/woodsoils_ground_side.png mode change 100755 => 100644 mods/plantlife_modpack/youngtrees/depends.txt mode change 100755 => 100644 mods/plantlife_modpack/youngtrees/init.lua mode change 100755 => 100644 mods/plantlife_modpack/youngtrees/textures/bamboo.png mode change 100755 => 100644 mods/plantlife_modpack/youngtrees/textures/unused/sapling.png mode change 100755 => 100644 mods/plantlife_modpack/youngtrees/textures/unused/sapling16x.png mode change 100755 => 100644 mods/plantlife_modpack/youngtrees/textures/youngtree16xa.png mode change 100755 => 100644 mods/plantlife_modpack/youngtrees/textures/youngtree16xb.png mode change 100755 => 100644 mods/plantlife_modpack/youngtrees/textures/youngtree16xc.png mode change 100755 => 100644 mods/plantlife_modpack/youngtrees/textures/youngtree2branch.png diff --git a/mods/plantlife_modpack/.gitignore b/mods/plantlife_modpack/.gitignore old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/API.txt b/mods/plantlife_modpack/API.txt old mode 100755 new mode 100644 index 730ea67c..8075865f --- a/mods/plantlife_modpack/API.txt +++ b/mods/plantlife_modpack/API.txt @@ -262,8 +262,8 @@ biome = { -- node. Useful in snow biomes to keep -- objects from spawning in snow that's on the -- wrong surface for that object. - avoid_nodes = {table}, -- List of nodes or groups to avoid when - -- spawning. + avoid_nodes = {table}, -- List of nodes to avoid when spawning. + -- Groups are not supported here. avoid_radius = num, -- how much distance to leave between the -- object to be added and the objects to be -- avoided. If this or the avoid_nodes value diff --git a/mods/plantlife_modpack/LICENSE b/mods/plantlife_modpack/LICENSE old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/README b/mods/plantlife_modpack/README old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/along_shore/depends.txt b/mods/plantlife_modpack/along_shore/depends.txt old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/along_shore/init.lua b/mods/plantlife_modpack/along_shore/init.lua old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/along_shore/textures/along_shore_seaweed_1Darker.png b/mods/plantlife_modpack/along_shore/textures/along_shore_seaweed_1Darker.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/along_shore/textures/credit_textures.txt b/mods/plantlife_modpack/along_shore/textures/credit_textures.txt old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/along_shore/textures/old/LillyPad3x16.png b/mods/plantlife_modpack/along_shore/textures/old/LillyPad3x16.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/along_shore/textures/old/MultiLilly16x.png b/mods/plantlife_modpack/along_shore/textures/old/MultiLilly16x.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/along_shore/textures/old/along_shore_empty.png b/mods/plantlife_modpack/along_shore/textures/old/along_shore_empty.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/along_shore/textures/old/along_shore_lilypads_1.png b/mods/plantlife_modpack/along_shore/textures/old/along_shore_lilypads_1.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/along_shore/textures/old/along_shore_lilypads_2.png b/mods/plantlife_modpack/along_shore/textures/old/along_shore_lilypads_2.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/along_shore/textures/old/along_shore_lilypads_3.png b/mods/plantlife_modpack/along_shore/textures/old/along_shore_lilypads_3.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/along_shore/textures/old/along_shore_lilypads_4.png b/mods/plantlife_modpack/along_shore/textures/old/along_shore_lilypads_4.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/along_shore/textures/old/along_shore_pondscum_1.png b/mods/plantlife_modpack/along_shore/textures/old/along_shore_pondscum_1.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/along_shore/textures/old/along_shore_seaweed_1.png b/mods/plantlife_modpack/along_shore/textures/old/along_shore_seaweed_1.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/along_shore/textures/old/along_shore_seaweed_2.png b/mods/plantlife_modpack/along_shore/textures/old/along_shore_seaweed_2.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/along_shore/textures/old/along_shore_seaweed_3.png b/mods/plantlife_modpack/along_shore/textures/old/along_shore_seaweed_3.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/along_shore/textures/old/along_shore_seaweed_4.png b/mods/plantlife_modpack/along_shore/textures/old/along_shore_seaweed_4.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/along_shore/textures/old/flowers_seaweed.png b/mods/plantlife_modpack/along_shore/textures/old/flowers_seaweed.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/along_shore/textures/old/flowers_waterlily.png b/mods/plantlife_modpack/along_shore/textures/old/flowers_waterlily.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/along_shore/textures/old/flowers_waterlily_22.5.png b/mods/plantlife_modpack/along_shore/textures/old/flowers_waterlily_22.5.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/along_shore/textures/old/flowers_waterlily_45.png b/mods/plantlife_modpack/along_shore/textures/old/flowers_waterlily_45.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/along_shore/textures/old/flowers_waterlily_67.5.png b/mods/plantlife_modpack/along_shore/textures/old/flowers_waterlily_67.5.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/along_shore/textures/old/lillyPad5x16.png b/mods/plantlife_modpack/along_shore/textures/old/lillyPad5x16.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/along_shore/textures/old/lillypad3Flower16x.png b/mods/plantlife_modpack/along_shore/textures/old/lillypad3Flower16x.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/along_shore/textures/old/pondscum16xc.png b/mods/plantlife_modpack/along_shore/textures/old/pondscum16xc.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes/depends.txt b/mods/plantlife_modpack/bushes/depends.txt old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes/init.lua b/mods/plantlife_modpack/bushes/init.lua old mode 100755 new mode 100644 index d92187b8..99fa116e --- a/mods/plantlife_modpack/bushes/init.lua +++ b/mods/plantlife_modpack/bushes/init.lua @@ -161,8 +161,7 @@ abstract_bushes.grow_bush_node = function(pos,dir, leaf_type) local right_here = {x=pos.x, y=pos.y+1, z=pos.z} local above_right_here = {x=pos.x, y=pos.y+2, z=pos.z} - --local bush_branch_type = math.random(1,3) - --local bush_branch_type = 2 + local bush_branch_type = 2 -- MM: I'm not sure if it's slower now than before... if dir ~= 5 and leaf_type == 1 then diff --git a/mods/plantlife_modpack/bushes/textures/bushes_branches_center_1.png b/mods/plantlife_modpack/bushes/textures/bushes_branches_center_1.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes/textures/bushes_branches_center_2.png b/mods/plantlife_modpack/bushes/textures/bushes_branches_center_2.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes/textures/bushes_branches_left_1.png b/mods/plantlife_modpack/bushes/textures/bushes_branches_left_1.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes/textures/bushes_branches_left_2.png b/mods/plantlife_modpack/bushes/textures/bushes_branches_left_2.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes/textures/bushes_branches_right_1.png b/mods/plantlife_modpack/bushes/textures/bushes_branches_right_1.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes/textures/bushes_branches_right_2.png b/mods/plantlife_modpack/bushes/textures/bushes_branches_right_2.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes/textures/bushes_leaves_1.png b/mods/plantlife_modpack/bushes/textures/bushes_leaves_1.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes/textures/bushes_leaves_2.png b/mods/plantlife_modpack/bushes/textures/bushes_leaves_2.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes/textures/bushes_youngtree2trunk.png b/mods/plantlife_modpack/bushes/textures/bushes_youngtree2trunk.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes/textures/bushes_youngtree2trunk_inv.png b/mods/plantlife_modpack/bushes/textures/bushes_youngtree2trunk_inv.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes/textures/old & unused/BlockBranch1.png b/mods/plantlife_modpack/bushes/textures/old & unused/BlockBranch1.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes/textures/old & unused/BlockBranch1L.png b/mods/plantlife_modpack/bushes/textures/old & unused/BlockBranch1L.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes/textures/old & unused/BlockBranch1R.png b/mods/plantlife_modpack/bushes/textures/old & unused/BlockBranch1R.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes/textures/old & unused/BushBranches1.png b/mods/plantlife_modpack/bushes/textures/old & unused/BushBranches1.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes/textures/old & unused/BushBranches1sm.png b/mods/plantlife_modpack/bushes/textures/old & unused/BushBranches1sm.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes/textures/old & unused/BushBranches1sm2.png b/mods/plantlife_modpack/bushes/textures/old & unused/BushBranches1sm2.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes/textures/old & unused/BushBranches1sm3.png b/mods/plantlife_modpack/bushes/textures/old & unused/BushBranches1sm3.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes/textures/old & unused/BushBranches1sm4.png b/mods/plantlife_modpack/bushes/textures/old & unused/BushBranches1sm4.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes/textures/old & unused/BushBranchesCenter.png b/mods/plantlife_modpack/bushes/textures/old & unused/BushBranchesCenter.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes/textures/old & unused/BushBranchesSide1.png b/mods/plantlife_modpack/bushes/textures/old & unused/BushBranchesSide1.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes/textures/old & unused/BushBranchesSide2.png b/mods/plantlife_modpack/bushes/textures/old & unused/BushBranchesSide2.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes/textures/old & unused/blank.png b/mods/plantlife_modpack/bushes/textures/old & unused/blank.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes/textures/old & unused/moretrees_pine_leaves3.png b/mods/plantlife_modpack/bushes/textures/old & unused/moretrees_pine_leaves3.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes_classic/depends.txt b/mods/plantlife_modpack/bushes_classic/depends.txt old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes_classic/image_credits.txt b/mods/plantlife_modpack/bushes_classic/image_credits.txt old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes_classic/init.lua b/mods/plantlife_modpack/bushes_classic/init.lua old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes_classic/locale/de.txt b/mods/plantlife_modpack/bushes_classic/locale/de.txt old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes_classic/locale/template.txt b/mods/plantlife_modpack/bushes_classic/locale/template.txt old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes_classic/nodes.lua b/mods/plantlife_modpack/bushes_classic/nodes.lua old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_basket_blackberry_top.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_basket_blackberry_top.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_basket_blueberry_top.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_basket_blueberry_top.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_basket_bottom.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_basket_bottom.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_basket_empty_top.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_basket_empty_top.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_basket_gooseberry_top.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_basket_gooseberry_top.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_basket_mixed_berry_top.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_basket_mixed_berry_top.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_basket_raspberry_top.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_basket_raspberry_top.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_basket_side.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_basket_side.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_basket_strawberry_top.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_basket_strawberry_top.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_blackberry.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_blackberry.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_blackberry_bush.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_blackberry_bush.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_blackberry_pie_cooked.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_blackberry_pie_cooked.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_blackberry_pie_raw.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_blackberry_pie_raw.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_blackberry_pie_slice.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_blackberry_pie_slice.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_blueberry.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_blueberry.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_blueberry_bush.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_blueberry_bush.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_blueberry_pie_cooked.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_blueberry_pie_cooked.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_blueberry_pie_raw.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_blueberry_pie_raw.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_blueberry_pie_slice.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_blueberry_pie_slice.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_bush_bottom.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_bush_bottom.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_bush_top.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_bush_top.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_fruitless_bush.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_fruitless_bush.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_fruitless_bush_bottom.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_fruitless_bush_bottom.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_fruitless_bush_top.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_fruitless_bush_top.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_gooseberry.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_gooseberry.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_gooseberry_bush.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_gooseberry_bush.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_gooseberry_pie_cooked.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_gooseberry_pie_cooked.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_gooseberry_pie_raw.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_gooseberry_pie_raw.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_gooseberry_pie_slice.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_gooseberry_pie_slice.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_mixed_berry_pie_cooked.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_mixed_berry_pie_cooked.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_mixed_berry_pie_raw.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_mixed_berry_pie_raw.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_mixed_berry_pie_slice.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_mixed_berry_pie_slice.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_raspberry.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_raspberry.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_raspberry_bush.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_raspberry_bush.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_raspberry_pie_cooked.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_raspberry_pie_cooked.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_raspberry_pie_raw.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_raspberry_pie_raw.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_raspberry_pie_slice.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_raspberry_pie_slice.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_strawberry.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_strawberry.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_strawberry_bush.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_strawberry_bush.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_strawberry_pie_cooked.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_strawberry_pie_cooked.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_strawberry_pie_raw.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_strawberry_pie_raw.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_strawberry_pie_slice.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_strawberry_pie_slice.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/bushes_classic/textures/bushes_sugar.png b/mods/plantlife_modpack/bushes_classic/textures/bushes_sugar.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/cavestuff/depends.txt b/mods/plantlife_modpack/cavestuff/depends.txt old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/cavestuff/init.lua b/mods/plantlife_modpack/cavestuff/init.lua old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/cavestuff/mapgen.lua b/mods/plantlife_modpack/cavestuff/mapgen.lua old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/cavestuff/nodes.lua b/mods/plantlife_modpack/cavestuff/nodes.lua old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/cavestuff/textures/undergrowth_desert_pebble.png b/mods/plantlife_modpack/cavestuff/textures/undergrowth_desert_pebble.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/cavestuff/textures/undergrowth_pebble.png b/mods/plantlife_modpack/cavestuff/textures/undergrowth_pebble.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/copyright.txt b/mods/plantlife_modpack/copyright.txt old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/crafting.lua b/mods/plantlife_modpack/dryplants/crafting.lua old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/depends.txt b/mods/plantlife_modpack/dryplants/depends.txt old mode 100755 new mode 100644 index 7e9f4724..af0befc0 --- a/mods/plantlife_modpack/dryplants/depends.txt +++ b/mods/plantlife_modpack/dryplants/depends.txt @@ -1,3 +1,3 @@ default -farming +farming? plants_lib \ No newline at end of file diff --git a/mods/plantlife_modpack/dryplants/init.lua b/mods/plantlife_modpack/dryplants/init.lua old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/juncus.lua b/mods/plantlife_modpack/dryplants/juncus.lua old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/meadowvariation.lua b/mods/plantlife_modpack/dryplants/meadowvariation.lua old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/models/plantlike.obj b/mods/plantlife_modpack/dryplants/models/plantlike.obj new file mode 100644 index 00000000..3a9ac439 --- /dev/null +++ b/mods/plantlife_modpack/dryplants/models/plantlike.obj @@ -0,0 +1,56 @@ +# Blender v2.69 (sub 0) OBJ File: 'plantlike.blend' +# www.blender.org +mtllib plantlike.mtl +o Plane.001 +v 0.347299 -0.500000 -0.359699 +v -0.347299 -0.500000 0.359699 +v 0.347299 0.500000 -0.359699 +v -0.347299 0.500000 0.359699 +v 0.359699 -0.500000 0.347299 +v -0.359699 -0.500000 -0.347299 +v 0.359699 0.500000 0.347299 +v -0.359699 0.500000 -0.347299 +v -0.347659 -0.500000 0.359352 +v -0.347659 0.500000 0.359351 +v 0.346940 0.500000 -0.360046 +v 0.346940 -0.500000 -0.360046 +v -0.359352 -0.500000 -0.347659 +v -0.359351 0.500000 -0.347659 +v 0.360046 0.500000 0.346939 +v 0.360046 -0.500000 0.346940 +vt 0.000000 0.000000 +vt 1.000000 0.000000 +vt 1.000000 1.000000 +vt 0.000000 1.000000 +vt 0.999500 0.499625 +vt 0.999500 0.000000 +vt 0.999750 0.000000 +vt 0.999750 0.499625 +vt 0.999250 0.499625 +vt 0.999251 0.000000 +vt 0.999750 0.999250 +vt 0.999500 0.999250 +vt 1.000000 0.499625 +vt 1.000000 0.999250 +vt 0.499625 0.999500 +vt 0.000000 0.999500 +vt 0.000000 0.999250 +vt 0.499625 0.999250 +vt 0.999251 0.999250 +vt 0.499625 0.999251 +vt 0.999250 0.999250 +vt 0.999250 0.999500 +usemtl None +s off +f 2/1 1/2 3/3 4/4 +f 6/1 5/2 7/3 8/4 +f 9/2 10/3 11/4 12/1 +f 13/2 14/3 15/4 16/1 +f 5/5 6/6 13/7 16/8 +f 7/6 5/5 16/9 15/10 +f 8/8 7/11 15/12 14/5 +f 6/13 8/14 14/11 13/8 +f 1/15 2/16 9/17 12/18 +f 3/5 1/12 12/19 11/9 +f 4/20 3/21 11/22 10/15 +f 2/2 4/13 10/8 9/7 diff --git a/mods/plantlife_modpack/dryplants/moregrass.lua b/mods/plantlife_modpack/dryplants/moregrass.lua old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/reed.lua b/mods/plantlife_modpack/dryplants/reed.lua old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/reedmace.lua b/mods/plantlife_modpack/dryplants/reedmace.lua old mode 100755 new mode 100644 index 81c54d19..ff7b0c78 --- a/mods/plantlife_modpack/dryplants/reedmace.lua +++ b/mods/plantlife_modpack/dryplants/reedmace.lua @@ -57,21 +57,21 @@ abstract_dryplants.grow_reedmace_water = function(pos) local pos_04 = {x = pos.x, y = pos.y + 4, z = pos.z} minetest.add_entity(pos_01, "dryplants:reedmace_water_entity") if minetest.get_node(pos_02).name == "air" then -- bug fix - if minetest.get_node(pos_03).name ~= "air" then - minetest.set_node(pos_02, {name="dryplants:reedmace_top"}) - elseif minetest.get_node(pos_04).name ~= "air" then - minetest.set_node(pos_02, {name="dryplants:reedmace_height_2"}) - elseif size == 1 then - minetest.set_node(pos_02, {name="dryplants:reedmace_top"}) - elseif size == 2 then - minetest.set_node(pos_02, {name="dryplants:reedmace_height_2"}) - elseif size == 3 then - if spikes == 1 then - minetest.set_node(pos_02, {name="dryplants:reedmace_height_3_spikes"}) - else - minetest.set_node(pos_02, {name="dryplants:reedmace_height_3"}) - end - end + if minetest.get_node(pos_03).name ~= "air" then + minetest.set_node(pos_02, {name="dryplants:reedmace_top"}) + elseif minetest.get_node(pos_04).name ~= "air" then + minetest.set_node(pos_02, {name="dryplants:reedmace_height_2"}) + elseif size == 1 then + minetest.set_node(pos_02, {name="dryplants:reedmace_top"}) + elseif size == 2 then + minetest.set_node(pos_02, {name="dryplants:reedmace_height_2"}) + elseif size == 3 then + if spikes == 1 then + minetest.set_node(pos_02, {name="dryplants:reedmace_height_3_spikes"}) + else + minetest.set_node(pos_02, {name="dryplants:reedmace_height_3"}) + end + end end end @@ -125,7 +125,7 @@ minetest.register_node("dryplants:reedmace_top", { minetest.register_node("dryplants:reedmace_height_2", { description = "Reedmace, height: 2", drawtype = "plantlike", - visual_scale = 2, + visual_scale = 2.8, paramtype = "light", tiles = {"dryplants_reedmace_height_2.png"}, inventory_image = "dryplants_reedmace_top.png", @@ -148,7 +148,7 @@ minetest.register_node("dryplants:reedmace_height_2", { minetest.register_node("dryplants:reedmace_height_3", { description = "Reedmace, height: 3", drawtype = "plantlike", - visual_scale = 2, + visual_scale = 2.8, paramtype = "light", tiles = {"dryplants_reedmace_height_3.png"}, inventory_image = "dryplants_reedmace_top.png", @@ -171,7 +171,7 @@ minetest.register_node("dryplants:reedmace_height_3", { minetest.register_node("dryplants:reedmace_height_3_spikes", { description = "Reedmace, height: 3 & Spikes", drawtype = "plantlike", - visual_scale = 2, + visual_scale = 2.8, paramtype = "light", tiles = {"dryplants_reedmace_height_3_spikes.png"}, inventory_image = "dryplants_reedmace_top.png", @@ -308,9 +308,10 @@ minetest.register_node("dryplants:reedmace_water", { -- REEDMACE WATER ENTITY ----------------------------------------------------------------------------------------------- minetest.register_entity("dryplants:reedmace_water_entity",{ - visual = "wielditem", - visual_size = {x=2/3, y=2/3, z=2/3}, - textures = {"dryplants:reedmace_water"}, + visual = "mesh", + mesh = "plantlike.obj", + visual_size = {x=10, y=10}, + textures = {"dryplants_reedmace_water.png"}, collisionbox = {-0.3, -0.5, -0.3, 0.3, 0.5, 0.3}, on_punch = function(self, puncher) if puncher:is_player() and puncher:get_inventory() then diff --git a/mods/plantlife_modpack/dryplants/settings.txt b/mods/plantlife_modpack/dryplants/settings.txt old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/default_grass_1.png b/mods/plantlife_modpack/dryplants/textures/default_grass_1.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/default_grass_2.png b/mods/plantlife_modpack/dryplants/textures/default_grass_2.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/default_grass_3.png b/mods/plantlife_modpack/dryplants/textures/default_grass_3.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/default_grass_4.png b/mods/plantlife_modpack/dryplants/textures/default_grass_4.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/default_grass_5.png b/mods/plantlife_modpack/dryplants/textures/default_grass_5.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/dryplants_grass.png b/mods/plantlife_modpack/dryplants/textures/dryplants_grass.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/dryplants_grass_short.png b/mods/plantlife_modpack/dryplants/textures/dryplants_grass_short.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/dryplants_grass_short_side.png b/mods/plantlife_modpack/dryplants/textures/dryplants_grass_short_side.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/dryplants_hay.png b/mods/plantlife_modpack/dryplants/textures/dryplants_hay.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/dryplants_juncus_02.png b/mods/plantlife_modpack/dryplants/textures/dryplants_juncus_02.png old mode 100755 new mode 100644 index aebaacee23e433b744d2c90eeb13ce0c5e0b6d76..790fb798049926b1447d3ca52d6ece8e7a6d5954 GIT binary patch delta 828 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 diff --git a/mods/plantlife_modpack/dryplants/textures/dryplants_reedmace_height_3.png b/mods/plantlife_modpack/dryplants/textures/dryplants_reedmace_height_3.png old mode 100755 new mode 100644 index 89c495c76366a712627f939a142a945291725edf..5e2a4702adff61214cbdf4b722dd5bf649dc20d9 GIT binary patch delta 1926 zcmV;12YL9w5|j^+BYy{5Nkl6^6fatGoI&(-Y4)acn{mWC4gBTcj)? zo)E;29b$u!AV?l1C?O~rVgyQLkpN@kMM4%qf*^t-IUCqS0z^y*N<;{IB-kK9jK}Wj z?y9$^!r@ z-u%x5`NhZXRevADe1^cNO&loGCB71 zAHFGt`tj%8+90Y@ORC9S5iqj!ZuEzi_7y*Kyi@ka)_-oLwLQOk{yN70p%CE1wbfii z`O-J;)$Q%h%yFB$v9-glZ123EKOq#+Yr6D{-@Pb#C}_8uyOQFh64)@S1at40%N#IL zZPt~0l47e-p9zx@Va|JsP|o~^4|C`N=bwH}-0;SiYW10OuWbEEeCB7uWT`TU`*yR5 zjk^dlbARdqg>#&G;-vQ6-V&E3#Y~vkV8@!_w)*l^1&Dic!rTy$`+~xkbjxhdxmuFq zq92FJPJfaomRDL+B{Xml!+}E~;1}oKmLgj0HM%<+OP)XT8;L`W(40z&ML7w9ppgq_ z|15J!z#!pyBtgIM;3sAb8HV!M$H2zsy59BvqkrRbtL>FZIn{6=_jPy#sK?k;T<|kZ zk*gKE3FXB1{cc=g=7l6y-^l{^dxaBiR<8FeAd5a2_g)qiSG zk%T}%RcV+ysN$oi)kv|qLlL}sjvQ?xF(GI`Ihdzp<{+(K4EuLQ+1Omys#dvrwZ{u* zekVS9Vl~okHA#~yE_#leRT_;HQNe4ZTCGq7iw%xf&;3RI+l1++Bfw8jbcSj#50*3? zybnZjwYbEQnkr@Vs45XfQ49j21b^|A>c*mKzX{V#M}VsGv$Jo?K<*CO*+x=hrR^A-gXN$9z3 zFb~kkkIwv7oDZxumq8B}9BYw?K}7i2hwp)?L;{GQCQyr2M1O>@KK@A+lo%so zlnN6*%U#bG=7NAb>PNV}x=d}QN}3pqK)2T)`pjoXUqPXa&SF0!yW23@z=H<4yiVJS&iroz#7eN36ZT5xB&M0$X`1rLva7!jv5#83%> z(a1+n+)cY`v`I>5AugeGDw?-&SDhKdP@X!fR>yaQ(22OwHmqLKQ z|Me1NMp~vxL+kAHI@qbFN99fjU;693Ddq+dfCuMF+V!PDS%0(v@gTMaZgBocy@k&v zCGPlPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi z!vFvd!vV){sAK>D02*{fSaefwW^{L9a%BKeVQFr3E>1;MAa*k@H7+qRNAp5A000QD zNkl%G^7WJYs5z({9{O?f*kAr^#;4#zxi2+Y3@T37x zBKXy-z_SjoY;B2o`1`M~Ez+g{=oCaZ-xnIIBJgz8^@jj-^V{+oGvM_Mfc)j_7676g z8D4Mxb967DJb!2aB=v*&Io@Y`yq6!{e|-QX^*z}sisW9k1zi1Q=kWlrogSf3`DI(c z%12!vzVx!984orEurVou_}f!@(H5}rJ0l2Ig2#1z13(}*(*^(pQf^)Xa8j71c-dho zH69EA@dPXyWKlOj`1|l|icX8OzY9R-e33W>`WFDBc;TcGv@Ct{ zlspA{3jpa2q(8v*F^l=%a}mTzOF9|>2=PfHuwZGv^*!FNW(UQ4oc8S$u&VwK!U}&W zr?IhMaeqe8eKRuL27ojA_m(wI@M#-0AXaSm31+pRry5{9wcB?0C^tcV<)-#yqwCqB z767MQ@{9lkH0u?h=P3XHjCR-P_xF@hidP&Y)5MqpIBkzM*#ZE+0lRGW)bG6tbaP{Q zO{}C-H(Fe13qaKV>|9&vb2BTj7M@{O8EMmxeSdYVD*()}prc*93joJV-BiU%9(D3F z06dzl#Sq+MOVLFTo*`78YpqXKUeQkWMlY=Hr;`qRRR9h$;}j~)(R%8K&j1Lrvx{*P zB-6wZ`KASc@=x6*;uR|`(00E9fB?L?Nm@)k|C|9ioA@kQ)?4AVChft1_|;8&94_9l z!GG%M_dEr#fdgfXmd>7k^2XX#->vC64}Aa&;y>%o5C9nG0Vjp&uJivv0I<#FZ6!KD z2Vol-+uWn3F8EZt(1~zUC;@<+2jFvWuDc2#+0ru&P}tF76Wf^~I#4HQ{bZ12QzV=q zkHS*5SG1QMBcy>(u?r?(P3(hHTpQ;q;(z9AyPI z0ELS4(Vxs&$FHV%A*AfP+Su;>K$_`TKOdnSUQs#}?$P)RRg!O{$Es6!Me zPPG6)X*`oU!F3)p0e{|3iONfI#eNWhyV|L4Q247QurV-JE{U7$D6JOb|A4#HI%T1WOzsm%C`* zNsFOxnGw43Zx_Z0^8lD0w98xC2#ez&Md1P&h;D=L2>?*>NI`FY4w_BOKIgKhW*4Um zrN=Y~^MC*|BhEVEyRZ}H0jLIk{tO~0o)_?10MSJY+*a)=ZN73M|0M?W}3|8St`Z7`~eal-Vc0$?0un7OfW66DT~6WUn- z;)woD1cShLOCz+w?eE#Si+>KeC&1KrodJM546qn_%TuC%KzYP9s04j86m17!LTnri zK!6Cw!-BYx=iuuu5jft%FRW(==p?77M4vYCxdm1+Ku-d1pdK(PK7yrmq zZvqf%%+X$ajJ&KJNPiJYXRFT#OvPqukp)8&?Y*0K9IeSEp^6ip|ubPIvl)?+1 zYKubfwhKe#V_}O_=9vNWw4NRyU)kOQAi>k2;?*iQK%?ALwSPY{v$7Rav6)(A<*v8Z zdh!z#uFq4DX96m>x_BN?`|l3-|C1D|%&@vI&{_sAkV~NULO8?Z&rbFRE3~hU&@q1| ze-bHSWh;4qPCDUW zW6X&7^-D@{qkrUM=J#kLR0g2R0C>-BRAc~fvdX^~ImZVnQJbR( zx6IqgA#z9b(N~14hWFe~r|cHvUDST#R!zlbYSA44$T8*X9Q0{%jOq+PjsGsbagkRU zpxmW{RQ3abX2TtB-J3Fadw;_Pruap5nNp<*x~i|z#l;f+ z|9>G$6b3)lFP9mRC3^Q^jnvZ3e~>7@b5aS$hn-;G1CUo{=(4mzDeepr%*FWfrl>ly=4 z-K6)|%YPJ&-SquGyIx6pl*eg_$*blMM{OH>0EtH z#S8BTXcWhaM6kX`#aGe_c9fmnMHS5gN>Z>#5c$fMkJ2ul%2vsJ>W!?{Xx=6 z$4!9nS+%l29`Cm;3w)RRce>UTN}YbBpTB_ea#DM!iv7dkAi2?n5diSyS cN6&!Y05jstt{FIaG)j;cUnDW{ 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 diff --git a/mods/plantlife_modpack/dryplants/textures/dryplants_reedmace_sapling.png b/mods/plantlife_modpack/dryplants/textures/dryplants_reedmace_sapling.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/dryplants_reedmace_spikes.png b/mods/plantlife_modpack/dryplants/textures/dryplants_reedmace_spikes.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/dryplants_reedmace_top.png b/mods/plantlife_modpack/dryplants/textures/dryplants_reedmace_top.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/dryplants_reedmace_water.png b/mods/plantlife_modpack/dryplants/textures/dryplants_reedmace_water.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/dryplants_sickle.png b/mods/plantlife_modpack/dryplants/textures/dryplants_sickle.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/not_in_use/big_pic_8.png b/mods/plantlife_modpack/dryplants/textures/not_in_use/big_pic_8.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/not_in_use/big_pic_9.png b/mods/plantlife_modpack/dryplants/textures/not_in_use/big_pic_9.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_cattailsG_m2.png b/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_cattailsG_m2.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_juncus_02_left.png b/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_juncus_02_left.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_juncus_02_right.png b/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_juncus_02_right.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_juncus_02_whole2.png b/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_juncus_02_whole2.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_juncus_03_left.png b/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_juncus_03_left.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_juncus_03_right.png b/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_juncus_03_right.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_juncus_03_whole2.png b/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_juncus_03_whole2.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_reedmace_01.png b/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_reedmace_01.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_reedmace_02.png b/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_reedmace_02.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_reedmace_03.png b/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_reedmace_03.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_reedmace_04.png b/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_reedmace_04.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_reedmace_bottom_left.png b/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_reedmace_bottom_left.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_reedmace_bottom_right.png b/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_reedmace_bottom_right.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_reedmace_left.png b/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_reedmace_left.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_reedmace_right.png b/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_reedmace_right.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_reedmace_top_left.png b/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_reedmace_top_left.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_reedmace_top_right.png b/mods/plantlife_modpack/dryplants/textures/not_in_use/dryplants_reedmace_top_right.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/not_in_use/reedmace2.png b/mods/plantlife_modpack/dryplants/textures/not_in_use/reedmace2.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/not_in_use/reedmace3.png b/mods/plantlife_modpack/dryplants/textures/not_in_use/reedmace3.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/not_in_use/reedmace4.png b/mods/plantlife_modpack/dryplants/textures/not_in_use/reedmace4.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/not_in_use/reedtest.png b/mods/plantlife_modpack/dryplants/textures/not_in_use/reedtest.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/not_in_use/texturing.png b/mods/plantlife_modpack/dryplants/textures/not_in_use/texturing.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/old/dryplants_grass_short_old3.png b/mods/plantlife_modpack/dryplants/textures/old/dryplants_grass_short_old3.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/old/dryplants_grass_short_old4.png b/mods/plantlife_modpack/dryplants/textures/old/dryplants_grass_short_old4.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/old/dryplants_juncus_02_left_old.png b/mods/plantlife_modpack/dryplants/textures/old/dryplants_juncus_02_left_old.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/old/dryplants_juncus_02_right_old.png b/mods/plantlife_modpack/dryplants/textures/old/dryplants_juncus_02_right_old.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/old/dryplants_juncus_03_left_old.png b/mods/plantlife_modpack/dryplants/textures/old/dryplants_juncus_03_left_old.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/old/dryplants_juncus_03_right_old.png b/mods/plantlife_modpack/dryplants/textures/old/dryplants_juncus_03_right_old.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_bottom_left_old2.png b/mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_bottom_left_old2.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_bottom_old4.png b/mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_bottom_old4.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_bottom_right_old2.png b/mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_bottom_right_old2.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_left_old2.png b/mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_left_old2.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_old8.png b/mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_old8.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_right_old2.png b/mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_right_old2.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_spikes_old3.png b/mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_spikes_old3.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_top_left_old2.png b/mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_top_left_old2.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_top_old3.png b/mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_top_old3.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_top_right_old2.png b/mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_top_right_old2.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_water_old2.png b/mods/plantlife_modpack/dryplants/textures/old/dryplants_reedmace_water_old2.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/crafting.lua b/mods/plantlife_modpack/ferns/crafting.lua old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/depends.txt b/mods/plantlife_modpack/ferns/depends.txt old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/fern.lua b/mods/plantlife_modpack/ferns/fern.lua old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/gianttreefern.lua b/mods/plantlife_modpack/ferns/gianttreefern.lua old mode 100755 new mode 100644 index 5b6feee9..130a0b10 --- a/mods/plantlife_modpack/ferns/gianttreefern.lua +++ b/mods/plantlife_modpack/ferns/gianttreefern.lua @@ -97,7 +97,7 @@ end minetest.register_node("ferns:tree_fern_leaves_giant", { description = "Tree Fern Crown (Dicksonia)", drawtype = "plantlike", - visual_scale = math.sqrt(8), + visual_scale = math.sqrt(64), wield_scale = {x=0.175, y=0.175, z=0.175}, paramtype = "light", tiles = {"ferns_fern_tree_giant.png"}, diff --git a/mods/plantlife_modpack/ferns/horsetail.lua b/mods/plantlife_modpack/ferns/horsetail.lua old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/init.lua b/mods/plantlife_modpack/ferns/init.lua old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/settings.lua b/mods/plantlife_modpack/ferns/settings.lua old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/ferns_5.png b/mods/plantlife_modpack/ferns/textures/ferns_5.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/ferns_6.png b/mods/plantlife_modpack/ferns/textures/ferns_6.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/ferns_7.png b/mods/plantlife_modpack/ferns/textures/ferns_7.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/ferns_8.png b/mods/plantlife_modpack/ferns/textures/ferns_8.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/ferns_fern.png b/mods/plantlife_modpack/ferns/textures/ferns_fern.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/ferns_fern_big.png b/mods/plantlife_modpack/ferns/textures/ferns_fern_big.png old mode 100755 new mode 100644 index d8ec7383372779068fa557567ede9659b8b3de0e..0c3094fdb51c726a2d0b9a141d319a391fb73648 GIT binary patch delta 1260 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 z zfX_iGH{F1SF2wbMOwc+Wq^dj!gxRPlzlw5u!GBKt)G**URwS#Io0ka*^&_NI9&VN7 zFjEKrPyF9;;tWVNfRo;z^2fwUCy?s-1b|c#Jnj1l15SGdQ;nZ6AXNlU`~JTH2E!8T TRbGSw00000NkvXXu0mjfkw%U2 diff --git a/mods/plantlife_modpack/ferns/textures/ferns_fern_mid.png b/mods/plantlife_modpack/ferns/textures/ferns_fern_mid.png old mode 100755 new mode 100644 index 4270e967e8260b4797f53335b089b0b9316dce34..39a1d026f0011a8a55cc58a1d379a896bb4baaaf GIT binary patch delta 761 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 VYw`AMDo+3a002ovPDHLkV1g-Z=2QRx delta 1634 zcmV-o2A%oL3-Sz*BYyw{XF*Lt006O%3;baP00009a7bBm000iY000iY0qR1rzyJUM z8gxZibW?9;ba!ELWdKlNX>N2bPDNB8b~7$DE-^7j^FlWO00r(zL_t(|UhP=LR!+#TV@$$A1$*%^f6Gm4j?taJJ!y<@gaIy zi;25hblt2($D$q+FCAOPj@+-`6MyR5Kl69Pp-Zp4IkD$;h(FO|XpKeUnd{itWBb9u z+jaXw3&!1>u)TN82rpNmZ$XWQm;}M4iuZ`6wx1f{9Rk{yO`LJ#PtCA(kMaX z;~0aw_7Y6}VZg|;3N3SLT)3u#Yd{W5PZ{h39w!9a^R}Xo)e< zIF7?X_G}mV&CgQXPYv*yF3^9MMKGa8&n+XoLkcwZOVD%I#I3o0mB2YD2HRSQz@!4E zwtr%H$CR)~BxsIFQPVEq_L+M{+eSVu35cyKF}H5S>;og_*7O)$l#)82#OUn`&YAw- z?Jzax!xNK3<<5t#ryM#@AsPlHP&rP+5-x$gyA*n_0Nt|;5)bu=%uA7YP=$&68pQ9b zJ|crUfYbnQL(!2CV|2}c@KrU29@U|Hg@4F?oke&>k0>dGeT!m5mKapn1gL8+gu;0W zdY=##rfe9RiXp511*TRJBb{bFaM!64EB0S+M-tj`1~XdbPoe zZ(PJ_Ge-V#zv+(Y&eG)c%~)jTQ!00 z7eap_2Nu!+l>R(eBB$XV6C+>yGum(1Q6DMdFtjbgPZmPz6s89FOczK#Vuv>hm$thI zjIRLNb|I=dh44j53M^_N37miqfxle?{72k7v3M-F(w)MUH9qIs51N@HyK73qe z&4ZII#c}D6@F(O@1WqE)a0IrR5|p{}ckK9AqksWw3AxUCvm`El4xWjiK;+J0()9TE`sYv8fVwj9$c zWF!@2X!W}wCkohvIoBY=XvqBS5zy{Zpv^DYa*QcEgIZ%H+%^^ljay=C{k&HJAG^^8 zcXCk&kQ!hoR=(ZS#BLmIlb22@gW0Gv;?O5eQE|%?Evlf gc>-t|{Mz6D7yF}P0^)Ht&Hw-a07*qoM6N<$f{RA@mH+?% diff --git a/mods/plantlife_modpack/ferns/textures/ferns_fern_tree_giant.png b/mods/plantlife_modpack/ferns/textures/ferns_fern_tree_giant.png old mode 100755 new mode 100644 index f8f1189b927ba2d34fd89a9b089df9517047336e..59580bbcb331436995a5c9bafd8682892fa60ada GIT binary patch literal 4493 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 aW~dGdU$|`I!A{qf0Hf<>dgZz<5&r`2hasQ< diff --git a/mods/plantlife_modpack/ferns/textures/ferns_fern_tree_inv.png b/mods/plantlife_modpack/ferns/textures/ferns_fern_tree_inv.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/ferns_fern_tree_tl.png b/mods/plantlife_modpack/ferns/textures/ferns_fern_tree_tl.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/ferns_fern_tree_tr.png b/mods/plantlife_modpack/ferns/textures/ferns_fern_tree_tr.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/ferns_fern_trunk.png b/mods/plantlife_modpack/ferns/textures/ferns_fern_trunk.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/ferns_fern_trunk_big.png b/mods/plantlife_modpack/ferns/textures/ferns_fern_trunk_big.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/ferns_fern_trunk_big_top.png b/mods/plantlife_modpack/ferns/textures/ferns_fern_trunk_big_top.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/ferns_fern_trunk_top.png b/mods/plantlife_modpack/ferns/textures/ferns_fern_trunk_top.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/ferns_ferntuber.png b/mods/plantlife_modpack/ferns/textures/ferns_ferntuber.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/ferns_ferntuber_roasted.png b/mods/plantlife_modpack/ferns/textures/ferns_ferntuber_roasted.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/ferns_fiddlehead.png b/mods/plantlife_modpack/ferns/textures/ferns_fiddlehead.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/ferns_fiddlehead_roasted.png b/mods/plantlife_modpack/ferns/textures/ferns_fiddlehead_roasted.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/ferns_horsetail_01.png b/mods/plantlife_modpack/ferns/textures/ferns_horsetail_01.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/ferns_horsetail_02.png b/mods/plantlife_modpack/ferns/textures/ferns_horsetail_02.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/ferns_horsetail_03.png b/mods/plantlife_modpack/ferns/textures/ferns_horsetail_03.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/ferns_horsetail_04.png b/mods/plantlife_modpack/ferns/textures/ferns_horsetail_04.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/ferns_sapling_tree_fern.png b/mods/plantlife_modpack/ferns/textures/ferns_sapling_tree_fern.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/ferns_sapling_tree_fern_giant.png b/mods/plantlife_modpack/ferns/textures/ferns_sapling_tree_fern_giant.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/ferns_tree_fern_leave_big.png b/mods/plantlife_modpack/ferns/textures/ferns_tree_fern_leave_big.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/ferns_tree_fern_leave_big_cross.png b/mods/plantlife_modpack/ferns/textures/ferns_tree_fern_leave_big_cross.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/ferns_tree_fern_leave_big_end.png b/mods/plantlife_modpack/ferns/textures/ferns_tree_fern_leave_big_end.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/not_in_use/archaeplantae_horsetails.png b/mods/plantlife_modpack/ferns/textures/not_in_use/archaeplantae_horsetails.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/not_in_use/big picture 3.png b/mods/plantlife_modpack/ferns/textures/not_in_use/big picture 3.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/not_in_use/ferns_fern_big_left.png b/mods/plantlife_modpack/ferns/textures/not_in_use/ferns_fern_big_left.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/not_in_use/ferns_fern_big_right.png b/mods/plantlife_modpack/ferns/textures/not_in_use/ferns_fern_big_right.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/not_in_use/ferns_fern_mid_left.png b/mods/plantlife_modpack/ferns/textures/not_in_use/ferns_fern_mid_left.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/not_in_use/ferns_fern_mid_right.png b/mods/plantlife_modpack/ferns/textures/not_in_use/ferns_fern_mid_right.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/not_in_use/ferns_fern_tree_bl.png b/mods/plantlife_modpack/ferns/textures/not_in_use/ferns_fern_tree_bl.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/not_in_use/ferns_fern_tree_br.png b/mods/plantlife_modpack/ferns/textures/not_in_use/ferns_fern_tree_br.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/not_in_use/ferns_fern_trunk_big_crown.png b/mods/plantlife_modpack/ferns/textures/not_in_use/ferns_fern_trunk_big_crown.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/old/archaeplantae_fern_old4.png b/mods/plantlife_modpack/ferns/textures/old/archaeplantae_fern_old4.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/old/comb.png b/mods/plantlife_modpack/ferns/textures/old/comb.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/old/ferns_5_old.png b/mods/plantlife_modpack/ferns/textures/old/ferns_5_old.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/old/ferns_6_old.png b/mods/plantlife_modpack/ferns/textures/old/ferns_6_old.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/old/ferns_7_old.png b/mods/plantlife_modpack/ferns/textures/old/ferns_7_old.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/old/ferns_fern_big_old.png b/mods/plantlife_modpack/ferns/textures/old/ferns_fern_big_old.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/old/ferns_fern_mid_old.png b/mods/plantlife_modpack/ferns/textures/old/ferns_fern_mid_old.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/old/ferns_fern_tree_old.png b/mods/plantlife_modpack/ferns/textures/old/ferns_fern_tree_old.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/old/ferns_fern_trunk_big_old2.png b/mods/plantlife_modpack/ferns/textures/old/ferns_fern_trunk_big_old2.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/old/ferns_fern_trunk_big_top_old.png b/mods/plantlife_modpack/ferns/textures/old/ferns_fern_trunk_big_top_old.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/old/ferns_fern_trunk_big_top_old2.png b/mods/plantlife_modpack/ferns/textures/old/ferns_fern_trunk_big_top_old2.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/old/ferns_fern_trunk_top_old.png b/mods/plantlife_modpack/ferns/textures/old/ferns_fern_trunk_top_old.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/old/ferns_horsetail_01_old2.png b/mods/plantlife_modpack/ferns/textures/old/ferns_horsetail_01_old2.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/old/ferns_horsetail_02_old2.png b/mods/plantlife_modpack/ferns/textures/old/ferns_horsetail_02_old2.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/old/ferns_horsetail_03_old2.png b/mods/plantlife_modpack/ferns/textures/old/ferns_horsetail_03_old2.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/old/ferns_horsetail_04_old2.png b/mods/plantlife_modpack/ferns/textures/old/ferns_horsetail_04_old2.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/old/ferns_tree_fern_leave_big_cross_old.png b/mods/plantlife_modpack/ferns/textures/old/ferns_tree_fern_leave_big_cross_old.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/old/ferns_tree_fern_leave_big_end_old.png b/mods/plantlife_modpack/ferns/textures/old/ferns_tree_fern_leave_big_end_old.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/textures/old/ferns_tree_fern_leave_big_old.png b/mods/plantlife_modpack/ferns/textures/old/ferns_tree_fern_leave_big_old.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/ferns/treefern.lua b/mods/plantlife_modpack/ferns/treefern.lua old mode 100755 new mode 100644 index 2878f57f..4c3e6b0d --- a/mods/plantlife_modpack/ferns/treefern.lua +++ b/mods/plantlife_modpack/ferns/treefern.lua @@ -42,7 +42,7 @@ end minetest.register_node("ferns:tree_fern_leaves", { description = "Tree Fern Crown (Dicksonia)", drawtype = "plantlike", - visual_scale = 2, + visual_scale = math.sqrt(32), paramtype = "light", paramtype2 = "facedir", --tiles = {"[combine:32x32:0,0=top_left.png:0,16=bottom_left.png:16,0=top_right.png:16,16=bottom_right.png"}, @@ -70,7 +70,7 @@ minetest.register_node("ferns:tree_fern_leaves", { }) minetest.register_node("ferns:tree_fern_leaves_02", { drawtype = "plantlike", - visual_scale = 2, + visual_scale = math.sqrt(32), paramtype = "light", tiles = {"ferns_fern_big.png"}, walkable = false, diff --git a/mods/plantlife_modpack/flowers_plus/depends.txt b/mods/plantlife_modpack/flowers_plus/depends.txt old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/flowers_plus/flowers-changelog.txt b/mods/plantlife_modpack/flowers_plus/flowers-changelog.txt old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/flowers_plus/init.lua b/mods/plantlife_modpack/flowers_plus/init.lua old mode 100755 new mode 100644 index 132375e2..5bf563d4 --- a/mods/plantlife_modpack/flowers_plus/init.lua +++ b/mods/plantlife_modpack/flowers_plus/init.lua @@ -94,7 +94,7 @@ for i in ipairs(lilies_list) do place_pos = pt.above end - if not minetest.is_protected(place_pos, placer:get_player_name()) then + if place_pos and not minetest.is_protected(place_pos, placer:get_player_name()) then local nodename = "default:cobble" -- if this block appears, something went....wrong :-) if place_pos == nil then return itemstack end -- pour éviter crash avec nénuphare @@ -118,7 +118,7 @@ for i in ipairs(lilies_list) do elseif waterlily == 8 then nodename = "flowers:waterlily_s4" end -minetest.set_node(place_pos, {name = nodename, param2 = math.random(0,3) }) + minetest.set_node(place_pos, {name = nodename, param2 = math.random(0,3) }) else local fdir = minetest.dir_to_facedir(placer:get_look_dir()) minetest.set_node(place_pos, {name = "flowers:waterlily", param2 = fdir}) diff --git a/mods/plantlife_modpack/flowers_plus/locale/de.txt b/mods/plantlife_modpack/flowers_plus/locale/de.txt old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/flowers_plus/locale/template.txt b/mods/plantlife_modpack/flowers_plus/locale/template.txt old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_flowerpot.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_flowerpot.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_potted_bonsai.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_potted_bonsai.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_potted_cactus.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_potted_cactus.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_potted_dandelion_white.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_potted_dandelion_white.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_potted_dandelion_yellow.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_potted_dandelion_yellow.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_potted_geranium.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_potted_geranium.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_potted_rose.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_potted_rose.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_potted_tulip.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_potted_tulip.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_potted_viola.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_potted_viola.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_seaweed.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_seaweed.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_seaweedLight.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_seaweedLight.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_seaweed_2.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_seaweed_2.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_seaweed_3.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_seaweed_3.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_seaweed_4.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_seaweed_4.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily_22.5.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily_22.5.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily_45.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily_45.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily_67.5.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily_67.5.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily_small_1.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily_small_1.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily_small_2.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily_small_2.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily_small_3.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily_small_3.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily_small_4.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily_small_4.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/junglegrass/init.lua b/mods/plantlife_modpack/junglegrass/init.lua old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/modpack.txt b/mods/plantlife_modpack/modpack.txt old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/molehills/depends.txt b/mods/plantlife_modpack/molehills/depends.txt old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/molehills/init.lua b/mods/plantlife_modpack/molehills/init.lua old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/molehills/molehills_settings.txt b/mods/plantlife_modpack/molehills/molehills_settings.txt old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/molehills/textures/molehills_dirt.png b/mods/plantlife_modpack/molehills/textures/molehills_dirt.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/molehills/textures/molehills_side.png b/mods/plantlife_modpack/molehills/textures/molehills_side.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/molehills/textures/old & unused/molehill_side.png b/mods/plantlife_modpack/molehills/textures/old & unused/molehill_side.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/molehills/textures/old & unused/molehill_top.png b/mods/plantlife_modpack/molehills/textures/old & unused/molehill_top.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/mushroom/compat.lua b/mods/plantlife_modpack/mushroom/compat.lua old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/mushroom/crafting.lua b/mods/plantlife_modpack/mushroom/crafting.lua old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/mushroom/depends.txt b/mods/plantlife_modpack/mushroom/depends.txt old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/mushroom/init.lua b/mods/plantlife_modpack/mushroom/init.lua old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/mushroom/textures/mushroom_brown.png b/mods/plantlife_modpack/mushroom/textures/mushroom_brown.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/mushroom/textures/mushroom_essence.png b/mods/plantlife_modpack/mushroom/textures/mushroom_essence.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/mushroom/textures/mushroom_identifier.png b/mods/plantlife_modpack/mushroom/textures/mushroom_identifier.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/mushroom/textures/mushroom_poison.png b/mods/plantlife_modpack/mushroom/textures/mushroom_poison.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/mushroom/textures/mushroom_red.png b/mods/plantlife_modpack/mushroom/textures/mushroom_red.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/mushroom/textures/mushroom_spore.png b/mods/plantlife_modpack/mushroom/textures/mushroom_spore.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/mushroom/textures/mushroom_spore_brown.png b/mods/plantlife_modpack/mushroom/textures/mushroom_spore_brown.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/mushroom/textures/mushroom_spore_red.png b/mods/plantlife_modpack/mushroom/textures/mushroom_spore_red.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/nature_classic/blossom.lua b/mods/plantlife_modpack/nature_classic/blossom.lua old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/nature_classic/config.lua b/mods/plantlife_modpack/nature_classic/config.lua old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/nature_classic/depends.txt b/mods/plantlife_modpack/nature_classic/depends.txt old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/nature_classic/global_function.lua b/mods/plantlife_modpack/nature_classic/global_function.lua old mode 100755 new mode 100644 index 659e29d5..6d640c2a --- a/mods/plantlife_modpack/nature_classic/global_function.lua +++ b/mods/plantlife_modpack/nature_classic/global_function.lua @@ -1,16 +1,21 @@ local NODE_YOUNG = "young" +local SETTING_TRUE = "true" +local SETTING_FALSE = "false" + +local YOUTH_DELAY = 5 + nature = {} local function set_young_node(pos) local meta = minetest.get_meta(pos) - meta:set_string(NODE_YOUNG, "true") - minetest.after(5, - function(pos) - local meta = minetest.get_meta(pos) - meta:set_string(NODE_YOUNG, "false") - end, + meta:set_string(NODE_YOUNG, SETTING_TRUE) + minetest.after(YOUTH_DELAY, + function(pos) + local meta = minetest.get_meta(pos) + meta:set_string(NODE_YOUNG, SETTING_FALSE) + end, pos) end @@ -18,26 +23,26 @@ local function is_not_young(pos) local meta = minetest.get_meta(pos) local young = meta:get_string(NODE_YOUNG) - return young ~= "true" + return young ~= SETTING_TRUE end function nature:grow_node(pos, nodename) if pos ~= nil then - local light_enough = minetest.get_node_light(pos, nil) - >= MINIMUM_GROWTH_LIGHT + local light_enough = minetest.get_node_light(pos, nil) + >= MINIMUM_GROWTH_LIGHT - if is_not_young(pos) and light_enough then - minetest.remove_node(pos) - minetest.set_node(pos, { name = nodename }) - set_young_node(pos) + if is_not_young(pos) and light_enough then + minetest.remove_node(pos) + minetest.set_node(pos, { name = nodename }) + set_young_node(pos) - minetest.log("info", nodename .. " has grown at " .. pos.x .. "," - .. pos.y .. "," .. pos.z) - end + minetest.log("info", nodename .. " has grown at " .. pos.x .. "," + .. pos.y .. "," .. pos.z) + end end end function nature:is_near_water(pos) - return minetest.find_node_near(pos, DISTANCE_FROM_WATER, - { "default:water_source" }) ~= nil or DISTANCE_FROM_WATER == -1 + return DISTANCE_FROM_WATER == -1 or minetest.find_node_near(pos, DISTANCE_FROM_WATER, + { "default:water_source" }) ~= nil end diff --git a/mods/plantlife_modpack/nature_classic/init.lua b/mods/plantlife_modpack/nature_classic/init.lua old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/nature_classic/textures/nature_blossom.png b/mods/plantlife_modpack/nature_classic/textures/nature_blossom.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/plants_lib/depends.txt b/mods/plantlife_modpack/plants_lib/depends.txt old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/plants_lib/init.lua b/mods/plantlife_modpack/plants_lib/init.lua old mode 100755 new mode 100644 index f38f1852..b92bd4b0 --- a/mods/plantlife_modpack/plants_lib/init.lua +++ b/mods/plantlife_modpack/plants_lib/init.lua @@ -10,10 +10,25 @@ plantslib = {} +plantslib.blocklist_aircheck = {} +plantslib.blocklist_no_aircheck = {} + +plantslib.surface_nodes_aircheck = {} +plantslib.surface_nodes_no_aircheck = {} + +plantslib.surfaceslist_aircheck = {} +plantslib.surfaceslist_no_aircheck = {} + +plantslib.actioncount_aircheck = {} +plantslib.actioncount_no_aircheck = {} + +plantslib.actionslist_aircheck = {} +plantslib.actionslist_no_aircheck = {} + plantslib.modpath = minetest.get_modpath("plants_lib") plantslib.intllib_modpath = minetest.get_modpath("intllib") -plantslib.total_no_air_check_calls = 0 +plantslib.total_no_aircheck_calls = 0 local S if plantslib.intllib_modpath then @@ -98,12 +113,6 @@ function plantslib:set_defaults(biome) biome.facedir = biome.facedir or 0 end -plantslib.surfaces_list = {} -plantslib.actions_list = {} - -plantslib.surfaces_list_noaircheck = {} -plantslib.actions_list_noaircheck = {} - local function search_table(t, s) for i = 1, #t do if t[i] == s then return true end @@ -133,12 +142,12 @@ function plantslib:register_generate_plant(biomedef, nodes_or_function_or_model) if biomedef.check_air == false then plantslib:dbg("Register no-air-check mapgen hook: "..dump(nodes_or_function_or_model)) - plantslib.actions_list_noaircheck[#plantslib.actions_list_noaircheck + 1] = { biomedef, nodes_or_function_or_model } + plantslib.actionslist_no_aircheck[#plantslib.actionslist_no_aircheck + 1] = { biomedef, nodes_or_function_or_model } local s = biomedef.surface if type(s) == "string" then - if s and minetest.registered_nodes[s] then - if not search_table(plantslib.surfaces_list_noaircheck, s) then - plantslib.surfaces_list_noaircheck[#plantslib.surfaces_list_noaircheck + 1] = s + if s and (string.find(s, "^group:") or minetest.registered_nodes[s]) then + if not search_table(plantslib.surfaceslist_no_aircheck, s) then + plantslib.surfaceslist_no_aircheck[#plantslib.surfaceslist_no_aircheck + 1] = s end else plantslib:dbg("Warning: Ignored no-air-check registration for undefined surface node: "..dump(s)) @@ -146,9 +155,9 @@ function plantslib:register_generate_plant(biomedef, nodes_or_function_or_model) else for i = 1, #biomedef.surface do local s = biomedef.surface[i] - if s and minetest.registered_nodes[s] then - if not search_table(plantslib.surfaces_list_noaircheck, s) then - plantslib.surfaces_list_noaircheck[#plantslib.surfaces_list_noaircheck + 1] = s + if s and (string.find(s, "^group:") or minetest.registered_nodes[s]) then + if not search_table(plantslib.surfaceslist_no_aircheck, s) then + plantslib.surfaceslist_no_aircheck[#plantslib.surfaceslist_no_aircheck + 1] = s end else plantslib:dbg("Warning: Ignored no-air-check registration for undefined surface node: "..dump(s)) @@ -157,12 +166,12 @@ function plantslib:register_generate_plant(biomedef, nodes_or_function_or_model) end else plantslib:dbg("Register with-air-checking mapgen hook: "..dump(nodes_or_function_or_model)) - plantslib.actions_list[#plantslib.actions_list + 1] = { biomedef, nodes_or_function_or_model } + plantslib.actionslist_aircheck[#plantslib.actionslist_aircheck + 1] = { biomedef, nodes_or_function_or_model } local s = biomedef.surface if type(s) == "string" then - if s and minetest.registered_nodes[s] then - if not search_table(plantslib.surfaces_list, s) then - plantslib.surfaces_list[#plantslib.surfaces_list + 1] = s + if s and (string.find(s, "^group:") or minetest.registered_nodes[s]) then + if not search_table(plantslib.surfaceslist_aircheck, s) then + plantslib.surfaceslist_aircheck[#plantslib.surfaceslist_aircheck + 1] = s end else plantslib:dbg("Warning: Ignored with-air-checking registration for undefined surface node: "..dump(s)) @@ -170,9 +179,9 @@ function plantslib:register_generate_plant(biomedef, nodes_or_function_or_model) else for i = 1, #biomedef.surface do local s = biomedef.surface[i] - if s and minetest.registered_nodes[s] then - if not search_table(plantslib.surfaces_list, s) then - plantslib.surfaces_list[#plantslib.surfaces_list + 1] = s + if s and (string.find(s, "^group:") or minetest.registered_nodes[s]) then + if not search_table(plantslib.surfaceslist_aircheck, s) then + plantslib.surfaceslist_aircheck[#plantslib.surfaceslist_aircheck + 1] = s end else plantslib:dbg("Warning: Ignored with-air-checking registration for undefined surface node: "..dump(s)) @@ -182,283 +191,243 @@ function plantslib:register_generate_plant(biomedef, nodes_or_function_or_model) end end +function plantslib:populate_surfaces(biome, nodes_or_function_or_model, snodes, checkair) + + plantslib:set_defaults(biome) + + -- filter stage 1 - find nodes from the supplied surfaces that are within the current biome. + + local in_biome_nodes = {} + local perlin_fertile_area = minetest.get_perlin(biome.seed_diff, perlin_octaves, perlin_persistence, perlin_scale) + + for i = 1, #snodes do + local pos = snodes[i] + local p_top = { x = pos.x, y = pos.y + 1, z = pos.z } + local noise1 = perlin_fertile_area:get2d({x=pos.x, y=pos.z}) + local noise2 = plantslib.perlin_temperature:get2d({x=pos.x, y=pos.z}) + local noise3 = plantslib.perlin_humidity:get2d({x=pos.x+150, y=pos.z+50}) + local biome_surfaces_string = dump(biome.surface) + local surface_ok = false + + if not biome.depth then + local dest_node = minetest.get_node(pos) + if string.find(biome_surfaces_string, dest_node.name) then + surface_ok = true + else + if string.find(biome_surfaces_string, "group:") then + for j = 1, #biome.surface do + if string.find(biome.surface[j], "^group:") + and minetest.get_item_group(dest_node.name, biome.surface[j]) then + surface_ok = true + break + end + end + end + end + elseif not string.find(biome_surfaces_string, minetest.get_node({ x = pos.x, y = pos.y-biome.depth-1, z = pos.z }).name) then + surface_ok = true + end + + if surface_ok + and (not checkair or minetest.get_node(p_top).name == "air") + and pos.y >= biome.min_elevation + and pos.y <= biome.max_elevation + and noise1 > biome.plantlife_limit + and noise2 <= biome.temp_min + and noise2 >= biome.temp_max + and noise3 <= biome.humidity_min + and noise3 >= biome.humidity_max + and (not biome.ncount or #(minetest.find_nodes_in_area({x=pos.x-1, y=pos.y, z=pos.z-1}, {x=pos.x+1, y=pos.y, z=pos.z+1}, biome.neighbors)) > biome.ncount) + and (not biome.near_nodes or #(minetest.find_nodes_in_area({x=pos.x-biome.near_nodes_size, y=pos.y-biome.near_nodes_vertical, z=pos.z-biome.near_nodes_size}, {x=pos.x+biome.near_nodes_size, y=pos.y+biome.near_nodes_vertical, z=pos.z+biome.near_nodes_size}, biome.near_nodes)) >= biome.near_nodes_count) + and math.random(1,100) > biome.rarity + and (not biome.below_nodes or string.find(dump(biome.below_nodes), minetest.get_node({x=pos.x, y=pos.y-1, z=pos.z}).name) ) + then + in_biome_nodes[#in_biome_nodes + 1] = pos + end + end + + -- filter stage 2 - find places within that biome area to place the plants. + + local num_in_biome_nodes = #in_biome_nodes + + if num_in_biome_nodes > 0 then + for i = 1, math.min(biome.max_count, num_in_biome_nodes) do + local tries = 0 + local spawned = false + while tries < 2 and not spawned do + local pos = in_biome_nodes[math.random(1, num_in_biome_nodes)] + if biome.spawn_replace_node then + pos.y = pos.y-1 + end + local p_top = { x = pos.x, y = pos.y + 1, z = pos.z } + + if not (biome.avoid_nodes and biome.avoid_radius and minetest.find_node_near(p_top, biome.avoid_radius + math.random(-1.5,2), biome.avoid_nodes)) then + if biome.delete_above then + minetest.remove_node(p_top) + minetest.remove_node({x=p_top.x, y=p_top.y+1, z=p_top.z}) + end + + if biome.delete_above_surround then + minetest.remove_node({x=p_top.x-1, y=p_top.y, z=p_top.z}) + minetest.remove_node({x=p_top.x+1, y=p_top.y, z=p_top.z}) + minetest.remove_node({x=p_top.x, y=p_top.y, z=p_top.z-1}) + minetest.remove_node({x=p_top.x, y=p_top.y, z=p_top.z+1}) + + minetest.remove_node({x=p_top.x-1, y=p_top.y+1, z=p_top.z}) + minetest.remove_node({x=p_top.x+1, y=p_top.y+1, z=p_top.z}) + minetest.remove_node({x=p_top.x, y=p_top.y+1, z=p_top.z-1}) + minetest.remove_node({x=p_top.x, y=p_top.y+1, z=p_top.z+1}) + end + + if biome.spawn_replace_node then + minetest.remove_node(pos) + end + + local objtype = type(nodes_or_function_or_model) + + if objtype == "table" then + if nodes_or_function_or_model.axiom then + plantslib:generate_tree(pos, nodes_or_function_or_model) + spawned = true + else + local fdir = nil + if biome.random_facedir then + fdir = math.random(biome.random_facedir[1], biome.random_facedir[2]) + end + minetest.set_node(p_top, { name = nodes_or_function_or_model[math.random(#nodes_or_function_or_model)], param2 = fdir }) + spawned = true + end + elseif objtype == "string" and + minetest.registered_nodes[nodes_or_function_or_model] then + local fdir = nil + if biome.random_facedir then + fdir = math.random(biome.random_facedir[1], biome.random_facedir[2]) + end + minetest.set_node(p_top, { name = nodes_or_function_or_model, param2 = fdir }) + spawned = true + elseif objtype == "function" then + nodes_or_function_or_model(pos) + spawned = true + elseif objtype == "string" and pcall(loadstring(("return %s(...)"): + format(nodes_or_function_or_model)),pos) then + spawned = true + else + plantslib:dbg("Warning: Ignored invalid definition for object "..dump(nodes_or_function_or_model).." that was pointed at {"..dump(pos).."}") + end + else + tries = tries + 1 + end + end + end + end +end + -- Primary mapgen spawner, for mods that can work with air checking enabled on -- a surface during the initial map read stage. -function plantslib:generate_block_with_air_checking(minp, maxp, blockseed) - return function(minp, maxp, blockseed) +function plantslib:generate_block_with_air_checking(dtime) - -- use the block hash as a unique key into the surface_nodes - -- table, so that we can write the table thread-safely. + if #plantslib.blocklist_aircheck > 0 then - local blockhash = minetest.hash_node_position(minp) - local search_area = minetest.find_nodes_in_area(minp, maxp, plantslib.surfaces_list) + local minp = plantslib.blocklist_aircheck[1][1] + local maxp = plantslib.blocklist_aircheck[1][2] - -- search the generated block for surfaces + -- use the block hash as a unique key into the surface nodes + -- tables, so that we can write the tables thread-safely. - local surface_nodes = {} - surface_nodes.blockhash = {} + local blockhash = minetest.hash_node_position(minp) - for i = 1, #search_area do - local pos = search_area[i] - local p_top = { x=pos.x, y=pos.y+1, z=pos.z } - if minetest.get_node(p_top).name == "air" then - surface_nodes.blockhash[#surface_nodes.blockhash + 1] = pos - end - end + if not plantslib.surface_nodes_aircheck.blockhash then - for action = 1, #plantslib.actions_list do - local biome = plantslib.actions_list[action][1] - local nodes_or_function_or_model = plantslib.actions_list[action][2] + local search_area = minetest.find_nodes_in_area(minp, maxp, plantslib.surfaceslist_aircheck) - plantslib:set_defaults(biome) + -- search the generated block for air-bounded surfaces - -- filter stage 1 - find nodes from the supplied surfaces that are within the current biome. + plantslib.surface_nodes_aircheck.blockhash = {} - local in_biome_nodes = {} - local perlin_fertile_area = minetest.get_perlin(biome.seed_diff, perlin_octaves, perlin_persistence, perlin_scale) - - for i = 1, #surface_nodes.blockhash do - local pos = surface_nodes.blockhash[i] - local p_top = { x = pos.x, y = pos.y + 1, z = pos.z } - local noise1 = perlin_fertile_area:get2d({x=pos.x, y=pos.z}) - local noise2 = plantslib.perlin_temperature:get2d({x=pos.x, y=pos.z}) - local noise3 = plantslib.perlin_humidity:get2d({x=pos.x+150, y=pos.z+50}) - local biome_surfaces_string = dump(biome.surface) - if ((not biome.depth and string.find(biome_surfaces_string, minetest.get_node(pos).name)) or (biome.depth and not string.find(biome_surfaces_string, minetest.get_node({ x = pos.x, y = pos.y-biome.depth-1, z = pos.z }).name))) - and minetest.get_node(p_top).name == "air" - and pos.y >= biome.min_elevation - and pos.y <= biome.max_elevation - and noise1 > biome.plantlife_limit - and noise2 <= biome.temp_min - and noise2 >= biome.temp_max - and noise3 <= biome.humidity_min - and noise3 >= biome.humidity_max - and (not biome.ncount or #(minetest.find_nodes_in_area({x=pos.x-1, y=pos.y, z=pos.z-1}, {x=pos.x+1, y=pos.y, z=pos.z+1}, biome.neighbors)) > biome.ncount) - and (not biome.near_nodes or #(minetest.find_nodes_in_area({x=pos.x-biome.near_nodes_size, y=pos.y-biome.near_nodes_vertical, z=pos.z-biome.near_nodes_size}, {x=pos.x+biome.near_nodes_size, y=pos.y+biome.near_nodes_vertical, z=pos.z+biome.near_nodes_size}, biome.near_nodes)) >= biome.near_nodes_count) - and math.random(1,100) > biome.rarity - and (not biome.below_nodes or string.find(dump(biome.below_nodes), minetest.get_node({x=pos.x, y=pos.y-1, z=pos.z}).name) ) - then - in_biome_nodes[#in_biome_nodes + 1] = pos + for i = 1, #search_area do + local pos = search_area[i] + local p_top = { x=pos.x, y=pos.y+1, z=pos.z } + if minetest.get_node(p_top).name == "air" then + plantslib.surface_nodes_aircheck.blockhash[#plantslib.surface_nodes_aircheck.blockhash + 1] = pos end end + plantslib.actioncount_aircheck.blockhash = 1 - -- filter stage 2 - find places within that biome area to place the plants. - - local num_in_biome_nodes = #in_biome_nodes - - if num_in_biome_nodes > 0 then - for i = 1, math.min(biome.max_count, num_in_biome_nodes) do - local tries = 0 - local spawned = false - while tries < 2 and not spawned do - local pos = in_biome_nodes[math.random(1, num_in_biome_nodes)] - if biome.spawn_replace_node then - pos.y = pos.y-1 - end - local p_top = { x = pos.x, y = pos.y + 1, z = pos.z } - - if not (biome.avoid_nodes and biome.avoid_radius and minetest.find_node_near(p_top, biome.avoid_radius + math.random(-1.5,2), biome.avoid_nodes)) then - if biome.delete_above then - minetest.remove_node(p_top) - minetest.remove_node({x=p_top.x, y=p_top.y+1, z=p_top.z}) - end - - if biome.delete_above_surround then - minetest.remove_node({x=p_top.x-1, y=p_top.y, z=p_top.z}) - minetest.remove_node({x=p_top.x+1, y=p_top.y, z=p_top.z}) - minetest.remove_node({x=p_top.x, y=p_top.y, z=p_top.z-1}) - minetest.remove_node({x=p_top.x, y=p_top.y, z=p_top.z+1}) - - minetest.remove_node({x=p_top.x-1, y=p_top.y+1, z=p_top.z}) - minetest.remove_node({x=p_top.x+1, y=p_top.y+1, z=p_top.z}) - minetest.remove_node({x=p_top.x, y=p_top.y+1, z=p_top.z-1}) - minetest.remove_node({x=p_top.x, y=p_top.y+1, z=p_top.z+1}) - end - - if biome.spawn_replace_node then - minetest.remove_node(pos) - end - - local objtype = type(nodes_or_function_or_model) - - if objtype == "table" then - if nodes_or_function_or_model.axiom then - plantslib:generate_tree(pos, nodes_or_function_or_model) - spawned = true - else - local fdir = nil - if biome.random_facedir then - fdir = math.random(biome.random_facedir[1], biome.random_facedir[2]) - end - minetest.set_node(p_top, { name = nodes_or_function_or_model[math.random(#nodes_or_function_or_model)], param2 = fdir }) - spawned = true - end - elseif objtype == "string" and - minetest.registered_nodes[nodes_or_function_or_model] then - local fdir = nil - if biome.random_facedir then - fdir = math.random(biome.random_facedir[1], biome.random_facedir[2]) - end - minetest.set_node(p_top, { name = nodes_or_function_or_model, param2 = fdir }) - spawned = true - elseif objtype == "function" then - nodes_or_function_or_model(pos) - spawned = true - elseif objtype == "string" and pcall(loadstring(("return %s(...)"): - format(nodes_or_function_or_model)),pos) then - spawned = true - else - plantslib:dbg("Warning: Ignored invalid definition for object "..dump(nodes_or_function_or_model).." that was pointed at {"..dump(pos).."}") - end - else - tries = tries + 1 - end - end + else + if plantslib.actioncount_aircheck.blockhash <= #plantslib.actionslist_aircheck then + -- [1] is biome, [2] is node/function/model + plantslib:populate_surfaces( + plantslib.actionslist_aircheck[plantslib.actioncount_aircheck.blockhash][1], + plantslib.actionslist_aircheck[plantslib.actioncount_aircheck.blockhash][2], + plantslib.surface_nodes_aircheck.blockhash, true) + plantslib.actioncount_aircheck.blockhash = plantslib.actioncount_aircheck.blockhash + 1 + else + if plantslib.surface_nodes_aircheck.blockhash then + table.remove(plantslib.blocklist_aircheck, 1) + plantslib.surface_nodes_aircheck.blockhash = nil end end end end end --- Separate copy of the mapgen spawner, for mods that require disabling of +-- Secondary mapgen spawner, for mods that require disabling of -- checking for air during the initial map read stage. -function plantslib:generate_block_no_air_check(minp, maxp, blockseed) - return function(minp, maxp, blockseed) +function plantslib:generate_block_no_aircheck(dtime) - -- use the block hash as a unique key into the surface_nodes - -- table, so that we can write the table thread-safely. + if #plantslib.blocklist_no_aircheck > 0 then - local blockhash = minetest.hash_node_position(minp) + local minp = plantslib.blocklist_no_aircheck[1][1] + local maxp = plantslib.blocklist_no_aircheck[1][2] - -- read the generated block into the block cache, filtered for "surfaces" + local blockhash = minetest.hash_node_position(minp) - local surface_nodes = {} - surface_nodes.blockhash = minetest.find_nodes_in_area(minp, maxp, plantslib.surfaces_list_noaircheck) + if not plantslib.surface_nodes_no_aircheck.blockhash then - for action = 1, #plantslib.actions_list_noaircheck do - local biome = plantslib.actions_list_noaircheck[action][1] - local nodes_or_function_or_model = plantslib.actions_list_noaircheck[action][2] + -- directly read the block to be searched into the chunk cache - plantslib:set_defaults(biome) + plantslib.surface_nodes_no_aircheck.blockhash = + minetest.find_nodes_in_area(minp, maxp, plantslib.surfaceslist_no_aircheck) + plantslib.actioncount_no_aircheck.blockhash = 1 - -- filter stage 1 - find nodes from the supplied surfaces that are within the current biome. - - local in_biome_nodes = {} - local perlin_fertile_area = minetest.get_perlin(biome.seed_diff, perlin_octaves, perlin_persistence, perlin_scale) - - for i = 1, #surface_nodes.blockhash do - local pos = surface_nodes.blockhash[i] - local p_top = { x = pos.x, y = pos.y + 1, z = pos.z } - local noise1 = perlin_fertile_area:get2d({x=pos.x, y=pos.z}) - local noise2 = plantslib.perlin_temperature:get2d({x=pos.x, y=pos.z}) - local noise3 = plantslib.perlin_humidity:get2d({x=pos.x+150, y=pos.z+50}) - local biome_surfaces_string = dump(biome.surface) - if ((not biome.depth and string.find(biome_surfaces_string, minetest.get_node(pos).name)) or (biome.depth and not string.find(biome_surfaces_string, minetest.get_node({ x = pos.x, y = pos.y-biome.depth-1, z = pos.z }).name))) - and pos.y >= biome.min_elevation - and pos.y <= biome.max_elevation - and noise1 > biome.plantlife_limit - and noise2 <= biome.temp_min - and noise2 >= biome.temp_max - and noise3 <= biome.humidity_min - and noise3 >= biome.humidity_max - and (not biome.ncount or #(minetest.find_nodes_in_area({x=pos.x-1, y=pos.y, z=pos.z-1}, {x=pos.x+1, y=pos.y, z=pos.z+1}, biome.neighbors)) > biome.ncount) - and (not biome.near_nodes or #(minetest.find_nodes_in_area({x=pos.x-biome.near_nodes_size, y=pos.y-biome.near_nodes_vertical, z=pos.z-biome.near_nodes_size}, {x=pos.x+biome.near_nodes_size, y=pos.y+biome.near_nodes_vertical, z=pos.z+biome.near_nodes_size}, biome.near_nodes)) >= biome.near_nodes_count) - and math.random(1,100) > biome.rarity - and (not biome.below_nodes or string.find(dump(biome.below_nodes), minetest.get_node({x=pos.x, y=pos.y-1, z=pos.z}).name) ) - then - in_biome_nodes[#in_biome_nodes + 1] = pos - end - end - - -- filter stage 2 - find places within that biome area to place the plants. - - local num_in_biome_nodes = #in_biome_nodes - - if num_in_biome_nodes > 0 then - for i = 1, math.min(biome.max_count, num_in_biome_nodes) do - local tries = 0 - local spawned = false - while tries < 2 and not spawned do - local pos = in_biome_nodes[math.random(1, num_in_biome_nodes)] - if biome.spawn_replace_node then - pos.y = pos.y-1 - end - local p_top = { x = pos.x, y = pos.y + 1, z = pos.z } - - if not (biome.avoid_nodes and biome.avoid_radius and minetest.find_node_near(p_top, biome.avoid_radius + math.random(-1.5,2), biome.avoid_nodes)) then - if biome.delete_above then - minetest.remove_node(p_top) - minetest.remove_node({x=p_top.x, y=p_top.y+1, z=p_top.z}) - end - - if biome.delete_above_surround then - minetest.remove_node({x=p_top.x-1, y=p_top.y, z=p_top.z}) - minetest.remove_node({x=p_top.x+1, y=p_top.y, z=p_top.z}) - minetest.remove_node({x=p_top.x, y=p_top.y, z=p_top.z-1}) - minetest.remove_node({x=p_top.x, y=p_top.y, z=p_top.z+1}) - - minetest.remove_node({x=p_top.x-1, y=p_top.y+1, z=p_top.z}) - minetest.remove_node({x=p_top.x+1, y=p_top.y+1, z=p_top.z}) - minetest.remove_node({x=p_top.x, y=p_top.y+1, z=p_top.z-1}) - minetest.remove_node({x=p_top.x, y=p_top.y+1, z=p_top.z+1}) - end - - if biome.spawn_replace_node then - minetest.remove_node(pos) - end - - local objtype = type(nodes_or_function_or_model) - - if objtype == "table" then - if nodes_or_function_or_model.axiom then - plantslib:generate_tree(pos, nodes_or_function_or_model) - spawned = true - else - local fdir = nil - if biome.random_facedir then - fdir = math.random(biome.random_facedir[1], biome.random_facedir[2]) - end - minetest.set_node(p_top, { name = nodes_or_function_or_model[math.random(#nodes_or_function_or_model)], param2 = fdir }) - spawned = true - end - elseif objtype == "string" and - minetest.registered_nodes[nodes_or_function_or_model] then - local fdir = nil - if biome.random_facedir then - fdir = math.random(biome.random_facedir[1], biome.random_facedir[2]) - end - minetest.set_node(p_top, { name = nodes_or_function_or_model, param2 = fdir }) - spawned = true - elseif objtype == "function" then - nodes_or_function_or_model(pos) - spawned = true - elseif objtype == "string" and pcall(loadstring(("return %s(...)"): - format(nodes_or_function_or_model)),pos) then - spawned = true - else - plantslib:dbg("Warning: Ignored invalid definition for object "..dump(nodes_or_function_or_model).." that was pointed at {"..dump(pos).."}") - end - else - tries = tries + 1 - end - end + else + if plantslib.actioncount_no_aircheck.blockhash <= #plantslib.actionslist_no_aircheck then + plantslib:populate_surfaces( + plantslib.actionslist_no_aircheck[plantslib.actioncount_no_aircheck.blockhash][1], + plantslib.actionslist_no_aircheck[plantslib.actioncount_no_aircheck.blockhash][2], + plantslib.surface_nodes_no_aircheck.blockhash, false) + plantslib.actioncount_no_aircheck.blockhash = plantslib.actioncount_no_aircheck.blockhash + 1 + else + if plantslib.surface_nodes_no_aircheck.blockhash then + table.remove(plantslib.blocklist_no_aircheck, 1) + plantslib.surface_nodes_no_aircheck.blockhash = nil end end end end end --- And here we actually register the mapgen hooks with the engine +-- "Record" the chunks being generated by the core mapgen -minetest.register_on_generated( - plantslib:generate_block_with_air_checking(minp, maxp, blockseed) -) +minetest.register_on_generated(function(minp, maxp, blockseed) + plantslib.blocklist_aircheck[#plantslib.blocklist_aircheck + 1] = { minp, maxp } +end) -minetest.register_on_generated( - plantslib:generate_block_no_air_check(minp, maxp, blockseed) -) +minetest.register_on_generated(function(minp, maxp, blockseed) + plantslib.blocklist_no_aircheck[#plantslib.blocklist_no_aircheck + 1] = { minp, maxp } +end) + +-- "Play" them back, populating them with new stuff in the process + +minetest.register_globalstep(function(dtime) + plantslib:generate_block_with_air_checking(dtime) +end) + +minetest.register_globalstep(function(dtime) + plantslib:generate_block_no_aircheck(dtime) +end) -- The spawning ABM @@ -530,8 +499,8 @@ function plantslib:spawn_on_surfaces(sd,sp,sr,sc,ss,sa) if biome.random_facedir then fdir = math.random(biome.random_facedir[1],biome.random_facedir[2]) end - if type(spawn_plants) == "string" then - assert(loadstring(spawn_plants.."(...)"))(pos) + if type(biome.spawn_plants) == "string" then + assert(loadstring(biome.spawn_plants.."(...)"))(pos) elseif not biome.spawn_on_side and not biome.spawn_on_bottom and not biome.spawn_replace_node then if n_top.name == "air" then minetest.set_node(p_top, { name = plant_to_spawn, param2 = fdir }) @@ -714,7 +683,7 @@ end print("[Plants Lib] Loaded") minetest.after(0, function() - print("[Plants Lib] Registered a total of "..(#plantslib.surfaces_list)+(#plantslib.surfaces_list_noaircheck).." surface types to be evaluated, spread") - print("[Plants Lib] across "..#plantslib.actions_list.." actions with air-checking and "..#plantslib.actions_list_noaircheck.." actions without.") + print("[Plants Lib] Registered a total of "..(#plantslib.surfaceslist_aircheck)+(#plantslib.surfaceslist_no_aircheck).." surface types to be evaluated, spread") + print("[Plants Lib] across "..#plantslib.actionslist_aircheck.." actions with air-checking and "..#plantslib.actionslist_no_aircheck.." actions without.") end) diff --git a/mods/plantlife_modpack/plants_lib/locale/de.txt b/mods/plantlife_modpack/plants_lib/locale/de.txt old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/plants_lib/locale/template.txt b/mods/plantlife_modpack/plants_lib/locale/template.txt old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/poisonivy/depends.txt b/mods/plantlife_modpack/poisonivy/depends.txt old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/poisonivy/init.lua b/mods/plantlife_modpack/poisonivy/init.lua old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/poisonivy/locale/de.txt b/mods/plantlife_modpack/poisonivy/locale/de.txt old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/poisonivy/locale/template.txt b/mods/plantlife_modpack/poisonivy/locale/template.txt old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/poisonivy/textures/poisonivy_climbing.png b/mods/plantlife_modpack/poisonivy/textures/poisonivy_climbing.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/poisonivy/textures/poisonivy_seedling.png b/mods/plantlife_modpack/poisonivy/textures/poisonivy_seedling.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/poisonivy/textures/poisonivy_sproutling.png b/mods/plantlife_modpack/poisonivy/textures/poisonivy_sproutling.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/trunks/crafting.lua b/mods/plantlife_modpack/trunks/crafting.lua old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/trunks/depends.txt b/mods/plantlife_modpack/trunks/depends.txt old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/trunks/generating.lua b/mods/plantlife_modpack/trunks/generating.lua old mode 100755 new mode 100644 index 6b5b897c..77962134 --- a/mods/plantlife_modpack/trunks/generating.lua +++ b/mods/plantlife_modpack/trunks/generating.lua @@ -1,8 +1,8 @@ -- Code by Mossmanikin, Neuromancer, and others local function clone_node(name) - node2={} - node=minetest.registered_nodes[name] + local node2 = {} + local node = minetest.registered_nodes[name] for k,v in pairs(node) do node2[k]=v end diff --git a/mods/plantlife_modpack/trunks/init.lua b/mods/plantlife_modpack/trunks/init.lua old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/trunks/nodes.lua b/mods/plantlife_modpack/trunks/nodes.lua old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/trunks/textures/credit_textures.txt b/mods/plantlife_modpack/trunks/textures/credit_textures.txt old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/trunks/textures/old & unused/comboSticks.png b/mods/plantlife_modpack/trunks/textures/old & unused/comboSticks.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/trunks/textures/old & unused/comboSticks_2.png b/mods/plantlife_modpack/trunks/textures/old & unused/comboSticks_2.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/trunks/textures/old & unused/trunks_root_mask_old.png b/mods/plantlife_modpack/trunks/textures/old & unused/trunks_root_mask_old.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/trunks/textures/old & unused/trunks_twig_1e.png b/mods/plantlife_modpack/trunks/textures/old & unused/trunks_twig_1e.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/trunks/textures/old & unused/trunks_twig_1n.png b/mods/plantlife_modpack/trunks/textures/old & unused/trunks_twig_1n.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/trunks/textures/old & unused/trunks_twig_2n.png b/mods/plantlife_modpack/trunks/textures/old & unused/trunks_twig_2n.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/trunks/textures/old & unused/trunks_twig_3n.png b/mods/plantlife_modpack/trunks/textures/old & unused/trunks_twig_3n.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/trunks/textures/old & unused/trunks_twig_4n.png b/mods/plantlife_modpack/trunks/textures/old & unused/trunks_twig_4n.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/trunks/textures/old & unused/trunks_twig_5-8.png b/mods/plantlife_modpack/trunks/textures/old & unused/trunks_twig_5-8.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/trunks/textures/old & unused/trunks_twig_9-12.png b/mods/plantlife_modpack/trunks/textures/old & unused/trunks_twig_9-12.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/trunks/textures/trunks_moss.png b/mods/plantlife_modpack/trunks/textures/trunks_moss.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/trunks/textures/trunks_moss_fungus.png b/mods/plantlife_modpack/trunks/textures/trunks_moss_fungus.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/trunks/textures/trunks_root_mask.png b/mods/plantlife_modpack/trunks/textures/trunks_root_mask.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/trunks/textures/trunks_twig_1.png b/mods/plantlife_modpack/trunks/textures/trunks_twig_1.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/trunks/textures/trunks_twig_10.png b/mods/plantlife_modpack/trunks/textures/trunks_twig_10.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/trunks/textures/trunks_twig_11.png b/mods/plantlife_modpack/trunks/textures/trunks_twig_11.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/trunks/textures/trunks_twig_12.png b/mods/plantlife_modpack/trunks/textures/trunks_twig_12.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/trunks/textures/trunks_twig_13.png b/mods/plantlife_modpack/trunks/textures/trunks_twig_13.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/trunks/textures/trunks_twig_2.png b/mods/plantlife_modpack/trunks/textures/trunks_twig_2.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/trunks/textures/trunks_twig_3.png b/mods/plantlife_modpack/trunks/textures/trunks_twig_3.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/trunks/textures/trunks_twig_4.png b/mods/plantlife_modpack/trunks/textures/trunks_twig_4.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/trunks/textures/trunks_twig_5.png b/mods/plantlife_modpack/trunks/textures/trunks_twig_5.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/trunks/textures/trunks_twig_6.png b/mods/plantlife_modpack/trunks/textures/trunks_twig_6.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/trunks/textures/trunks_twig_7.png b/mods/plantlife_modpack/trunks/textures/trunks_twig_7.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/trunks/textures/trunks_twig_8.png b/mods/plantlife_modpack/trunks/textures/trunks_twig_8.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/trunks/textures/trunks_twig_9.png b/mods/plantlife_modpack/trunks/textures/trunks_twig_9.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/trunks/textures/trunks_twigs.png b/mods/plantlife_modpack/trunks/textures/trunks_twigs.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/trunks/textures/trunks_twigs_corner.png b/mods/plantlife_modpack/trunks/textures/trunks_twigs_corner.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/trunks/textures/trunks_twigs_top.png b/mods/plantlife_modpack/trunks/textures/trunks_twigs_top.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/trunks/trunks_settings.txt b/mods/plantlife_modpack/trunks/trunks_settings.txt old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/vines/depends.txt b/mods/plantlife_modpack/vines/depends.txt old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/vines/init.lua b/mods/plantlife_modpack/vines/init.lua old mode 100755 new mode 100644 index b4638c26..97cc252c --- a/mods/plantlife_modpack/vines/init.lua +++ b/mods/plantlife_modpack/vines/init.lua @@ -243,7 +243,7 @@ minetest.register_abm({ chance = 8, action = function(pos, node, active_object_count, active_object_count_wider) if minetest.find_node_near(pos, 5, "group:tree") == nil then - walldir = node.param2 + local walldir = node.param2 minetest.add_node(pos, {name=node.name.."_rotten", param2 = walldir}) end end @@ -257,7 +257,7 @@ minetest.register_abm({ local p = {x=pos.x, y=pos.y-1, z=pos.z} local n = minetest.get_node(p) if n.name == "air" then - walldir = node.param2 + local walldir = node.param2 minetest.add_node(p, {name=node.name, param2 = walldir}) end end diff --git a/mods/plantlife_modpack/vines/readme.txt b/mods/plantlife_modpack/vines/readme.txt old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/vines/textures/new/bottomvine.png b/mods/plantlife_modpack/vines/textures/new/bottomvine.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/vines/textures/new/sidevine.png b/mods/plantlife_modpack/vines/textures/new/sidevine.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/vines/textures/new/vinesdead.png b/mods/plantlife_modpack/vines/textures/new/vinesdead.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/vines/textures/new/vineslive.png b/mods/plantlife_modpack/vines/textures/new/vineslive.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/vines/textures/old/vines_vine2.png b/mods/plantlife_modpack/vines/textures/old/vines_vine2.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/vines/textures/old/vines_vine_rotten2.png b/mods/plantlife_modpack/vines/textures/old/vines_vine_rotten2.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/vines/textures/shears.png b/mods/plantlife_modpack/vines/textures/shears.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/vines/textures/vines_item.png b/mods/plantlife_modpack/vines/textures/vines_item.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/vines/textures/vines_root.png b/mods/plantlife_modpack/vines/textures/vines_root.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/vines/textures/vines_rope.png b/mods/plantlife_modpack/vines/textures/vines_rope.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/vines/textures/vines_rope_end.png b/mods/plantlife_modpack/vines/textures/vines_rope_end.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/vines/textures/vines_side.png b/mods/plantlife_modpack/vines/textures/vines_side.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/vines/textures/vines_side_rotten.png b/mods/plantlife_modpack/vines/textures/vines_side_rotten.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/vines/textures/vines_vine.png b/mods/plantlife_modpack/vines/textures/vines_vine.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/vines/textures/vines_vine_rotten.png b/mods/plantlife_modpack/vines/textures/vines_vine_rotten.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/vines/textures/vines_willow.png b/mods/plantlife_modpack/vines/textures/vines_willow.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/vines/textures/vines_willow_rotten.png b/mods/plantlife_modpack/vines/textures/vines_willow_rotten.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/woodsoils/depends.txt b/mods/plantlife_modpack/woodsoils/depends.txt old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/woodsoils/generating.lua b/mods/plantlife_modpack/woodsoils/generating.lua old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/woodsoils/init.lua b/mods/plantlife_modpack/woodsoils/init.lua old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/woodsoils/nodes.lua b/mods/plantlife_modpack/woodsoils/nodes.lua old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/woodsoils/textures/credit_textures.txt b/mods/plantlife_modpack/woodsoils/textures/credit_textures.txt old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/woodsoils/textures/not in use/woodsoils.png b/mods/plantlife_modpack/woodsoils/textures/not in use/woodsoils.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/woodsoils/textures/woodsoils_ground.png b/mods/plantlife_modpack/woodsoils/textures/woodsoils_ground.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/woodsoils/textures/woodsoils_ground_cover.png b/mods/plantlife_modpack/woodsoils/textures/woodsoils_ground_cover.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/woodsoils/textures/woodsoils_ground_cover2.png b/mods/plantlife_modpack/woodsoils/textures/woodsoils_ground_cover2.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/woodsoils/textures/woodsoils_ground_cover_side.png b/mods/plantlife_modpack/woodsoils/textures/woodsoils_ground_cover_side.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/woodsoils/textures/woodsoils_ground_cover_side2.png b/mods/plantlife_modpack/woodsoils/textures/woodsoils_ground_cover_side2.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/woodsoils/textures/woodsoils_ground_side.png b/mods/plantlife_modpack/woodsoils/textures/woodsoils_ground_side.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/youngtrees/depends.txt b/mods/plantlife_modpack/youngtrees/depends.txt old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/youngtrees/init.lua b/mods/plantlife_modpack/youngtrees/init.lua old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/youngtrees/textures/bamboo.png b/mods/plantlife_modpack/youngtrees/textures/bamboo.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/youngtrees/textures/unused/sapling.png b/mods/plantlife_modpack/youngtrees/textures/unused/sapling.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/youngtrees/textures/unused/sapling16x.png b/mods/plantlife_modpack/youngtrees/textures/unused/sapling16x.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/youngtrees/textures/youngtree16xa.png b/mods/plantlife_modpack/youngtrees/textures/youngtree16xa.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/youngtrees/textures/youngtree16xb.png b/mods/plantlife_modpack/youngtrees/textures/youngtree16xb.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/youngtrees/textures/youngtree16xc.png b/mods/plantlife_modpack/youngtrees/textures/youngtree16xc.png old mode 100755 new mode 100644 diff --git a/mods/plantlife_modpack/youngtrees/textures/youngtree2branch.png b/mods/plantlife_modpack/youngtrees/textures/youngtree2branch.png old mode 100755 new mode 100644