Merge branch 'master-1.8' into master-1.9

Conflicts:
	build.properties

Author: rubensworks

build.properties

@@ -1,4 +1,4 @@
-mod_version=0.5.2
+mod_version=0.5.3
 minecraft_version=1.9
 forge_version=12.16.0.1767-1.9
 mcp_mappings_version=snapshot_20160312

resources/changelog/1.8.9-0.5.3.txt

@@ -0,0 +1,5 @@
+Make sure to backup your world before updating!
+
+Fixes:
+* Move the place at which onPreBlockDestroyed is called.
+* Add safety checks for avoiding null oredict entries

resources/changelog/1.9-0.5.2.txt resources/changelog/1.9-0.5.3.txtresources/changelog/1.9-0.5.2.txt renamed to resources/changelog/1.9-0.5.3.txt

@@ -192,9 +192,9 @@ public void breakBlock(World world, BlockPos blockPos, IBlockState blockState) {
     }
 
     @Override
-    public void onBlockHarvested(World worldIn, BlockPos pos, IBlockState state, EntityPlayer player) {
-        onPreBlockDestroyed(worldIn, pos, player);
-        super.onBlockHarvested(worldIn, pos, state, player);
+    public boolean removedByPlayer(World world, BlockPos pos, EntityPlayer player, boolean willHarvest) {
+        onPreBlockDestroyed(world, pos, player);
+        return super.removedByPlayer(world, pos, player, willHarvest);
     }
 
     @Override