From 49a5e283987f8020b58d06fdfeb350e21a93d284 Mon Sep 17 00:00:00 2001 From: grorp Date: Sat, 11 Mar 2023 08:16:25 +0000 Subject: [PATCH 01/11] Make dye descriptions more consistent The descriptions of all the dyes now end with the word "Dye". Also, they happen to match the descriptions in Minecraft now, but that wasn't my intention. --- mods/ITEMS/mcl_dye/init.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mods/ITEMS/mcl_dye/init.lua b/mods/ITEMS/mcl_dye/init.lua index 227649687..692cd5e87 100644 --- a/mods/ITEMS/mcl_dye/init.lua +++ b/mods/ITEMS/mcl_dye/init.lua @@ -68,12 +68,12 @@ local dyes = { {"blue", S("Blue Dye"), {basecolor_blue=1, excolor_blue=1, unicolor_blue=1}}, {"lightblue", S("Light Blue Dye"), {basecolor_blue=1, excolor_blue=1, unicolor_light_blue=1}}, {"cyan", S("Cyan Dye"), {basecolor_cyan=1, excolor_cyan=1, unicolor_cyan=1}}, - {"dark_green", S("Cactus Green"), {basecolor_green=1, excolor_green=1, unicolor_dark_green=1}}, + {"dark_green", S("Green Dye"), {basecolor_green=1, excolor_green=1, unicolor_dark_green=1}}, {"green", S("Lime Dye"), {basecolor_green=1, excolor_green=1, unicolor_green=1}}, - {"yellow", S("Dandelion Yellow"), {basecolor_yellow=1, excolor_yellow=1, unicolor_yellow=1}}, + {"yellow", S("Yellow Dye"), {basecolor_yellow=1, excolor_yellow=1, unicolor_yellow=1}}, {"brown", S("Brown Dye"), {basecolor_brown=1, excolor_orange=1, unicolor_dark_orange=1}}, {"orange", S("Orange Dye"), {basecolor_orange=1, excolor_orange=1, unicolor_orange=1}}, - {"red", S("Rose Red"), {basecolor_red=1, excolor_red=1, unicolor_red=1}}, + {"red", S("Red Dye"), {basecolor_red=1, excolor_red=1, unicolor_red=1}}, {"magenta", S("Magenta Dye"), {basecolor_magenta=1, excolor_red_violet=1,unicolor_red_violet=1}}, {"pink", S("Pink Dye"), {basecolor_red=1, excolor_red=1, unicolor_light_red=1}}, } From 735904ce61ef97809c6a9bf8a08d65bacb750fc1 Mon Sep 17 00:00:00 2001 From: grorp Date: Sun, 12 Mar 2023 11:32:05 +0000 Subject: [PATCH 02/11] Update translations (1/9) --- mods/ITEMS/mcl_dye/locale/mcl_dye.de.tr | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mods/ITEMS/mcl_dye/locale/mcl_dye.de.tr b/mods/ITEMS/mcl_dye/locale/mcl_dye.de.tr index ca56dff22..4757cfcd2 100644 --- a/mods/ITEMS/mcl_dye/locale/mcl_dye.de.tr +++ b/mods/ITEMS/mcl_dye/locale/mcl_dye.de.tr @@ -7,12 +7,12 @@ Purple Dye=Violetter Farbstoff Blue Dye=Blaue Farbstoff Light Blue Dye=Hellblauer Farbstoff Cyan Dye=Türkiser Farbstoff -Cactus Green=Kaktusgrün +Green Dye=Grüner Farbstoff Lime Dye=Lindgrüner Farbstoff -Dandelion Yellow=Löwenzahngelb +Yellow Dye=Gelber Farbstoff Brown Dye=Brauner Farbstoff Orange Dye=Orange Farbstoff -Rose Red=Rosenrot +Red Dye=Roter Farbstoff Magenta Dye=Magenta Farbstoff Pink Dye=Rosa Farbstoff This item is a dye which is used for dyeing and crafting.=Dieser Gegenstand ist ein Farbstoff, der zum Einfärben und in der Herstellung benutzt werden kann. From df160656177c1504ef49ea8e19d76826c5fc4e30 Mon Sep 17 00:00:00 2001 From: grorp Date: Sun, 12 Mar 2023 11:32:32 +0000 Subject: [PATCH 03/11] Update translations (2/9) --- mods/ITEMS/mcl_dye/locale/mcl_dye.es.tr | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mods/ITEMS/mcl_dye/locale/mcl_dye.es.tr b/mods/ITEMS/mcl_dye/locale/mcl_dye.es.tr index 14c2c12d1..a829d5386 100644 --- a/mods/ITEMS/mcl_dye/locale/mcl_dye.es.tr +++ b/mods/ITEMS/mcl_dye/locale/mcl_dye.es.tr @@ -7,12 +7,12 @@ Purple Dye=Tinte púrpura Blue Dye=Tinte azul Light Blue Dye=Tinte azul claro Cyan Dye=Tinte cian -Cactus Green=Tinte verde +Green Dye=Tinte verde Lime Dye=Tinte amarillo verdoso -Dandelion Yellow=Tinte amarillo +Yellow Dye=Tinte amarillo Brown Dye=Tinte marrón Orange Dye=Tinte naranja -Rose Red=Tinte rojo +Red Dye=Tinte rojo Magenta Dye=Tinte magenta Pink Dye=Tinte rosado This item is a dye which is used for dyeing and crafting.=Este artículo es un tinte que se utiliza para teñir y elaborar. From fa07fab325c79257de94e54a36469ffa4ceb0dc8 Mon Sep 17 00:00:00 2001 From: grorp Date: Sun, 12 Mar 2023 11:32:59 +0000 Subject: [PATCH 04/11] Update translations (3/9) --- mods/ITEMS/mcl_dye/locale/mcl_dye.fr.tr | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mods/ITEMS/mcl_dye/locale/mcl_dye.fr.tr b/mods/ITEMS/mcl_dye/locale/mcl_dye.fr.tr index 9418225d6..761511c5b 100644 --- a/mods/ITEMS/mcl_dye/locale/mcl_dye.fr.tr +++ b/mods/ITEMS/mcl_dye/locale/mcl_dye.fr.tr @@ -7,12 +7,12 @@ Purple Dye=Teinture Violette Blue Dye=Teinture Bleu Light Blue Dye=Teinture Bleu Clair Cyan Dye=Teinture Cyan -Cactus Green=Cactus Vert +Green Dye=Teinture Verte Lime Dye=Teinture Vert Clair -Dandelion Yellow=Teinture Jaune +Yellow Dye=Teinture Jaune Brown Dye=Teinture Marron Orange Dye=Teinture Orange -Rose Red=Teinture Rouge +Red Dye=Teinture Rouge Magenta Dye=Teinture Magenta Pink Dye=Teinture Rose This item is a dye which is used for dyeing and crafting.=Cet objet est un colorant utilisé pour la teinture et l'artisanat. From 9463d12a35b57a535727b9a87083597ff8f68fad Mon Sep 17 00:00:00 2001 From: grorp Date: Sun, 12 Mar 2023 11:33:25 +0000 Subject: [PATCH 05/11] Update translations (4/9) --- mods/ITEMS/mcl_dye/locale/mcl_dye.ja.tr | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mods/ITEMS/mcl_dye/locale/mcl_dye.ja.tr b/mods/ITEMS/mcl_dye/locale/mcl_dye.ja.tr index 1dcd820db..0d5d35da2 100644 --- a/mods/ITEMS/mcl_dye/locale/mcl_dye.ja.tr +++ b/mods/ITEMS/mcl_dye/locale/mcl_dye.ja.tr @@ -7,12 +7,12 @@ Purple Dye=紫色の染料 Lapis Lazuli=ラピスラズリ Light Blue Dye=空色の染料 Cyan Dye=青緑色の染料 -Cactus Green=緑色の染料 +Green Dye=緑色の染料 Lime Dye=黄緑色の染料 -Dandelion Yellow=黄色の染料 +Yellow Dye=黄色の染料 Cocoa Beans=カカオ豆 Orange Dye=橙色の染料 -Rose Red=赤色の染料 +Red Dye=赤色の染料 Magenta Dye=赤紫色の染料 Pink Dye=桃色の染料 This item is a dye which is used for dyeing and crafting.=このアイテムは、染色や クラフトに使用される染料です。 From feca77c1d7735c84ad77b95eb3925868439324e9 Mon Sep 17 00:00:00 2001 From: grorp Date: Sun, 12 Mar 2023 11:33:49 +0000 Subject: [PATCH 06/11] Update translations (5/9) --- mods/ITEMS/mcl_dye/locale/mcl_dye.pl.tr | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mods/ITEMS/mcl_dye/locale/mcl_dye.pl.tr b/mods/ITEMS/mcl_dye/locale/mcl_dye.pl.tr index e9d8e4173..921983ec0 100644 --- a/mods/ITEMS/mcl_dye/locale/mcl_dye.pl.tr +++ b/mods/ITEMS/mcl_dye/locale/mcl_dye.pl.tr @@ -7,12 +7,12 @@ Purple Dye=Fioletowa farba Blue Dye=Niebieska farba Light Blue Dye=Jasnoniebieska farba Cyan Dye=Błękitna farba -Cactus Green=Kaktusowa zieleń +Green Dye=Zielona farba Lime Dye=Jasnozielona farba -Dandelion Yellow=Mleczowy żółty +Yellow Dye=Żółta farba Brown Dye=Brązowy farba Orange Dye=Pomarańczowa farba -Rose Red=Różany czerwony +Red Dye=Czerwona farba Magenta Dye=Karmazynowa farba Pink Dye=Różowa farba This item is a dye which is used for dyeing and crafting.=Ten przedmiot to farba wykorzystywana to farbowania i wytwarzania. From c706d44d55704abf61b89d13bf0d73b18bbeb842 Mon Sep 17 00:00:00 2001 From: grorp Date: Sun, 12 Mar 2023 11:34:14 +0000 Subject: [PATCH 07/11] Update translations (6/9) --- mods/ITEMS/mcl_dye/locale/mcl_dye.pt_BR.tr | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mods/ITEMS/mcl_dye/locale/mcl_dye.pt_BR.tr b/mods/ITEMS/mcl_dye/locale/mcl_dye.pt_BR.tr index 631a68f6c..2b6aef9f0 100644 --- a/mods/ITEMS/mcl_dye/locale/mcl_dye.pt_BR.tr +++ b/mods/ITEMS/mcl_dye/locale/mcl_dye.pt_BR.tr @@ -7,12 +7,12 @@ Purple Dye=Tintura Roxa Lapis Lazuli=Lápis-lazuli Light Blue Dye=Tintura Azul Claro Cyan Dye=Tintura Ciano -Cactus Green=Verde Cacto +Green Dye=Tintura Verde Lime Dye=Tintura Lima -Dandelion Yellow=Dente-de-leão Amarelo +Yellow Dye=Tintura Amarela Cocoa Beans=Sementes de Cacau Orange Dye=Tintura Laranja -Rose Red=Tintura Vermelha +Red Dye=Tintura Vermelha Magenta Dye=Tintura Magenta Pink Dye=Tintura Rosa This item is a dye which is used for dyeing and crafting.=Este item é uma tintura e pode ser usado para tingir ou fabricar. From 166f15f5c6af21950540b39e76fa8c66cf350a92 Mon Sep 17 00:00:00 2001 From: grorp Date: Sun, 12 Mar 2023 11:34:51 +0000 Subject: [PATCH 08/11] Update translations (7/9) --- mods/ITEMS/mcl_dye/locale/mcl_dye.ru.tr | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mods/ITEMS/mcl_dye/locale/mcl_dye.ru.tr b/mods/ITEMS/mcl_dye/locale/mcl_dye.ru.tr index 4e7903132..fc45a4bb4 100644 --- a/mods/ITEMS/mcl_dye/locale/mcl_dye.ru.tr +++ b/mods/ITEMS/mcl_dye/locale/mcl_dye.ru.tr @@ -7,12 +7,12 @@ Purple Dye=Пурпурный краситель Blue Dye=голубой краситель Light Blue Dye=Светло-голубой краситель Cyan Dye=Голубой краситель -Cactus Green=Зелень кактуса +Green Dye=Зеленый краситель Lime Dye=Зелёный лаймовый краситель -Dandelion Yellow=Одуванчиковый жёлтый краситель +Yellow Dye=Желтый краситель Brown Dye=Коричневый краситель Orange Dye=Оранжевый краситель -Rose Red=Экстракт красной розы +Red Dye=Красный краситель Magenta Dye=Фиолетовый краситель Pink Dye=Розовый краситель This item is a dye which is used for dyeing and crafting.=Это краситель, которые используется, чтобы окрашивать и крафтить. From 79996f143ef22344ea09f7526b2f5062f41bb544 Mon Sep 17 00:00:00 2001 From: grorp Date: Sun, 12 Mar 2023 11:35:31 +0000 Subject: [PATCH 09/11] Update translations (8/9) --- mods/ITEMS/mcl_dye/locale/mcl_dye.zh_TW.tr | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mods/ITEMS/mcl_dye/locale/mcl_dye.zh_TW.tr b/mods/ITEMS/mcl_dye/locale/mcl_dye.zh_TW.tr index 5e236e9dd..86dc708e2 100644 --- a/mods/ITEMS/mcl_dye/locale/mcl_dye.zh_TW.tr +++ b/mods/ITEMS/mcl_dye/locale/mcl_dye.zh_TW.tr @@ -7,12 +7,12 @@ Purple Dye=紫色染料 Blue Dye=藍色染料 Light Blue Dye=淺藍色染料 Cyan Dye=青色染料 -Cactus Green=仙人掌綠 +Green Dye=绿色染料 Lime Dye=淺綠色染料 -Dandelion Yellow=蒲公英黃 +Yellow Dye=黄色染料 Brown Dye=棕色染料 Orange Dye=橙色染料 -Rose Red=玫瑰紅 +Red Dye=红色染料 Magenta Dye=洋紅色染料 Pink Dye=粉紅色染料 This item is a dye which is used for dyeing and crafting.=這個物品是一種用於染色和合成的染料。 From 2b0c5549f46a7a1d887661131c665bcc96187049 Mon Sep 17 00:00:00 2001 From: grorp Date: Sun, 12 Mar 2023 11:35:56 +0000 Subject: [PATCH 10/11] Update translations (9/9) --- mods/ITEMS/mcl_dye/locale/template.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mods/ITEMS/mcl_dye/locale/template.txt b/mods/ITEMS/mcl_dye/locale/template.txt index a40b0859a..84bac96af 100644 --- a/mods/ITEMS/mcl_dye/locale/template.txt +++ b/mods/ITEMS/mcl_dye/locale/template.txt @@ -7,12 +7,12 @@ Purple Dye= Blue Dye= Light Blue Dye= Cyan Dye= -Cactus Green= +Green Dye= Lime Dye= -Dandelion Yellow= +Yellow Dye= Brown Dye= Orange Dye= -Rose Red= +Red Dye= Magenta Dye= Pink Dye= This item is a dye which is used for dyeing and crafting.= From a766a6ac85b75d7cbdf81cccdba97f10783b99a7 Mon Sep 17 00:00:00 2001 From: grorp Date: Sun, 12 Mar 2023 11:41:45 +0000 Subject: [PATCH 11/11] Fix a mistake in the German mcl_dye translation --- mods/ITEMS/mcl_dye/locale/mcl_dye.de.tr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ITEMS/mcl_dye/locale/mcl_dye.de.tr b/mods/ITEMS/mcl_dye/locale/mcl_dye.de.tr index 4757cfcd2..affe4cb8a 100644 --- a/mods/ITEMS/mcl_dye/locale/mcl_dye.de.tr +++ b/mods/ITEMS/mcl_dye/locale/mcl_dye.de.tr @@ -4,7 +4,7 @@ Light Grey Dye=Hellgrauer Farbstoff Grey Dye=Grauer Farbstoff Black Dye=Schwarzer Farbstoff Purple Dye=Violetter Farbstoff -Blue Dye=Blaue Farbstoff +Blue Dye=Blauer Farbstoff Light Blue Dye=Hellblauer Farbstoff Cyan Dye=Türkiser Farbstoff Green Dye=Grüner Farbstoff