From 0790e0f2586fd2bef7a07a42f9a91caa93b61b24 Mon Sep 17 00:00:00 2001 From: xin Date: Sat, 14 Oct 2017 17:27:13 +0000 Subject: Translated using Weblate (French) Currently translated at 100.0% (22 of 22 strings) Translation: Minetest/Mod: Storage Drawers Translate-URL: https://hosted.weblate.org/projects/minetest/mod-storage-drawers/fr/ --- locale/fr.po | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/locale/fr.po b/locale/fr.po index 1d204f0..986f534 100644 --- a/locale/fr.po +++ b/locale/fr.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-06-03 17:04+0200\n" -"PO-Revision-Date: 2017-08-30 13:46+0000\n" -"Last-Translator: fwhcat \n" +"PO-Revision-Date: 2017-10-15 17:45+0000\n" +"Last-Translator: xin \n" "Language-Team: French \n" "Language: fr\n" @@ -17,7 +17,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Generator: Weblate 2.17-dev\n" +"X-Generator: Weblate 2.17\n" #: lua/visual.lua msgid "Empty" @@ -25,7 +25,7 @@ msgstr "Vide" #: lua/api.lua init.lua msgid "Wooden" -msgstr "en Bois" +msgstr "En bois" #: lua/api.lua msgid "@1 Drawer" @@ -49,60 +49,60 @@ msgstr "@1 @2 (@3% plein)" #: init.lua msgid "Acacia Wood" -msgstr "Bois d'Acacia" +msgstr "Bois d'acacia" #: init.lua msgid "Aspen Wood" -msgstr "Bois de Tremble" +msgstr "Bois de tremble" #: init.lua msgid "Junglewood" -msgstr "Bois de Jungle" +msgstr "Bois de jungle" #: init.lua msgid "Pine Wood" -msgstr "Bois de Pin" +msgstr "Bois de pin" #: init.lua msgid "Oak Wood" -msgstr "Bois de Chêne" +msgstr "Bois de chêne" #: init.lua msgid "Birch Wood" -msgstr "Bois de Bouleau" +msgstr "Bois de bouleau" #: init.lua msgid "Dark Oak Wood" -msgstr "Bois de Chêne Foncé" +msgstr "Bois de chêne foncé" #: init.lua msgid "Spruce Wood" -msgstr "Bois d'Épicéa" +msgstr "Bois d'épicéa" #: init.lua msgid "Steel Drawer Upgrade (x2)" -msgstr "Amélioration Tiroir en Acier (x2)" +msgstr "Amélioration tiroir en acier (x2)" #: init.lua msgid "Gold Drawer Upgrade (x3)" -msgstr "Amélioration Tiroir en Or (x3)" +msgstr "Amélioration tiroir en or (x3)" #: init.lua msgid "Obsidian Drawer Upgrade (x5)" -msgstr "Amélioration Tiroir en Obsidienne (x5)" +msgstr "Amélioration tiroir en obsidienne (x5)" #: init.lua msgid "Diamond Drawer Upgrade (x8)" -msgstr "Amélioration Tiroir en Diamant (x8)" +msgstr "Amélioration tiroir en diamant (x8)" #: init.lua msgid "Iron Drawer Upgrade (x2)" -msgstr "Amélioration Tiroir en Fer (x2)" +msgstr "Amélioration tiroir en fer (x2)" #: init.lua msgid "Emerald Drawer Upgrade (x13)" -msgstr "Amélioration Tiroir en Émeraude (x13)" +msgstr "Amélioration tiroir en émeraude (x13)" #: init.lua msgid "Drawer Upgrade Template" -msgstr "Amélioration Modèle de Tiroir" +msgstr "Amélioration modèle de tiroir" -- cgit v1.2.3 From ea4b968368481f39ed0f4f3a351061e7ae7a7124 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Sun, 22 Oct 2017 22:54:16 +0000 Subject: Translated using Weblate (German) Currently translated at 100.0% (22 of 22 strings) Translation: Minetest/Mod: Storage Drawers Translate-URL: https://hosted.weblate.org/projects/minetest/mod-storage-drawers/de/ --- locale/de.po | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/locale/de.po b/locale/de.po index b0096aa..23b73e4 100644 --- a/locale/de.po +++ b/locale/de.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-06-03 17:04+0200\n" -"PO-Revision-Date: 2017-06-04 19:46+0000\n" -"Last-Translator: LNJ \n" +"PO-Revision-Date: 2017-10-23 23:46+0000\n" +"Last-Translator: Wuzzy \n" "Language-Team: German \n" "Language: de\n" @@ -17,7 +17,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 2.15-dev\n" +"X-Generator: Weblate 2.17\n" #: lua/visual.lua msgid "Empty" @@ -33,11 +33,11 @@ msgstr "@1schubfach" #: lua/api.lua msgid "@1 Drawers (1x2)" -msgstr "@1schubfächer (1x2)" +msgstr "@1schubfächer (1×2)" #: lua/api.lua msgid "@1 Drawers (2x2)" -msgstr "@1schubfächer (2x2)" +msgstr "@1schubfächer (2×2)" #: lua/helpers.lua msgid "@1 (@2% full)" @@ -81,27 +81,27 @@ msgstr "Fichtenholz" #: init.lua msgid "Steel Drawer Upgrade (x2)" -msgstr "Stahl-Schubfachverbesserung (x2)" +msgstr "Stahl-Schubfachverbesserung (×2)" #: init.lua msgid "Gold Drawer Upgrade (x3)" -msgstr "Gold-Schubfachverbesserung (x3)" +msgstr "Gold-Schubfachverbesserung (×3)" #: init.lua msgid "Obsidian Drawer Upgrade (x5)" -msgstr "Obsidian-Schubfachverbesserung (x5)" +msgstr "Obsidian-Schubfachverbesserung (×5)" #: init.lua msgid "Diamond Drawer Upgrade (x8)" -msgstr "Diamant-Schubfachverbesserung (x8)" +msgstr "Diamant-Schubfachverbesserung (×8)" #: init.lua msgid "Iron Drawer Upgrade (x2)" -msgstr "Eise-Schubfachverbesserung (x2)" +msgstr "Eisen-Schubfachverbesserung (×2)" #: init.lua msgid "Emerald Drawer Upgrade (x13)" -msgstr "Smaragd-Schubfachverbesserung (x13)" +msgstr "Smaragd-Schubfachverbesserung (×13)" #: init.lua msgid "Drawer Upgrade Template" -- cgit v1.2.3 From fe409885f0532d10da2c9628873f2d4ce315e51f Mon Sep 17 00:00:00 2001 From: gpcf Date: Fri, 8 Dec 2017 17:57:05 +0100 Subject: Fix duplicate items bug when inserting items from pipes (#13) --- lua/api.lua | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lua/api.lua b/lua/api.lua index 2bca40c..740e33e 100755 --- a/lua/api.lua +++ b/lua/api.lua @@ -189,11 +189,13 @@ function drawers.drawer_can_insert_object(pos, node, stack, direction) local drawer_visuals = drawers.drawer_visuals[core.serialize(pos)] if not drawer_visuals then return false end - local leftover = stack + for _, visual in pairs(drawer_visuals) do - leftover = visual:try_insert_stack(leftover, true) + if visual.itemName == "" or (visual.itemName == stack:get_name() and visual.count ~= visual.maxCount) then + return true + end end - return not (leftover == stack) + return false end function drawers.register_drawer(name, def) -- cgit v1.2.3