From 8d8519786e748ae996a71cc779f9101db5beab1f Mon Sep 17 00:00:00 2001
From: Ellpeck <megamaximal@gmail.com>
Date: Wed, 6 Jul 2016 22:01:28 +0200
Subject: [PATCH] r48!

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

diff --git a/build.gradle b/build.gradle
index 3d26e29f4..58cdfc4e5 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-r47"
+version = "1.10.2-r48"
 group = "de.ellpeck.actuallyadditions"
 archivesBaseName = "ActuallyAdditions"
 
diff --git a/update/changelog.md b/update/changelog.md
index b50d5e3e8..a245eb03c 100644
--- a/update/changelog.md
+++ b/update/changelog.md
@@ -1,4 +1,16 @@
-#1.10.2-r47
+# 1.10.2-r48
+* Added Shock Suppressor, a block that will cause explosions not to happen
+* Added Phantom Placer Siding rule button
+* Memes
+* Made some more blocks store some more information when broken
+* Make the miner have the drill's harvest level (4)
+* Made display stand only display RF when sneaking
+* Remove NEI Integration because it's not getting updated anymore anyways
+* Fixed a crash with the phantom redstoneface
+* Fixed a dupe bug with the drill and skulls
+* Removed booklet stand crafting recipe and doc
+
+# 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
diff --git a/update/updateVersions.properties b/update/updateVersions.properties
index debd0c5be..40abbbc11 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=47
\ No newline at end of file
+1.10.2=48
\ No newline at end of file