From b55c63538fcc58c9705c402476716e8d6a40adc3 Mon Sep 17 00:00:00 2001
From: Ellpeck <megamaximal@gmail.com>
Date: Wed, 29 Jun 2016 14:03:14 +0200
Subject: [PATCH] 1.10.2 and with that, r47!

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

diff --git a/build.gradle b/build.gradle
index 7e5fd36e5..3d26e29f4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,12 +14,12 @@ buildscript {
 apply plugin: 'net.minecraftforge.gradle.forge'
 apply plugin: 'idea'
 
-version = "1.10-r46"
+version = "1.10.2-r47"
 group = "de.ellpeck.actuallyadditions"
 archivesBaseName = "ActuallyAdditions"
 
 minecraft {
-    version = "1.10-12.18.0.2000-1.10.0"
+    version = "1.10.2-12.18.0.2002-1.10.0"
     runDir = "idea"
 
     mappings = "snapshot_20160519"
diff --git a/update/changelog.md b/update/changelog.md
index 61cab6d44..b50d5e3e8 100644
--- a/update/changelog.md
+++ b/update/changelog.md
@@ -1,3 +1,10 @@
+#1.10.2-r47
+* Updated to 1.10.2. Could've guessed that by the name.
+* Fixed a crash when searching the booklet
+* Made empty buckets be able to get pulled out of the coal generator
+* Added biomass and biocoal made from canola seeds and made canola edible
+* Added medium and large storage crates
+
 # 1.10-r46
 * Updated to 1.10. Obviously.
 * Made booklet actually save its bookmarks
diff --git a/update/updateVersions.properties b/update/updateVersions.properties
index a8ff10a10..debd0c5be 100644
--- a/update/updateVersions.properties
+++ b/update/updateVersions.properties
@@ -2,4 +2,5 @@
 1.8.9=26
 1.9=33
 1.9.4=45
-1.10=46
\ No newline at end of file
+1.10=46
+1.10.2=47
\ No newline at end of file