etc
/
BiomesOPlenty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix merge conflicts with ko translation

This commit is contained in:
Adubbz 2021-08-18 13:31:16 +10:00
parent 1ae9e6807a
commit 3ebc6bee5d
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/resources/assets/biomesoplenty/lang/ko_kr.json
View File

@ -146,11 +146,7 @@
"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": "죽은 나무 버튼",