From eccbd83afbea57f4b79a3cc6809e2f2321813c37 Mon Sep 17 00:00:00 2001 From: Adubbz Date: Wed, 18 Aug 2021 13:18:44 +1000 Subject: [PATCH] git subrepo commit (merge) public subrepo: subdir: "public" merged: "1ae9e680" upstream: origin: "https://github.com/Glitchfiend/BiomesOPlenty.git" branch: "BOP-public" commit: "d54666a0" git-subrepo: version: "0.4.3" origin: "???" commit: "???" --- src/main/resources/assets/biomesoplenty/lang/ko_kr.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/resources/assets/biomesoplenty/lang/ko_kr.json b/src/main/resources/assets/biomesoplenty/lang/ko_kr.json index d7a59e84c..6301389ae 100644 --- a/src/main/resources/assets/biomesoplenty/lang/ko_kr.json +++ b/src/main/resources/assets/biomesoplenty/lang/ko_kr.json @@ -146,7 +146,11 @@ "block.biomesoplenty.cut_black_sandstone_slab": "깎인 검은 사암 반 블록", "block.biomesoplenty.cut_orange_sandstone": "깎인 주황 사암", "block.biomesoplenty.cut_orange_sandstone_slab": "깎인 주황 사암 반 블록", +<<<<<<< HEAD "block.biomesoplenty.cut_white_sandstone": "깍인 하얀 사암", +======= + "block.biomesoplenty.cut_white_sandstone": "깎인 하얀 사암", +>>>>>>> refs/subrepo/public/fetch "block.biomesoplenty.cut_white_sandstone_slab": "깎인 하얀 사암 반 블록", "block.biomesoplenty.dead_branch": "죽은 나뭇가지", "block.biomesoplenty.dead_button": "죽은 나무 버튼",