develop #30

Merged
milan merged 8 commits from develop into master 2021-01-27 21:59:08 +01:00
12 changed files with 11 additions and 15 deletions
Showing only changes of commit 424dcc4a4e - Show all commits

View file

@ -1,3 +1,4 @@
name = homedecor_books name = homedecor_books
description = Homedecor mod: books description = Homedecor mod: books
depends = homedecor_common, default, unifieddyes, creative depends = homedecor_common, default, creative
optional_depends = unifieddyes

View file

@ -7,14 +7,14 @@ Barbecue=Barbacoa
Doghouse=Casa de perros Doghouse=Casa de perros
Garden Lattice (@1)=Enrejado de jardín (@1) Garden Lattice (@1)=Enrejado de jardín (@1)
Garden stone path=Camino de piedra de jardín Garden stone path=Camino de piedra de jardín
No room in your inventory to add a filled bucket!= No room in your inventory to add a filled bucket!=No hay espacio en tu inv para el cubo
No room under there to hang a swing.= No room under there to hang a swing.=No hay espacio para colgar el columpio
Shrubbery (@1)=Arbustos (@1) Shrubbery (@1)=Arbustos (@1)
Shrubbery (large, @1)=Arbustos (@1) Shrubbery (large, @1)=Arbustos (@1)
Tree's swing=Columpio Tree's swing=Columpio
Water well=Pozo de agua Water well=Pozo de agua
You have to point at the bottom side of an overhanging object to place a swing.= You have to point at the bottom side of an overhanging object to place a swing.=Debe ser la parte inferior de un objeto para colocar el columpio.
green=verde green=verde
red=roja red=roja

View file

@ -1,3 +0,0 @@
grian
MINECRAFTLOVER
CC BY-SA 3.0

View file

@ -1,3 +0,0 @@
lotte with purple hair
nadine
CC 0 (1.0)

View file

@ -1,3 +0,0 @@
Goebbels
Goebbels
CC BY-SA 3.0

View file

@ -0,0 +1,3 @@
alex_mercer_corrupted
gamer 20n
CC BY-SA 3.0

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.1 KiB

View file

@ -209,7 +209,8 @@ function techpack_warehouse.allow_metadata_inventory_put(self, pos, listname, in
local main_stack = inv:get_stack("main", index) local main_stack = inv:get_stack("main", index)
local item_name = inv:get_stack("filter", index):get_name() local item_name = inv:get_stack("filter", index):get_name()
if listname == "input" and item_name == stack:get_name() then if listname == "input" and item_name == stack:get_name() then
return math.min(stack:get_count(), self.inv_size - main_stack:get_count()) local input_stack = inv:get_stack("input", index)
return math.min(stack:get_count(), self.inv_size - main_stack:get_count() - input_stack:get_count())
elseif listname == "filter" and item_name == main_stack:get_name() then elseif listname == "filter" and item_name == main_stack:get_name() then
return 1 return 1
elseif listname == "shift" then elseif listname == "shift" then

View file

@ -98,7 +98,7 @@ minetest.register_craft({
if tubelib2.version < 2.0 then if tubelib2.version < 2.0 then
minetest.log("error", "TechPack/Tubelib requires tubelib2 version 2.0 or newer!!!") error("TechPack/Tubelib requires tubelib2 version 2.0 or newer!!!")
else else
dofile(minetest.get_modpath("tubelib") .. "/tubes.lua") dofile(minetest.get_modpath("tubelib") .. "/tubes.lua")
dofile(minetest.get_modpath("tubelib") .. "/command.lua") dofile(minetest.get_modpath("tubelib") .. "/command.lua")