update ambience, cottages, bakedclay, cooltrees, basic_materials, bees,

blox, bonemeal, homedecor, cblocks, currency, digilines, digistuff,
farming_redo, gloopblocks, jumping, mesecons, moreblocks, pipeworks,
quartz, signs_lib, technic, unified_inventory, unifieddyes, and
worldedit
master
VanessaE 2021-02-19 09:38:37 -05:00
parent 1c425e2a31
commit 11adf56b75
1354 changed files with 96289 additions and 91044 deletions

View File

@ -129,11 +129,13 @@ local get_ambience = function(player, tod, name)
pos.y = pos.y + 1.4 -- head level pos.y = pos.y + 1.4 -- head level
local nod_head = pplus and playerplus[name].nod_head or minetest.get_node(pos).name local nod_head = pplus and name and playerplus[name].nod_head or
minetest.get_node(pos).name
pos.y = pos.y - 1.2 -- foot level pos.y = pos.y - 1.2 -- foot level
local nod_feet = pplus and playerplus[name].nod_feet or minetest.get_node(pos).name local nod_feet = pplus and name and playerplus[name].nod_feet or
minetest.get_node(pos).name
pos.y = pos.y - 0.2 -- reset pos pos.y = pos.y - 0.2 -- reset pos

View File

@ -1 +1,4 @@
name = ambience name = ambience
depends = default
optional_depends = fire, playerplus
description = Adds realistic sound effects into your world.

View File

