From 9edec3c7ab6eaa7615c658125b747b121c97999c Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sun, 11 Oct 2020 19:14:16 -0400
Subject: [PATCH 1/2] Update .travis.yml

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 6b1dfd72ac..11dbe8cd1e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,7 @@ script:
 - git clone --depth=1 --branch=master https://github.com/Anuken/MindustryBuilds ../MindustryBuilds
 - cd ../MindustryBuilds
 - echo ${TRAVIS_TAG}
-- if [ -n "$TRAVIS_TAG" ]; then echo versionName=5-fdroid-${TRAVIS_TAG:1}$'\n'versionCode=${TRAVIS_TAG:1} > version_fdroid.txt; git add .; git commit -m "Updating to build ${TRAVIS_TAG}"; fi
+- if [ -n "$TRAVIS_TAG" ]; then echo versionName=6-fdroid-${TRAVIS_TAG:1}$'\n'versionCode=${TRAVIS_TAG:1} > version_fdroid.txt; git add .; git commit -m "Updating to build ${TRAVIS_TAG}"; fi
 - git tag ${TRAVIS_BUILD_NUMBER}
 - git config --global user.name "Build Uploader"
 - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then git push https://Anuken:${GH_PUSH_TOKEN}@github.com/Anuken/MindustryBuilds ${TRAVIS_BUILD_NUMBER}; git push https://Anuken:${GH_PUSH_TOKEN}@github.com/Anuken/MindustryBuilds; fi

From 08629bb7f71b93e6022c81b22edc23a7d6a41fd2 Mon Sep 17 00:00:00 2001
From: Wiki Updater <57631841+Catchears@users.noreply.github.com>
Date: Mon, 12 Oct 2020 10:49:41 +0200
Subject: [PATCH 2/2] add bundle entry for dacit boulder

---
 core/assets/bundles/bundle.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index 70d7430557..51c8ac2485 100644
--- 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