Merge remote-tracking branch 'origin/master'

2020-10-12 10:06:41 -04:00
parent 378e81cd90 0ddc34a51d
commit f10c5c1ca8
2 changed files with 2 additions and 1 deletions
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -994,6 +994,7 @@ block.darksand-water.name = Dark Sand Water
 block.char.name = Char
 block.dacite.name = Dacite
 block.dacite-wall.name = Dacite Wall
+block.dacite-boulder.name = Dacite Boulder
 block.ice-snow.name = Ice Snow
 block.stone-wall.name = Stone Wall
 block.ice-wall.name = Ice Wall