From 04541bd7a9de6aff4ec99a394c4fa3442f73fd93 Mon Sep 17 00:00:00 2001
From: Ellpeck <megamaximal@gmail.com>
Date: Sat, 8 Jul 2017 21:13:25 +0200
Subject: [PATCH] r114!

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

diff --git a/build.gradle b/build.gradle
index 3fa499c90..85d55e89d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,7 +14,7 @@ buildscript {
 apply plugin: 'net.minecraftforge.gradle.forge'
 apply plugin: 'idea'
 
-version = "1.12-r113"
+version = "1.12-r114"
 group = "de.ellpeck.actuallyadditions"
 archivesBaseName = "ActuallyAdditions"
 
diff --git a/update/changelog.md b/update/changelog.md
index d8c003d0e..04bbec7dc 100644
--- a/update/changelog.md
+++ b/update/changelog.md
@@ -1,3 +1,12 @@
+# 1.12-r114
+#### Shadows_of_Fire has been doing all the maintaining and fixing for 1.12 so far and I really appreciate it. So thank him for making these fixes possible <3
+* Fix the Crafting Table On A Stick not working
+* Fix worms not rendering when placed in the world
+* Make lamps only be toggleable with an empty hand
+* Make lamps' light update smoother
+* Fix Laser Relays sometimes crashing when they're transferring energy
+* Fix the game crashing if any of the villagers is disabled in the config
+
 # 1.12-r113
 * Fixed recipes not showing up in the manual (thanks Shadows >_>)
 
diff --git a/update/updateVersions.properties b/update/updateVersions.properties
index 524a11ecd..eb88731d0 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=113
\ No newline at end of file
+1.12=114
\ No newline at end of file