From a2000d8bb3c95da09638851b4a60f1a556be59f5 Mon Sep 17 00:00:00 2001
From: Ellpeck <megamaximal@gmail.com>
Date: Wed, 31 Aug 2016 21:23:47 +0200
Subject: [PATCH] r61!

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

diff --git a/build.gradle b/build.gradle
index a97b6e14c..75335e035 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,7 +14,7 @@ buildscript {
 apply plugin: 'net.minecraftforge.gradle.forge'
 apply plugin: 'idea'
 
-version = "1.10.2-r60"
+version = "1.10.2-r61"
 group = "de.ellpeck.actuallyadditions"
 archivesBaseName = "ActuallyAdditions"
 
diff --git a/update/changelog.md b/update/changelog.md
index 083eeb302..9f564cb9f 100644
--- a/update/changelog.md
+++ b/update/changelog.md
@@ -1,3 +1,24 @@
+# 1.10.2-r61
+* Made machines split their energy/fluids when putting them into other blocks
+* Removed worm's bounding box as it was showing up on some HUD mods
+* Move JEI booklet handler so that people notice the other JEI handlers and don't just click away
+* Made empowerer recipes take different items, so they're sort of a little bit like Botania runes now, yay
+* Made empowerer recipes take less energy and time
+* Made the display stand always show its RF, not just by sneaking
+* Fixed crash with null facing in tesla integration
+* Stopped the breaker from mining liquids because it doesn't even make any sense anyway
+* Fixed the phantom placer just crashing in pulse mode .-.
+* Made water vaporize in the nether with the Fluid Placer
+* New Fermenting barrel texture and model
+* New Canola press texture and model
+* Fixed mushrooms creating nether wart infinitely with the Reconstructor
+* Use that weird new runnable thing now that apparently prevents crashes in some way
+* Made the smiley cloud not crash with ItemBlock-less blocks on them
+* Use Oredictionary Chests for crafting
+* Finally hopefully fix weird syncing bugs
+* New Oil Gen texture/model
+* Tweaked empowerer and display stand models
+
 # 1.10.2-r60
 * Fixed infinite worm tilling
 * Made the grinder not crash you once opening it
diff --git a/update/updateVersions.properties b/update/updateVersions.properties
index 15895ac2b..aac0335ee 100644
--- a/update/updateVersions.properties
+++ b/update/updateVersions.properties
@@ -3,4 +3,4 @@
 1.9=33
 1.9.4=45
 1.10=46
-1.10.2=60
\ No newline at end of file
+1.10.2=61
\ No newline at end of file