From 77a808ab7692e4835e53a762ae9774356f85320a Mon Sep 17 00:00:00 2001
From: Ellpeck <megamaximal@gmail.com>
Date: Mon, 21 Aug 2017 02:33:37 +0200
Subject: [PATCH] r118

---
 build.gradle                     |  2 +-
 update/changelog.md              | 10 ++++++++++
 update/updateVersions.properties |  2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 3f29f66b7..4af4199b4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,7 +14,7 @@ buildscript {
 apply plugin: 'net.minecraftforge.gradle.forge'
 apply plugin: 'idea'
 
-version = "1.12-r117"
+version = "1.12-r118"
 group = "de.ellpeck.actuallyadditions"
 archivesBaseName = "ActuallyAdditions"
 
diff --git a/update/changelog.md b/update/changelog.md
index 27bfadeb4..def4c2767 100644
--- a/update/changelog.md
+++ b/update/changelog.md
@@ -1,3 +1,13 @@
+# 1.12-r118
+* Added magma blocks as additional sources for the heat collector
+* Fix Experience Solidifier not working with automation
+* Added config option to completely disable tools
+* Fix normal torches attaching to the sides of tiny torches
+* Fix Nether Coal from BWM being made from grinding coal in the Crusher
+* Added Comparator support for the Atomic Reconstructor
+* Fix the Drill progress being reset while it recharges
+* Fix lush caves having blocks from other mods (like marble or limestone) inside of them
+
 # 1.12-r117
 * Resolve a dupe glitch with the advanced precision dropper
 * Made the worm be able to hoe BOP grasses
diff --git a/update/updateVersions.properties b/update/updateVersions.properties
index 69e4baa6b..6d6f143fe 100644
--- a/update/updateVersions.properties
+++ b/update/updateVersions.properties
@@ -6,4 +6,4 @@
 1.10.2=105
 1.11=92
 1.11.2=110
-1.12=117
\ No newline at end of file
+1.12=118
\ No newline at end of file