From 88be86ab4bea56efd0c0af59a357cb35777f6315 Mon Sep 17 00:00:00 2001 From: teknomunk Date: Sun, 18 Aug 2024 19:59:05 -0500 Subject: [PATCH] Remove stray merge conflict marking, add two additional empty translations to match template.txt --- mods/ITEMS/mcl_core/locale/mcl_core.de.tr | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mods/ITEMS/mcl_core/locale/mcl_core.de.tr b/mods/ITEMS/mcl_core/locale/mcl_core.de.tr index 33c3fe3c4..22c536edc 100644 --- a/mods/ITEMS/mcl_core/locale/mcl_core.de.tr +++ b/mods/ITEMS/mcl_core/locale/mcl_core.de.tr @@ -285,8 +285,9 @@ Slows down movement=Verlangsamt die Fortbewegung Grows on sand or dirt next to water=Wächst auf Sand oder Erde neben Wasser Stackable=Stapelbar Needs soil and water to grow=Braucht Nährboden und Wasser zum wachsen +Crying Obsidian= +Crying obsidian is a luminous obsidian that can generate as part of ruined portals.= Enchanted Golden Apple=Verzauberter goldener Apfel Light= Lights are invisible blocks. They are used to light up adventure maps and the like.= When you hold a light in hand, you reveal all placed lights in a short distance around you.= ->>>>>>> 25a4fae2e (Last three German translations for #4529)