@ -191,10 +191,25 @@ minetest.register_node("anvil:anvil", {
inv:set_size("input", 1) inv:set_size("input", 1)
end, end,
after_place_node = function(pos, placer) after_place_node = function(pos, placer, itemstack)
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
local stackmeta = itemstack:get_meta()
if stackmeta:get_int("shared") == 1 then
meta:set_int("shared", 1)
meta:set_string("infotext", S("Shared anvil"))
else
meta:set_string("owner", placer:get_player_name() or "") meta:set_string("owner", placer:get_player_name() or "")
meta:set_string("infotext", S("@1's anvil", placer:get_player_name())) meta:set_string("infotext", S("@1's anvil", placer:get_player_name()))
end
end,
preserve_metadata = function(pos, oldnode, oldmeta, drops)
if next(drops) and tonumber(oldmeta.shared) == 1 then
local meta = drops[next(drops)]:get_meta()
meta:set_int("shared", 1)
meta:set_string("description", S("Shared anvil"))
end
return drops
end, end,
can_dig = function(pos,player) can_dig = function(pos,player)
@ -245,8 +260,9 @@ minetest.register_node("anvil:anvil", {
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
local name = clicker:get_player_name() local name = clicker:get_player_name()
local owner = meta:get_string("owner") local owner = meta:get_string("owner")
local shared = meta:get_int("shared") == 1
if name ~= owner then return itemstack end if name ~= owner and not shared then return itemstack end
if itemstack:get_count() == 0 then if itemstack:get_count() == 0 then
local inv = meta:get_inventory() local inv = meta:get_inventory()
if not inv:is_empty("input") then if not inv:is_empty("input") then
@ -254,7 +270,11 @@ minetest.register_node("anvil:anvil", {
inv:set_stack("input", 1, nil) inv:set_stack("input", 1, nil)
local wield_index = clicker:get_wield_index() local wield_index = clicker:get_wield_index()
clicker:get_inventory():set_stack("main", wield_index, return_stack) clicker:get_inventory():set_stack("main", wield_index, return_stack)
if shared then
meta:set_string("infotext", S("Shared anvil"))
else
meta:set_string("infotext", S("@1's anvil", owner)) meta:set_string("infotext", S("@1's anvil", owner))
end
remove_item(pos, node) remove_item(pos, node)
return return_stack return return_stack
end end
@ -267,8 +287,12 @@ minetest.register_node("anvil:anvil", {
inv:add_item("input", s) inv:add_item("input", s)
local meta_description = s:get_meta():get_string("description") local meta_description = s:get_meta():get_string("description")
if "" ~= meta_description then if "" ~= meta_description then
if shared then
meta:set_string("infotext", S("Shared anvil"))
else
meta:set_string("infotext", S("@1's anvil", owner) .. "\n" .. meta_description) meta:set_string("infotext", S("@1's anvil", owner) .. "\n" .. meta_description)
end end
end
meta:set_int("informed", 0) meta:set_int("informed", 0)
update_item(pos,node) update_item(pos,node)
end end
@ -285,7 +309,8 @@ minetest.register_node("anvil:anvil", {
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
local inv = meta:get_inventory() local inv = meta:get_inventory()
local owner = meta:get_string("owner") local owner = meta:get_string("owner")
if owner ~= puncher:get_player_name() then local shared = meta:get_int("shared") == 1
if owner ~= puncher:get_player_name() and not shared then
return return
end end
@ -295,7 +320,11 @@ minetest.register_node("anvil:anvil", {
inv:set_stack("input", 1, nil) inv:set_stack("input", 1, nil)
local wield_index = puncher:get_wield_index() local wield_index = puncher:get_wield_index()
puncher:get_inventory():set_stack("main", wield_index, return_stack) puncher:get_inventory():set_stack("main", wield_index, return_stack)
if shared then
meta:set_string("infotext", S("Shared anvil"))
else
meta:set_string("infotext", S("@1's anvil", owner)) meta:set_string("infotext", S("@1's anvil", owner))
end
remove_item(pos, node) remove_item(pos, node)
end end
end end
@ -432,6 +461,21 @@ minetest.register_lbm({
--------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------
-- crafting receipes -- crafting receipes
--------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------
minetest.register_craft({
output = "anvil:anvil",
type = "shapeless",
recipe = { "anvil:anvil" }
})
local shared_anvil_craft_stack = ItemStack("anvil:anvil")
shared_anvil_craft_stack:get_meta():set_int("shared", 1)
shared_anvil_craft_stack:get_meta():set_string("description", S("Shared anvil"))
minetest.register_craft({
output = shared_anvil_craft_stack:to_string(),
type = "shapeless",
recipe = { "anvil:anvil", "default:paper" }
})
minetest.register_craft({ minetest.register_craft({
output = "anvil:anvil", output = "anvil:anvil",
recipe = { recipe = {

View File

@ -18,6 +18,8 @@ Anvil=Amboss
#WARNING: AUTOTRANSLATED BY GOOGLE TRANSLATE #WARNING: AUTOTRANSLATED BY GOOGLE TRANSLATE
Right-click on this anvil with a damaged tool to place the damaged tool upon it. You can then repair the damaged tool by striking it with a blacksmith's hammer. Repeated blows may be necessary to fully repair a badly worn tool. To retrieve the tool either punch or right-click the anvil with an empty hand.=Klicken Sie mit einem beschädigten Werkzeug mit der rechten Maustaste auf diesen Amboss, um das beschädigte Werkzeug darauf zu platzieren. Sie können das beschädigte Werkzeug dann reparieren, indem Sie es mit einem Schmiedehammer schlagen. Wiederholte Schläge können erforderlich sein, um ein stark abgenutztes Werkzeug vollständig zu reparieren. Um das Werkzeug abzurufen, schlagen Sie entweder mit einer leeren Hand auf den Amboss oder klicken Sie mit der rechten Maustaste darauf. Right-click on this anvil with a damaged tool to place the damaged tool upon it. You can then repair the damaged tool by striking it with a blacksmith's hammer. Repeated blows may be necessary to fully repair a badly worn tool. To retrieve the tool either punch or right-click the anvil with an empty hand.=Klicken Sie mit einem beschädigten Werkzeug mit der rechten Maustaste auf diesen Amboss, um das beschädigte Werkzeug darauf zu platzieren. Sie können das beschädigte Werkzeug dann reparieren, indem Sie es mit einem Schmiedehammer schlagen. Wiederholte Schläge können erforderlich sein, um ein stark abgenutztes Werkzeug vollständig zu reparieren. Um das Werkzeug abzurufen, schlagen Sie entweder mit einer leeren Hand auf den Amboss oder klicken Sie mit der rechten Maustaste darauf.
#WARNING: AUTOTRANSLATED BY GOOGLE TRANSLATE
Shared anvil=Geteilter Amboss
#WARNING: AUTOTRANSLATED BY GOOGLE TRANSLATE #WARNING: AUTOTRANSLATED BY GOOGLE TRANSLATE
Steel blacksmithing hammer=Stahlschmiedehammer Steel blacksmithing hammer=Stahlschmiedehammer
This anvil is for damaged tools only.=Das Werkstueckfeld gilt nur fuer beschaedigtes Werkzeug. This anvil is for damaged tools only.=Das Werkstueckfeld gilt nur fuer beschaedigtes Werkzeug.

View File

@ -16,6 +16,8 @@ Anvil=Yunque
Right-click on this anvil with a damaged tool to place the damaged tool upon it. You can then repair the damaged tool by striking it with a blacksmith's hammer. Repeated blows may be necessary to fully repair a badly worn tool. To retrieve the tool either punch or right-click the anvil with an empty hand.=Haga clic derecho sobre este yunque con una herramienta dañada Puede reparar la herramienta dañada golpeándola con el martillo del herrero Para reparar completamente una herramienta puede dar varios golpes Para sacar la herramienta, golpeela con la mano vacia o tambien con un clic derecho Right-click on this anvil with a damaged tool to place the damaged tool upon it. You can then repair the damaged tool by striking it with a blacksmith's hammer. Repeated blows may be necessary to fully repair a badly worn tool. To retrieve the tool either punch or right-click the anvil with an empty hand.=Haga clic derecho sobre este yunque con una herramienta dañada Puede reparar la herramienta dañada golpeándola con el martillo del herrero Para reparar completamente una herramienta puede dar varios golpes Para sacar la herramienta, golpeela con la mano vacia o tambien con un clic derecho
#WARNING: AUTOTRANSLATED BY GOOGLE TRANSLATE
Shared anvil=Yunque compartido
Steel blacksmithing hammer=Martillo de acero para la herrería Steel blacksmithing hammer=Martillo de acero para la herrería
This anvil is for damaged tools only.=Este yunque es sólo para herramientas dañadas This anvil is for damaged tools only.=Este yunque es sólo para herramientas dañadas

View File

@ -14,6 +14,8 @@ Anvil=Enclume
Right-click on this anvil with a damaged tool to place the damaged tool upon it. You can then repair the damaged tool by striking it with a blacksmith's hammer. Repeated blows may be necessary to fully repair a badly worn tool. To retrieve the tool either punch or right-click the anvil with an empty hand.=Cliquez-droit sur cette enclume avec un outil endommagé pour le placer dessus. Vous pourrez alors réparer l'outil endommagé en le frappant avec un marteau de forgeron. Des coups successifs seront nécessaires pour réparer l'outil entièrement. Pour récupérer l'outil, frappez dessus ou faites un click-droit en ayant la main vide. Right-click on this anvil with a damaged tool to place the damaged tool upon it. You can then repair the damaged tool by striking it with a blacksmith's hammer. Repeated blows may be necessary to fully repair a badly worn tool. To retrieve the tool either punch or right-click the anvil with an empty hand.=Cliquez-droit sur cette enclume avec un outil endommagé pour le placer dessus. Vous pourrez alors réparer l'outil endommagé en le frappant avec un marteau de forgeron. Des coups successifs seront nécessaires pour réparer l'outil entièrement. Pour récupérer l'outil, frappez dessus ou faites un click-droit en ayant la main vide.
#WARNING: AUTOTRANSLATED BY GOOGLE TRANSLATE
Shared anvil=Enclume partagée
Steel blacksmithing hammer=Marteau de forgeron en acier Steel blacksmithing hammer=Marteau de forgeron en acier
This anvil is for damaged tools only.=L'enclume s'utilise sur les outils endommagés. This anvil is for damaged tools only.=L'enclume s'utilise sur les outils endommagés.

View File

@ -16,6 +16,8 @@ Anvil=Incudine
Right-click on this anvil with a damaged tool to place the damaged tool upon it. You can then repair the damaged tool by striking it with a blacksmith's hammer. Repeated blows may be necessary to fully repair a badly worn tool. To retrieve the tool either punch or right-click the anvil with an empty hand.=Fate click destro su questa incudine con un attrezzo danneggiato per metterlo sull'incudine. Poi potrete ripararlo colpendolo con un martello da fabbro. Potrebbero essere necessari più colpi per riparare un attrezzo gravemente danneggiato. Per riprendere l'attrezzo colpite o fate click destro sull'incudine a mani vuote. Right-click on this anvil with a damaged tool to place the damaged tool upon it. You can then repair the damaged tool by striking it with a blacksmith's hammer. Repeated blows may be necessary to fully repair a badly worn tool. To retrieve the tool either punch or right-click the anvil with an empty hand.=Fate click destro su questa incudine con un attrezzo danneggiato per metterlo sull'incudine. Poi potrete ripararlo colpendolo con un martello da fabbro. Potrebbero essere necessari più colpi per riparare un attrezzo gravemente danneggiato. Per riprendere l'attrezzo colpite o fate click destro sull'incudine a mani vuote.
#WARNING: AUTOTRANSLATED BY GOOGLE TRANSLATE
Shared anvil=Incudine condivisa
Steel blacksmithing hammer=Martello da fabbro di acciaio Steel blacksmithing hammer=Martello da fabbro di acciaio
This anvil is for damaged tools only.=Questa incudine è solo per attrezzi danneggiati. This anvil is for damaged tools only.=Questa incudine è solo per attrezzi danneggiati.

View File

@ -14,6 +14,7 @@ Anvil=
Right-click on this anvil with a damaged tool to place the damaged tool upon it. You can then repair the damaged tool by striking it with a blacksmith's hammer. Repeated blows may be necessary to fully repair a badly worn tool. To retrieve the tool either punch or right-click the anvil with an empty hand.= Right-click on this anvil with a damaged tool to place the damaged tool upon it. You can then repair the damaged tool by striking it with a blacksmith's hammer. Repeated blows may be necessary to fully repair a badly worn tool. To retrieve the tool either punch or right-click the anvil with an empty hand.=
Shared anvil=
Steel blacksmithing hammer= Steel blacksmithing hammer=
This anvil is for damaged tools only.= This anvil is for damaged tools only.=

View File

@ -1 +1,4 @@
name = bakedclay name = bakedclay
depends = default
optional_depends = stairs, moreblocks, lucky_block, technic_cnc
description = Adds the ability to bake clay into blocks and colour them with dye.

View File

@ -117,8 +117,6 @@ minetest.register_node("baldcypress:leaves", {
description = S("Bald Cypress Leaves"), description = S("Bald Cypress Leaves"),
drawtype = "allfaces_optional", drawtype = "allfaces_optional",
tiles = {"baldcypress_leaves.png"}, tiles = {"baldcypress_leaves.png"},
inventory_image = "baldcypress_leaves.png",
wield_image = "baldcypress_leaves.png",
paramtype = "light", paramtype = "light",
walkable = true, walkable = true,
waving = 1, waving = 1,
@ -141,6 +139,7 @@ minetest.register_node("baldcypress:dry_branches", {
paramtype = "light", paramtype = "light",
paramtype2 = "facedir", paramtype2 = "facedir",
tiles = {"baldcypress_dry_branches.png"}, tiles = {"baldcypress_dry_branches.png"},
use_texture_alpha = true,
inventory_image = "baldcypress_dry_branches.png", inventory_image = "baldcypress_dry_branches.png",
wield_image = "baldcypress_dry_branches.png", wield_image = "baldcypress_dry_branches.png",
node_box = { node_box = {
@ -160,6 +159,7 @@ minetest.register_node("baldcypress:liana", {
paramtype = "light", paramtype = "light",
paramtype2 = "facedir", paramtype2 = "facedir",
tiles = {"baldcypress_liana.png"}, tiles = {"baldcypress_liana.png"},
use_texture_alpha = true,
inventory_image = "baldcypress_liana.png", inventory_image = "baldcypress_liana.png",
wield_image = "baldcypress_liana.png", wield_image = "baldcypress_liana.png",
is_ground_content = false, is_ground_content = false,

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.0 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 887 B

After

Width:  |  Height:  |  Size: 3.0 KiB

View File

@ -146,7 +146,8 @@ minetest.register_node("bamboo:trunk", {
wield_image = "bamboo.png", wield_image = "bamboo.png",
paramtype = "light", paramtype = "light",
sunlight_propagates = true, sunlight_propagates = true,
walkable = true, walkable = false,
climbable = true,
selection_box = { selection_box = {
type = "fixed", type = "fixed",
fixed = {-0.3, -0.5, -0.3, 0.3, 0.5, 0.3} fixed = {-0.3, -0.5, -0.3, 0.3, 0.5, 0.3}
@ -176,10 +177,9 @@ minetest.register_node("bamboo:leaves", {
description = S("Bamboo Leaves"), description = S("Bamboo Leaves"),
drawtype = "allfaces_optional", drawtype = "allfaces_optional",
tiles = {"bamboo_leaves.png"}, tiles = {"bamboo_leaves.png"},
inventory_image = "bamboo_leaves.png",
wield_image = "bamboo_leaves.png",
paramtype = "light", paramtype = "light",
walkable = true, walkable = false,
climbable = true,
waving = 1, waving = 1,
groups = {snappy = 3, leafdecay = 3, leaves = 1, flammable = 2}, groups = {snappy = 3, leafdecay = 3, leaves = 1, flammable = 2},
drop = { drop = {

View File

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -0,0 +1,34 @@
# textdomain: basic_materials
# Author: Salvo 'LtWorf' Tomaselli <tiposchi@tiscali.it>
Silicon lump=Grumo di silicio
Simple Integrated Circuit=Circuito integrato semplice
Simple Motor=Motore semplice
Heating element=Elemento riscaldante
Simple energy crystal=Cristallo di energia semplice
Spool of steel wire=Bobina di filo d'acciaio
Spool of copper wire=Bobina di filo di rame
Spool of silver wire=Bobina di filo d'argento
Spool of gold wire=Bobina di filo d'oro
Steel Strip=Striscia d'acciaio
Copper Strip=Striscia di rame
Steel Bar=Barra d'acciaio
Chainlinks (brass)=Catena (ottone)
Chainlinks (steel)=Catena (acciaio)
Brass Ingot=Lingotto di ottone
Steel gear=Ingranaggio d'acciaio
Padlock=Catenaccio
Chain (steel, hanging)=Catena (acciaio, pendente)
Chain (brass, hanging)=Catena (ottone, pendente)
Brass Block=Blocco di ottone
Oil extract=Estratto d'olio
Unprocessed paraffin=Paraffina grezza
Uncooked Terracotta Base=Argilla cruda
Wet Cement=Cemento umido
Cement=Cemento
Concrete Block=Blocco di calcestruzzo
Plastic sheet=Foglio di plastica
Plastic strips=Striscia di plastica
Empty wire spool=Rocchetto vuoto

View File

@ -1 +1 @@
This mod adds bees and beehives into minetest Adds bees and hives to Minetest.

View File

@ -14,7 +14,9 @@ else
end end
--
-- FUNCTIONS -- FUNCTIONS
--
local floor = math.floor local floor = math.floor
local random = math.random local random = math.random
@ -55,15 +57,17 @@ local polinate_flower = function(pos, flower)
} }
local floor_pos = {x = spawn_pos.x, y = spawn_pos.y - 1, z = spawn_pos.z} local floor_pos = {x = spawn_pos.x, y = spawn_pos.y - 1, z = spawn_pos.z}
local spawn = minetest.get_node(spawn_pos).name local spawn = minetest.get_node(spawn_pos).name
local floor = minetest.get_node(floor_pos).name local floorn = minetest.get_node(floor_pos).name
if floor == "group:soil" and spawn == "air" then if floorn == "group:soil" and spawn == "air" then
minetest.set_node(spawn_pos, {name = flower}) minetest.set_node(spawn_pos, {name = flower})
end end
end end
--
-- NODES -- NODES
--
minetest.register_node("bees:extractor", { minetest.register_node("bees:extractor", {
description = S("Honey Extractor"), description = S("Honey Extractor"),
@ -77,11 +81,11 @@ minetest.register_node("bees:extractor", {
tubedevice_receiver = 1 tubedevice_receiver = 1
}, },
on_construct = function(pos, node) on_construct = function(pos)
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
local inv = meta:get_inventory() local inv = meta:get_inventory()
local pos = pos.x .. "," .. pos.y .. "," .. pos.z pos = pos.x .. "," .. pos.y .. "," .. pos.z
inv:set_size("frames_filled", 1) inv:set_size("frames_filled", 1)
inv:set_size("frames_emptied", 1) inv:set_size("frames_emptied", 1)
@ -90,22 +94,23 @@ minetest.register_node("bees:extractor", {
inv:set_size("wax", 1) inv:set_size("wax", 1)
meta:set_string("formspec", "size[8,9]" meta:set_string("formspec", "size[8,9]"
--input -- input
.. "list[nodemeta:"..pos..";frames_filled;2,1;1,1;]" .. "list[nodemeta:"..pos..";frames_filled;2,1;1,1;]"
.. "list[nodemeta:"..pos..";bottles_empty;2,3;1,1;]" .. "list[nodemeta:"..pos..";bottles_empty;2,3;1,1;]"
--output -- output
.. "list[nodemeta:"..pos..";frames_emptied;5,0.5;1,1;]" .. "list[nodemeta:"..pos..";frames_emptied;5,0.5;1,1;]"
.. "list[nodemeta:"..pos..";wax;5,2;1,1;]" .. "list[nodemeta:"..pos..";wax;5,2;1,1;]"
.. "list[nodemeta:"..pos..";bottles_full;5,3.5;1,1;]" .. "list[nodemeta:"..pos..";bottles_full;5,3.5;1,1;]"
--player inventory -- player inventory
.. "list[current_player;main;0,5;8,4;]" .. "list[current_player;main;0,5;8,4;]"
) )
end, end,
on_timer = function(pos, node) on_timer = function(pos)
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
local inv = meta:get_inventory() local inv = meta:get_inventory()
local timer = minetest.get_node_timer(pos)
if not inv:contains_item("frames_filled", "bees:frame_full") if not inv:contains_item("frames_filled", "bees:frame_full")
or not inv:contains_item("bottles_empty", "vessels:glass_bottle") then or not inv:contains_item("bottles_empty", "vessels:glass_bottle") then
@ -116,48 +121,38 @@ minetest.register_node("bees:extractor", {
and inv:room_for_item("wax", "bees:wax") and inv:room_for_item("wax", "bees:wax")
and inv:room_for_item("bottles_full", "bees:bottle_honey") then and inv:room_for_item("bottles_full", "bees:bottle_honey") then
--add to output -- add to output
inv:add_item("frames_emptied", "bees:frame_empty") inv:add_item("frames_emptied", "bees:frame_empty")
inv:add_item("wax", "bees:wax") inv:add_item("wax", "bees:wax")
inv:add_item("bottles_full", "bees:bottle_honey") inv:add_item("bottles_full", "bees:bottle_honey")
--remove from input -- remove from input
inv:remove_item("bottles_empty", "vessels:glass_bottle") inv:remove_item("bottles_empty", "vessels:glass_bottle")
inv:remove_item("frames_filled", "bees:frame_full") inv:remove_item("frames_filled", "bees:frame_full")
local p = { -- wax flying all over the place
x = pos.x + random() - 0.5,
y = pos.y + random() - 0.5,
z = pos.z + random() - 0.5
}
--wax flying all over the place
minetest.add_particle({ minetest.add_particle({
pos = {x = pos.x, y = pos.y, z = pos.z}, pos = {x = pos.x, y = pos.y, z = pos.z},
vel = { velocity = {
x = random(-1, 1), x = random(-1, 1),
y = random(4), y = random(4),
z = random(-1, 1) z = random(-1, 1)
}, },
acc = {x = 0, y = -6, z = 0}, acceleration = {x = 0, y = -6, z = 0},
expirationtime = 2, expirationtime = 2,
size = random(1, 3), size = random(1, 3),
collisiondetection = false, collisiondetection = false,
texture = "bees_wax_particle.png", texture = "bees_wax_particle.png",
}) })
local timer = minetest.get_node_timer(pos)
timer:start(5) timer:start(5)
else else
local timer = minetest.get_node_timer(pos) timer:start(5) -- try again in 5 seconds (was 1)
timer:start(5) -- Try again in 5 seconds (was 1)
end end
end, end,
tube = { tube = {
insert_object = function(pos, node, stack, direction) insert_object = function(pos, _, stack)
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
local inv = meta:get_inventory() local inv = meta:get_inventory()
@ -183,18 +178,18 @@ minetest.register_node("bees:extractor", {
return stack return stack
end, end,
can_insert = function(pos,node,stack,direction) can_insert = function(pos, _, stack)
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
local inv = meta:get_inventory() local inv = meta:get_inventory()
if stack:get_name() == "bees:frame_full" then if stack:get_name() == "bees:frame_full" then
return inv:room_for_item("frames_filled",stack) return inv:room_for_item("frames_filled", stack)
elseif stack:get_name() == "vessels:glass_bottle" then elseif stack:get_name() == "vessels:glass_bottle" then
return inv:room_for_item("bottles_empty",stack) return inv:room_for_item("bottles_empty", stack)
end end
return false return false
@ -205,7 +200,7 @@ minetest.register_node("bees:extractor", {
connect_sides = {left = 1, right = 1, back = 1, front = 1, bottom = 1, top = 1} connect_sides = {left = 1, right = 1, back = 1, front = 1, bottom = 1, top = 1}
}, },
on_metadata_inventory_put = function(pos, listname, index, stack, player) on_metadata_inventory_put = function(pos, listname, _, stack)
local timer = minetest.get_node_timer(pos) local timer = minetest.get_node_timer(pos)
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
@ -217,7 +212,7 @@ minetest.register_node("bees:extractor", {
end end
end, end,
allow_metadata_inventory_put = function(pos, listname, index, stack, player) allow_metadata_inventory_put = function(_, listname, _, stack)
if (listname == "bottles_empty" and stack:get_name() == "vessels:glass_bottle") if (listname == "bottles_empty" and stack:get_name() == "vessels:glass_bottle")
or (listname == "frames_filled" and stack:get_name() == "bees:frame_full") then or (listname == "frames_filled" and stack:get_name() == "bees:frame_full") then
@ -227,11 +222,11 @@ minetest.register_node("bees:extractor", {
end end
end, end,
allow_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player) allow_metadata_inventory_move = function()
return 0 return 0
end, end,
allow_metadata_inventory_take = function(pos, listname, index, stack, player) allow_metadata_inventory_take = function(pos, _, _, stack, player)
if player and minetest.is_protected(pos, player:get_player_name()) then if player and minetest.is_protected(pos, player:get_player_name()) then
return 0 return 0
@ -247,14 +242,12 @@ minetest.register_node("bees:bees", {
drawtype = "plantlike", drawtype = "plantlike",
paramtype = "light", paramtype = "light",
groups = {not_in_creative_inventory = 1}, groups = {not_in_creative_inventory = 1},
tiles = { tiles = {{
{
name = "bees_strip.png", name = "bees_strip.png",
animation = { animation = {
type = "vertical_frames", aspect_w = 16, aspect_h = 16, length = 2.0 type = "vertical_frames", aspect_w = 16, aspect_h = 16, length = 2.0
} }
} }},
},
damage_per_second = 1, damage_per_second = 1,
walkable = false, walkable = false,
buildable_to = true, buildable_to = true,
@ -265,8 +258,7 @@ minetest.register_node("bees:bees", {
} }
}, },
on_punch = function(pos, node, puncher) on_punch = function(_, _, puncher)
puncher:set_hp(puncher:get_hp() - 2) puncher:set_hp(puncher:get_hp() - 2)
end, end,
}) })
@ -274,7 +266,7 @@ minetest.register_node("bees:bees", {
minetest.register_node("bees:hive_wild", { minetest.register_node("bees:hive_wild", {
description = S("Wild Bee Hive"), description = S("Wild Bee Hive"),
tiles = { --Neuromancer"s base texture tiles = { -- Neuromancer's base texture
"bees_hive_wild.png", "bees_hive_wild.png", "bees_hive_wild.png", "bees_hive_wild.png", "bees_hive_wild.png", "bees_hive_wild.png",
"bees_hive_wild.png", "bees_hive_wild_bottom.png" "bees_hive_wild.png", "bees_hive_wild_bottom.png"
}, },
@ -284,17 +276,17 @@ minetest.register_node("bees:hive_wild", {
drop = { drop = {
max_items = 6, max_items = 6,
items = { items = {
{ items = {"bees:honey_comb"}, rarity = 5} {items = {"bees:honey_comb"}, rarity = 5}
} }
}, },
groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 3, attached_node = 1}, groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 3, attached_node = 1},
node_box = { --VanessaE's wild hive nodebox contribution node_box = { -- VanessaE's wild hive nodebox contribution
type = "fixed", type = "fixed",
fixed = { fixed = {
{-0.250000,-0.500000,-0.250000,0.250000,0.375000,0.250000}, --NodeBox 2 {-0.25, -0.5, -0.25, 0.25, 0.375, 0.25},
{-0.312500,-0.375000,-0.312500,0.312500,0.250000,0.312500}, --NodeBox 4 {-0.3125, -0.375, -0.3125, 0.3125, 0.25, 0.3125},
{-0.375000,-0.250000,-0.375000,0.375000,0.125000,0.375000}, --NodeBox 5 {-0.375, -0.25, -0.375, 0.375, 0.125, 0.375},
{-0.062500,-0.500000,-0.062500,0.062500,0.500000,0.062500}, --NodeBox 6 {-0.0625, -0.5, -0.0625, 0.0625, 0.5, 0.0625},
} }
}, },
@ -328,7 +320,7 @@ minetest.register_node("bees:hive_wild", {
local stacks = inv:get_list("combs") local stacks = inv:get_list("combs")
for k, v in pairs(stacks) do for k, _ in pairs(stacks) do
if inv:get_stack("combs", k):is_empty() then if inv:get_stack("combs", k):is_empty() then
@ -339,7 +331,7 @@ minetest.register_node("bees:hive_wild", {
return return
end end
end end
--what to do if all combs are filled -- what to do if all combs are filled
end, end,
on_construct = function(pos) on_construct = function(pos)
@ -363,7 +355,7 @@ minetest.register_node("bees:hive_wild", {
end end
end, end,
on_punch = function(pos, node, puncher) on_punch = function(pos, _, puncher)
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
local inv = meta:get_inventory() local inv = meta:get_inventory()
@ -374,7 +366,7 @@ minetest.register_node("bees:hive_wild", {
end end
end, end,
on_metadata_inventory_take = function(pos, listname, index, stack, taker) on_metadata_inventory_take = function(pos, listname, _, _, taker)
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
local inv = meta:get_inventory() local inv = meta:get_inventory()
@ -388,7 +380,7 @@ minetest.register_node("bees:hive_wild", {
end end
end, end,
on_metadata_inventory_put = function(pos, listname, index, stack, taker) on_metadata_inventory_put = function(pos)
local timer = minetest.get_node_timer(pos) local timer = minetest.get_node_timer(pos)
@ -397,9 +389,9 @@ minetest.register_node("bees:hive_wild", {
end end
end, end,
allow_metadata_inventory_put = function(pos, listname, index, stack, player) allow_metadata_inventory_put = function(_, listname, _, stack)
--restart the colony by adding a queen -- restart the colony by adding a queen
if listname == "queen" and stack:get_name() == "bees:queen" then if listname == "queen" and stack:get_name() == "bees:queen" then
return 1 return 1
else else
@ -407,7 +399,7 @@ minetest.register_node("bees:hive_wild", {
end end
end, end,
on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) on_rightclick = function(pos, _, clicker, itemstack)
minetest.show_formspec(clicker:get_player_name(), minetest.show_formspec(clicker:get_player_name(),
"bees:hive_artificial", "bees:hive_artificial",
@ -426,7 +418,7 @@ minetest.register_node("bees:hive_wild", {
end end
end, end,
can_dig = function(pos,player) can_dig = function(pos)
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
local inv = meta:get_inventory() local inv = meta:get_inventory()
@ -438,10 +430,9 @@ minetest.register_node("bees:hive_wild", {
end end
end, end,
after_dig_node = function(pos, oldnode, oldmetadata, user) after_dig_node = function(_, _, _, user)
local wielded local wielded
if user:get_wielded_item() ~= nil then if user:get_wielded_item() ~= nil then
wielded = user:get_wielded_item() wielded = user:get_wielded_item()
else else
@ -488,7 +479,6 @@ minetest.register_node("bees:hive_artificial", {
on_construct = function(pos) on_construct = function(pos)
local timer = minetest.get_node_timer(pos)
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
local inv = meta:get_inventory() local inv = meta:get_inventory()
@ -500,13 +490,15 @@ minetest.register_node("bees:hive_artificial", {
meta:set_string("infotext", S("Requires Queen bee to function")) meta:set_string("infotext", S("Requires Queen bee to function"))
end, end,
on_rightclick = function(pos, node, clicker, itemstack) on_rightclick = function(pos, _, clicker)
if minetest.is_protected(pos, clicker:get_player_name()) then local player_name = clicker:get_player_name()
if minetest.is_protected(pos, player_name) then
return return
end end
minetest.show_formspec(clicker:get_player_name(), minetest.show_formspec(player_name,
"bees:hive_artificial", "bees:hive_artificial",
hive_artificial(pos) hive_artificial(pos)
) )
@ -523,7 +515,7 @@ minetest.register_node("bees:hive_artificial", {
end end
end, end,
on_timer = function(pos,elapsed) on_timer = function(pos)
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
local inv = meta:get_inventory() local inv = meta:get_inventory()
@ -555,7 +547,7 @@ minetest.register_node("bees:hive_artificial", {
local stacks = inv:get_list("frames") local stacks = inv:get_list("frames")
for k, v in pairs(stacks) do for k, _ in pairs(stacks) do
if inv:get_stack("frames", k):get_name() == "bees:frame_empty" then if inv:get_stack("frames", k):get_name() == "bees:frame_empty" then
@ -578,7 +570,7 @@ minetest.register_node("bees:hive_artificial", {
end end
end, end,
on_metadata_inventory_take = function(pos, listname, index, stack, player) on_metadata_inventory_take = function(pos, listname)
if listname == "queen" then if listname == "queen" then
@ -591,7 +583,7 @@ minetest.register_node("bees:hive_artificial", {
end end
end, end,
allow_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player) allow_metadata_inventory_move = function(pos, from_list, _, to_list, to_index)
local inv = minetest.get_meta(pos):get_inventory() local inv = minetest.get_meta(pos):get_inventory()
@ -607,7 +599,7 @@ minetest.register_node("bees:hive_artificial", {
end end
end, end,
on_metadata_inventory_put = function(pos, listname, index, stack, player) on_metadata_inventory_put = function(pos, listname, _, stack)
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
local inv = meta:get_inventory() local inv = meta:get_inventory()
@ -627,7 +619,7 @@ minetest.register_node("bees:hive_artificial", {
end end
end, end,
allow_metadata_inventory_put = function(pos, listname, index, stack, player) allow_metadata_inventory_put = function(pos, listname, index, stack)
if not minetest.get_meta(pos):get_inventory():get_stack(listname, index):is_empty() then return 0 end if not minetest.get_meta(pos):get_inventory():get_stack(listname, index):is_empty() then return 0 end
@ -648,7 +640,10 @@ minetest.register_node("bees:hive_artificial", {
end, end,
}) })
-- ABMS
--
-- ABMs
--
minetest.register_abm({ minetest.register_abm({
nodenames = {"bees:hive_artificial", "bees:hive_wild", "bees:hive_industrial"}, nodenames = {"bees:hive_artificial", "bees:hive_wild", "bees:hive_industrial"},
@ -660,12 +655,12 @@ minetest.register_abm({
-- Bee particle -- Bee particle
minetest.add_particle({ minetest.add_particle({
pos = {x = pos.x, y = pos.y, z = pos.z}, pos = {x = pos.x, y = pos.y, z = pos.z},
vel = { velocity = {
x = (random() - 0.5) * 5, x = (random() - 0.5) * 5,
y = (random() - 0.5) * 5, y = (random() - 0.5) * 5,
z = (random() - 0.5) * 5 z = (random() - 0.5) * 5
}, },
acc = { acceleration = {
x = random() - 0.5, x = random() - 0.5,
y = random() - 0.5, y = random() - 0.5,
z = random() - 0.5 z = random() - 0.5
@ -692,14 +687,14 @@ minetest.register_abm({
}) })
-- spawn abm. This should be changed to a more realistic type of spawning -- spawn ABM. This should be changed to a more realistic type of spawning
minetest.register_abm({ minetest.register_abm({
nodenames = {"group:leaves"}, nodenames = {"group:leaves"},
neighbors = {"air"}, neighbors = {"air"},
interval = 800,--1600, interval = 800,
chance = 10,--20, chance = 10,
action = function(pos, node) action = function(pos)
if floor(pos.x / 40) ~= pos.x / 40 if floor(pos.x / 40) ~= pos.x / 40
or floor(pos.z / 40) ~= pos.z / 40 or floor(pos.z / 40) ~= pos.z / 40
@ -725,7 +720,7 @@ minetest.register_abm({
interval = 30, interval = 30,
chance = 4, chance = 4,
action = function(pos, node, _, _) action = function(pos)
local p = { local p = {
x = pos.x + random(-5, 5), x = pos.x + random(-5, 5),
@ -746,13 +741,15 @@ minetest.register_abm({
interval = 30, interval = 30,
chance = 5, chance = 5,
action = function(pos, node, _, _) action = function(pos)
minetest.remove_node(pos) minetest.remove_node(pos)
end, end,
}) })
--
-- ITEMS -- ITEMS
--
minetest.register_craftitem("bees:frame_empty", { minetest.register_craftitem("bees:frame_empty", {
description = S("Empty hive frame"), description = S("Empty hive frame"),
@ -794,7 +791,9 @@ minetest.register_craftitem("bees:queen", {
}) })
--
-- CRAFTS -- CRAFTS
--
minetest.register_craft({ minetest.register_craft({
output = "bees:extractor", output = "bees:extractor",
@ -852,7 +851,9 @@ if minetest.get_modpath("bushes_classic") then
end end
--
-- TOOLS -- TOOLS
--
minetest.register_tool("bees:smoker", { minetest.register_tool("bees:smoker", {
description = S("smoker"), description = S("smoker"),
@ -863,7 +864,7 @@ minetest.register_tool("bees:smoker", {
damage_groups = {fleshy = 2}, damage_groups = {fleshy = 2},
}, },
on_use = function(itemstack, user, pointed_thing) on_use = function(itemstack, _, pointed_thing)
if pointed_thing.type ~= "node" then if pointed_thing.type ~= "node" then
return return
@ -879,8 +880,8 @@ minetest.register_tool("bees:smoker", {
y = pos.y, y = pos.y,
z = pos.z + random() - 0.5 z = pos.z + random() - 0.5
}, },
vel = {x = 0, y = 0.5 + random(), z = 0}, velocity = {x = 0, y = 0.5 + random(), z = 0},
acc = {x = 0, y = 0, z = 0}, acceleration = {x = 0, y = 0, z = 0},
expirationtime = 2 + random(2.5), expirationtime = 2 + random(2.5),
size = random(3), size = random(3),
collisiondetection = false, collisiondetection = false,
@ -909,7 +910,10 @@ minetest.register_tool("bees:grafting_tool", {
}) })
-- COMPATIBILTY --remove after all has been updated --
-- COMPATIBILTY
-- remove after all has been updated
--
-- ALIASES -- ALIASES
minetest.register_alias("bees:honey_extractor", "bees:extractor") minetest.register_alias("bees:honey_extractor", "bees:extractor")
@ -952,7 +956,9 @@ minetest.register_lbm({
}) })
--
-- PIPEWORKS -- PIPEWORKS
--
if minetest.get_modpath("pipeworks") then if minetest.get_modpath("pipeworks") then
@ -967,7 +973,7 @@ if minetest.get_modpath("pipeworks") then
sounds = default.node_sound_wood_defaults(), sounds = default.node_sound_wood_defaults(),
tube = { tube = {
insert_object = function(pos, node, stack, direction) insert_object = function(pos, _, stack)
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
local inv = meta:get_inventory() local inv = meta:get_inventory()
@ -996,7 +1002,7 @@ if minetest.get_modpath("pipeworks") then
return stack return stack
end, end,
can_insert = function(pos,node,stack,direction) can_insert = function(pos, _, stack)
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
local inv = meta:get_inventory() local inv = meta:get_inventory()
@ -1016,7 +1022,7 @@ if minetest.get_modpath("pipeworks") then
return false return false
end, end,
can_remove = function(pos,node,stack,direction) can_remove = function(_, _, stack)
if stack:get_name() == "bees:frame_full" then if stack:get_name() == "bees:frame_full" then
return 1 return 1
@ -1032,7 +1038,6 @@ if minetest.get_modpath("pipeworks") then
on_construct = function(pos) on_construct = function(pos)
local timer = minetest.get_node_timer(pos)
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
local inv = meta:get_inventory() local inv = meta:get_inventory()
@ -1044,13 +1049,15 @@ if minetest.get_modpath("pipeworks") then
meta:set_string("infotext", S("Requires Queen bee to function")) meta:set_string("infotext", S("Requires Queen bee to function"))
end, end,
on_rightclick = function(pos, node, clicker, itemstack) on_rightclick = function(pos, _, clicker)
if minetest.is_protected(pos, clicker:get_player_name()) then local player_name = clicker:get_player_name()
if minetest.is_protected(pos, player_name) then
return return
end end
minetest.show_formspec(clicker:get_player_name(), minetest.show_formspec(player_name,
"bees:hive_artificial", "bees:hive_artificial",
hive_artificial(pos) hive_artificial(pos)
) )
@ -1067,7 +1074,7 @@ if minetest.get_modpath("pipeworks") then
end end
end, end,
on_timer = function(pos,elapsed) on_timer = function(pos)
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
local inv = meta:get_inventory() local inv = meta:get_inventory()
@ -1097,7 +1104,7 @@ if minetest.get_modpath("pipeworks") then
local stacks = inv:get_list("frames") local stacks = inv:get_list("frames")
for k, v in pairs(stacks) do for k, _ in pairs(stacks) do
if inv:get_stack("frames", k):get_name() == "bees:frame_empty" then if inv:get_stack("frames", k):get_name() == "bees:frame_empty" then
@ -1120,7 +1127,7 @@ if minetest.get_modpath("pipeworks") then
end end
end, end,
on_metadata_inventory_take = function(pos, listname, index, stack, player) on_metadata_inventory_take = function(pos, listname)
if listname == "queen" then if listname == "queen" then
@ -1133,7 +1140,7 @@ if minetest.get_modpath("pipeworks") then
end end
end, end,
allow_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player) allow_metadata_inventory_move = function(pos, from_list, _, to_list, to_index)
local inv = minetest.get_meta(pos):get_inventory() local inv = minetest.get_meta(pos):get_inventory()
@ -1149,7 +1156,7 @@ if minetest.get_modpath("pipeworks") then
end end
end, end,
on_metadata_inventory_put = function(pos, listname, index, stack, player) on_metadata_inventory_put = function(pos, listname, _, stack)
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
local inv = meta:get_inventory() local inv = meta:get_inventory()
@ -1169,7 +1176,7 @@ if minetest.get_modpath("pipeworks") then
end end
end, end,
allow_metadata_inventory_put = function(pos, listname, index, stack, player) allow_metadata_inventory_put = function(pos, listname, index, stack)
if not minetest.get_meta(pos):get_inventory():get_stack(listname, index):is_empty() then if not minetest.get_meta(pos):get_inventory():get_stack(listname, index):is_empty() then
return 0 return 0
@ -1203,17 +1210,18 @@ if minetest.get_modpath("pipeworks") then
end end
--
-- LUCKY BLOCKS -- LUCKY BLOCKS
--
if minetest.get_modpath("lucky_block") then if minetest.get_modpath("lucky_block") then
local add_bees = function(pos, player) local add_bees = function(pos, player)
local objs = minetest.get_objects_inside_radius(pos, 15) local objs = minetest.get_objects_inside_radius(pos, 15)
local violet = minetest.get_color_escape_sequence("#ff00ff")
minetest.chat_send_player(player:get_player_name(), minetest.chat_send_player(player:get_player_name(),
violet .. S("Bees! Bees for all!")) minetest.colorize("violet", S("Bees! Bees for all!")))
for n = 1, #objs do for n = 1, #objs do

View File

@ -1 +1,4 @@
name = bees name = bees
depends = default
optional_depends = intllib, lucky_block
description = Adds bees and hives to Minetest.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 460 B

After

Width:  |  Height:  |  Size: 327 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 628 B

After

Width:  |  Height:  |  Size: 170 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 366 B

After

Width:  |  Height:  |  Size: 133 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 445 B

After

Width:  |  Height:  |  Size: 191 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 642 B

After

Width:  |  Height:  |  Size: 210 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 543 B

After

Width:  |  Height:  |  Size: 237 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 200 B

After

Width:  |  Height:  |  Size: 129 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 477 B

After

Width:  |  Height:  |  Size: 231 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 346 B

After

Width:  |  Height:  |  Size: 137 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 465 B

After

Width:  |  Height:  |  Size: 204 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 582 B

After

Width:  |  Height:  |  Size: 241 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 135 B

After

Width:  |  Height:  |  Size: 84 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 200 B

After

Width:  |  Height:  |  Size: 103 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 202 B

After

Width:  |  Height:  |  Size: 102 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 378 B

After

Width:  |  Height:  |  Size: 179 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 697 B

After

Width:  |  Height:  |  Size: 303 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 336 B

After

Width:  |  Height:  |  Size: 176 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 502 B

After

Width:  |  Height:  |  Size: 206 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 255 B

After

Width:  |  Height:  |  Size: 150 B

View File

@ -192,8 +192,6 @@ minetest.register_node("birch:leaves", {
description = S("Birch Leaves"), description = S("Birch Leaves"),
drawtype = "allfaces_optional", drawtype = "allfaces_optional",
tiles = {"birch_leaves.png"}, tiles = {"birch_leaves.png"},
inventory_image = "birch_leaves.png",
wield_image = "birch_leaves.png",
paramtype = "light", paramtype = "light",
walkable = true, walkable = true,
waving = 1, waving = 1,

View File

@ -113,7 +113,7 @@ for _, nodeclass in ipairs(NodeClass) do
paramtype = "light", paramtype = "light",
paramtype2 = "color", paramtype2 = "color",
is_ground_content = true, is_ground_content = true,
groups = {cracky=3, ud_param2_colorable = 1}, groups = {cracky=3, stone=1, ud_param2_colorable = 1},
sounds = default.node_sound_stone_defaults(), sounds = default.node_sound_stone_defaults(),
on_construct = unifieddyes.on_construct, on_construct = unifieddyes.on_construct,
on_dig = unifieddyes.on_dig on_dig = unifieddyes.on_dig
@ -131,7 +131,7 @@ for _, nodeclass in ipairs(NodeClass) do
paramtype = "light", paramtype = "light",
paramtype2 = "color", paramtype2 = "color",
is_ground_content = true, is_ground_content = true,
groups = {cracky=3, ud_param2_colorable = 1}, groups = {cracky=3, stone=2, ud_param2_colorable = 1},
sounds = default.node_sound_stone_defaults(), sounds = default.node_sound_stone_defaults(),
on_construct = unifieddyes.on_construct, on_construct = unifieddyes.on_construct,
on_dig = unifieddyes.on_dig on_dig = unifieddyes.on_dig
@ -149,7 +149,7 @@ for _, nodeclass in ipairs(NodeClass) do
paramtype = "light", paramtype = "light",
paramtype2 = "color", paramtype2 = "color",
is_ground_content = true, is_ground_content = true,
groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=3, ud_param2_colorable = 1}, groups = {snappy=2, choppy=2, wood=1, oddly_breakable_by_hand=2,flammable=3, ud_param2_colorable = 1},
sounds = default.node_sound_wood_defaults(), sounds = default.node_sound_wood_defaults(),
on_construct = unifieddyes.on_construct, on_construct = unifieddyes.on_construct,
on_dig = unifieddyes.on_dig on_dig = unifieddyes.on_dig
@ -169,7 +169,7 @@ minetest.register_node("blox:wood_tinted", {
paramtype = "light", paramtype = "light",
paramtype2 = "color", paramtype2 = "color",
is_ground_content = true, is_ground_content = true,
groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=3, ud_param2_colorable = 1}, groups = {snappy=2, choppy=2, wood=1, oddly_breakable_by_hand=2,flammable=3, ud_param2_colorable = 1},
sounds = default.node_sound_wood_defaults(), sounds = default.node_sound_wood_defaults(),
on_construct = unifieddyes.on_construct, on_construct = unifieddyes.on_construct,
on_dig = unifieddyes.on_dig on_dig = unifieddyes.on_dig
@ -182,7 +182,7 @@ minetest.register_node("blox:stone_square", {
paramtype = "light", paramtype = "light",
paramtype2 = "color", paramtype2 = "color",
is_ground_content = true, is_ground_content = true,
groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=3, ud_param2_colorable = 1}, groups = {snappy=2, choppy=2, stone=1, oddly_breakable_by_hand=2,flammable=3, ud_param2_colorable = 1},
sounds = default.node_sound_wood_defaults(), sounds = default.node_sound_wood_defaults(),
on_construct = unifieddyes.on_construct, on_construct = unifieddyes.on_construct,
on_dig = unifieddyes.on_dig on_dig = unifieddyes.on_dig
@ -195,7 +195,7 @@ minetest.register_node("blox:cobble_tinted", {
paramtype = "light", paramtype = "light",
paramtype2 = "color", paramtype2 = "color",
is_ground_content = true, is_ground_content = true,
groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=3, not_in_creative_inventory = 1, ud_param2_colorable = 1}, groups = {snappy=2, choppy=2, stone=2, oddly_breakable_by_hand=2,flammable=3, not_in_creative_inventory = 1, ud_param2_colorable = 1},
sounds = default.node_sound_wood_defaults(), sounds = default.node_sound_wood_defaults(),
on_construct = unifieddyes.on_construct, on_construct = unifieddyes.on_construct,
on_dig = unifieddyes.on_dig on_dig = unifieddyes.on_dig
@ -208,7 +208,7 @@ minetest.register_node("blox:stone_tinted", {
paramtype = "light", paramtype = "light",
paramtype2 = "color", paramtype2 = "color",
is_ground_content = true, is_ground_content = true,
groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=3, not_in_creative_inventory = 1, ud_param2_colorable = 1}, groups = {snappy=2, choppy=2, stone=1, oddly_breakable_by_hand=2,flammable=3, not_in_creative_inventory = 1, ud_param2_colorable = 1},
sounds = default.node_sound_wood_defaults(), sounds = default.node_sound_wood_defaults(),
on_construct = unifieddyes.on_construct, on_construct = unifieddyes.on_construct,
on_dig = unifieddyes.on_dig, on_dig = unifieddyes.on_dig,

View File

@ -181,7 +181,7 @@ local function check_sapling(pos, nodename)
if can_grow then if can_grow then
particle_effect(pos) particle_effect(pos)
grow_tree(pos, saplings[n][2]) grow_tree(pos, saplings[n][2])
return return true
end end
end end
end end
@ -216,7 +216,7 @@ local function check_crops(pos, nodename, strength)
particle_effect(pos) particle_effect(pos)
return return true
end end
end end
end end
@ -438,13 +438,13 @@ function bonemeal:on_use(pos, strength, node)
default.grow_papyrus(pos, node) default.grow_papyrus(pos, node)
particle_effect(pos) particle_effect(pos)
return return true
elseif node.name == "default:cactus" then elseif node.name == "default:cactus" then
default.grow_cactus(pos, node) default.grow_cactus(pos, node)
particle_effect(pos) particle_effect(pos)
return return true
end end
-- grow grass and flowers -- grow grass and flowers
@ -452,7 +452,7 @@ function bonemeal:on_use(pos, strength, node)
or minetest.get_item_group(node.name, "sand") > 0 or minetest.get_item_group(node.name, "sand") > 0
or minetest.get_item_group(node.name, "can_bonemeal") > 0 then or minetest.get_item_group(node.name, "can_bonemeal") > 0 then
check_soil(pos, node.name, strength) check_soil(pos, node.name, strength)
return return true
end end
-- light check depending on strength (strength of 4 = no light needed) -- light check depending on strength (strength of 4 = no light needed)
@ -464,11 +464,13 @@ function bonemeal:on_use(pos, strength, node)
if minetest.get_item_group(node.name, "sapling") > 0 if minetest.get_item_group(node.name, "sapling") > 0
and random(5 - strength) == 1 then and random(5 - strength) == 1 then
check_sapling(pos, node.name) check_sapling(pos, node.name)
return return true
end end
-- check for crop growth -- check for crop growth
check_crops(pos, node.name, strength) if check_crops(pos, node.name, strength) then
return true
end
end end
@ -494,13 +496,14 @@ minetest.register_craftitem("bonemeal:mulch", {
return return
end end
-- call global on_use function with strength of 1
if bonemeal:on_use(pointed_thing.under, 1) then
-- take item if not in creative -- take item if not in creative
if not bonemeal.is_creative(user:get_player_name()) then if not bonemeal.is_creative(user:get_player_name()) then
itemstack:take_item() itemstack:take_item()
end end
end
-- call global on_use function with strength of 1
bonemeal:on_use(pointed_thing.under, 1)
return itemstack return itemstack
end end
@ -524,13 +527,14 @@ minetest.register_craftitem("bonemeal:bonemeal", {
return return
end end
-- call global on_use function with strength of 2
if bonemeal:on_use(pointed_thing.under, 2) then
-- take item if not in creative -- take item if not in creative
if not bonemeal.is_creative(user:get_player_name()) then if not bonemeal.is_creative(user:get_player_name()) then
itemstack:take_item() itemstack:take_item()
end end
end
-- call global on_use function with strength of 2
bonemeal:on_use(pointed_thing.under, 2)
return itemstack return itemstack
end end
@ -554,13 +558,14 @@ minetest.register_craftitem("bonemeal:fertiliser", {
return return
end end
-- call global on_use function with strength of 3
if bonemeal:on_use(pointed_thing.under, 3) then
-- take item if not in creative -- take item if not in creative
if not bonemeal.is_creative(user:get_player_name()) then if not bonemeal.is_creative(user:get_player_name()) then
itemstack:take_item() itemstack:take_item()
end end
end
-- call global on_use function with strength of 3
bonemeal:on_use(pointed_thing.under, 3)
return itemstack return itemstack
end end

View File

@ -0,0 +1,7 @@
# textdomain:bonemeal
[MOD] bonemeal loaded=[MOD] bonemeal geladen
Bone=Knochen
Bone Meal=Knochenmehl
Fertiliser=Dünger
Gelatin Powder=Gelatinepulver
Mulch=Mulch

View File

@ -1 +1,4 @@
name = bonemeal name = bonemeal
depends = default
optional_depends = intllib, lucky_block, farming, ethereal, moretrees, technic_worldgen, flowers, dye
description = Adds bone and bonemeal giving the ability to quickly grow plants and saplings.

View File

@ -32,7 +32,7 @@ if farming and farming.mod and farming.mod == "redo" then
{"farming:chili_", 8}, {"farming:chili_", 8},
{"farming:garlic_", 5}, {"farming:garlic_", 5},
{"farming:onion_", 5}, {"farming:onion_", 5},
{"farming:pepper_", 5}, {"farming:pepper_", 7},
{"farming:pineapple_", 8}, {"farming:pineapple_", 8},
{"farming:pea_", 5}, {"farming:pea_", 5},
{"farming:beetroot_", 5}, {"farming:beetroot_", 5},
@ -40,7 +40,11 @@ if farming and farming.mod and farming.mod == "redo" then
{"farming:oat_", 8}, {"farming:oat_", 8},
{"farming:rice_", 8}, {"farming:rice_", 8},
{"farming:mint_", 4}, {"farming:mint_", 4},
{"farming:cabbage_", 6} {"farming:cabbage_", 6},
{"farming:lettuce_", 5},
{"farming:blackberry_", 4},
{"farming:vanilla_", 8},
{"farming:soy_", 7}
}) })
end end
@ -65,7 +69,9 @@ if minetest.get_modpath("ethereal") then
{"ethereal:orange_tree_sapling", ethereal.grow_orange_tree, "soil"}, {"ethereal:orange_tree_sapling", ethereal.grow_orange_tree, "soil"},
{"ethereal:bamboo_sprout", ethereal.grow_bamboo_tree, "soil"}, {"ethereal:bamboo_sprout", ethereal.grow_bamboo_tree, "soil"},
{"ethereal:birch_sapling", ethereal.grow_birch_tree, "soil"}, {"ethereal:birch_sapling", ethereal.grow_birch_tree, "soil"},
{"ethereal:sakura_sapling", ethereal.grow_sakura_tree, "soil"} {"ethereal:sakura_sapling", ethereal.grow_sakura_tree, "soil"},
{"ethereal:lemon_tree_sapling", ethereal.grow_lemon_tree, "soil"},
{"ethereal:olive_tree_sapling", ethereal.grow_olive_tree, "soil"}
}) })
local grass = {"default:grass_3", "default:grass_4", "default:grass_5", ""} local grass = {"default:grass_3", "default:grass_4", "default:grass_5", ""}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 260 B

After

Width:  |  Height:  |  Size: 256 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 568 B

After

Width:  |  Height:  |  Size: 514 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 324 B

After

Width:  |  Height:  |  Size: 320 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 381 B

After

Width:  |  Height:  |  Size: 340 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.1 KiB

After

Width:  |  Height:  |  Size: 8.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.6 KiB

After

Width:  |  Height:  |  Size: 6.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 195 B

After

Width:  |  Height:  |  Size: 151 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 261 B

After

Width:  |  Height:  |  Size: 252 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 581 B

After

Width:  |  Height:  |  Size: 532 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 302 B

After

Width:  |  Height:  |  Size: 242 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.6 KiB

After

Width:  |  Height:  |  Size: 7.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 286 B

After

Width:  |  Height:  |  Size: 285 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 177 B

After

Width:  |  Height:  |  Size: 176 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 450 B

After

Width:  |  Height:  |  Size: 370 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 280 B

After

Width:  |  Height:  |  Size: 272 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 261 B

After

Width:  |  Height:  |  Size: 118 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 409 B

After

Width:  |  Height:  |  Size: 362 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.5 KiB

After

Width:  |  Height:  |  Size: 6.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 502 B

After

Width:  |  Height:  |  Size: 498 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 766 B

After

Width:  |  Height:  |  Size: 751 B

View File

@ -1 +1,4 @@
name = cblocks name = cblocks
depends = default
optional_depends = lucky_block, stairs, moreblocks
description = Adds coloured wood, glass and stone blocks.

View File

@ -160,8 +160,6 @@ minetest.register_node("cherrytree:blossom_leaves", {
description = S("Cherrytree Blossom Leaves"), description = S("Cherrytree Blossom Leaves"),
drawtype = "allfaces_optional", drawtype = "allfaces_optional",
tiles = {"cherrytree_blossom_leaves.png"}, tiles = {"cherrytree_blossom_leaves.png"},
inventory_image = "cherrytree_blossom_leaves.png",
wield_image = "cherrytree_blossom_leaves.png",
paramtype = "light", paramtype = "light",
walkable = true, walkable = true,
waving = 1, waving = 1,
@ -193,8 +191,6 @@ minetest.register_node("cherrytree:leaves", {
description = S("Cherrytree Leaves"), description = S("Cherrytree Leaves"),
drawtype = "allfaces_optional", drawtype = "allfaces_optional",
tiles = {"cherrytree_leaves.png"}, tiles = {"cherrytree_leaves.png"},
inventory_image = "cherrytree_leaves.png",
wield_image = "cherrytree_leaves.png",
paramtype = "light", paramtype = "light",
walkable = true, walkable = true,
waving = 1, waving = 1,

View File

@ -174,8 +174,6 @@ minetest.register_node("chestnuttree:leaves", {
description = S("Chestnut Tree Leaves"), description = S("Chestnut Tree Leaves"),
drawtype = "allfaces_optional", drawtype = "allfaces_optional",
tiles = {"chestnuttree_leaves.png"}, tiles = {"chestnuttree_leaves.png"},
inventory_image = "chestnuttree_leaves.png",
wield_image = "chestnuttree_leaves.png",
paramtype = "light", paramtype = "light",
walkable = true, walkable = true,
waving = 1, waving = 1,

View File

@ -137,8 +137,6 @@ minetest.register_node("clementinetree:leaves", {
description = S("Clementine Tree Leaves"), description = S("Clementine Tree Leaves"),
drawtype = "allfaces_optional", drawtype = "allfaces_optional",
tiles = {"clementinetree_leaves.png"}, tiles = {"clementinetree_leaves.png"},
inventory_image = "clementinetree_leaves.png",
wield_image = "clementinetree_leaves.png",
paramtype = "light", paramtype = "light",
walkable = true, walkable = true,
waving = 1, waving = 1,

File diff suppressed because it is too large Load Diff

View File

@ -1,86 +1,81 @@
# Blender v2.69 (sub 0) OBJ File: '' v -0.34 0.023 0.335
# www.blender.org v -0.34 0.013 0.362
mtllib computer_laptop.mtl v 0.332 0.023 0.335
o Cube.001 v 0.332 -0.433 0.183
v -0.340277 0.022636 0.335290 v 0.332 0.013 0.363
v -0.340277 0.013075 0.362499 v -0.34 -0.5 -0.313
v 0.332320 0.022636 0.335292 v -0.34 -0.433 -0.313
v 0.332320 -0.432772 0.182772 v 0.332 -0.5 -0.313
v 0.332320 0.013075 0.362501 v -0.34 -0.5 0.183
v -0.340276 -0.499994 -0.312651 v 0.332 -0.5 0.183
v -0.340276 -0.432772 -0.312651 v -0.34 -0.433 0.183
v 0.332321 -0.499994 -0.312650 v -0.34 -0.433 0.21
v -0.340277 -0.499994 0.182771 v 0.332 -0.433 0.21
v 0.332320 -0.499994 0.182772 v 0.332 -0.5 0.21
v -0.340277 -0.432772 0.182771 v -0.34 -0.5 0.21
v -0.340278 -0.432772 0.209979 v -0.32 -0.418 0.195
v 0.332320 -0.432772 0.209981 v -0.32 -0.001 0.334
v 0.332320 -0.499994 0.209981 v 0.312 -0.418 0.195
v -0.340278 -0.499994 0.209979 v -0.34 -0.433 -0.159
v -0.319957 -0.417924 0.194820 v 0.332 -0.433 -0.313
v -0.319957 -0.001053 0.334433 v 0.312 -0.001 0.334
v 0.312000 -0.417925 0.194821 v 0.332 -0.433 -0.159
v -0.340277 -0.432772 -0.159321 vt 0.683 0.005
v 0.332321 -0.432772 -0.312650 vt 0.683 0.021
v 0.311999 -0.001054 0.334434 vt 0.31 0.005
v 0.332321 -0.432772 -0.159320 vt 0.044 0.009
vt 0.682604 0.005242 vt 0.31 0.021
vt 0.682603 0.021207 vt 0.753 0.12
vt 0.310265 0.005245 vt 0.81 0.12
vt 0.044426 0.009206 vt 0.753 0.598
vt 0.310266 0.021211 vt 0.857 0.982
vt 0.753340 0.119988 vt 0.746 0.982
vt 0.810356 0.119988 vt 0.857 0.831
vt 0.753340 0.597765 vt 0.948 0.009
vt 0.856851 0.982221 vt 0.878 0.982
vt 0.745750 0.982220 vt 0.878 0.831
vt 0.856851 0.831387 vt 0.984 0.982
vt 0.948453 0.009205 vt 0.863 0.831
vt 0.878028 0.982221 vt 0.863 0.982
vt 0.878028 0.831387 vt 0.728 0.491
vt 0.983700 0.982221 vt 0.728 0.99
vt 0.862953 0.831387 vt 0.011 0.491
vt 0.862953 0.982221 vt 0.832 0.13
vt 0.728292 0.490807 vt 0.982 0.13
vt 0.728292 0.989869 vt 0.832 0.79
vt 0.010900 0.490807 vt 0.758 0.755
vt 0.831643 0.129995 vt 0.758 0.813
vt 0.982007 0.129995 vt 0.756 0.753
vt 0.831643 0.789586 vt 0.799 0.813
vt 0.758249 0.754841 vt 0.756 0.815
vt 0.758228 0.812823 vt 0.799 0.755
vt 0.756060 0.752868 vt 0.8 0.815
vt 0.798519 0.812617 vt 0.708 0.114
vt 0.756052 0.814797 vt 0.708 0.471
vt 0.798577 0.754909 vt 0.006 0.114
vt 0.800285 0.814587 vt 0.346 0.099
vt 0.707729 0.114386 vt 0.497 0.033
vt 0.707729 0.471212 vt 0.497 0.099
vt 0.006162 0.114385 vt 0.991 0.099
vt 0.345650 0.099088 vt 0.838 0.033
vt 0.497058 0.032709 vt 0.991 0.033
vt 0.497058 0.099088 vt 0.008 0.009
vt 0.990661 0.099453 vt 0.013 0.023
vt 0.838275 0.032645 vt 0.984 0.01
vt 0.990661 0.032645 vt 0.943 0.023
vt 0.007709 0.008663 vt 0.049 0.023
vt 0.012705 0.022873 vt 0.81 0.598
vt 0.983559 0.009737 vt 0.746 0.831
vt 0.943457 0.023414 vt 0.984 0.831
vt 0.049421 0.023416 vt 0.011 0.99
vt 0.810356 0.597766 vt 0.982 0.79
vt 0.745750 0.831387 vt 0.8 0.753
vt 0.983700 0.831387 vt 0.006 0.471
vt 0.010900 0.989869 vt 0.008 0.099
vt 0.982007 0.789586 vt 0.008 0.033
vt 0.800332 0.752938 vt 0.498 0.099
vt 0.006162 0.471212 vt 0.498 0.033
vt 0.007844 0.099088 vt 0.979 0.024
vt 0.007844 0.032709
vt 0.498289 0.099453
vt 0.498289 0.032646
vt 0.978563 0.023946
usemtl Material.001
s off s off
f 1/1 2/2 3/3 f 1/1 2/2 3/3
f 4/4 3/3 5/5 f 4/4 3/3 5/5

View File

@ -1,98 +1,93 @@
# Blender v2.69 (sub 0) OBJ File: '' v 0.332 -0.433 0.183
# www.blender.org v -0.34 -0.5 -0.313
mtllib computer_laptop_closed.mtl v -0.34 -0.433 -0.313
o Cube.001 v 0.332 -0.5 -0.313
v 0.332320 -0.432772 0.182772 v -0.34 -0.5 0.183
v -0.340276 -0.499994 -0.312651 v 0.332 -0.5 0.183
v -0.340276 -0.432772 -0.312651 v -0.34 -0.433 0.183
v 0.332321 -0.499994 -0.312650 v -0.34 -0.433 0.21
v -0.340277 -0.499994 0.182771 v 0.332 -0.433 0.21
v 0.332320 -0.499994 0.182772 v 0.332 -0.5 0.21
v -0.340277 -0.432772 0.182771 v -0.34 -0.5 0.21
v -0.340278 -0.432772 0.209979 v -0.34 -0.433 -0.159
v 0.332320 -0.432772 0.209981 v 0.332 -0.433 -0.313
v 0.332320 -0.499994 0.209981 v 0.332 -0.433 -0.159
v -0.340278 -0.499994 0.209979 v -0.339 -0.432 -0.313
v -0.340277 -0.432772 -0.159321 v -0.339 -0.401 -0.312
v 0.332321 -0.432772 -0.312650 v 0.331 -0.432 -0.313
v 0.332321 -0.432772 -0.159320 v 0.331 -0.432 0.207
v -0.339100 -0.432290 -0.312591 v 0.331 -0.401 -0.312
v -0.339100 -0.401111 -0.312123 v -0.339 -0.432 0.207
v 0.331143 -0.432288 -0.312592 v -0.339 -0.405 0.197
v 0.331143 -0.432434 0.206702 v 0.331 -0.405 0.197
v 0.331143 -0.401109 -0.312123 v -0.319 -0.425 0.187
v -0.339100 -0.432435 0.206702 v -0.319 -0.425 -0.288
v -0.339101 -0.404537 0.197368 v 0.311 -0.425 0.187
v 0.331143 -0.404535 0.197367 v 0.311 -0.425 -0.288
v -0.318852 -0.425175 0.187344 vt 0.753 0.12
v -0.318852 -0.425042 -0.288007 vt 0.81 0.12
v 0.310895 -0.425173 0.187344 vt 0.753 0.598
v 0.310894 -0.425040 -0.288006 vt 0.857 0.982
vt 0.753340 0.119988 vt 0.746 0.982
vt 0.810356 0.119988 vt 0.857 0.831
vt 0.753340 0.597765 vt 0.878 0.831
vt 0.856851 0.982221 vt 0.878 0.982
vt 0.745750 0.982220 vt 0.863 0.831
vt 0.856851 0.831387 vt 0.863 0.982
vt 0.878028 0.831387 vt 0.858 0.829
vt 0.878028 0.982221 vt 0.886 0.829
vt 0.862953 0.831387 vt 0.858 0.95
vt 0.862953 0.982221 vt 0.936 0.853
vt 0.858063 0.829423 vt 0.936 0.923
vt 0.885587 0.829423 vt 0.798 0.853
vt 0.858063 0.950158 vt 0.346 0.099
vt 0.935597 0.852882 vt 0.497 0.033
vt 0.935597 0.922715 vt 0.497 0.099
vt 0.798294 0.852882 vt 0.991 0.099
vt 0.345650 0.099088 vt 0.838 0.033
vt 0.497058 0.032709 vt 0.991 0.033
vt 0.497058 0.099088 vt 0.008 0.009
vt 0.990661 0.099453 vt 0.044 0.009
vt 0.838275 0.032645 vt 0.013 0.023
vt 0.990661 0.032645 vt 0.948 0.009
vt 0.007709 0.008663 vt 0.984 0.01
vt 0.044426 0.009206 vt 0.943 0.023
vt 0.012705 0.022873 vt 0.81 0.598
vt 0.948453 0.009205 vt 0.746 0.831
vt 0.983559 0.009737 vt 0.886 0.95
vt 0.943457 0.023414 vt 0.912 0.963
vt 0.810356 0.597766 vt 0.786 0.838
vt 0.745750 0.831387 vt 0.886 0.908
vt 0.885587 0.950158 vt 0.922 0.84
vt 0.912135 0.962581 vt 0.798 0.923
vt 0.785835 0.838012 vt 0.008 0.099
vt 0.886333 0.908011 vt 0.008 0.033
vt 0.922048 0.840165 vt 0.498 0.099
vt 0.798294 0.922715 vt 0.498 0.033
vt 0.007844 0.099088 vt 0.049 0.023
vt 0.007844 0.032709 vt 0.979 0.024
vt 0.498289 0.099453 vt 0.683 0.005
vt 0.498289 0.032646 vt 0.683 0.021
vt 0.049421 0.023416 vt 0.31 0.005
vt 0.978563 0.023946 vt 0.31 0.021
vt 0.682604 0.005242 vt 0.984 0.982
vt 0.682603 0.021207 vt 0.922 0.868
vt 0.310265 0.005245 vt 0.922 0.952
vt 0.310266 0.021211 vt 0.802 0.868
vt 0.983700 0.982221 vt 0.758 0.755
vt 0.922420 0.868181 vt 0.758 0.813
vt 0.922420 0.951695 vt 0.756 0.753
vt 0.802372 0.868181 vt 0.799 0.813
vt 0.758249 0.754841 vt 0.756 0.815
vt 0.758228 0.812823 vt 0.799 0.755
vt 0.756060 0.752868 vt 0.8 0.815
vt 0.798519 0.812617 vt 0.984 0.831
vt 0.756052 0.814797 vt 0.802 0.952
vt 0.798577 0.754909 vt 0.8 0.753
vt 0.800285 0.814587 vt 0.896 0.949
vt 0.983700 0.831387 vt 0.904 0.849
vt 0.802372 0.951695 vt 0.888 0.925
vt 0.800332 0.752938 vt 0.811 0.85
vt 0.896350 0.948981
vt 0.903598 0.848845
vt 0.888354 0.925385
vt 0.811076 0.850308
usemtl Material.001
s off s off
f 2/1 3/2 4/3 f 2/1 3/2 4/3
f 5/4 2/5 6/6 f 5/4 2/5 6/6

File diff suppressed because it is too large Load Diff

View File

@ -1,29 +1,24 @@
# Blender v2.72 (sub 0) OBJ File: '' v -0.183 -0.5 0.45
# www.blender.org v -0.183 -0.5 -0.35
mtllib computer_tower.mtl v 0.183 -0.5 -0.35
o Cube.001 v 0.183 -0.5 0.45
v -0.182508 -0.499998 0.450000 v -0.183 0.336 0.45
v -0.182508 -0.499998 -0.349946 v 0.183 0.336 0.45
v 0.182508 -0.499998 -0.349946 v 0.183 0.336 -0.35
v 0.182508 -0.499998 0.450000 v -0.183 0.336 -0.35
v -0.182508 0.335734 0.450000 vt 1 0.75
v 0.182508 0.335734 0.450000 vt 0.5 0.75
v 0.182508 0.335734 -0.349946 vt 0.5 0.5
v -0.182508 0.335734 -0.349947 vt 1 0.5
vt 0.999994 0.750017 vt 0.5 1
vt 0.500006 0.749983 vt 1 1
vt 0.500002 0.499996 vt 0.5 0
vt 0.999997 0.500009 vt 0 0.5
vt 0.499989 0.999941 vt 0 0
vt 0.999986 0.999931 vt 0.25 1
vt 0.500005 0.000003 vt 0.25 0.5
vt 0.000007 0.500002 vt 1 0
vt -0.000003 0.000003 vt 0 1
vt 0.250005 0.999991
vt 0.250005 0.499995
vt 0.999993 0.000002
vt 0.000017 0.999997
usemtl Material.001
s off s off
f 1/1 2/2 3/3 4/4 f 1/1 2/2 3/3 4/4
f 5/5 6/2 7/1 8/6 f 5/5 6/2 7/1 8/6

View File

@ -1,129 +1,123 @@
# Blender v2.66 (sub 1) OBJ File: '' v -0.45 1.3 -0.45
# www.blender.org v -0.45 1.3 -0.5
mtllib tetris_arcade.mtl v 0.45 1.3 -0.5
o Cube.001 v 0.45 1.3 -0.45
v -0.450000 1.299500 -0.450000 v -0.45 1.5 -0.45
v -0.450000 1.299500 -0.500000 v -0.45 1.5 -0.5
v 0.450000 1.299500 -0.500000 v 0.45 1.5 -0.5
v 0.450000 1.299500 -0.450000 v 0.45 1.5 -0.45
v -0.450000 1.499500 -0.450000 v 0.45 -0.495 -0.5
v -0.450000 1.499500 -0.500000 v 0.45 0.305 -0.5
v 0.450000 1.499500 -0.500000 v -0.45 -0.495 -0.5
v 0.450000 1.499500 -0.450000 v -0.45 0.305 -0.5
v 0.450000 -0.495000 -0.500000 v 0.45 -0.498 0.5
v 0.450000 0.305000 -0.500001 v 0.45 -0.498 -0.5
v -0.450000 -0.495000 -0.499999 v 0.5 -0.498 -0.5
v -0.450000 0.305000 -0.500000 v 0.5 -0.498 0.5
v 0.450000 -0.498500 0.500000 v 0.45 1.499 0.5
v 0.450000 -0.498500 -0.500000 v 0.45 1.499 -0.5
v 0.500000 -0.498500 -0.500000 v 0.5 1.499 -0.5
v 0.500000 -0.498500 0.500000 v 0.5 1.499 0.5
v 0.450000 1.498500 0.500000 v 0.5 -0.5 -0.5
v 0.450000 1.498500 -0.500000 v 0.5 -0.5 0.5
v 0.500000 1.498500 -0.500000 v -0.5 -0.5 0.5
v 0.500000 1.498500 0.500000 v -0.5 -0.5 -0.5
v 0.499998 -0.499998 -0.499998 v 0.5 1.5 -0.5
v 0.499998 -0.499998 0.499998 v -0.5 1.5 -0.5
v -0.499998 -0.499998 0.499998 v -0.5 1.5 0.5
v -0.499998 -0.499998 -0.499998 v 0.5 1.5 0.5
v 0.499998 1.499994 -0.499998 v -0.5 -0.498 0.5
v -0.499998 1.499994 -0.499998 v -0.5 -0.498 -0.5
v -0.499998 1.499994 0.499998 v -0.45 -0.498 -0.5
v 0.499998 1.499994 0.499998 v -0.45 -0.498 0.5
v -0.500000 -0.498500 0.500000 v -0.5 1.499 0.5
v -0.500000 -0.498500 -0.500000 v -0.5 1.499 -0.5
v -0.450000 -0.498500 -0.500000 v -0.45 1.499 -0.5
v -0.450000 -0.498500 0.500000 v -0.45 1.499 0.5
v -0.500000 1.498500 0.500000 v 0.45 0.305 -0.5
v -0.500000 1.498500 -0.500000 v 0.45 0.474 -0.137
v -0.450000 1.498500 -0.500000 v -0.45 0.305 -0.5
v -0.450000 1.498500 0.500000 v -0.45 0.474 -0.137
v 0.450000 0.304976 -0.499762 v 0.45 0.473 -0.138
v 0.450000 0.474024 -0.137239 v 0.45 0.614 -0.087
v -0.450000 0.304976 -0.499761 v -0.45 0.473 -0.138
v -0.450000 0.474024 -0.137238 v -0.45 0.614 -0.087
v 0.450000 0.472946 -0.138083 v 0.45 0.611 -0.085
v 0.450000 0.613900 -0.086780 v 0.45 1.399 0.054
v -0.450000 0.472946 -0.138082 v -0.45 0.611 -0.085
v -0.450000 0.613900 -0.086779 v -0.45 1.399 0.054
v 0.450000 0.610884 -0.085130 v 0.45 1.395 0.055
v 0.450000 1.398731 0.053788 v 0.45 1.495 0.055
v -0.450000 0.610884 -0.085130 v -0.45 1.395 0.055
v -0.450000 1.398731 0.053789 v -0.45 1.495 0.055
v 0.450000 1.395000 0.055138 vt 0.25 0.745
v 0.450000 1.495000 0.055138 vt 0.25 0.516
v -0.450000 1.395000 0.055138 vt 0.495 0.516
v -0.450000 1.495000 0.055138 vt 0.495 0.745
vt 0.250108 0.745030 vt 0.5 0.745
vt 0.250224 0.516409 vt 0.25 0.745
vt 0.494888 0.516008 vt 0.25 0.693
vt 0.495027 0.744660 vt 0.5 0.693
vt 0.500090 0.744658 vt 0.245 1
vt 0.250080 0.744698 vt 0 1
vt 0.250023 0.693307 vt 0 0.926
vt 0.500163 0.693337 vt 0.245 0.926
vt 0.244872 0.999900 vt 0 0.985
vt 0.000100 0.999900 vt 0.246 0.985
vt 0.000100 0.925965 vt 0.247 1
vt 0.244701 0.925965 vt 0.255 0.396
vt -0.000234 0.985285 vt 0.255 0.252
vt 0.246386 0.985398 vt 0.49 0.252
vt 0.246568 0.999900 vt 0.49 0.396
vt 0.254685 0.396330 vt 0.747 0.252
vt 0.255312 0.252326 vt 1.001 0.252
vt 0.489851 0.252497 vt 1 0.749
vt 0.489923 0.396494 vt 0.748 0.749
vt 0.746604 0.251526 vt 0.971 0.251
vt 1.000599 0.251553 vt 0.999 0.251
vt 1.000481 0.749319 vt 1 0.749
vt 0.748216 0.749150 vt 0.972 0.749
vt 0.971448 0.251053 vt 0.25 0.75
vt 0.999396 0.251108 vt 0 0.75
vt 1.000262 0.749144 vt 0.001 0.252
vt 0.972149 0.748806 vt 0.25 0.252
vt 0.250110 0.749633 vt 0.742 0.745
vt 0.000464 0.749633 vt 0.501 0.745
vt 0.001279 0.251648 vt 0.501 0.255
vt 0.250023 0.251690 vt 0.742 0.255
vt 0.742499 0.744632 vt 0.952 0.253
vt 0.500700 0.744632 vt 1 0.253
vt 0.500700 0.255368 vt 1 0.749
vt 0.742499 0.255368 vt 0.952 0.749
vt 0.951737 0.252687 vt 1 0.749
vt 0.999900 0.252686 vt 0.745 0.749
vt 0.999900 0.748679 vt 0.745 0.251
vt 0.951737 0.748679 vt 1.001 0.251
vt 1.000029 0.749233 vt 0.256 0.485
vt 0.744529 0.749104 vt 0.255 0.402
vt 0.745177 0.251367 vt 0.495 0.401
vt 1.001019 0.251067 vt 0.495 0.485
vt 0.255742 0.485017 vt 0.261 0.516
vt 0.255492 0.401623 vt 0.261 0.485
vt 0.494936 0.401277 vt 0.494 0.485
vt 0.495186 0.485021 vt 0.494 0.516
vt 0.260753 0.515705 vt 0 0.745
vt 0.260629 0.484664 vt 0 0.703
vt 0.494387 0.484878 vt 0.246 0.704
vt 0.494282 0.515673 vt 0.246 0.745
vt -0.000037 0.745106 vt 0.25 0.25
vt 0.000017 0.703328 vt 0 0.25
vt 0.245542 0.703882 vt 0 0
vt 0.245632 0.745399 vt 0.25 0
vt 0.250050 0.250050 vt 0.25 0.75
vt 0.000100 0.250050 vt 0.25 1
vt 0.000100 0.000100 vt 0 0.75
vt 0.250050 0.000100 vt 1 0.25
vt 0.250050 0.749950 vt 1 0.75
vt 0.250050 0.999900 vt 0.75 0.75
vt 0.000100 0.749950 vt 0.75 0.25
vt 0.999900 0.250049
vt 0.999900 0.749949
vt 0.749950 0.749950
vt 0.749950 0.250050
usemtl Material.001
s off s off
f 46/1 45/2 47/3 48/4 f 46/1 45/2 47/3 48/4
usemtl Material.001_tetris_arcade.png
f 6/5 7/6 3/7 2/8 f 6/5 7/6 3/7 2/8
f 8/9 5/10 1/11 4/12 f 8/9 5/10 1/11 4/12
f 1/10 2/13 3/14 4/15 f 1/10 2/13 3/14 4/15
@ -137,7 +131,6 @@ f 35/40 36/41 32/42 31/43
f 38/44 37/45 39/46 40/47 f 38/44 37/45 39/46 40/47
f 42/48 41/49 43/50 44/51 f 42/48 41/49 43/50 44/51
f 50/52 49/53 51/54 52/55 f 50/52 49/53 51/54 52/55
usemtl Material.001_NONE
f 21/56 22/57 23/58 24/59 f 21/56 22/57 23/58 24/59
f 25/60 26/61 27/10 28/62 f 25/60 26/61 27/10 28/62
f 22/63 28/64 27/65 23/66 f 22/63 28/64 27/65 23/66

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 313 B

After

Width:  |  Height:  |  Size: 105 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 313 B

After

Width:  |  Height:  |  Size: 115 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 105 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 315 B

After

Width:  |  Height:  |  Size: 107 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 315 B

After

Width:  |  Height:  |  Size: 109 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 483 B

After

Width:  |  Height:  |  Size: 261 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 321 B

After

Width:  |  Height:  |  Size: 103 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 313 B

After

Width:  |  Height:  |  Size: 113 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 415 B

After

Width:  |  Height:  |  Size: 103 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 331 B

After

Width:  |  Height:  |  Size: 106 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 315 B

After

Width:  |  Height:  |  Size: 107 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 461 B

After

Width:  |  Height:  |  Size: 235 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 82 B

After

Width:  |  Height:  |  Size: 67 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 114 B

After

Width:  |  Height:  |  Size: 98 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 122 B

After

Width:  |  Height:  |  Size: 118 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 129 B

After

Width:  |  Height:  |  Size: 123 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 114 B

After

Width:  |  Height:  |  Size: 102 B

Some files were not shown because too many files have changed in this diff Show More