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

git subrepo commit (merge) public

Browse source 
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:   "???"
This commit is contained in:
Adubbz 2021-08-18 13:18:44 +10:00
parent 87eda1720b
commit eccbd83afb
1 changed files with 4 additions and 0 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,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": "죽은 나무 버튼",