Merge branch 'BOP-1.12.x-7.0.x' of https://github.com/Glitchfiend/BiomesOPlenty into BOP-1.12.x-7.0.x

This commit is contained in:
Forstride 2018-04-13 09:55:47 -04:00
commit c53b3402e7

View file

@ -157,6 +157,7 @@ tile.dirt.coarse_silty_dirt.name=粗淤土
tile.double_plant.flax.name=亚麻
tile.double_plant.tall_cattail.name=香蒲
tile.double_plant.eyebulb.name=眼灯草
tile.double_plant.sea_oats.name=海燕麦
tile.ebony_fence.name=檀木栅栏
tile.ebony_fence_gate.name=檀木栅栏门
tile.ebony_wood_slab.name=檀木台阶
@ -361,6 +362,7 @@ tile.plant_1.devilweed.name=恶魔草
tile.plant_1.reed.name=芦苇
tile.plant_1.root.name=根
tile.plant_1.rafflesia.name=大王花
tile.plant_1.barley.name=麦
tile.redwood_fence.name=红木栅栏
tile.redwood_fence_gate.name=红木栅栏门
tile.redwood_wood_slab.name=红木台阶