From 706a6efbefa7264689fc04efab3e27731704712c Mon Sep 17 00:00:00 2001 From: Marcx <55658162+Ma-rcx@users.noreply.github.com> Date: Fri, 14 Jan 2022 04:13:18 +0100 Subject: [PATCH] Resolve merge conflict --- descriptions/ab+/ko_kr.lua | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/descriptions/ab+/ko_kr.lua b/descriptions/ab+/ko_kr.lua index b212298e..9134cff2 100644 --- a/descriptions/ab+/ko_kr.lua +++ b/descriptions/ab+/ko_kr.lua @@ -18,8 +18,19 @@ EID.descriptions[languageCode].custom = {} -- table for custom entity descriptio EID.descriptions[languageCode].languageName = "Korean" -- Fonts to be used with this language pack -EID.descriptions[languageCode].fonts={"korean_hcrdotum"--[[ , "korean_gulim", "korean_dotum" ]]} --- Only HCR_Dotum is compatible with current markup. Other fonts from pre-EID Korean have inline icon issues. +EID.descriptions[languageCode].languageName = "Korean" +--[[ + Description for Korean fonts : + korean_hcrdotum(함초롬돋움) - Default Korean font that was used from former EID Korean. Recommended LineHeight : 10 + korean_lanapixel(Lanapixel) - Used for official translation for TBoI : Repentance. Recommended LineHeight : 11 + korean_soyakkoma(소야꼬마9) - A fancy font that improves readability. Borderless/Inverted version available. Recommended LineHeight : 13 + korean_soyanon(소야논8) - A fancy font that that was used from former EID Korean. Recommended LineHeight : 11 + korean_galmoori9(갈무리9) - A font that inspired from Nintendo DS Korean font. Recommended LineHeight : 11 + korean_galmoori11(갈무리11) - A font that inspired from Nintendo DS Korean font. Used for unofficial Korean mod by Blackcreamtea. Recommended LineHeight : 13 + + korean_galmoori9, korean_galmoori11 is added for community request. + ]] +EID.descriptions[languageCode].fonts = {"korean_hcrdotum", "korean_lanapixel", "korean_soyakkoma", "korean_soyakkoma_borderless", "korean_soyakkoma_inverted", "korean_soyanon", "korean_galmoori9", "korean_galmoori11"} ---------- Collectibles ---------- EID.descriptions[languageCode].collectibles={