From 424dcc4a4e60e838b68b493d0fbaef73f46e82eb Mon Sep 17 00:00:00 2001 From: root Date: Wed, 27 Jan 2021 21:55:09 +0100 Subject: [PATCH] update --- mods/homedecor_modpack/homedecor_books/mod.conf | 3 ++- .../locale/homedecor_exterior.es.tr | 6 +++--- mods/skinsdb/meta/character_1777.txt | 3 --- mods/skinsdb/meta/character_1795.txt | 3 --- mods/skinsdb/meta/character_1936.txt | 3 --- mods/skinsdb/meta/character_1941.txt | 3 +++ mods/skinsdb/textures/character_1777.png | Bin 1970 -> 0 bytes mods/skinsdb/textures/character_1795.png | Bin 1256 -> 0 bytes mods/skinsdb/textures/character_1936.png | Bin 3778 -> 0 bytes mods/skinsdb/textures/character_1941.png | Bin 0 -> 8325 bytes mods/techpack/techpack_warehouse/common.lua | 3 ++- mods/techpack/tubelib/init.lua | 2 +- 12 files changed, 11 insertions(+), 15 deletions(-) delete mode 100644 mods/skinsdb/meta/character_1777.txt delete mode 100644 mods/skinsdb/meta/character_1795.txt delete mode 100644 mods/skinsdb/meta/character_1936.txt create mode 100644 mods/skinsdb/meta/character_1941.txt delete mode 100644 mods/skinsdb/textures/character_1777.png delete mode 100644 mods/skinsdb/textures/character_1795.png delete mode 100644 mods/skinsdb/textures/character_1936.png create mode 100644 mods/skinsdb/textures/character_1941.png diff --git a/mods/homedecor_modpack/homedecor_books/mod.conf b/mods/homedecor_modpack/homedecor_books/mod.conf index 2adae924..54d6c859 100644 --- a/mods/homedecor_modpack/homedecor_books/mod.conf +++ b/mods/homedecor_modpack/homedecor_books/mod.conf @@ -1,3 +1,4 @@ name = homedecor_books description = Homedecor mod: books -depends = homedecor_common, default, unifieddyes, creative +depends = homedecor_common, default, creative +optional_depends = unifieddyes diff --git a/mods/homedecor_modpack/homedecor_exterior/locale/homedecor_exterior.es.tr b/mods/homedecor_modpack/homedecor_exterior/locale/homedecor_exterior.es.tr index cb49597d..7d2c60d1 100644 --- a/mods/homedecor_modpack/homedecor_exterior/locale/homedecor_exterior.es.tr +++ b/mods/homedecor_modpack/homedecor_exterior/locale/homedecor_exterior.es.tr @@ -7,14 +7,14 @@ Barbecue=Barbacoa Doghouse=Casa de perros Garden Lattice (@1)=Enrejado de jardín (@1) Garden stone path=Camino de piedra de jardín -No room in your inventory to add a filled bucket!= -No room under there to hang a swing.= +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 hay espacio para colgar el columpio Shrubbery (@1)=Arbustos (@1) Shrubbery (large, @1)=Arbustos (@1) Tree's swing=Columpio 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 red=roja diff --git a/mods/skinsdb/meta/character_1777.txt b/mods/skinsdb/meta/character_1777.txt deleted file mode 100644 index 81e0cf35..00000000 --- a/mods/skinsdb/meta/character_1777.txt +++ /dev/null @@ -1,3 +0,0 @@ -grian -MINECRAFTLOVER -CC BY-SA 3.0 diff --git a/mods/skinsdb/meta/character_1795.txt b/mods/skinsdb/meta/character_1795.txt deleted file mode 100644 index f5a885c6..00000000 --- a/mods/skinsdb/meta/character_1795.txt +++ /dev/null @@ -1,3 +0,0 @@ -lotte with purple hair -nadine -CC 0 (1.0) diff --git a/mods/skinsdb/meta/character_1936.txt b/mods/skinsdb/meta/character_1936.txt deleted file mode 100644 index 67fead79..00000000 --- a/mods/skinsdb/meta/character_1936.txt +++ /dev/null @@ -1,3 +0,0 @@ -Goebbels -Goebbels -CC BY-SA 3.0 diff --git a/mods/skinsdb/meta/character_1941.txt b/mods/skinsdb/meta/character_1941.txt new file mode 100644 index 00000000..0ea90d97 --- /dev/null +++ b/mods/skinsdb/meta/character_1941.txt @@ -0,0 +1,3 @@ +alex_mercer_corrupted +gamer 20n +CC BY-SA 3.0 diff --git a/mods/skinsdb/textures/character_1777.png b/mods/skinsdb/textures/character_1777.png deleted file mode 100644 index 721460e30162613dd84290acd2809a3a6b3e8d57..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1970 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 literal 0 HcmV?d00001 diff --git a/mods/techpack/techpack_warehouse/common.lua b/mods/techpack/techpack_warehouse/common.lua index 659290eb..f954f8eb 100644 --- a/mods/techpack/techpack_warehouse/common.lua +++ b/mods/techpack/techpack_warehouse/common.lua @@ -209,7 +209,8 @@ function techpack_warehouse.allow_metadata_inventory_put(self, pos, listname, in local main_stack = inv:get_stack("main", index) local item_name = inv:get_stack("filter", index):get_name() 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 return 1 elseif listname == "shift" then diff --git a/mods/techpack/tubelib/init.lua b/mods/techpack/tubelib/init.lua index 6f52324f..8c874149 100644 --- a/mods/techpack/tubelib/init.lua +++ b/mods/techpack/tubelib/init.lua @@ -98,7 +98,7 @@ minetest.register_craft({ 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 dofile(minetest.get_modpath("tubelib") .. "/tubes.lua") dofile(minetest.get_modpath("tubelib") .. "/command.lua")