From 1c90cbb3e7f7c83b95f2842c8f04d45e5f61a3b6 Mon Sep 17 00:00:00 2001 From: VanessaE Date: Sun, 31 May 2020 16:20:11 -0400 Subject: [PATCH] updated cool_trees, basic_materials, bonemeal, castles, cblocks, currency, facade, farming redo, item_drop, mesecons, pipeworks, technic, titanium, and worldedit. Switched to cheapie's display_blocks redo mod (replaces jojo1997's old version). --- baldcypress/init.lua | 200 +++ baldcypress/locale/baldcypress.es.tr | 10 + baldcypress/mod.conf | 4 + baldcypress/schematics/baldcypress.lua | 1554 +++++++++++++++++ baldcypress/schematics/baldcypress.mts | Bin 0 -> 570 bytes baldcypress/textures/baldcypress_leaves.png | Bin 0 -> 3019 bytes baldcypress/textures/baldcypress_sapling.png | Bin 0 -> 1205 bytes baldcypress/textures/baldcypress_trunk.png | Bin 0 -> 3234 bytes .../textures/baldcypress_trunk_top.png | Bin 0 -> 10212 bytes baldcypress/textures/baldcypress_wood.png | Bin 0 -> 2843 bytes basic_materials/locale/basic_materials.ru.tr | 33 + bonemeal/init.lua | 2 +- bonemeal/mods.lua | 3 +- castle_gates/doors.lua | 2 +- cblocks/README.md | 1 + cblocks/init.lua | 127 +- chestnuttree/textures/chestnuttree_leaves.png | Bin 2591 -> 6553 bytes clementinetree/schematics/clementinetree.lua | 1 + crafting_bench/init.lua | 3 +- currency/barter.lua | 6 +- currency/income.lua | 38 +- currency/settingtypes.txt | 3 + display_blocks/LICENSE.txt | 29 - display_blocks/README.txt | 4 - display_blocks/config.lua | 6 - display_blocks/depends.txt | 2 - display_blocks/description.txt | 1 - display_blocks/init.lua | 267 --- display_blocks/mod.conf | 1 - display_blocks/technic.lua | 40 - .../display_blocks_mese_giver_block.png | Bin 158 -> 0 bytes display_blocks/uranium.lua | 56 - display_blocks_redo/COPYING | 63 + display_blocks_redo/init.lua | 302 ++++ display_blocks_redo/mod.conf | 3 + .../textures/display_blocks_redo_air_base.png | Bin .../display_blocks_redo_air_crystal.png | Bin .../display_blocks_redo_compressed_earth.png | Bin .../display_blocks_redo_earth_base.png | Bin .../display_blocks_redo_earth_crystal.png | Bin .../display_blocks_redo_empty_base.png | Bin .../display_blocks_redo_fire_base.png | Bin .../display_blocks_redo_fire_crystal.png | Bin .../display_blocks_redo_glass_base.png | Bin .../display_blocks_redo_glass_crystal.png | Bin .../display_blocks_redo_industria_cube.png | Bin .../display_blocks_redo_mese_base.png | Bin .../display_blocks_redo_mese_crystal.png | Bin .../display_blocks_redo_metal_base.png | Bin .../display_blocks_redo_metal_crystal.png | Bin .../display_blocks_redo_natura_cube.png | Bin .../display_blocks_redo_titanium_base.png | Bin .../display_blocks_redo_titanium_crystal.png | Bin .../display_blocks_redo_universia_base.png | Bin .../display_blocks_redo_universia_crystal.png | Bin .../display_blocks_redo_uranium_base.png | Bin .../display_blocks_redo_uranium_block.png | Bin .../display_blocks_redo_uranium_crystal.png | Bin .../display_blocks_redo_uranium_dust.png | Bin .../display_blocks_redo_uranium_ore.png | Bin .../display_blocks_redo_water_base.png | Bin .../display_blocks_redo_water_crystal.png | Bin .../customize-dreambuilder.sh | 10 +- .../update-dreambuilder-online-files.sh | 33 +- ebony/init.lua | 4 +- facade/.github/workflows/check-release.yml | 11 - farming/README.md | 2 +- farming/crops/mint.lua | 91 + farming/crops/onion.lua | 21 +- farming/farming.conf_example | 1 + farming/init.lua | 4 +- farming/mapgen.lua | 2 + farming/textures/farming_mint_1.png | Bin 0 -> 114 bytes farming/textures/farming_mint_2.png | Bin 0 -> 122 bytes farming/textures/farming_mint_3.png | Bin 0 -> 132 bytes farming/textures/farming_mint_4.png | Bin 0 -> 174 bytes farming/textures/farming_mint_leaf.png | Bin 0 -> 158 bytes farming/textures/farming_mint_seeds.png | Bin 0 -> 143 bytes farming/textures/farming_mint_tea.png | Bin 0 -> 166 bytes farming/textures/farming_onion_soup.png | Bin 0 -> 161 bytes item_drop/.luacheckrc | 19 + item_drop/README.md | 9 +- item_drop/init.lua | 19 +- mesecons_gates/init.lua | 36 +- .../textures/jeija_gate_output_off.png | Bin 0 -> 98 bytes .../textures/jeija_gate_output_on.png | Bin 0 -> 99 bytes mesecons_gates/textures/jeija_gate_side.png | Bin 0 -> 136 bytes .../textures/jeija_gate_side_output_off.png | Bin 0 -> 109 bytes .../textures/jeija_gate_side_output_on.png | Bin 0 -> 110 bytes pipeworks/wielder.lua | 2 +- pomegranate/init.lua | 4 +- pomegranate/schematics/pomegranate.mts | Bin 174 -> 151 bytes technic/machines/other/injector.lua | 2 +- technic/machines/register/alloy_recipes.lua | 16 +- .../machines/register/centrifuge_recipes.lua | 4 +- technic/machines/register/common.lua | 2 +- technic/tools/chainsaw.lua | 87 +- titanium/init.lua | 8 +- unifieddyes/init.lua | 6 +- willow/init.lua | 8 +- willow/textures/willow_sapling.png | Bin 1242 -> 7753 bytes worldedit/common.lua | 3 + worldedit_commands/init.lua | 31 +- worldedit_gui/functionality.lua | 6 +- 104 files changed, 2643 insertions(+), 559 deletions(-) create mode 100644 baldcypress/init.lua create mode 100644 baldcypress/locale/baldcypress.es.tr create mode 100644 baldcypress/mod.conf create mode 100644 baldcypress/schematics/baldcypress.lua create mode 100644 baldcypress/schematics/baldcypress.mts create mode 100644 baldcypress/textures/baldcypress_leaves.png create mode 100644 baldcypress/textures/baldcypress_sapling.png create mode 100644 baldcypress/textures/baldcypress_trunk.png create mode 100644 baldcypress/textures/baldcypress_trunk_top.png create mode 100644 baldcypress/textures/baldcypress_wood.png create mode 100644 basic_materials/locale/basic_materials.ru.tr delete mode 100644 display_blocks/LICENSE.txt delete mode 100644 display_blocks/README.txt delete mode 100644 display_blocks/config.lua delete mode 100644 display_blocks/depends.txt delete mode 100644 display_blocks/description.txt delete mode 100644 display_blocks/init.lua delete mode 100644 display_blocks/mod.conf delete mode 100644 display_blocks/technic.lua delete mode 100644 display_blocks/textures/display_blocks_mese_giver_block.png delete mode 100644 display_blocks/uranium.lua create mode 100644 display_blocks_redo/COPYING create mode 100644 display_blocks_redo/init.lua create mode 100644 display_blocks_redo/mod.conf rename display_blocks/textures/display_blocks_air_block.png => display_blocks_redo/textures/display_blocks_redo_air_base.png (100%) rename display_blocks/textures/display_blocks_air_crystal.png => display_blocks_redo/textures/display_blocks_redo_air_crystal.png (100%) rename display_blocks/textures/display_blocks_compressed_earth.png => display_blocks_redo/textures/display_blocks_redo_compressed_earth.png (100%) rename display_blocks/textures/display_blocks_earth_block.png => display_blocks_redo/textures/display_blocks_redo_earth_base.png (100%) rename display_blocks/textures/display_blocks_earth_crystal.png => display_blocks_redo/textures/display_blocks_redo_earth_crystal.png (100%) rename display_blocks/textures/display_blocks_empty_display.png => display_blocks_redo/textures/display_blocks_redo_empty_base.png (100%) rename display_blocks/textures/display_blocks_fire_block.png => display_blocks_redo/textures/display_blocks_redo_fire_base.png (100%) rename display_blocks/textures/display_blocks_fire_crystal.png => display_blocks_redo/textures/display_blocks_redo_fire_crystal.png (100%) rename display_blocks/textures/display_blocks_glass_block.png => display_blocks_redo/textures/display_blocks_redo_glass_base.png (100%) rename display_blocks/textures/display_blocks_glass_crystal.png => display_blocks_redo/textures/display_blocks_redo_glass_crystal.png (100%) rename display_blocks/textures/display_blocks_industria_cube.png => display_blocks_redo/textures/display_blocks_redo_industria_cube.png (100%) rename display_blocks/textures/display_blocks_mese_block.png => display_blocks_redo/textures/display_blocks_redo_mese_base.png (100%) rename display_blocks/textures/display_blocks_mese_crystal.png => display_blocks_redo/textures/display_blocks_redo_mese_crystal.png (100%) rename display_blocks/textures/display_blocks_metal_block.png => display_blocks_redo/textures/display_blocks_redo_metal_base.png (100%) rename display_blocks/textures/display_blocks_metal_crystal.png => display_blocks_redo/textures/display_blocks_redo_metal_crystal.png (100%) rename display_blocks/textures/display_blocks_natura_cube.png => display_blocks_redo/textures/display_blocks_redo_natura_cube.png (100%) rename display_blocks/textures/display_blocks_titanium_block.png => display_blocks_redo/textures/display_blocks_redo_titanium_base.png (100%) rename display_blocks/textures/display_blocks_titanium_crystal.png => display_blocks_redo/textures/display_blocks_redo_titanium_crystal.png (100%) rename display_blocks/textures/display_blocks_universia_block.png => display_blocks_redo/textures/display_blocks_redo_universia_base.png (100%) rename display_blocks/textures/display_blocks_universia_crystal.png => display_blocks_redo/textures/display_blocks_redo_universia_crystal.png (100%) rename display_blocks/textures/display_blocks_uranium_block.png => display_blocks_redo/textures/display_blocks_redo_uranium_base.png (100%) rename display_blocks/textures/uranium_block.png => display_blocks_redo/textures/display_blocks_redo_uranium_block.png (100%) rename display_blocks/textures/display_blocks_uranium_crystal.png => display_blocks_redo/textures/display_blocks_redo_uranium_crystal.png (100%) rename display_blocks/textures/uranium_dust.png => display_blocks_redo/textures/display_blocks_redo_uranium_dust.png (100%) rename display_blocks/textures/uranium_ore.png => display_blocks_redo/textures/display_blocks_redo_uranium_ore.png (100%) rename display_blocks/textures/display_blocks_water_block.png => display_blocks_redo/textures/display_blocks_redo_water_base.png (100%) rename display_blocks/textures/display_blocks_water_crystal.png => display_blocks_redo/textures/display_blocks_redo_water_crystal.png (100%) delete mode 100644 facade/.github/workflows/check-release.yml create mode 100644 farming/crops/mint.lua create mode 100644 farming/textures/farming_mint_1.png create mode 100644 farming/textures/farming_mint_2.png create mode 100644 farming/textures/farming_mint_3.png create mode 100644 farming/textures/farming_mint_4.png create mode 100644 farming/textures/farming_mint_leaf.png create mode 100644 farming/textures/farming_mint_seeds.png create mode 100644 farming/textures/farming_mint_tea.png create mode 100644 farming/textures/farming_onion_soup.png create mode 100644 item_drop/.luacheckrc create mode 100644 mesecons_gates/textures/jeija_gate_output_off.png create mode 100644 mesecons_gates/textures/jeija_gate_output_on.png create mode 100644 mesecons_gates/textures/jeija_gate_side.png create mode 100644 mesecons_gates/textures/jeija_gate_side_output_off.png create mode 100644 mesecons_gates/textures/jeija_gate_side_output_on.png diff --git a/baldcypress/init.lua b/baldcypress/init.lua new file mode 100644 index 00000000..18830059 --- /dev/null +++ b/baldcypress/init.lua @@ -0,0 +1,200 @@ +-- +-- Bald Cypress +-- +local modname = "baldcypress" +local modpath = minetest.get_modpath(modname) +local mg_name = minetest.get_mapgen_setting("mg_name") + +-- internationalization boilerplate +local S = minetest.get_translator(minetest.get_current_modname()) + +-- Bald Cypress + +local function grow_new_baldcypress_tree(pos) + if not default.can_grow(pos) then + -- try a bit later again + minetest.get_node_timer(pos):start(math.random(240, 600)) + return + end + minetest.remove_node(pos) + minetest.place_schematic({x = pos.x-4, y = pos.y, z = pos.z-4}, modpath.."/schematics/baldcypress.mts", "0", nil, false) +end + +-- +-- Decoration +-- + +if mg_name ~= "v6" and mg_name ~= "singlenode" then + minetest.register_decoration({ + deco_type = "schematic", + place_on = {"default:sand"}, + sidelen = 16, + noise_params = { + offset = 0.0005, + scale = 0.0005, + spread = {x = 250, y = 250, z = 250}, + seed = 2, + octaves = 3, + persist = 0.66 + }, + biomes = {"coniferous_forest_ocean"}, + height = 2, + y_min = 0, + y_max = 0, + schematic = modpath.."/schematics/baldcypress.mts", + flags = "place_center_x, place_center_z, force_placement", + rotation = "random", + }) +end + +-- +-- Nodes +-- + +minetest.register_node("baldcypress:sapling", { + description = S("Bald Cypress Tree Sapling"), + drawtype = "plantlike", + visual_scale = 1.0, + tiles = {"baldcypress_sapling.png"}, + inventory_image = "baldcypress_sapling.png", + wield_image = "baldcypress_sapling.png", + paramtype = "light", + --sunlight_propagates = true, + walkable = false, + on_timer = grow_new_baldcypress_tree, + selection_box = { + type = "fixed", + fixed = {-4 / 16, -0.5, -4 / 16, 4 / 16, 7 / 16, 4 / 16} + }, + groups = {snappy = 2, dig_immediate = 3, flammable = 2, + attached_node = 1, sapling = 1}, + sounds = default.node_sound_leaves_defaults(), + + on_construct = function(pos) + minetest.get_node_timer(pos):start(math.random(2400,4800)) + end, + + on_place = function(itemstack, placer, pointed_thing) + itemstack = default.sapling_on_place(itemstack, placer, pointed_thing, + "baldcypress:sapling", + -- minp, maxp to be checked, relative to sapling pos + -- minp_relative.y = 1 because sapling pos has been checked + {x = -2, y = 1, z = -2}, + {x = 2, y = 6, z = 2}, + -- maximum interval of interior volume check + 4) + + return itemstack + end, +}) + +minetest.register_node("baldcypress:trunk", { + description = S("Bald Cypress Trunk"), + tiles = { + "baldcypress_trunk_top.png", + "baldcypress_trunk_top.png", + "baldcypress_trunk.png" + }, + groups = {tree = 1, choppy = 2, oddly_breakable_by_hand = 1, flammable = 2}, + sounds = default.node_sound_wood_defaults(), + paramtype2 = "facedir", + is_ground_content = false, + on_place = minetest.rotate_node, +}) + +-- baldcypress wood +minetest.register_node("baldcypress:wood", { + description = S("Bald Cypress Wood"), + tiles = {"baldcypress_wood.png"}, + paramtype2 = "facedir", + place_param2 = 0, + is_ground_content = false, + groups = {wood = 1, choppy = 2, oddly_breakable_by_hand = 1, flammable = 3}, + sounds = default.node_sound_wood_defaults(), +}) + +-- baldcypress tree leaves +minetest.register_node("baldcypress:leaves", { + description = S("Bald Cypress Leaves"), + drawtype = "allfaces_optional", + visual_scale = 1.2, + tiles = {"baldcypress_leaves.png"}, + inventory_image = "baldcypress_leaves.png", + wield_image = "baldcypress_leaves.png", + paramtype = "light", + walkable = true, + waving = 1, + groups = {snappy = 3, leafdecay = 3, leaves = 1, flammable = 2}, + drop = { + max_items = 1, + items = { + {items = {"baldcypress:sapling"}, rarity = 20}, + {items = {"baldcypress:leaves"}} + } + }, + sounds = default.node_sound_leaves_defaults(), + after_place_node = default.after_place_leaves, +}) + +-- +-- Craftitems +-- + +-- +-- Recipes +-- + +minetest.register_craft({ + output = "baldcypress:wood 4", + recipe = {{"baldcypress:trunk"}} +}) + + +minetest.register_craft({ + type = "fuel", + recipe = "baldcypress:trunk", + burntime = 30, +}) + +minetest.register_craft({ + type = "fuel", + recipe = "baldcypress:wood", + burntime = 7, +}) + + +minetest.register_lbm({ + name = "baldcypress:convert_baldcypress_saplings_to_node_timer", + nodenames = {"baldcypress:sapling"}, + action = function(pos) + minetest.get_node_timer(pos):start(math.random(1200, 2400)) + end +}) + +default.register_leafdecay({ + trunks = {"baldcypress:trunk"}, + leaves = {"baldcypress:leaves"}, + radius = 3, +}) + +--Stairs + +if minetest.get_modpath("stairs") ~= nil then + stairs.register_stair_and_slab( + "baldcypress_trunk", + "baldcypress:trunk", + {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2}, + {"baldcypress_wood.png"}, + S("Bald Cypress Stair"), + S("Bald Cypress Slab"), + default.node_sound_wood_defaults() + ) +end + +--Support for bonemeal + +if minetest.get_modpath("bonemeal") ~= nil then + bonemeal:add_sapling({ + {"baldcypress:sapling", grow_new_baldcypress_tree, "soil"}, + }) +end diff --git a/baldcypress/locale/baldcypress.es.tr b/baldcypress/locale/baldcypress.es.tr new file mode 100644 index 00000000..e895b8d5 --- /dev/null +++ b/baldcypress/locale/baldcypress.es.tr @@ -0,0 +1,10 @@ +# textdomain: baldcypress +Bald Cypress Trunk=Madera de criprés calvo +Bald Cypress Wood=Tablas de criprés calvo +Bald Cypress Leaves=Hojas de criprés calvo +Bald Cypress Tree Sapling=Retoño de criprés calvo +Bald Cypress Tree Stair=Escaleras de criprés calvo +Bald Cypress Slab=Losa de de criprés calvo +Inner Bald Cypress Stair=Escaleras de de criprés calvo interior +Outer Bald Cypress Stair=Escaleras de criprés calvo exterior +Bald Cypress Slab=Losa de criprés calvo diff --git a/baldcypress/mod.conf b/baldcypress/mod.conf new file mode 100644 index 00000000..1f6c1a83 --- /dev/null +++ b/baldcypress/mod.conf @@ -0,0 +1,4 @@ +name = baldcypress +description = Blad Cypress for Swamps +depends = default +optional_depends = stairs, bonemeal diff --git a/baldcypress/schematics/baldcypress.lua b/baldcypress/schematics/baldcypress.lua new file mode 100644 index 00000000..3d7da18f --- /dev/null +++ b/baldcypress/schematics/baldcypress.lua @@ -0,0 +1,1554 @@ +schematic = { + size = {x=10, y=17, z=9}, + yslice_prob = { + {ypos=0, prob=254}, + {ypos=1, prob=254}, + {ypos=2, prob=254}, + {ypos=3, prob=254}, + {ypos=4, prob=254}, + {ypos=5, prob=254}, + {ypos=6, prob=254}, + {ypos=7, prob=254}, + {ypos=8, prob=254}, + {ypos=9, prob=254}, + {ypos=10, prob=254}, + {ypos=11, prob=254}, + {ypos=12, prob=254}, + {ypos=13, prob=254}, + {ypos=14, prob=254}, + {ypos=15, prob=254}, + {ypos=16, prob=254}, + }, + data = { + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:leaves", prob=126, param2=1}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:trunk", prob=254, param2=20}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:trunk", prob=254, param2=20}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="air", prob=0, param2=0}, + {name="baldcypress:trunk", prob=254, param2=20}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:leaves", prob=126, param2=1}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="air", prob=0, param2=0}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:trunk", prob=254, param2=20}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:leaves", prob=126, param2=1}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="baldcypress:trunk", prob=254, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:trunk", prob=254, param2=9}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="air", prob=0, param2=0}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="baldcypress:trunk", prob=254, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="air", prob=0, param2=0}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="air", prob=0, param2=0}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="air", prob=0, param2=0}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="baldcypress:leaves", prob=126, param2=1}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="baldcypress:trunk", prob=254, param2=0}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:leaves", prob=126, param2=1}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="baldcypress:trunk", prob=254, param2=1}, + {name="baldcypress:trunk", prob=254, param2=1}, + {name="baldcypress:trunk", prob=254, param2=3}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="swaz:swamp_grass", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="baldcypress:trunk", prob=254, param2=2}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="baldcypress:trunk", prob=254, param2=2}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="baldcypress:trunk", prob=254, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:trunk", prob=254, param2=0}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:trunk", prob=254, param2=3}, + {name="baldcypress:trunk", prob=254, param2=0}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:trunk", prob=254, param2=3}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:trunk", prob=254, param2=3}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:trunk", prob=254, param2=2}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="air", prob=0, param2=0}, + {name="baldcypress:trunk", prob=254, param2=20}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:trunk", prob=254, param2=2}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="air", prob=0, param2=0}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:trunk", prob=254, param2=20}, + {name="baldcypress:leaves", prob=126, param2=1}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:trunk", prob=254, param2=0}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:trunk", prob=254, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:trunk", prob=254, param2=18}, + {name="baldcypress:trunk", prob=254, param2=3}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:leaves", prob=126, param2=1}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:trunk", prob=254, param2=1}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:trunk", prob=254, param2=3}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="baldcypress:trunk", prob=254, param2=2}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:trunk", prob=254, param2=2}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="baldcypress:trunk", prob=254, param2=1}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="baldcypress:trunk", prob=254, param2=3}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="air", prob=0, param2=0}, + {name="baldcypress:trunk", prob=254, param2=22}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:trunk", prob=254, param2=7}, + {name="air", prob=0, param2=0}, + {name="baldcypress:trunk", prob=254, param2=7}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="air", prob=0, param2=0}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:trunk", prob=254, param2=7}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="swaz:swamp_grass", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:trunk", prob=254, param2=20}, + {name="baldcypress:leaves", prob=126, param2=1}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="baldcypress:leaves", prob=126, param2=1}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="baldcypress:trunk", prob=254, param2=2}, + {name="air", prob=0, param2=0}, + {name="baldcypress:leaves", prob=126, param2=1}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:trunk", prob=254, param2=2}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="swaz:swamp_grass", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:trunk", prob=254, param2=7}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:leaves", prob=126, param2=1}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:trunk", prob=254, param2=20}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:leaves", prob=254, param2=1}, + {name="baldcypress:leaves", prob=126, param2=1}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + {name="air", prob=0, param2=0}, + }, +} diff --git a/baldcypress/schematics/baldcypress.mts b/baldcypress/schematics/baldcypress.mts new file mode 100644 index 0000000000000000000000000000000000000000..7898e852d4f1482eb2706fbb9af79d9de9623768 GIT binary patch literal 570 zcmV-A0>%AJR8vg=1ON&E5daB)e}8{}e}8{}e}8{}e}8{}00RI6VQF#z5@KO&WMg@7 za%FRKI&5WOc4cz_5n^F%WMg@7a%FRKI&^Y%Zfkg)-B(+V!!QUmx>#aA=zdH8MsqQ~_rhQ&*Z(_WO=H9mF)bhJ#PLBfAR9V&-G{e`} z_CE3MgtkI8MZBlmD>eOHx8v@LPh3@3UaLoustfT<8dVU#lv3%V-)7}R5Qis=NNh?P zi3qO76sbbq$)&xTh>l>I*7e1e*q*J(0teN~)J(F4ljCz&#l~%>qOPPbn8spfIUUQ% zh)r5!RkOT40#PB0bIN09&aAZAFPT(tbr)6SFsBl~=AzwIkDcm_ Ie+^t=T=~!$ZU6uP literal 0 HcmV?d00001 diff --git a/baldcypress/textures/baldcypress_leaves.png b/baldcypress/textures/baldcypress_leaves.png new file mode 100644 index 0000000000000000000000000000000000000000..c6e501dfddc3248ec66a842b5b9f7843c530179f GIT binary patch literal 3019 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 N002ovPDHLkV1iOmlb`?q literal 0 HcmV?d00001 diff --git a/baldcypress/textures/baldcypress_sapling.png b/baldcypress/textures/baldcypress_sapling.png new file mode 100644 index 0000000000000000000000000000000000000000..c41e4688f32b544c290418b46c231c61f8ba7e37 GIT binary patch literal 1205 zcmV;m1WNmfP)e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00bRLL_t(o!|j$mZyaS5g`b&s zW_EUV*1Ps@jAJLUaybL??UpZ{>hq?u%XA!K&ZAq)-e z={B!ld(Rwu0-t>Uw(%Ptb!BKT)F@(@TMUT%DbqWee~&wX!;U1{$(UaV*t*~2&aDp5 z9`up2q`fFuy>ZDL8^Fr?syWrFabdMhz2@RrHl6L1jemwb+K7n`6k#>s%bz|p#{w|j zGVJdT8AdU8|2m-2uCj2p%F_8MrUHjY4|>#UF8yx8yPvI^BkREXH{LKSZ_bd6N;-Rn z&bA_oGOB^Y+_FzFRilVvoSTjKP6TqcOvUx9Zq# z!S<$R<0v}t(bpG^?+fP6)^P+Rhl03QaBexEby{%xyvJ*&1GItQR7N3pupCXE=94FI z?VHP{R&y|xg)B8?sc@~2}(BZE7CZ}$a1n3xSpWu3mjn+ zHWf-~dL4=7N^lFhj}?04p)CtxOFEl5Panh_b`x-2j9(dl1@C;kWM&uY9CTBLhZ&{P zQlVpsr9yl+#PSrbZ&+9n%%1g_nHOj+F=avdVh>+P7FSoySS#@BE~7*+ z)c`MWC^H38VFN;pC{;*MweV{W(zbZK5n&8e8XDI!#DfCLkSBjWw8jF+N0KrtNk)n! zmbd_>LY_*5Q^&K1c#R5nMc~;sNt`34!K=BHiNqLQ`teu3374;&GctCl`6a_Rp({TFIF5Yu(Y&99LEy@*prxxqChEiasXQElLZKZ03pQ5CgA)2L;(K*EQR%D T326$000000NkvXXu0mjf>}Dj# literal 0 HcmV?d00001 diff --git a/baldcypress/textures/baldcypress_trunk.png b/baldcypress/textures/baldcypress_trunk.png new file mode 100644 index 0000000000000000000000000000000000000000..0dcb0aa68afa949e9eefb60544408c847865a1c2 GIT binary patch literal 3234 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 literal 0 HcmV?d00001 diff --git a/baldcypress/textures/baldcypress_trunk_top.png b/baldcypress/textures/baldcypress_trunk_top.png new file mode 100644 index 0000000000000000000000000000000000000000..d8faeb6701b04f181a7a1ff8f289e8e293334478 GIT binary patch literal 10212 zcmeHqcU05cwr)VW^dcajp-GXD1VRZ#q)IQL2uMoK#d(v&VBumJ%9L8S^v zZ&CyS6#)@x(gm>q(q2H%-tPDIJNKS3?)`6PjFdIkH@`W5-L61ZBEge(wTT2-gu7I#?t;(DKybguUBN74n@DYzV5%cGI>znI6G*wFQhi)lD>qn^S**|ddc(Yc{H4A@)C{~+V7UIZd9<(>lMzc_s`_lcN$g=?HO=z#a^H?9s` zwczZRR5JkkM}>m9j!o6Kj{Y+Tlpd5V8?A5Q@4qa|c1TWf*9^76p=DbuyJB)0%9HeT zZ0_9h9PD(rS&FCl*ko4B9b!kal>_$GD=SCzbEaV5ci52$-%0cUhl$d? zgQCLP;Q__rFm=&hs|U6fUTq&D+!ZE*dP{32Lb@{5%yx3WE4xjx%3uNN~DD^kN{uh%C>SI^&1?x{u)j_28XK;MyW$f#{9qymEJhq0LX`hJm z-GwKt4$0OtCqh4;Vy%^Ej;+lHPv@TXaEchMbjyT{YD9bzmfotheK)L+TD|<+-EDZc z^0f61?m;$eiqq!pyV5hh^x17i$E>o4W$B6H`#F1o8_uQC5jd3hPVgN6>dTJ$bmN)I zy%Wp%cjnJlk89-HY<{s($0qR3ttjs38MYS-UW{HQEmPHJ_rT>DB@FaJDRl5A#?Nlp zMAy(!ooXg^&%L3+g)dY*OqATA|Ik0Sa2#kBW`w+S^I5|C`X;LQd_Xk(hbTne6&NA>DpUYXN-SfZ@1 z@-5zbbsRA3m&HL8m!{8i2D7~6Pu4w_!{y{i1CwPnG@Zzk2p(lC;VgA#QeD!$9lxD1 zwIFMTy6Bp*U=o8EPn0QJU@6sfn3EChGH$iNrkwcno0hDw!-^o?d4?GqidMA^`O@1o zt(Jq8wIi^i)7S2Y)SiFpW>%NnQZ&!Q!!z9#_bt|4FlFnp{e9*^V}qLC<$DkvOe-jH zz7+0}Q}Me_qoz|j%G2E2-na8#GyPUV={Y?%#U~;fJ$B|qtxg6LRHtP^sv%fd=gXjG z$Cc@n$L$o)e1%TBW1rCu3T-Qx=A6Z;aTdv)A>8H^W~1}EGx@q(jOp&x(6E-biJK># z4QYhy!|r^k_C2mYbIjdDr)$kyaP^&ru>Or8?Q$nMr4LL&Coep}oV?;X%<+4IGS{PQ zp6A7iSF}b=H_Dhz+D4yQt%|)#m-7PZbs5xJ+jW(nkiYE=_lvC6^o672_f!Kx9s`&YGjVDN;*0V>FntejH^o-yA89cLY3pN=2hIUh;4d>7rHJj&BeWtFWs2E8h zltzk68xM1C50a2#%`yQR#MI<-#6OA9yhgI-QVA2ZrMKNQ^x zW4Ek5qu$7l(Pg5I@pX+P=D0VTNWJoZwqg|Tgl8|l&YDDr_0%`iKJcrIm1xyrOBENP zZ|q_N^?KS-bI8cwd8B4bl<&F5*mH3Tv(6Sf9U7_WnmBvgt>RntW=x0~%1OP$F{F{D zlvOb&EBVE&XyhZ{9`0%U^KMnMEW_lq@1{xB?;j}$_F3ygPtR*l^CweSocD>Sbjjnb z(i9ncQ_0#l$u+pa$)I57-5_($!dg-oo_e`vhzcC0UTIm(K>fhbU3J}(Ai#AWl{^}l zUHp}1rzMobbcH6cpS?K8g6r04?X>9GuUj=rwCZ+#wXl#K)I(Mde_plnPuH^wm~K8= zpm%m}?uf9z^n2&%r`WBR5!p03aQ>oF>WXx$D`8A*Vf_Xh{tSaxuSrtBpklet>Q!kB z5rQ5Q#BZD!e*XM&yN`7QOPIm&Wd^SKqKr2P5k_h)RF6si^CEs8K)h+dB@$ah~*&2$!2tUfSH3Hebv9X|%8^5v7we&Fc z7T?xQ7}Y?Jw(+P?J3%pqKY};SFt=zUoAYwkmeH0W+dUD+)(j;}iT4~mw+(dGKFEKk zEzs)m_Rxl^mvy76Pd`$S*=y&O1z}!BfF85}ZD;6!zQ$R3yf2+nG?4Tevi=Md;0_&Q ztGABD-jbKHvgpN{pxPF%3M&;%zMqwHNC@g?&+~qvtkiRiUrU#kv3b+trj*0+@qv(q ziyN)AB}ieGb;c?h$e{&*Twy>a*7KV2+=SJ^2{~%KGOp}b1O#N z_KOtV_c1!zfr$Hj#*MB7Ry&nBXH=JU;mW0|Z&9A1)Mh$a#&X3U1t0ql-Rn>4^9eWS zzfsR=9%Y+=6EPE40u}{)k8$A<5kWFOQPtk_2M65^t5J1$8}*@UfM!6mDV5qC*!t|@leQ78I3 zCEgneZfwk_Rprc%h|-t#)Ra@*FuM_(TJlvpJI4ZFXC5UI`8KoAB8hrTU4*WGDhHCX z4tp{FVzbqu|3b#Ogxw1XX$fbpz%y`5xeH#8yOyM1uC#_^E^m!Tt-#-KaaAApgSuVi zN$wpJj=+Ax$_S6;Kbf^+3-#4^J1s?@V|nYM54%)c;gD(UxmdH6-rk=0T7y-(uQF%i z8F-}k--5K01D-gLf_1vt-_f<2`Oz5l^#b7?oAbnDG5l65X_W{lf_mR@vPF?gHG%RL z$NhU=-yTER^8gCIv)%D`$1}a!&=O#}$0|USI z^^IeLA3xWLNZZE^o=6I(mU}gxTg`^fp!hZn=Iv~zt$BH0)W#|BwC{vGPJdkehN1)B z-y!ve#j6V@@2#ME=T3cX-6&4bGnpw&&`s2bu(|FjoENmp7Uj!Ve-!zRyV2)XPZ7Y& zIXL*u{c}twdz_7H+{(Rd9-QSUNLqNPwd{4%zIg0K!#$xlzObTziR|I|k4;OOJF)pu_t8$iKtR(&txQTSgB9$$qucGJ zOTymBI$MMQzs7;b5Qya~l);zn{^G>Oc?BOas?c8XyT@l=gE+a4%cK%kiUeac{ocEn zg)C=l`^T+(F%dPK8xK#(xK#_L#LpgvIuX;)ljzyM?;Ru4zNAbMKml>$>>t%A{0;!HXyV8hNNXcQB{bes z8i~Q9u+sjX-sB_z02MWVZzS3sO9G;>E;uh$p|$!ZAs`N;Ds)lK2x8=|iFL*41`@F5 zfyNf-KzB48BcyhYLB(H*OyG$nA%Xs$9$rKxe^sF)UM2GHLo-+icmyH2s|r~gnF2NO z1S}9H4U>j|wEc0uGD7DVfGPxxvl2o}=O+buq$=b}B6%x;!G3;z(tfhic!CQU3WvkN z5E-zH42X;X5d*wPNPmzQQTUMJ2Zt7xh$fJg!{NPvhnz?h-iM?rBt)JE{vP_D6byq0$hr zr{`Zhh$L;_KjZza2hoCjj|U^LM7$3Hjn($WdXa>G4eIUTL;N+S4-tE4I?CGv;|wMz zbrktmp9^|MrhoVx%IJdg^gi-9ME{D!p#Q*m`w%>iFc>r#>w)zoCqg7ML;r#&`~Tta zw~uo~ek7EV79Q<$$fBpEDs-5D5(baPVU&)3Ix9fskthW$2n$ETK`@An90&zk9d=S3tTz0lZ0Dl)k=j?4p-lgGkf7$^vXl!by|NUQ<~1;faIu(EPU zqzp_R_=^qmqw2}^)5J@f`oF~!+3-nZA|idUn4={i>-b{|?TYkr!IF2$pDpq)JMM3) z6^)j~IHTbx5Cn!ogJ90`SP)VkB@a@Nm2t*kQO*ijjND(@iFjv{ACiDocOmx>d7a4} zbhOSu@uMP>_$%7a6-!R?EJQ{L0ulPLyg(K3;YRqc$5T1nDvXSjeicCFa4S*LJFGBs zA8&6D9G37`Vg6Mp{~z2h{y&TIzjFT-_QP8f?;SwyO;?hMpVz+)|2M!N42C!~){BV$ zcd7ph`60_M=LI?EA2#wiL_XHQf1GPS%i^$e{uf_A%k6(L0-5@sApeoR|H$=^T>p^* z{}K3~>iS2n|44!V2>efV{g27T@aN4K>qY*f=SRNx9+UXJk$h*SK^a`o0`vgt0C(L} z)*g^8^xnEQL;&D8+u@rc6yq3AHqw&xjI?QIsd*_lS@?w8bIGtNJuP($-7Zk79+Ced z;p%74s*66BJ_>;pFSO9YPkwvSE=O2r&Yks+)Y|Vd(9mAm8^Kj=NLd&<0)`%C zFO3%`a;US5P~5h@q7JrvRn@c^=x`6;g=^guX;R;5L>Q;1n|q%LlMV=6H?| zFIt!-sSLp9lZMKrB3M^_mA@}e)-e?hdvm8t=k-0JqT5&)?Co8SR=*>r2T7+H2)wS~ z9}T4eq!%P(=>bVYFr&~A*@4dij{>sLF?_L|M!ORzmlmQ)65nZPE2{=D{x-V^)nbx~ zORR0a74&#_7e}3)0=+)%^@^sLhaHzySjbXdeNa}0ih*{1won<^X&&9NRIs&o*bv~m z%o`!d8Ng|HYm=qdRX)1Qad+N?QC~a(79~E%$h%77+`>LTl zK+n?RX4KQZ)2ippAm7i_vQbf>V^}rnCZzK%^he#QY`3=Bl=;ePAWYK`!%gPzc;gHC z?~99JZjt)WKInhV{Ho(JD$69mdg7{MrgmY&)z9UqWln3qhEE$t18FPS8pqHNiY2w_ z^dz92(ZdfX$3Kb}b4ONuQXC5ousE^Re}ymFh+EJmMKoU$AQEvK&}`=5d>OXPB33xx z^0A}^)l2lWFSu{%htkBI+n+MMLMx~xub@yNRd2XioN{@mVYy=T!DMzL{Iq7A+SYmx zq9jaPFq}0(>@t5$*Pwr~l$;seh_T5&!CJahbe(|J1fq>6~iD7%m+l zNTqRqVfWkX9`zKFw&?rfy&})g?Q98*zj`bsD{X874!r*U{d1Ajj&2~pP$lANQ-j5& z^)b(EHcI|5k%Ogo6_b0bApJ%C3LUPxJJRPu_wSNdbga5mAat+$!uX;Gf9Krj<@J)y z5qHaDdTEin<7>VLJA-<6lA4}A_OJ=`>mFZv4Z->yZ2qoxr@AD4p05B)(;{Wks~DGh zB7kxq!o;#cdYM`f;fXe`0J z$h1!@-6S$^9d)nBt-+0jW`>*gdgi8bs_p)D7ngFa@Y{0*#34QxZQIfSgueYqQBt{W zDdkHz2jwYan? z0G2uAMldGD`dl1;p8jp?J*sM1yf_Sc>I-d!;?7sG8n>!q4eHL4GWU;7Dw#2@DXSSN z#;jQ}ny30{^0qKAS*}b|rOY#klm6$r>oi20^L3~xBziUIyo90%K54psQtYos>Z4sdlLmePJC z^rL$Gd=exJyXWAj-_5fMdpii5QgKPTQ~kh^LK zO*&i(Js`j=1;JB50o?gW8v|tk?1h{L8(edpsG)7cRaoXTKC~-77vd|k!em#2;u(AW zy0~m;;NVMT!$Mzfu1!tas%v`g^z`__Xcg>%I42e6GD42j=`GRQ(9n>a%+U;F?daWvnz`bGv@$N)e`lkrrX!_9y7x!mAuYJZ? z(TV)d|AjWzH_x`zo#BJ_r}gfVrhWe>l}=AyE%__W!VkPQ{c~1J41`w=egKL$Z!3KuLF~f4{9UNiw=K{s`38ZxiRHB1*Six#gBHfB?Mq%wD>Ao1^w=vaDrR=h%?B9=$ISqmJ>={2RSw?! zj%?aRYNu+2SAPn@K$5-o+OMqrbg&_@l(>ayx5pY(_^69{=nudnpgZ(}6C<{w$ zOipHIX05qkIM(JavGY#Za@*9S;l*9AucdQV5WqY&m(W4ixFke5v>p*Y*3nO0@;|2?}Lze2wSSbPbk|L4b{SmA@GZ4n;-1Xq5QIDm% zED^o*0-~cCC$&0c;1V5jyn044v0J3KeEUExRWYt8iC{cV+{#=gMj)bC8QQ#IC-)4? z!}}e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{01AUiL_t(o!zGtHk7ZXvM%R9v zv(Nk1ty{0Iw!7^%Xe=>c5D5|lKma)zA=yYsM0RRjFG855xiwOMs%(S{XmcjRaGz??W5mye{yJEOw^b zpGbv6MvX8TJ0-@YO*C6BKk$(vj1x}j^oM#gI%?jBLa29ZIfC6hI1y(TRz z^Ee|u|JT2YLIG~U`x7$O`0#)T3*ILvq0yOR=^T0Ul%N-sQk2az?A+t}dz4Xlzu*Jd z;~hxJG@MWpWbi1H5$73Itk7wJR|+xrIOotsS+ckp>mw?yvC{)_oEZ*pkm`)IX^_bc z`Atch)GTg9sD$IgTZXx#SglEwAV?6yBT;E&%!u{~IxxEilUF3QK^sG=QV=tfh2Uni zjSI(zcZ^G*KEFchrzC4ZcKH!1sfg~orAt3@nBR~lE6S!qWhtxGEpa+BbPGXwrtTgi z9oug|#SWfo^Ar+?T@*njcpva0;Kmf48BAu-iPXp}W3#T1(IAy$S$c*;i^*y{3w5z# zCbF(B7`N|u`0Rg>ro_1czi9mADK2snbH;HRDX%|aU0-5nPkDC1G(1pM6@DCvx}?68 zSeG)iZ_uwk{gh&J!Mu2yQZtSxkOF0Ly2B$nS<%`@wr}rPJ$XVvBlB~7&}3zb5H%t~ zEY8qUlcXc-oA>BXJz9>)Xvw6;4Fhi3(;XjCbC2~79X#UGfBK8)7t1sYRBlLQNsyjA z7xeoUX%x;IWTMGZjkh!9*#;LpOFtrIKxs)kSPEegNs0&~L+`;J@P47JH<;3}ef5&^ z>K3U=v`$$>L|5mxbln5%DloefwttP?_aqm$xZxggf~W(cIA=Wc1X&@)h|~>AEw}|_ zj8qE3JkpOxbV#Vr-os9kq$pT|#|uq<{vm1BFpV85)kqf+|Ms`PAG5V)Iqo6Nh<+ij zHn?%YIzfH?f~-gw`-!HiDbCJV<`M5^(xPD6A2D@}9Z$%_V5gQeO%ZlxXkU?}HHY06 z!GKbVMdUEOL+4MKeTG)e4Xe%j*m_TrWsF@TJyo3|wBX_EpOaJ- zOeeNmPiXI`S1Y!!UgA?hDqxvYvdtw%7YLJJnl(xBF(NM1)r#eGWbu#{27Uef0|b%9 zW+Yid5*D_PKLe}jk6X67BTdhcszGY`o$0TBL2>gjtENKKFHlL~x_OQYfx!imY>jXo zKBib}kwy}j$@7NY!)ugJX|ApqPA%d;|Kayy_xKhm3^97Bp0M70K#&P}a|Sv?_yso! zLKw);FY)~&F)p~S!`YU(y(29zL1`ibcQ1d5Nfr1&R$n4aNjQy|^BYvzV4|j<52PYN zXXn35e&O&wMG1?}RyaG7pb1ML_!grR3f18lIKBJ|JG}Xh@n{k8$Z#CU&+b{gz(_-C zO4jfH4w;m+r#tHPGu)YCXzv*JEpw8vkWrkUquudq%;t)u+OYI3ARvA7DQl-)TQ+$YInPGMLoUXga zFC&{QM;8@ZuV2uec9hZ~i;C&~3+BVGu=A05f26$qKEw8o&HJB_<{4Squ$&HLQetw$ zsXdY;4XJ5Z21jZlr{k751-cZpNJvc1e0*R!9;mOL;xQcBH{`BI6C7u&4K~aS4;?O4 zH1GW(UO<`}+<0RBF1jYG>xR@e- z^1~m*Jj=0eMw^l(39$4mQ%isMl6Ln6!aHPf&GiR=KuA*(3CI0goJbj7eL?o@H_7uH zzlUYZlP>yhSLt*NRbBp(o-oS0CYy z9jeH&r#nn@gOW34wL$#&AOAc?uaUyw?2&AJg^Y?sPGo6;6CMEXA|{de;fPtC5v-%A zE;;O9p%X(|RLrNI#kZ)X<9PSK9Nv9Hl5P;yHBZ0y#|(Xokd`c8fsE`92gHB;{UKroFHv(@v}hu>|g#eDy>NG)=HEui+DVV!&@%asTT@j`owJ|*IchvO;Q#N?-Ay`C|2-ji94v{1*PLfwEy4{}j zlPBntOAze?-bX@c5lYd#_){(tNo0m`OWS_QmoHyasX)vxDOXplu0KX7gBx3{h#VJ* z(Tbtn;=F(`BjZ3;UeXOCMZF?eIKOF_Pc6mShIackdgXt~%Wpnocd(SXAz%GE#2x1R zmO>_+mYIBWMjfAU^<>5AFj1Td=6OI2FVV&!+8y2YE9@LeiW^RcFQ`^8SfV7Tj-*)= zRe>Fj>>l^joi5g{scBC#V#9S}eN=O4sq z9a$EceIP_ZDg`>L$*PKO`z>w`s4OEjIhKGQ267`A_V>K~>c`x_?rENVOkQ20iz~7` z!Q>hvJWKFI4{qwI*H^gdg!PV8M`mZxpfG0zW50taSr(5nCF3+Pj1yteBw5OACrk=L zWYkqc5DE2VgEAX#f6anUNb`)jKcdo-se47&9SAaEYTwa!GsF1})9~H(D>m=pMUEzT z9^O2nlprq?h%noUl)!?++Y^4NN%MwzUWn1sD~XabAxdJJ(wH002ovPDHLkV1n>GG++P# literal 0 HcmV?d00001 diff --git a/basic_materials/locale/basic_materials.ru.tr b/basic_materials/locale/basic_materials.ru.tr new file mode 100644 index 00000000..85e9c0cf --- /dev/null +++ b/basic_materials/locale/basic_materials.ru.tr @@ -0,0 +1,33 @@ +# textdomain: basic_materials +Silicon lump=Кусок Кремния +Simple Integrated Circuit=Микросхема +Simple Motor=Мотор +Heating element=Нить Накала +Simple energy crystal=Энергетический Кристалл + +Spool of steel wire=Катушка Стальной Проволоки +Spool of copper wire=Катушка Медной Проволоки +Spool of silver wire=Катушка Серебрянной Проволоки +Spool of gold wire=Катушка Золотой Проволоки +Steel Strip=Стальная Полоса +Copper Strip=Медная Полоса +Steel Bar=Стальной Прут +Chainlinks (brass)=Латунные Звенья +Chainlinks (steel)=Стальные Звенья +Brass Ingot=Латунный Брусок +Steel gear=Стальная Шестерня +Padlock=Навесной Замок +Chain (steel, hanging)=Стальная Цепь +Chain (brass, hanging)=Латунная Цепь +Brass Block=Латунный Блок + +Oil extract=Масляный Экстракт +Unprocessed paraffin=Необработанный Парафин +Uncooked Terracotta Base=Ком Мокрого Терракота +Wet Cement=Ком Мокрого Цемента +Cement=Цемент +Concrete Block=Железобетон + +Plastic sheet=Пластиковый Лист +Plastic strips=Пластиковая Полоса +Empty wire spool=Пустая Катушка diff --git a/bonemeal/init.lua b/bonemeal/init.lua index 7924a1ed..0317856b 100644 --- a/bonemeal/init.lua +++ b/bonemeal/init.lua @@ -646,7 +646,7 @@ minetest.override_item("default:dirt", { items = { { items = {"bonemeal:bone"}, - rarity = 30 + rarity = 40 }, { items = {"default:dirt"} diff --git a/bonemeal/mods.lua b/bonemeal/mods.lua index e193273b..ae9f1af2 100644 --- a/bonemeal/mods.lua +++ b/bonemeal/mods.lua @@ -38,7 +38,8 @@ if farming and farming.mod and farming.mod == "redo" then {"farming:beetroot_", 5}, {"farming:rye_", 8}, {"farming:oat_", 8}, - {"farming:rice_", 8} + {"farming:rice_", 8}, + {"farming:mint_", 4} }) end diff --git a/castle_gates/doors.lua b/castle_gates/doors.lua index ea3440cf..545bbd88 100644 --- a/castle_gates/doors.lua +++ b/castle_gates/doors.lua @@ -67,7 +67,7 @@ if minetest.get_modpath("xpanes") then tiles = {"castle_jailbars.png"}, drawtype = "airlike", paramtype = "light", - textures = {"castle_jailbars.png", "castle_jailbars.png", "xpanes_space.png"}, + textures = {"castle_jailbars.png", "castle_jailbars.png", "castle_jailbars.png"}, inventory_image = "castle_jailbars.png", wield_image = "castle_jailbars.png", sounds = default.node_sound_metal_defaults(), diff --git a/cblocks/README.md b/cblocks/README.md index fcef3112..fa2686a8 100644 --- a/cblocks/README.md +++ b/cblocks/README.md @@ -10,5 +10,6 @@ Change log: - 0.1 - Initial release - 0.2 - Added coloured glass and fixed violet - 0.3 - Added stairsplus and stairs mod support +- 0.4 - Glass stairs created with transparency if stairs redo active Lucky Blocks: 4 diff --git a/cblocks/init.lua b/cblocks/init.lua index 337c7f99..f37c391e 100644 --- a/cblocks/init.lua +++ b/cblocks/init.lua @@ -1,4 +1,9 @@ +local stairs_mod = minetest.get_modpath("stairs") +local stairsplus_mod = minetest.global_exists("stairsplus") +local ethereal_mod = minetest.get_modpath("ethereal") + + local colours = { {"black", "Black", "#000000b0"}, {"blue", "Blue", "#015dbb70"}, @@ -17,9 +22,6 @@ local colours = { {"yellow", "Yellow", "#e3ff0070"}, } -local stairs_mod = minetest.get_modpath("stairs") -local stairsplus_mod = minetest.get_modpath("moreblocks") - and minetest.global_exists("stairsplus") local function cblocks_stairs(nodename, def) @@ -48,17 +50,17 @@ local function cblocks_stairs(nodename, def) groups = def.groups, sounds = def.sounds, }) ---[[ - elseif stairs_mod and stairs.mod then + + elseif stairs_mod and stairs + and stairs.mod and stairs.mod == "redo" then stairs.register_all(name, nodename, def.groups, def.tiles, def.description, - def.sounds, - def.alpha + def.sounds ) -]] + elseif stairs_mod and not stairs.mod then stairs.register_stair_and_slab(name, nodename, @@ -72,26 +74,28 @@ local function cblocks_stairs(nodename, def) end end + +local function set_alias(col, name) + +minetest.register_alias("stairs:stair_" .. col .. "_" .. name, + "stairs:stair_" .. name .. "_" .. col) + +minetest.register_alias("stairs:slab_" .. col .. "_" .. name, + "stairs:slab_" .. name .. "_" .. col) + +minetest.register_alias("stairs:stair_inner_" .. col .. "_" .. name, + "stairs:stair_inner_" .. name .. "_" .. col) + +minetest.register_alias("stairs:stair_outer_" .. col .. "_" .. name, + "stairs:stair_outer_" .. name .. "_" .. col) + +minetest.register_alias("stairs:slope_" .. col .. "_" .. name, + "stairs:slope_" .. name .. "_" .. col) +end + + for i = 1, #colours, 1 do --- wood - -cblocks_stairs("cblocks:wood_" .. colours[i][1], { - description = colours[i][2] .. " Wooden Planks", - tiles = {"default_wood.png^[colorize:" .. colours[i][3]}, - paramtype = "light", - is_ground_content = false, - groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 3, wood = 1}, - sounds = default.node_sound_wood_defaults(), -}) - -minetest.register_craft({ - output = "cblocks:wood_".. colours[i][1] .. " 2", - recipe = { - {"group:wood","group:wood", "dye:" .. colours[i][1]}, - } -}) - -- stone brick cblocks_stairs("cblocks:stonebrick_" .. colours[i][1], { @@ -110,19 +114,37 @@ minetest.register_craft({ } }) --- glass (no stairs because they dont support transparant nodes) +-- glass (no stairs unless stairs redo active because default stairs mod +-- does not support transparent stairs) -minetest.register_node("cblocks:glass_" .. colours[i][1], { - description = colours[i][2] .. " Glass", - tiles = {"cblocks.png^[colorize:" .. colours[i][3]}, - drawtype = "glasslike", - paramtype = "light", - sunlight_propagates = true, - use_texture_alpha = true, - is_ground_content = false, - groups = {cracky = 3, oddly_breakable_by_hand = 3}, - sounds = default.node_sound_glass_defaults(), -}) +if stairs_mod and stairs and stairs.mod and stairs.mod == "redo" then + + cblocks_stairs("cblocks:glass_" .. colours[i][1], { + description = colours[i][2] .. " Glass", + tiles = {"cblocks.png^[colorize:" .. colours[i][3]}, + drawtype = "glasslike", + paramtype = "light", + sunlight_propagates = true, + use_texture_alpha = true, + is_ground_content = false, + groups = {cracky = 3, oddly_breakable_by_hand = 3}, + sounds = default.node_sound_glass_defaults(), + }) + + set_alias(colours[i][1], "glass") +else + minetest.register_node("cblocks:glass_" .. colours[i][1], { + description = colours[i][2] .. " Glass", + tiles = {"cblocks.png^[colorize:" .. colours[i][3]}, + drawtype = "glasslike", + paramtype = "light", + sunlight_propagates = true, + use_texture_alpha = true, + is_ground_content = false, + groups = {cracky = 3, oddly_breakable_by_hand = 3}, + sounds = default.node_sound_glass_defaults(), + }) +end minetest.register_craft({ output = "cblocks:glass_".. colours[i][1] .. " 2", @@ -131,8 +153,36 @@ minetest.register_craft({ } }) +-- wood + +local col = colours[i][1] + +-- ethereal already has yellow wood so rename to yellow2 +if ethereal_mod and col == "yellow" then + col = "yellow2" end +cblocks_stairs("cblocks:wood_" .. col, { + description = colours[i][2] .. " Wooden Planks", + tiles = {"default_wood.png^[colorize:" .. colours[i][3]}, + paramtype = "light", + is_ground_content = false, + groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 3, wood = 1}, + sounds = default.node_sound_wood_defaults(), +}) + +set_alias(colours[i][1], "wood") + +minetest.register_craft({ + output = "cblocks:wood_".. col .. " 2", + recipe = { + {"group:wood","group:wood", "dye:" .. colours[i][1]}, + } +}) + +end + + -- add lucky blocks if minetest.get_modpath("lucky_block") then lucky_block:add_blocks({ @@ -143,4 +193,5 @@ lucky_block:add_blocks({ }) end + print ("[MOD] Cblocks loaded") diff --git a/chestnuttree/textures/chestnuttree_leaves.png b/chestnuttree/textures/chestnuttree_leaves.png index a92468910de601fd5d298039c44340a7aba09342..1a8be438a141f9d419adca6ba68f31a4b7e5680d 100644 GIT binary patch literal 6553 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 diff --git a/clementinetree/schematics/clementinetree.lua b/clementinetree/schematics/clementinetree.lua index b2bfaf66..a66a18b0 100644 --- a/clementinetree/schematics/clementinetree.lua +++ b/clementinetree/schematics/clementinetree.lua @@ -161,3 +161,4 @@ schematic = { {name="air", prob=0, param2=0}, }, } + diff --git a/crafting_bench/init.lua b/crafting_bench/init.lua index 554e3cd2..066ad6fc 100644 --- a/crafting_bench/init.lua +++ b/crafting_bench/init.lua @@ -9,8 +9,7 @@ if minetest.get_modpath("hopper") and hopper ~= nil and hopper.add_container ~= end -local crafting_rate = minetest.settings:get("crafting_bench_crafting_rate") -if crafting_rate == nil then crafting_rate = 5 end +local crafting_rate = tonumber(minetest.settings:get("crafting_bench_crafting_rate")) or 5 minetest.register_node("crafting_bench:workbench",{ diff --git a/currency/barter.lua b/currency/barter.lua index 6d8e1534..e1ebac78 100644 --- a/currency/barter.lua +++ b/currency/barter.lua @@ -67,7 +67,11 @@ barter.chest.give_inventory = function(inv,list,playername) player = minetest.get_player_by_name(playername) if player then for k,v in ipairs(inv:get_list(list)) do - player:get_inventory():add_item("main",v) + if player:get_inventory():room_for_item("main",v) then + player:get_inventory():add_item("main",v) + else + minetest.add_item(player:get_pos(),v) + end inv:remove_item(list,v) end end diff --git a/currency/income.lua b/currency/income.lua index da1cfd78..8f2354b4 100644 --- a/currency/income.lua +++ b/currency/income.lua @@ -1,23 +1,41 @@ local players_income = {} local income_enabled = minetest.settings:get_bool("currency.income_enabled", true) +local creative_income_enabled = minetest.settings:get_bool("currency.creative_income_enabled", true) local income_item = minetest.settings:get("currency.income_item") or "currency:minegeld_10" local income_count = tonumber(minetest.settings:get("currency.income_count")) or 1 local income_period = tonumber(minetest.settings:get("currency.income_period")) or 720 if income_enabled then local timer = 0 - minetest.register_globalstep(function(dtime) - timer = timer + dtime; - if timer >= income_period then - timer = 0 - for _, player in ipairs(minetest.get_connected_players()) do - local name = player:get_player_name() - players_income[name] = income_count - minetest.log("info", "[Currency] basic income for "..name) + if creative_income_enabled then + minetest.register_globalstep(function(dtime) + timer = timer + dtime; + if timer >= income_period then + timer = 0 + for _, player in ipairs(minetest.get_connected_players()) do + local name = player:get_player_name() + players_income[name] = income_count + minetest.log("info", "[Currency] basic income for "..name) + end end - end - end) + end) + else + minetest.register_globalstep(function(dtime) + timer = timer + dtime; + if timer >= income_period then + timer = 0 + for _, player in ipairs(minetest.get_connected_players()) do + local name = player:get_player_name() + local privs = minetest.get_player_privs(name) + if not (privs.creative or privs.give) then + players_income[name] = income_count + minetest.log("info", "[Currency] basic income for "..name) + end + end + end + end) + end local function earn_income(player) if not player or player.is_fake_player then return end diff --git a/currency/settingtypes.txt b/currency/settingtypes.txt index 12e89aa7..330296d1 100644 --- a/currency/settingtypes.txt +++ b/currency/settingtypes.txt @@ -1,6 +1,9 @@ # Is income enabled? currency.income_enabled (Is currency income enabled?) bool true +# Is income enabled for creative players? +currency.creative_income_enabled (Is income enabled for creative players?) bool true + # Item that is given as income by the currency mod currency.income_item (Currency income item) string currency:minegeld_10 diff --git a/display_blocks/LICENSE.txt b/display_blocks/LICENSE.txt deleted file mode 100644 index ff49e2d9..00000000 --- a/display_blocks/LICENSE.txt +++ /dev/null @@ -1,29 +0,0 @@ - -License: - -Copyright (C) 2016 - VanessaE, cheapie, jojoa1997 - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject -to the following conditions: - -The above copyright notice and this permission notice shall be included -in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY -KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE -WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY -CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -Except as contained in this notice, the name of the authors shall -not be used in advertising or otherwise to promote the sale, use or -other dealings in this Software without prior written authorization -from the authors. - diff --git a/display_blocks/README.txt b/display_blocks/README.txt deleted file mode 100644 index 9ab17a5c..00000000 --- a/display_blocks/README.txt +++ /dev/null @@ -1,4 +0,0 @@ -display_blocks -============== -This mod adds blocks that create crystals on top. -Some have different light levels others can be seen through and i hope i can make them do other things too. diff --git a/display_blocks/config.lua b/display_blocks/config.lua deleted file mode 100644 index 2f5a2abd..00000000 --- a/display_blocks/config.lua +++ /dev/null @@ -1,6 +0,0 @@ --- Disable to make the uranium only be "technic"uranium". Enable to add "display_blocks:uranium" -enable_display_uranium = false ---Enable to make "technic:uranium" spawning like "display_blocks:uranium". -technic_uranium_new_ore_gen = true ---Enable to add a recipe that uses "technic:uranium" -enable_technic_recipe = true diff --git a/display_blocks/depends.txt b/display_blocks/depends.txt deleted file mode 100644 index 44e7384b..00000000 --- a/display_blocks/depends.txt +++ /dev/null @@ -1,2 +0,0 @@ -default -technic? \ No newline at end of file diff --git a/display_blocks/description.txt b/display_blocks/description.txt deleted file mode 100644 index af7e923f..00000000 --- a/display_blocks/description.txt +++ /dev/null @@ -1 +0,0 @@ -This mod adds blocks that create crystals on top. Some have different light levels others can be seen through and i hope i can make them do other things too. diff --git a/display_blocks/init.lua b/display_blocks/init.lua deleted file mode 100644 index 28b5d604..00000000 --- a/display_blocks/init.lua +++ /dev/null @@ -1,267 +0,0 @@ -local PATH = minetest.get_modpath("display_blocks") - -dofile(PATH.."/config.lua") -dofile(PATH.."/technic.lua") - -if enable_display_uranium == true then - dofile(minetest.get_modpath("display_blocks").."/uranium.lua") -end - -local Scale = 0.9 - -function disp(base, name, light, rec, rp) - minetest.register_node( "display_blocks:"..base.."_base", { - description = name.."Display Base", - tiles = { "display_blocks_"..base.."_block.png" }, - is_ground_content = true, - groups = {cracky=3,}, - light_source = light, - sunlight_propagates = true, - paramtype = "light", - drawtype = "glasslike", - }) - - minetest.register_node( "display_blocks:"..base.."_crystal", { - drawtype = "plantlike", - description = name.." Display Crystal", - tiles = { "display_blocks_"..base.."_crystal.png" }, - is_ground_content = true, - paramtype = "light", - visual_scale = Scale, - groups = {immortal=1, not_in_creative_inventory=1}, - selection_box = { - type = "fixed", - fixed = { -0.15, -0.5, -0.15, 0.15, 0.2, 0.15 }, - }, - walkable = false, - }) - - minetest.register_abm({ - nodenames = {"display_blocks:"..base.."_base"}, - interval = 2.0, - chance = 1.0, - action = function(pos, node, active_object_count, active_object_count_wider) - pos.y = pos.y + 1 - local n = minetest.get_node(pos) - if n and n.name == "air" then - minetest.add_node(pos, {name="display_blocks:"..base.."_crystal"}) - end - end - }) - - function remove_crystal(pos, node, active_object_count, active_object_count_wider) - if node.name == "display_blocks:"..base.."_base" then - pos.y = pos.y + 1 - local n = minetest.get_node(pos) - if n and n.name == "display_blocks:"..base.."_crystal" then - minetest.remove_node(pos) - end - end - end - minetest.register_on_dignode(remove_crystal) - - minetest.register_craft({ - output = 'display_blocks:'..base..'_base 5', - recipe = { - {'', 'default:mese_crystal_fragment', ''}, - {rec, 'display_blocks:empty_display', rec}, - {'', rec, ''}, - }, - replacements = {{rec, rp}, {rec, rp},{rec, rp}}, - }) -end - --- disp(base, name, rec, rp) -disp("mese", "Mese", 0, "default:mese_block", "") -disp("glass", "Glass", 0, "default:sand", "") -disp("fire", "Fire", 12, "bucket:bucket_lava" ,"bucket:bucket_empty") -disp("air", "Air", 5, "bucket:bucket_empty", "bucket:bucket_empty") -disp("water", "Water", 0, "bucket:bucket_water", "bucket:bucket_empty") -disp("uranium", "Uranium", 10, "display_blocks:uranium_block", "") -disp("earth", "Earth", 0, "display_blocks:compressed_earth", "") -disp("metal", "Metal", 2, "default:steelblock", "") - - -if minetest.get_modpath("titanium") then - disp("titanium", "Titanium", 0, "titanium:block", "") -end - --- --- Universia Display --- - -minetest.register_node( "display_blocks:universia_base", { - description = "Universia Display Base", - tiles = {"display_blocks_universia_block.png"}, - is_ground_content = true, - groups = {cracky=3,}, - light_source = 15, - sunlight_propagates = true, - paramtype = "light", - drawtype = "glasslike", -}) - -minetest.register_node( "display_blocks:universia_crystal", { - description = "Universia Display Crystal", - drawtype = "plantlike", - tiles = {"display_blocks_universia_crystal.png"}, - selection_box = { - type = "fixed", - fixed = { -0.15, -0.5, -0.15, 0.15, 0.2, 0.15 }, - }, - walkable = false, - is_ground_content = true, - paramtype = "light", - visual_scale = Scale, - groups = {immortal=1, not_in_creative_inventory=1}, -}) - -minetest.register_abm({ - nodenames = {"display_blocks:universia_base"}, - interval = 1.0, - chance = 1.0, - action = function(pos, node, active_object_count, active_object_count_wider) - pos.y = pos.y + 1 - minetest.add_node(pos, {name="display_blocks:universia_crystal"}) - end -}) - -function remove_crystal(pos, node, active_object_count, active_object_count_wider) - if - node.name == "display_blocks:universia_base" - then - pos.y = pos.y + 1 - minetest.remove_node(pos, {name="display_blocks:universia_crystal"}) - end -end -minetest.register_on_dignode(remove_crystal) - -minetest.register_craft({ - output = "display_blocks:universia_base", - recipe = { - {'default:mese_crystal', 'default:mese_crystal', 'default:mese_crystal'}, - {'display_blocks:natura_cube', 'default:mese_block', 'display_blocks:industria_cube'}, - {'default:obsidian', 'default:obsidian', 'default:obsidian'}, - }, -}) - --- --- Other Blocks --- - -minetest.register_node("display_blocks:compressed_earth", { - description = "Compressed Earth", - tiles = {"display_blocks_compressed_earth.png"}, - groups = {crumbly=3,soil=1}, - sounds = default.node_sound_dirt_defaults({ - footstep = {name="default_grass_footstep", gain=0.25}, - }), -}) - -minetest.register_node("display_blocks:empty_display", { - description = "Empty Display", - tiles = {"display_blocks_empty_display.png"}, - groups = {cracky=3,oddly_breakable_by_hand=3}, - sounds = default.node_sound_glass_defaults(), - sunlight_propagates = true, - paramtype = "light", - drawtype = "glasslike", - is_ground_content = true, -}) - -minetest.register_node("display_blocks:industria_cube", { - description = "Industria Cube", - tiles = {"display_blocks_industria_cube.png"}, - groups = {cracky=3,oddly_breakable_by_hand=3}, - sounds = default.node_sound_glass_defaults(), - sunlight_propagates = true, - paramtype = "light", - drawtype = "glasslike", - is_ground_content = true, -}) - -minetest.register_node("display_blocks:natura_cube", { - description = "Natura Cube", - tiles = {"display_blocks_natura_cube.png"}, - groups = {cracky=3,oddly_breakable_by_hand=3}, - sounds = default.node_sound_glass_defaults(), - sunlight_propagates = true, - paramtype = "light", - drawtype = "glasslike", - is_ground_content = true, -}) - -minetest.register_craft({ - output= "display_blocks:compressed_earth", - recipe = { - {'default:gravel', 'default:dirt', 'default:gravel'}, - {'default:dirt', 'default:gravel', 'default:dirt'}, - {'default:gravel', 'default:dirt', 'default:gravel'}, - } -}) - -minetest.register_craft({ - output = "display_blocks:empty_display", - recipe = { - {'default:desert_sand', 'default:glass', 'default:sand'}, - {'default:glass', '', 'default:glass'}, - {'default:sand', 'default:glass', 'default:desert_sand'}, - }, -}) - -minetest.register_craft({ - output = "display_blocks:natura_cube", - recipe = { - {'', 'display_blocks:air_base', ''}, - {'display_blocks:fire_base', '', 'display_blocks:water_base'}, - {'', 'display_blocks:earth_base', ''}, - }, -}) - -minetest.register_craft({ - output = "display_blocks:industria_cube", - recipe = { - {'', 'display_blocks:mese_base', ''}, - {'display_blocks:metal_base', '', 'display_blocks:glass_base'}, - {'', 'display_blocks:uranium_base', ''}, - }, -}) - --- --- Compressed Earth Ore Gen --- - -minetest.register_ore({ - ore_type = "scatter", - ore = "display_blocks:compressed_earth", - wherein = "default:dirt", - clust_scarcity = 25*25*25, - clust_num_ores = 20, - clust_size = 5, - y_max = -5, - y_min = -15, -}) - -minetest.register_ore({ - ore_type = "scatter", - ore = "display_blocks:compressed_earth", - wherein = "default:dirt", - clust_scarcity = 20*20*20, - clust_num_ores = 50, - clust_size = 5, - y_max = -16, - y_min = -29, -}) - -minetest.register_ore({ - ore_type = "scatter", - ore = "display_blocks:compressed_earth", - wherein = "default:dirt", - clust_scarcity = 15*15*15, - clust_num_ores = 80, - clust_size = 5, - y_max = -30, - y_min = -100, -}) - -print("[Display Blocks] Loaded! by jojoa1997 :-)") diff --git a/display_blocks/mod.conf b/display_blocks/mod.conf deleted file mode 100644 index 2ccbba44..00000000 --- a/display_blocks/mod.conf +++ /dev/null @@ -1 +0,0 @@ -name = display_blocks diff --git a/display_blocks/technic.lua b/display_blocks/technic.lua deleted file mode 100644 index 56adb5df..00000000 --- a/display_blocks/technic.lua +++ /dev/null @@ -1,40 +0,0 @@ -if enable_display_uranium == false then - minetest.register_alias("display_blocks:uranium_dust", "technic:uranium_block") - minetest.register_alias("display_blocks:uranium_block", "technic:uranium_block") - minetest.register_alias("display_blocks:uranium_ore", "technic:mineral_uranium") -end - -if technic_uranium_new_ore_gen == true then - minetest.register_ore({ - ore_type = "scatter", - ore = "technic:mineral_uranium", - wherein = "default:stone", - clust_scarcity = 20*20*20, - clust_num_ores = 18, - clust_size = 3, - y_min = -3000, - y_max = -2000, - }) - - minetest.register_ore({ - ore_type = "scatter", - ore = "technic:mineral_uranium", - wherein = "default:stone", - clust_scarcity =30*30*30, - clust_num_ores = 40, - clust_size = 4, - y_min = -7000, - y_max = -5000, - }) -end - -if enable_technic_recipe == true then - minetest.register_craft({ - output = 'display_blocks:uranium_base 5', - recipe = { - {'', 'default:mese_crystal_fragment', ''}, - {'technic:uranium_block', 'display_blocks:empty_display', 'technic:uranium_block'}, - {'', 'technic:uranium_block', ''}, - } - }) -end diff --git a/display_blocks/textures/display_blocks_mese_giver_block.png b/display_blocks/textures/display_blocks_mese_giver_block.png deleted file mode 100644 index f663bb135f6fba8adacfda5a46a4b7550223bfb2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 158 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`sh%#5Ar-fh|NQTKXwS^rAeh3S zEYGZLIqP6mA{&SKglChs^9G!r$jiVfv{-VP*lNa>LoBhnVazVS6#QJafAtld$hM%G zbGl3%b3vQcU7iIexJB5NTrYYAIxW)BoV-X_ diff --git a/display_blocks/uranium.lua b/display_blocks/uranium.lua deleted file mode 100644 index 10a004bd..00000000 --- a/display_blocks/uranium.lua +++ /dev/null @@ -1,56 +0,0 @@ -minetest.register_node( "display_blocks:uranium_ore", { - description = "Uranium Ore", - tiles = { "default_stone.png^uranium_ore.png" }, - is_ground_content = true, - groups = {cracky=3}, - drop = 'craft "display_blocks:uranium_dust" 3', -}) - -minetest.register_craftitem( "display_blocks:uranium_dust", { - description = "Uranium Dust", - inventory_image = "uranium_dust.png", - on_place_on_ground = minetest.craftitem_place_item, -}) - -minetest.register_node( "display_blocks:uranium_block", { - description = "Uranium Block", - tiles = { "uranium_block.png" }, - light_propagates = true, - paramtype = "light", - sunlight_propagates = true, - light_source = 15, - is_ground_content = true, - groups = {snappy=1,bendy=2,cracky=1,melty=2,level=2}, -}) - - -minetest.register_craft( { - output = 'node "display_blocks:uranium_block" 1', - recipe = { - { 'display_blocks:uranium_dust', 'display_blocks:uranium_dust', 'display_blocks:uranium_dust' }, - { 'display_blocks:uranium_dust', 'display_blocks:uranium_dust', 'display_blocks:uranium_dust' }, - { 'display_blocks:uranium_dust', 'display_blocks:uranium_dust', 'display_blocks:uranium_dust' }, - } -}) - -minetest.register_ore({ - ore_type = "scatter", - ore = "display_blocks:uranium_ore", - wherein = "default:stone", - clust_scarcity = 10*10*10, - clust_num_ores =18, - clust_size = 3, - y_min = -3000, - y_max = -2000, -}) - -minetest.register_ore({ - ore_type = "scatter", - ore = "display_blocks:uranium_ore", - wherein = "default:stone", - clust_scarcity =20*20*20, - clust_num_ores =40, - clust_size = 4, - y_min = -7000, - y_max = -5000, -}) diff --git a/display_blocks_redo/COPYING b/display_blocks_redo/COPYING new file mode 100644 index 00000000..7519497c --- /dev/null +++ b/display_blocks_redo/COPYING @@ -0,0 +1,63 @@ +The code in this mod is licensed under the following terms: + +This is free and unencumbered software released into the public domain. + +Anyone is free to copy, modify, publish, use, compile, sell, or +distribute this software, either in source code form or as a compiled +binary, for any purpose, commercial or non-commercial, and by any +means. + +In jurisdictions that recognize copyright laws, the author or authors +of this software dedicate any and all copyright interest in the +software to the public domain. We make this dedication for the benefit +of the public at large and to the detriment of our heirs and +successors. We intend this dedication to be an overt act of +relinquishment in perpetuity of all present and future rights to this +software under copyright law. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR +OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. + +For more information, please refer to + + +------------------------------------------------------------------------ + + +The textures in this mod are from the original display_blocks mod and are licensed under the same terms as the original. +The contents of the original LICENSE.txt file are as follows: + + +License: + +Copyright (C) 2016 - VanessaE, cheapie, jojoa1997 + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject +to the following conditions: + +The above copyright notice and this permission notice shall be included +in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY +KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE +WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of the authors shall +not be used in advertising or otherwise to promote the sale, use or +other dealings in this Software without prior written authorization +from the authors. + diff --git a/display_blocks_redo/init.lua b/display_blocks_redo/init.lua new file mode 100644 index 00000000..5bf85b05 --- /dev/null +++ b/display_blocks_redo/init.lua @@ -0,0 +1,302 @@ +local disptypes = { + { + name = "Mese", + light_source = 0, + craft_type = "normal", + craft_item = "default:mese", + }, + { + name = "Glass", + light_source = 0, + craft_type = "normal", + craft_item = "default:glass", + }, + { + name = "Fire", + light_source = 12, + craft_type = "normal", + craft_item = "bucket:bucket_lava", + }, + { + name = "Air", + light_source = 5, + craft_type = "normal", + craft_item = "bucket:bucket_empty", + }, + { + name = "Water", + light_source = 0, + craft_type = "normal", + craft_item = "bucket:bucket_water", + }, + { + name = "Uranium", + light_source = 10, + craft_type = "normal", + craft_item = "group:uranium_block", + }, + { + name = "Earth", + light_source = 0, + craft_type = "normal", + craft_item = "default:dirt", + }, + { + name = "Metal", + light_source = 2, + craft_type = "normal", + craft_item = "default:steelblock", + }, + { + name = "Empty", + light_source = 0, + suppress_crystal = true, + craft_type = "special", + craft_recipe = { + {"default:desert_sand","default:glass","default:sand",}, + {"default:glass","","default:glass",}, + {"default:sand","default:glass","default:desert_sand",}, + }, + }, + { + name = "Universia", + light_source = 14, + craft_type = "special", + craft_recipe = { + {"default:mese_crystal","default:mese_crystal","default:mese_crystal",}, + {"display_blocks_redo:natura_cube","default:mese","display_blocks_redo:industria_cube",}, + {"default:obsidian","default:obsidian","default:obsidian",}, + }, + }, +} + +if minetest.get_modpath("titanium") then + table.insert(disptypes,{ + name = "Titanium", + light_source = 0, + craft_type = "normal", + craft_item = "titanium:block", + }) +end + +local function regcraft(def) + local lname = string.lower(def.name) + if def.craft_type == "normal" then + local craft = {} + craft.output = string.format("display_blocks_redo:%s_base",lname) + craft.recipe = { + {"","default:mese_crystal_fragment","",}, + {def.craft_item,"display_blocks_redo:empty_base",def.craft_item,}, + {"",def.craft_item,"",}, + } + if string.sub(def.craft_item,1,7) == "bucket:" then + craft.replacements = {} + for i=1,3,1 do + table.insert(craft.replacements,{def.craft_item,"bucket:bucket_empty",}) + end + end + minetest.register_craft(craft) + elseif def.craft_type == "special" then + local craft = {} + craft.output = string.format("display_blocks_redo:%s_base",lname) + craft.recipe = def.craft_recipe + minetest.register_craft(craft) + end +end + +for _,def in ipairs(disptypes) do + local lname = string.lower(def.name) + if not def.suppress_crystal then + minetest.register_node(string.format("display_blocks_redo:%s_crystal",lname),{ + description = string.format("%s Display Crystal (you hacker you!)",def.name), + drawtype = "plantlike", + drop = "", + groups = { + not_in_creative_inventory = 1, + }, + paramtype = "light", + tiles = { + string.format("display_blocks_redo_%s_crystal.png",lname), + }, + light_source = def.light_source, + visual_scale = 0.9, + selection_box = { + type = "fixed", + fixed = {-0.15,-0.5,-0.15,0.15,0.2,0.15}, + }, + walkable = false, + }) + minetest.register_alias(string.format("display_blocks:%s_crystal",lname),string.format("display_blocks_redo:%s_crystal",lname)) + end + minetest.register_node(string.format("display_blocks_redo:%s_base",lname),{ + description = string.format("%s Display Base",def.name), + groups = { + cracky = 3, + }, + sounds = minetest.global_exists("default") and default.node_sound_glass_defaults(), + paramtype = "light", + light_source = def.light_source, + tiles = { + string.format("display_blocks_redo_%s_base.png",lname), + }, + drawtype = "glasslike", + after_place_node = function(pos,_,stack) + if def.suppress_crystal then return end + local crystalpos = vector.add(pos,vector.new(0,1,0)) + if minetest.get_node(crystalpos).name == "air" then + local node = {} + node.name = string.format("display_blocks_redo:%s_crystal",lname) + minetest.set_node(crystalpos,node) + stack:take_item(1) + return stack + else + minetest.set_node(pos,{name = "air"}) + return stack + end + end, + after_destruct = function(pos) + if def.suppress_crystal then return end + local crystalpos = vector.add(pos,vector.new(0,1,0)) + if minetest.get_node(crystalpos).name == string.format("display_blocks_redo:%s_crystal",lname) then + minetest.set_node(crystalpos,{name = "air"}) + end + end, + }) + regcraft(def) + minetest.register_alias(string.format("display_blocks:%s_base",lname),string.format("display_blocks_redo:%s_base",lname)) +end + +minetest.register_alias("display_blocks:empty_display","display_blocks_redo:empty_base") +minetest.register_alias("display_blocks:compressed_earth","default:dirt") + +minetest.register_node("display_blocks_redo:natura_cube",{ + description = "Natura Cube", + tiles = { + "display_blocks_redo_natura_cube.png", + }, + groups = { + cracky = 3, + oddly_breakable_by_hand = 3, + }, + paramtype = "light", + drawtype = "glasslike", + sounds = minetest.global_exists("default") and default.node_sound_glass_defaults(), +}) + +minetest.register_alias("display_blocks:natura_cube","display_blocks_redo:natura_cube") + +minetest.register_node("display_blocks_redo:industria_cube",{ + description = "Industria Cube", + tiles = { + "display_blocks_redo_industria_cube.png", + }, + groups = { + cracky = 3, + oddly_breakable_by_hand = 3, + }, + paramtype = "light", + drawtype = "glasslike", + sounds = minetest.global_exists("default") and default.node_sound_glass_defaults(), +}) + +minetest.register_alias("display_blocks:industria_cube","display_blocks_redo:industria_cube") + +minetest.register_craft({ + output = "display_blocks_redo:natura_cube", + recipe = { + {"","display_blocks:air_base","",}, + {"display_blocks:fire_base","","display_blocks:water_base",}, + {"","display_blocks:earth_base","",}, + }, +}) + +minetest.register_craft({ + output = "display_blocks_redo:industria_cube", + recipe = { + {"","display_blocks:mese_base","",}, + {"display_blocks:metal_base","","display_blocks:glass_base",}, + {"","display_blocks:uranium_base","",}, + }, +}) + +if minetest.get_modpath("technic_worldgen") then + minetest.register_alias("display_blocks:uranium_ore","technic:mineral_uranium") + minetest.register_alias("display_blocks:uranium_dust","technic:uranium_dust") + minetest.register_alias("display_blocks:uranium_block","technic:uranium_block") + minetest.register_alias("display_blocks_redo:uranium_ore","technic:mineral_uranium") + minetest.register_alias("display_blocks_redo:uranium_dust","technic:uranium_dust") + minetest.register_alias("display_blocks_redo:uranium_block","technic:uranium_block") +else + minetest.register_node("display_blocks_redo:uranium_ore",{ + description = "Uranium Ore", + drop = "display_blocks_redo:uranium_dust 3", + paramtype = "light", + light_source = 2, + groups = { + cracky = 3, + }, + tiles = { + "default_stone.png^display_blocks_redo_uranium_ore.png", + }, + is_ground_content = true, + }) + + minetest.register_node("display_blocks_redo:uranium_block",{ + description = "Uranium Block", + paramtype = "light", + light_source = 7, + groups = { + snappy = 1, + }, + tiles = { + "display_blocks_redo_uranium_block.png", + }, + }) + + minetest.register_craftitem("display_blocks_redo:uranium_dust",{ + description = "Uranium Dust", + inventory_image = "display_blocks_redo_uranium_dust.png", + }) + + minetest.register_craft({ + type = "shapeless", + output = "display_blocks_redo:uranium_block", + recipe = { + "display_blocks_redo:uranium_dust", + "display_blocks_redo:uranium_dust", + "display_blocks_redo:uranium_dust", + "display_blocks_redo:uranium_dust", + "display_blocks_redo:uranium_dust", + "display_blocks_redo:uranium_dust", + "display_blocks_redo:uranium_dust", + "display_blocks_redo:uranium_dust", + "display_blocks_redo:uranium_dust", + }, + }) + + minetest.register_ore({ + ore_type = "scatter", + ore = "display_blocks_redo:uranium_ore", + wherein = "default:stone", + clust_scarcity = 10*10*10, + clust_num_ores = 18, + clust_size = 3, + y_min = -3000, + y_max = -2000, + }) + + minetest.register_ore({ + ore_type = "scatter", + ore = "display_blocks_redo:uranium_ore", + wherein = "default:stone", + clust_scarcity = 20*20*20, + clust_num_ores = 40, + clust_size = 4, + y_min = -31000, + y_max = -5000, + }) + + minetest.register_alias("display_blocks:uranium_ore","display_blocks_redo:uranium_ore") + minetest.register_alias("display_blocks:uranium_dust","display_blocks_redo:uranium_dust") + minetest.register_alias("display_blocks:uranium_block","display_blocks_redo:uranium_block") +end diff --git a/display_blocks_redo/mod.conf b/display_blocks_redo/mod.conf new file mode 100644 index 00000000..d2290c97 --- /dev/null +++ b/display_blocks_redo/mod.conf @@ -0,0 +1,3 @@ +name = display_blocks_redo +description = Rewrite of the old display_blocks mod for Minetest +optional_depends = default diff --git a/display_blocks/textures/display_blocks_air_block.png b/display_blocks_redo/textures/display_blocks_redo_air_base.png similarity index 100% rename from display_blocks/textures/display_blocks_air_block.png rename to display_blocks_redo/textures/display_blocks_redo_air_base.png diff --git a/display_blocks/textures/display_blocks_air_crystal.png b/display_blocks_redo/textures/display_blocks_redo_air_crystal.png similarity index 100% rename from display_blocks/textures/display_blocks_air_crystal.png rename to display_blocks_redo/textures/display_blocks_redo_air_crystal.png diff --git a/display_blocks/textures/display_blocks_compressed_earth.png b/display_blocks_redo/textures/display_blocks_redo_compressed_earth.png similarity index 100% rename from display_blocks/textures/display_blocks_compressed_earth.png rename to display_blocks_redo/textures/display_blocks_redo_compressed_earth.png diff --git a/display_blocks/textures/display_blocks_earth_block.png b/display_blocks_redo/textures/display_blocks_redo_earth_base.png similarity index 100% rename from display_blocks/textures/display_blocks_earth_block.png rename to display_blocks_redo/textures/display_blocks_redo_earth_base.png diff --git a/display_blocks/textures/display_blocks_earth_crystal.png b/display_blocks_redo/textures/display_blocks_redo_earth_crystal.png similarity index 100% rename from display_blocks/textures/display_blocks_earth_crystal.png rename to display_blocks_redo/textures/display_blocks_redo_earth_crystal.png diff --git a/display_blocks/textures/display_blocks_empty_display.png b/display_blocks_redo/textures/display_blocks_redo_empty_base.png similarity index 100% rename from display_blocks/textures/display_blocks_empty_display.png rename to display_blocks_redo/textures/display_blocks_redo_empty_base.png diff --git a/display_blocks/textures/display_blocks_fire_block.png b/display_blocks_redo/textures/display_blocks_redo_fire_base.png similarity index 100% rename from display_blocks/textures/display_blocks_fire_block.png rename to display_blocks_redo/textures/display_blocks_redo_fire_base.png diff --git a/display_blocks/textures/display_blocks_fire_crystal.png b/display_blocks_redo/textures/display_blocks_redo_fire_crystal.png similarity index 100% rename from display_blocks/textures/display_blocks_fire_crystal.png rename to display_blocks_redo/textures/display_blocks_redo_fire_crystal.png diff --git a/display_blocks/textures/display_blocks_glass_block.png b/display_blocks_redo/textures/display_blocks_redo_glass_base.png similarity index 100% rename from display_blocks/textures/display_blocks_glass_block.png rename to display_blocks_redo/textures/display_blocks_redo_glass_base.png diff --git a/display_blocks/textures/display_blocks_glass_crystal.png b/display_blocks_redo/textures/display_blocks_redo_glass_crystal.png similarity index 100% rename from display_blocks/textures/display_blocks_glass_crystal.png rename to display_blocks_redo/textures/display_blocks_redo_glass_crystal.png diff --git a/display_blocks/textures/display_blocks_industria_cube.png b/display_blocks_redo/textures/display_blocks_redo_industria_cube.png similarity index 100% rename from display_blocks/textures/display_blocks_industria_cube.png rename to display_blocks_redo/textures/display_blocks_redo_industria_cube.png diff --git a/display_blocks/textures/display_blocks_mese_block.png b/display_blocks_redo/textures/display_blocks_redo_mese_base.png similarity index 100% rename from display_blocks/textures/display_blocks_mese_block.png rename to display_blocks_redo/textures/display_blocks_redo_mese_base.png diff --git a/display_blocks/textures/display_blocks_mese_crystal.png b/display_blocks_redo/textures/display_blocks_redo_mese_crystal.png similarity index 100% rename from display_blocks/textures/display_blocks_mese_crystal.png rename to display_blocks_redo/textures/display_blocks_redo_mese_crystal.png diff --git a/display_blocks/textures/display_blocks_metal_block.png b/display_blocks_redo/textures/display_blocks_redo_metal_base.png similarity index 100% rename from display_blocks/textures/display_blocks_metal_block.png rename to display_blocks_redo/textures/display_blocks_redo_metal_base.png diff --git a/display_blocks/textures/display_blocks_metal_crystal.png b/display_blocks_redo/textures/display_blocks_redo_metal_crystal.png similarity index 100% rename from display_blocks/textures/display_blocks_metal_crystal.png rename to display_blocks_redo/textures/display_blocks_redo_metal_crystal.png diff --git a/display_blocks/textures/display_blocks_natura_cube.png b/display_blocks_redo/textures/display_blocks_redo_natura_cube.png similarity index 100% rename from display_blocks/textures/display_blocks_natura_cube.png rename to display_blocks_redo/textures/display_blocks_redo_natura_cube.png diff --git a/display_blocks/textures/display_blocks_titanium_block.png b/display_blocks_redo/textures/display_blocks_redo_titanium_base.png similarity index 100% rename from display_blocks/textures/display_blocks_titanium_block.png rename to display_blocks_redo/textures/display_blocks_redo_titanium_base.png diff --git a/display_blocks/textures/display_blocks_titanium_crystal.png b/display_blocks_redo/textures/display_blocks_redo_titanium_crystal.png similarity index 100% rename from display_blocks/textures/display_blocks_titanium_crystal.png rename to display_blocks_redo/textures/display_blocks_redo_titanium_crystal.png diff --git a/display_blocks/textures/display_blocks_universia_block.png b/display_blocks_redo/textures/display_blocks_redo_universia_base.png similarity index 100% rename from display_blocks/textures/display_blocks_universia_block.png rename to display_blocks_redo/textures/display_blocks_redo_universia_base.png diff --git a/display_blocks/textures/display_blocks_universia_crystal.png b/display_blocks_redo/textures/display_blocks_redo_universia_crystal.png similarity index 100% rename from display_blocks/textures/display_blocks_universia_crystal.png rename to display_blocks_redo/textures/display_blocks_redo_universia_crystal.png diff --git a/display_blocks/textures/display_blocks_uranium_block.png b/display_blocks_redo/textures/display_blocks_redo_uranium_base.png similarity index 100% rename from display_blocks/textures/display_blocks_uranium_block.png rename to display_blocks_redo/textures/display_blocks_redo_uranium_base.png diff --git a/display_blocks/textures/uranium_block.png b/display_blocks_redo/textures/display_blocks_redo_uranium_block.png similarity index 100% rename from display_blocks/textures/uranium_block.png rename to display_blocks_redo/textures/display_blocks_redo_uranium_block.png diff --git a/display_blocks/textures/display_blocks_uranium_crystal.png b/display_blocks_redo/textures/display_blocks_redo_uranium_crystal.png similarity index 100% rename from display_blocks/textures/display_blocks_uranium_crystal.png rename to display_blocks_redo/textures/display_blocks_redo_uranium_crystal.png diff --git a/display_blocks/textures/uranium_dust.png b/display_blocks_redo/textures/display_blocks_redo_uranium_dust.png similarity index 100% rename from display_blocks/textures/uranium_dust.png rename to display_blocks_redo/textures/display_blocks_redo_uranium_dust.png diff --git a/display_blocks/textures/uranium_ore.png b/display_blocks_redo/textures/display_blocks_redo_uranium_ore.png similarity index 100% rename from display_blocks/textures/uranium_ore.png rename to display_blocks_redo/textures/display_blocks_redo_uranium_ore.png diff --git a/display_blocks/textures/display_blocks_water_block.png b/display_blocks_redo/textures/display_blocks_redo_water_base.png similarity index 100% rename from display_blocks/textures/display_blocks_water_block.png rename to display_blocks_redo/textures/display_blocks_redo_water_base.png diff --git a/display_blocks/textures/display_blocks_water_crystal.png b/display_blocks_redo/textures/display_blocks_redo_water_crystal.png similarity index 100% rename from display_blocks/textures/display_blocks_water_crystal.png rename to display_blocks_redo/textures/display_blocks_redo_water_crystal.png diff --git a/dreambuilder_mp_extras/customize-dreambuilder.sh b/dreambuilder_mp_extras/customize-dreambuilder.sh index 090f3b6e..a595222a 100755 --- a/dreambuilder_mp_extras/customize-dreambuilder.sh +++ b/dreambuilder_mp_extras/customize-dreambuilder.sh @@ -16,8 +16,10 @@ if [ ! -d "$upstream_mods_path" ] ; then fi modpack_path=$upstream_mods_path"/my_mods/dreambuilder_modpack" +gitrefs_path=$upstream_mods_path"/my_mods/dreambuilder_git_refs" -rm -rf $modpack_path/* +rm -rf $modpack_path +mkdir $modpack_path touch $modpack_path/modpack.txt echo -e "\nBring all mods up-to-date from "$upstream_mods_path @@ -62,6 +64,7 @@ cheapies_mods/rgblightstone \ cheapies_mods/solidcolor \ cheapies_mods/arrowboards \ cheapies_mods/digidisplay \ +cheapies_mods/display_blocks_redo \ Jeijas_mods/digilines \ Jeijas_mods/jumping \ TenPlus1s_mods/farming \ @@ -75,7 +78,6 @@ DonBatmans_mods/mymillwork \ quartz \ stained_glass \ titanium \ -display_blocks \ gardening \ caverealms_lite \ deezls_mods/extra_stairsplus \ @@ -183,6 +185,8 @@ done <<< "$LIST" ln -s $upstream_mods_path"/my_mods/dreambuilder_mp_extras/readme.md" $modpack_path +cp -a $gitrefs_path/.git* $modpack_path + echo -e "\nCustomization completed. Here's what will be included in the modpack:\n" -ls $modpack_path +ls -a $modpack_path diff --git a/dreambuilder_mp_extras/update-dreambuilder-online-files.sh b/dreambuilder_mp_extras/update-dreambuilder-online-files.sh index ff67854c..f3358c26 100755 --- a/dreambuilder_mp_extras/update-dreambuilder-online-files.sh +++ b/dreambuilder_mp_extras/update-dreambuilder-online-files.sh @@ -7,18 +7,29 @@ echo -e "=================================================================\n" timestamp=`date +%Y%m%d-%H%M` -echo -e "\nCopy the Dreambuilder to /home/vanessa/.minetest/mods..." +echo -e "\nCopy Dreambuilder to /home/vanessa/.minetest/mods..." echo -e "=================================================================\n" -rsync -a --exclude=".git/" \ - /home/vanessa/Minetest-related/mods/my_mods/dreambuilder_modpack \ - /home/vanessa/.minetest/mods/ +rm -rf /home/vanessa/.minetest/mods/dreambuilder_modpack + +cp -a /home/vanessa/Minetest-related/mods/my_mods/dreambuilder_modpack \ + /home/vanessa/.minetest/mods/ echo -e "\nUpdate git repos..." echo -e "=================================================================\n" -rm -rf /run/shm/dreambuilder_modpack -rsync -aL /home/vanessa/Minetest-related/mods/my_mods/dreambuilder_modpack /run/shm/ +rm -rf /run/shm/dreambuilder_modpack* + +rsync -aL \ + /home/vanessa/Minetest-related/mods/my_mods/dreambuilder_modpack/* \ + /run/shm/dreambuilder_modpack_raw + +rsync -a --exclude ".git*" \ + /run/shm/dreambuilder_modpack_raw/* \ + /run/shm/dreambuilder_modpack + +cp -a /home/vanessa/Minetest-related/mods/my_mods/dreambuilder_git_refs/.git* \ + /run/shm/dreambuilder_modpack cd /run/shm/dreambuilder_modpack git add . @@ -28,24 +39,24 @@ git tag $timestamp git push --tags cd ~ -rsync -aL --delete /run/shm/dreambuilder_modpack/.git /home/vanessa/Minetest-related/mods/my_mods/dreambuilder_modpack -rm -rf /run/shm/dreambuilder_modpack - echo -e "\nRecreate secondary game archive ..." echo -e "=================================================================\n" echo "Build timestamp: $timestamp" > \ - /home/vanessa/Minetest-related/mods/my_mods/dreambuilder_modpack/build-date.txt + /run/shm/dreambuilder_modpack/build-date.txt rm -f /home/vanessa/Minetest-related/Dreambuilder_Modpack.tar.bz2 -cd /home/vanessa/Minetest-related/mods/my_mods/ +cd /run/shm tar -jcf /home/vanessa/Digital-Audio-Concepts-Website/vanessa/hobbies/minetest/Dreambuilder_Modpack.tar.bz2 \ --exclude=".git/*" \ dreambuilder_modpack + rm /home/vanessa/Minetest-related/mods/my_mods/dreambuilder_modpack/build-date.txt /home/vanessa/Scripts/sync-website.sh +rm -rf /run/shm/dreambuilder_modpack* + echo -e "\nDone. Build timestamp: $timestamp \n" diff --git a/ebony/init.lua b/ebony/init.lua index 6f86ecd4..37055387 100644 --- a/ebony/init.lua +++ b/ebony/init.lua @@ -265,7 +265,7 @@ default.register_leafdecay({ --Stairs -if minetest.get_modpath("stairs") ~= nil then +if minetest.get_modpath("stairs") ~= nil then stairs.register_stair_and_slab( "ebony_trunk", "ebony:trunk", @@ -277,7 +277,7 @@ if minetest.get_modpath("stairs") ~= nil then ) end -if minetest.get_modpath("bonemeal") ~= nil then +if minetest.get_modpath("bonemeal") ~= nil then bonemeal:add_sapling({ {"ebony:sapling", grow_new_ebony_tree, "soil"}, }) diff --git a/facade/.github/workflows/check-release.yml b/facade/.github/workflows/check-release.yml deleted file mode 100644 index e5b52ded..00000000 --- a/facade/.github/workflows/check-release.yml +++ /dev/null @@ -1,11 +0,0 @@ -on: [push, pull_request] -name: Check & Release -jobs: - lint: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@master - - name: lint - uses: Roang-zero1/factorio-mod-luacheck@master - with: - luacheckrc_url: https://raw.githubusercontent.com/TumeniNodes/facade/master/.luacheckrc diff --git a/farming/README.md b/farming/README.md index 2416f326..697f4a0b 100644 --- a/farming/README.md +++ b/farming/README.md @@ -13,7 +13,7 @@ This mod works by adding your new plant to the {growing=1} group and numbering t ### Changelog: -- 1.45 - Dirt and Hoes are more in line with default by using dry/wet/base options +- 1.45 - Dirt and Hoes are more in line with default by using dry/wet/base options, onion soup added (thanks edcrypt) - 1.44 - Added 'farming_stage_length' in mod settings for speed of crop growth, also thanks to TheDarkTiger for translation updates - 1.43 - Scythe works on use instead of right-click, added seed=1 groups to actual seeds and seed=2 group for plantable food items. - 1.42 - Soil needs water to be present within 3 blocks horizontally and 1 below to make wet soil, Jack 'o Lanterns now check protection, add chocolate block. diff --git a/farming/crops/mint.lua b/farming/crops/mint.lua new file mode 100644 index 00000000..96b2f46b --- /dev/null +++ b/farming/crops/mint.lua @@ -0,0 +1,91 @@ + +local S = farming.intllib + +-- mint seed +minetest.register_craftitem("farming:seed_mint", { + description = S("Mint Seeds"), + inventory_image = "farming_mint_seeds.png", + groups = {seed = 2, flammable = 2}, + on_place = function(itemstack, placer, pointed_thing) + return farming.place_seed( + itemstack, placer, pointed_thing, "farming:mint_1") + end +}) + +-- mint leaf +minetest.register_craftitem("farming:mint_leaf", { + description = S("Mint Leaf"), + inventory_image = "farming_mint_leaf.png", + groups = {food_mint = 1, flammable = 4}, +}) + +-- mint tea +minetest.register_craftitem("farming:mint_tea", { + description = S("Mint Tea"), + inventory_image = "farming_mint_tea.png", + on_use = minetest.item_eat(2, "vessels:drinking_glass"), + groups = {flammable = 4}, +}) + +minetest.register_craft({ + output = "farming:mint_tea", + type = "shapeless", + recipe = { + "vessels:drinking_glass", "group:food_mint", + "group:food_mint", "group:food_mint", + "farming:juicer", "bucket:bucket_water" + }, + replacements = { + {"group:food_juicer", "farming:juicer"}, + {"bucket:bucket_water", "bucket:bucket_empty"}, + }, +}) + +-- mint definition +local crop_def = { + drawtype = "plantlike", + tiles = {"farming_mint_1.png"}, + paramtype = "light", + walkable = false, + buildable_to = true, + drop = "", + selection_box = farming.select, + groups = { + snappy = 3, flammable = 2, plant = 1, attached_node = 1, + not_in_creative_inventory = 1, growing = 1 + }, + sounds = default.node_sound_leaves_defaults() +} + +-- stage 1 +minetest.register_node("farming:mint_1", table.copy(crop_def)) + +-- stage 2 +crop_def.tiles = {"farming_mint_2.png"} +minetest.register_node("farming:mint_2", table.copy(crop_def)) + +-- stage 3 +crop_def.tiles = {"farming_mint_3.png"} +minetest.register_node("farming:mint_3", table.copy(crop_def)) + +-- stage 4 (final) +crop_def.tiles = {"farming_mint_4.png"} +crop_def.groups.growing = 0 +crop_def.drop = { + items = { + {items = {"farming:mint_leaf 2"}, rarity = 1}, + {items = {"farming:mint_leaf 2"}, rarity = 2}, + {items = {"farming:seed_mint 1"}, rarity = 1}, + {items = {"farming:seed_mint 2"}, rarity = 2}, + } +} +minetest.register_node("farming:mint_4", table.copy(crop_def)) + +-- add to registered_plants +farming.registered_plants["farming:mint"] = { + crop = "farming:mint", + seed = "farming:seed_mint", + minlight = 13, + maxlight = 15, + steps = 4 +} diff --git a/farming/crops/onion.lua b/farming/crops/onion.lua index 72a425e4..ba8c301b 100644 --- a/farming/crops/onion.lua +++ b/farming/crops/onion.lua @@ -7,7 +7,7 @@ local S = farming.intllib --- potato +-- onion minetest.register_craftitem("farming:onion", { description = S("Onion"), inventory_image = "crops_onion.png", @@ -18,6 +18,25 @@ minetest.register_craftitem("farming:onion", { on_use = minetest.item_eat(1), }) +-- onion soup +minetest.register_craftitem("farming:onion_soup", { + description = S("Onion Soup"), + inventory_image = "farming_onion_soup.png", + groups = {flammable = 2}, + on_use = minetest.item_eat(6, "farming:bowl"), +}) + +minetest.register_craft({ + type = "shapeless", + output = "farming:onion_soup", + recipe = { + "group:food_onion", "group:food_onion", "group:food_pot", + "group:food_onion", "group:food_onion", + "group:food_onion", "group:food_onion", "group:food_bowl" + }, + replacements = {{"farming:pot", "farming:pot"}} +}) + -- crop definition local crop_def = { drawtype = "plantlike", diff --git a/farming/farming.conf_example b/farming/farming.conf_example index c2c5de06..a1998f69 100644 --- a/farming/farming.conf_example +++ b/farming/farming.conf_example @@ -29,6 +29,7 @@ farming.pepper = 0.002 farming.pineapple = 0.001 farming.peas = 0.001 farming.beetroot = 0.001 +farming.mint = 0.005 farming.grains = true -- true or false only -- default rarety of crops on map (higher number = more crops) diff --git a/farming/init.lua b/farming/init.lua index 5ff80b69..1ab7abdf 100644 --- a/farming/init.lua +++ b/farming/init.lua @@ -7,7 +7,7 @@ farming = { mod = "redo", - version = "20200430", + version = "20200527", path = minetest.get_modpath("farming"), select = { type = "fixed", @@ -624,6 +624,7 @@ farming.pepper = 0.002 farming.pineapple = 0.001 farming.peas = 0.001 farming.beetroot = 0.001 +farming.mint = 0.005 farming.grains = true farming.rarety = 0.002 @@ -688,6 +689,7 @@ ddoo("peas.lua", farming.peas) ddoo("beetroot.lua", farming.beetroot) ddoo("chili.lua", farming.chili) ddoo("ryeoatrice.lua", farming.grains) +ddoo("mint.lua", farming.mint) dofile(farming.path.."/food.lua") dofile(farming.path.."/mapgen.lua") diff --git a/farming/mapgen.lua b/farming/mapgen.lua index beacd21a..6ebbff5e 100644 --- a/farming/mapgen.lua +++ b/farming/mapgen.lua @@ -47,6 +47,8 @@ register_plant("onion_5", 5, 22, nil, "", -1, farming.onion) register_plant("garlic_5", 3, 30, nil, "group:tree", 1, farming.garlic) register_plant("pea_5", 25, 50, nil, "", -1, farming.peas) register_plant("beetroot_5", 1, 15, nil, "", -1, farming.beetroot) +register_plant("mint_4", 1, 75, {"default:dirt_with_grass", +"default:dirt_with_coniferous_litter"}, "group:water", 1, farming.mint) if minetest.get_mapgen_setting("mg_name") == "v6" then diff --git a/farming/textures/farming_mint_1.png b/farming/textures/farming_mint_1.png new file mode 100644 index 0000000000000000000000000000000000000000..10ba563ded7966d2e1be61f52c047bfc362d7acd GIT binary patch literal 114 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9oB=)|u0Y!Iw!h=AsLqe?*8n+; zB|(0{3=Yq3qyahNo-U3d9M_W*7I0`VY;<6rkih(LhJ*wIXBorJhX2YnKqU;Gu6{1- HoD!Mcix@p!8QIwUuK6jP7CwmLCTGd Zjln9Hsc+j8!HGak44$rjF6*2UngGQ_AwvKF literal 0 HcmV?d00001 diff --git a/farming/textures/farming_mint_4.png b/farming/textures/farming_mint_4.png new file mode 100644 index 0000000000000000000000000000000000000000..83c0e90161dc7ecf0ace3b46bb58831d8c8a1a89 GIT binary patch literal 174 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9oB=)|u0Y!Iw!h=AsLqe?*8n+; zB|(0{3=Yq3qyag>o-U3d9M^eIZRBlG5OFx@zL4|o^$ew@VLMnwL~;}tXB=1&9AUZK zBwV(F(Uc{l{B^)*MxkQ2>7gH9dP`hRpZ1}|$5St9XRhw2MaP9bqL&tmvf9hO%aj^Q=SzzCd@08)-*OIUgcV0$gpW9&&A8%SHuF1WAJqKb6Mw<&;$Td Caxc^X literal 0 HcmV?d00001 diff --git a/farming/textures/farming_mint_seeds.png b/farming/textures/farming_mint_seeds.png new file mode 100644 index 0000000000000000000000000000000000000000..2e0a0eae34ad5353728b75b4d1b714dd31efc5b5 GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9oB=)|u0YyYQ^CPmEal|aXmS~p`ne_!O4Ni!=T8)fSKJz?O k5;Ghg2{$~_;W@#;uvvq}|5zQz9-w{(Pgg&ebxsLQ0FLA&8vpAr_~T6C_v*x7D?wIxy85}Sb4q9e03rl2761SM literal 0 HcmV?d00001 diff --git a/mesecons_gates/textures/jeija_gate_side_output_off.png b/mesecons_gates/textures/jeija_gate_side_output_off.png new file mode 100644 index 0000000000000000000000000000000000000000..785e7c6b4b4c92c3fe6901cdf7b92d7bb58c4aad GIT binary patch literal 109 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`CY~;iAr_~T6C_v*CThCdBqtnT=;85k;Au2C(Bo#LxH8Eh$o+&2 q$BOOi*_jNuyWSjh;`!#0^(ryz!LvrjBPkqBT?R>k%nYipxfB7p5*^wA delta 112 zcmbQvxQ*8H7_((-KQ_N~}_fD&y0O5{rxDjVFq@+tv0k zaxo}yFsFahpTBLr_%cPIyCKIUm?kV^yjwlxW=^=bx7YjM?Hn0*c61x|C+wJT)ALB7 OxNxV96?e@QuB!mu-YE_M diff --git a/technic/machines/other/injector.lua b/technic/machines/other/injector.lua index 193d0516..c1926142 100644 --- a/technic/machines/other/injector.lua +++ b/technic/machines/other/injector.lua @@ -16,7 +16,7 @@ local function inject_items (pos) if stack then local item0=stack:to_table() if item0 then - item0["count"] = "1" + item0["count"] = 1 technic.tube_inject_item(pos, pos, vector.new(0, -1, 0), item0) stack:take_item(1) inv:set_stack("main", i, stack) diff --git a/technic/machines/register/alloy_recipes.lua b/technic/machines/register/alloy_recipes.lua index a058dadd..388e0bba 100644 --- a/technic/machines/register/alloy_recipes.lua +++ b/technic/machines/register/alloy_recipes.lua @@ -12,14 +12,14 @@ function technic.register_alloy_recipe(data) end local recipes = { - {"technic:copper_dust 3", "technic:tin_dust", "technic:bronze_dust 4"}, - {"default:copper_ingot 3", "default:tin_ingot", "default:bronze_ingot 4"}, - {"technic:wrought_iron_dust", "technic:coal_dust", "technic:carbon_steel_dust", 3}, - {"technic:wrought_iron_ingot", "technic:coal_dust", "technic:carbon_steel_ingot", 3}, - {"technic:carbon_steel_dust", "technic:coal_dust", "technic:cast_iron_dust", 3}, - {"technic:carbon_steel_ingot", "technic:coal_dust", "technic:cast_iron_ingot", 3}, - {"technic:carbon_steel_dust 3", "technic:chromium_dust", "technic:stainless_steel_dust 4"}, - {"technic:carbon_steel_ingot 3", "technic:chromium_ingot", "technic:stainless_steel_ingot 4"}, + {"technic:copper_dust 7", "technic:tin_dust", "technic:bronze_dust 8", 12}, + {"default:copper_ingot 7", "default:tin_ingot", "default:bronze_ingot 8", 12}, + {"technic:wrought_iron_dust 2", "technic:coal_dust", "technic:carbon_steel_dust 2", 6}, + {"technic:wrought_iron_ingot 2", "technic:coal_dust", "technic:carbon_steel_ingot 2", 6}, + {"technic:carbon_steel_dust 2", "technic:coal_dust", "technic:cast_iron_dust 2", 6}, + {"technic:carbon_steel_ingot 2", "technic:coal_dust", "technic:cast_iron_ingot 2", 6}, + {"technic:carbon_steel_dust 4", "technic:chromium_dust", "technic:stainless_steel_dust 5", 7.5}, + {"technic:carbon_steel_ingot 4", "technic:chromium_ingot", "technic:stainless_steel_ingot 5", 7.5}, {"technic:copper_dust 2", "technic:zinc_dust", "technic:brass_dust 3"}, {"default:copper_ingot 2", "technic:zinc_ingot", "basic_materials:brass_ingot 3"}, {"default:sand 2", "technic:coal_dust 2", "technic:silicon_wafer"}, diff --git a/technic/machines/register/centrifuge_recipes.lua b/technic/machines/register/centrifuge_recipes.lua index 4684ba07..11c67887 100644 --- a/technic/machines/register/centrifuge_recipes.lua +++ b/technic/machines/register/centrifuge_recipes.lua @@ -11,8 +11,8 @@ function technic.register_separating_recipe(data) end local recipes = { - { "technic:bronze_dust 4", "technic:copper_dust 3", "technic:tin_dust" }, - { "technic:stainless_steel_dust 4", "technic:wrought_iron_dust 3", "technic:chromium_dust" }, + { "technic:bronze_dust 8", "technic:copper_dust 7", "technic:tin_dust" }, + { "technic:stainless_steel_dust 5", "technic:wrought_iron_dust 4", "technic:chromium_dust" }, { "technic:brass_dust 3", "technic:copper_dust 2", "technic:zinc_dust" }, { "technic:chernobylite_dust", "default:sand", "technic:uranium3_dust" }, { "default:dirt 4", "default:sand", "default:gravel", "default:clay_lump 2" }, diff --git a/technic/machines/register/common.lua b/technic/machines/register/common.lua index 38354f97..9d88702a 100644 --- a/technic/machines/register/common.lua +++ b/technic/machines/register/common.lua @@ -74,7 +74,7 @@ function technic.send_items(pos, x_velocity, z_velocity, output_name) if stack then local item0 = stack:to_table() if item0 then - item0["count"] = "1" + item0["count"] = 1 technic.tube_inject_item(pos, pos, vector.new(x_velocity, 0, z_velocity), item0) stack:take_item(1) inv:set_stack(output_name, i, stack) diff --git a/technic/tools/chainsaw.lua b/technic/tools/chainsaw.lua index 22685cfa..4d33324d 100644 --- a/technic/tools/chainsaw.lua +++ b/technic/tools/chainsaw.lua @@ -24,48 +24,81 @@ local nodes = { {"default:jungleleaves", false}, {"default:pine_needles", false}, + -- The default bushes + {"default:acacia_bush_stem", true}, + {"default:bush_stem", true}, + {"default:pine_bush_stem", true}, + {"default:acacia_bush_leaves", false}, + {"default:blueberry_bush_leaves", false}, + {"default:blueberry_bush_leaves_with_berries", false}, + {"default:bush_leaves", false}, + {"default:pine_bush_needles", false}, + -- Rubber trees from moretrees or technic_worldgen if moretrees isn't installed {"moretrees:rubber_tree_trunk_empty", true}, {"moretrees:rubber_tree_trunk", true}, {"moretrees:rubber_tree_leaves", false}, - -- Support moretrees + -- Support moretrees (trunk) {"moretrees:acacia_trunk", true}, {"moretrees:apple_tree_trunk", true}, {"moretrees:beech_trunk", true}, {"moretrees:birch_trunk", true}, + {"moretrees:cedar_trunk", true}, + {"moretrees:date_palm_ffruit_trunk", true}, + {"moretrees:date_palm_fruit_trunk", true}, + {"moretrees:date_palm_mfruit_trunk", true}, + {"moretrees:date_palm_trunk", true}, {"moretrees:fir_trunk", true}, + {"moretrees:jungletree_trunk", true}, {"moretrees:oak_trunk", true}, {"moretrees:palm_trunk", true}, + {"moretrees:palm_fruit_trunk", true}, + {"moretrees:palm_fruit_trunk_gen", true}, {"moretrees:pine_trunk", true}, + {"moretrees:poplar_trunk", true}, {"moretrees:sequoia_trunk", true}, {"moretrees:spruce_trunk", true}, {"moretrees:willow_trunk", true}, - {"moretrees:jungletree_trunk", true}, - {"moretrees:poplar_trunk", true}, + -- Support moretrees (leaves) {"moretrees:acacia_leaves", false}, {"moretrees:apple_tree_leaves", false}, - {"moretrees:oak_leaves", false}, + {"moretrees:beech_leaves", false}, + {"moretrees:birch_leaves", false}, + {"moretrees:cedar_leaves", false}, + {"moretrees:date_palm_leaves", false}, {"moretrees:fir_leaves", false}, {"moretrees:fir_leaves_bright", false}, - {"moretrees:sequoia_leaves", false}, - {"moretrees:birch_leaves", false}, - {"moretrees:birch_leaves", false}, - {"moretrees:palm_leaves", false}, - {"moretrees:spruce_leaves", false}, - {"moretrees:spruce_leaves", false}, - {"moretrees:pine_leaves", false}, - {"moretrees:willow_leaves", false}, {"moretrees:jungletree_leaves_green", false}, {"moretrees:jungletree_leaves_yellow", false}, {"moretrees:jungletree_leaves_red", false}, - {"moretrees:acorn", false}, - {"moretrees:coconut", false}, - {"moretrees:spruce_cone", false}, - {"moretrees:pine_cone", false}, - {"moretrees:fir_cone", false}, - {"moretrees:apple_blossoms", false}, + {"moretrees:oak_leaves", false}, + {"moretrees:palm_leaves", false}, {"moretrees:poplar_leaves", false}, + {"moretrees:pine_leaves", false}, + {"moretrees:sequoia_leaves", false}, + {"moretrees:spruce_leaves", false}, + {"moretrees:willow_leaves", false}, + -- Support moretrees (fruit) + {"moretrees:acorn", false}, + {"moretrees:apple_blossoms", false}, + {"moretrees:cedar_cone", false}, + {"moretrees:coconut", false}, + {"moretrees:coconut_0", false}, + {"moretrees:coconut_1", false}, + {"moretrees:coconut_2", false}, + {"moretrees:coconut_3", false}, + {"moretrees:dates_f0", false}, + {"moretrees:dates_f1", false}, + {"moretrees:dates_f2", false}, + {"moretrees:dates_f3", false}, + {"moretrees:dates_f4", false}, + {"moretrees:dates_fn", false}, + {"moretrees:dates_m0", false}, + {"moretrees:dates_n", false}, + {"moretrees:fir_cone", false}, + {"moretrees:pine_cone", false}, + {"moretrees:spruce_cone", false}, -- Support growing_trees {"growing_trees:trunk", true}, @@ -161,6 +194,18 @@ local S = technic.getter technic.register_power_tool("technic:chainsaw", chainsaw_max_charge) +-- This function checks if the specified node should be sawed +local function check_if_node_sawed(pos) + local node_name = minetest.get_node(pos).name + if timber_nodenames[node_name] + or (chainsaw_leaves and minetest.get_item_group(node_name, "leaves") ~= 0) + or minetest.get_item_group(node_name, "tree") ~= 0 then + return true + end + + return false +end + -- Table for saving what was sawed down local produced = {} @@ -237,7 +282,7 @@ local function recursive_dig(pos, remaining_charge) end local node = minetest.get_node(pos) - if not timber_nodenames[node.name] then + if not check_if_node_sawed(pos) then return remaining_charge end @@ -251,8 +296,10 @@ local function recursive_dig(pos, remaining_charge) if remaining_charge < chainsaw_charge_per_node then break end - if timber_nodenames[minetest.get_node(npos).name] then + if check_if_node_sawed(npos) then remaining_charge = recursive_dig(npos, remaining_charge) + else + minetest.check_for_falling(npos) end end return remaining_charge diff --git a/titanium/init.lua b/titanium/init.lua index ecaa2d4b..a9d4eff8 100644 --- a/titanium/init.lua +++ b/titanium/init.lua @@ -105,10 +105,10 @@ minetest.register_tool("titanium:sword", { full_punch_interval = 1.0, max_drop_level=1, groupcaps={ - fleshy={times={[1]=2.00, [2]=0.60, [3]=0.20}, uses=100, maxlevel=2}, - snappy={times={[2]=0.60, [3]=0.20}, uses=100, maxlevel=1}, - choppy={times={[3]=0.70}, uses=100, maxlevel=0} - } + snappy={times={[2]=0.60, [3]=0.20}, uses=1000, maxlevel=1}, + choppy={times={[3]=0.70}, uses=1000, maxlevel=0} + }, + damage_groups = {fleshy=6}, } }) diff --git a/unifieddyes/init.lua b/unifieddyes/init.lua index e8f388e0..8924294e 100644 --- a/unifieddyes/init.lua +++ b/unifieddyes/init.lua @@ -161,7 +161,8 @@ minetest.register_on_placenode( if not def or not def.palette - or def.after_place_node then + or def.after_place_node + or not placer then return false end @@ -192,6 +193,7 @@ minetest.register_on_placenode( -- The complementary function: strip-off the color if the node being dug is still white/neutral local function move_item(item, pos, inv, digger) + if not digger then return end local creative = creative_mode or minetest.check_player_privs(digger, "creative") if inv:room_for_item("main", item) and (not creative or not inv:contains_item("main", item, true)) then @@ -203,7 +205,7 @@ local function move_item(item, pos, inv, digger) end function unifieddyes.on_dig(pos, node, digger) - + if not digger then return end local playername = digger:get_player_name() if minetest.is_protected(pos, playername) then minetest.record_protection_violation(pos, playername) diff --git a/willow/init.lua b/willow/init.lua index f35208ff..ad0e2ab7 100644 --- a/willow/init.lua +++ b/willow/init.lua @@ -28,17 +28,17 @@ end if mg_name ~= "v6" and mg_name ~= "singlenode" then minetest.register_decoration({ deco_type = "schematic", - place_on = {"default:dirt_with_rainforest_litter"}, + place_on = {"default:dirt"}, sidelen = 16, noise_params = { - offset = 0.005, - scale = 0.002, + offset = 0.0005, + scale = 0.0002, spread = {x = 250, y = 250, z = 250}, seed = 2, octaves = 3, persist = 0.66 }, - biomes = {"savanna_shore"}, + biomes = {"deciduous_forest_shore"}, height = 2, y_min = -1, y_max = 62, diff --git a/willow/textures/willow_sapling.png b/willow/textures/willow_sapling.png index 93a3b479716a8f1cfafca0f04e1090953156d196..abcab083e7e202c7a6325e7c0ed5a042b43227c9 100644 GIT binary patch literal 7753 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 KW{|Jv6#QRo&Z}|& delta 1161 zcmV;41a|w$JlYA6BM<-vVoOIv00000008+zyML2~86OD(7YZgC#UwELldTyje?mz_ zK~zY`?bl7HT~`$c@ZUaP_rBM>q)%E5RtJg$!GX49=CG((G$1JS5i}sSBgJtij+{Br z)~2XM5W!Ywc3_aIW38m3h!a6{P}+n<-@D)Edpp=|l4nAj+lGSRg3GykpMCcFumAq9 zwa(%H_P=1~o)!zcZzUeR{!>~iW9_wCd7EZ6+t@$Er`+eKVuD7klsBBaQdE!VCx zozQd)IQbqbUUqmuVNY zGsYcuEA~p(&2|hN15kI28ChVpWp@S#2mgx|Xb?%u@<>Jz*sDgpzS&vnEW~FUc#)e~j2Mb{wtPWHd{v zJP9{17>74u;NlZP*Dy51mNF81jC2i}w73`(y-mk@lXfWcB*G!wSifmF+T3tnVlv^e zXOFXx-8>jt`j%-!-ZIuH>h6fJK}^38Y5OFytV#}gtg=*DijulzS)dZ%cqzR1ycmikGLcnH+$0f~V*)&H(!F)f zdPTpcdp#{jf8bP~YDU{p3{-nmS<0OE z-=7%hV`^G;#>t#Z-%h@_ZXS<(>P)=&;-vulUlJAEJ1|VB8+HR5oSd*2c;7zligsY9 zWF9#&;V<7wzO!usTzv6T`243IjBx)f33cq!k%WOVq`DCXF8@eqdg72G{qqH(>uxx| zMFV$gWgeaVf8;}P97?ZtFKIJg`=Ri_qhelh^t^ENhOpbDhd8G3E6*Nh{p|rLbHmuH z+h9|2qDu2sNCoR=``a^HG^0DUx*1hvrtW$lxy)aGpPc;T`MdB!a;NsiM;?mNXkKS_ ztITv#`q>M=d-nib&x(gX9#2ftOH5H_e)@|)ZnbCjUrqsB{OzAY2swei8@GP`9Rq-$ z|MKM!$G6AlT>$`XpZd$e*)v;xClq(X`DY*gSnRqe&&aaj-DTj>&pjBk5LHz$49u3> beJK40kR$QY>{L?R00000NkvXXu0mjfx!O_Q diff --git a/worldedit/common.lua b/worldedit/common.lua index c62957f2..9a2215dd 100644 --- a/worldedit/common.lua +++ b/worldedit/common.lua @@ -46,6 +46,9 @@ end function worldedit.keep_loaded(pos1, pos2) + -- Create a vmanip and read the area from map, this + -- causes all MapBlocks to be loaded into memory. + -- This doesn't actually *keep* them loaded, unlike the name implies. local manip = minetest.get_voxel_manip() manip:read_from_map(pos1, pos2) end diff --git a/worldedit_commands/init.lua b/worldedit_commands/init.lua index 4e5edbe4..1cdb1077 100644 --- a/worldedit_commands/init.lua +++ b/worldedit_commands/init.lua @@ -154,6 +154,8 @@ local function string_endswith(full, part) return full:find(part, 1, true) == #full - #part + 1 end +local description_cache = nil + -- normalizes node "description" `nodename`, returning a string (or nil) worldedit.normalize_nodename = function(nodename) nodename = nodename:gsub("^%s*(.-)%s*$", "%1") -- strip spaces @@ -164,16 +166,30 @@ worldedit.normalize_nodename = function(nodename) return fullname end nodename = nodename:lower() - for key, value in pairs(minetest.registered_nodes) do - if string_endswith(key, ":" .. nodename) then -- matches name (w/o mod part) + + for key, _ in pairs(minetest.registered_nodes) do + if string_endswith(key:lower(), ":" .. nodename) then -- matches name (w/o mod part) return key end end - for key, value in pairs(minetest.registered_nodes) do - local desc = strip_escapes(value.description):gsub("\n.*", "", 1):lower() + + if description_cache == nil then + -- cache stripped descriptions + description_cache = {} + for key, value in pairs(minetest.registered_nodes) do + local desc = strip_escapes(value.description):gsub("\n.*", "", 1):lower() + if desc ~= "" then + description_cache[key] = desc + end + end + end + + for key, desc in pairs(description_cache) do if desc == nodename then -- matches description return key end + end + for key, desc in pairs(description_cache) do if desc == nodename .. " block" then -- fuzzy description match (e.g. "Steel" == "Steel Block") return key @@ -181,8 +197,8 @@ worldedit.normalize_nodename = function(nodename) end local match = nil - for key, value in pairs(minetest.registered_nodes) do - if value.description:lower():find(nodename, 1, true) ~= nil then + for key, value in pairs(description_cache) do + if value:find(nodename, 1, true) ~= nil then if match ~= nil then return nil end @@ -574,6 +590,9 @@ worldedit.register_command("mix", { nodes[#nodes + 1] = node end end + if #nodes == 0 then + return false + end return true, nodes end, nodes_needed = check_region, diff --git a/worldedit_gui/functionality.lua b/worldedit_gui/functionality.lua index 9dda5f54..2efbf9ae 100644 --- a/worldedit_gui/functionality.lua +++ b/worldedit_gui/functionality.lua @@ -461,8 +461,8 @@ worldedit.register_gui_handler("worldedit_gui_pyramid", function(name, fields) local n = worldedit.normalize_nodename(gui_nodename1[name]) if n then execute_worldedit_command(submit, name, - axis_values[gui_axis1[name]] .. " " .. gui_distance1[name] .. - " " .. n) + string.format("%s %s %s", axis_values[gui_axis1[name]], + gui_distance1[name], n)) end return true end @@ -691,7 +691,7 @@ worldedit.register_gui_handler("worldedit_gui_rotate", function(name, fields) worldedit.show_page(name, "worldedit_gui_rotate") execute_worldedit_command("rotate", name, - axis_values[gui_axis1[name]] .. angle_values[gui_angle[name]]) + axis_values[gui_axis1[name]] .. " " .. angle_values[gui_angle[name]]) return true end return ret