Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1

block/AEBaseBlock.java

@@ -187,8 +187,9 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
 		this( c, mat, null );
 		setLightOpacity( 15 );
 		setLightLevel( 0 );
-		setHardness( 1.2F );
+		setHardness( 2.2F );
 		setTileProvider( false );
+		setHarvestLevel( "pickaxe", 0 );
 	}
 
 	// update Block value.

block/grindstone/BlockGrinder.java

@@ -19,6 +19,7 @@ public class BlockGrinder extends AEBaseBlock
 		super( BlockGrinder.class, Material.rock );
 		setfeature( EnumSet.of( AEFeature.GrindStone ) );
 		setTileEntiy( TileGrinder.class );
+		setHardness( 3.2F );
 	}
 
 	@Override
@@ -27,7 +28,7 @@ public class BlockGrinder extends AEBaseBlock
 		TileGrinder tg = getTileEntity( w, x, y, z );
 		if ( tg != null && !p.isSneaking() )
 		{
-			Platform.openGUI( p, tg, ForgeDirection.getOrientation(side),GuiBridge.GUI_GRINDER );
+			Platform.openGUI( p, tg, ForgeDirection.getOrientation( side ), GuiBridge.GUI_GRINDER );
 			return true;
 		}
 		return false;

block/misc/BlockVibrationChamber.java

@@ -25,6 +25,7 @@ public class BlockVibrationChamber extends AEBaseBlock
 		super( BlockVibrationChamber.class, Material.iron );
 		setfeature( EnumSet.of( AEFeature.PowerGen ) );
 		setTileEntiy( TileVibrationChamber.class );
+		setHardness( 4.2F );
 	}
 
 	@Override

block/solids/BlockSkyStone.java

@@ -46,8 +46,17 @@ public class BlockSkyStone extends AEBaseBlock implements IOrientableBlock
 	@SubscribeEvent
 	public void breakFaster(PlayerEvent.BreakSpeed Ev)
 	{
-		if ( Ev.block == this && (Ev.originalSpeed > 7 || Ev.metadata > 0) )
-			Ev.newSpeed /= 0.1;
+		if ( Ev.block == this && Ev.entityPlayer != null )
+		{
+			ItemStack is = Ev.entityPlayer.inventory.getCurrentItem();
+			int level = -1;
+
+			if ( is != null )
+				level = is.getItem().getHarvestLevel( is, "pickaxe" );
+
+			if ( Ev.metadata > 0 || level >= 3 || Ev.originalSpeed > 7.0 )
+				Ev.newSpeed /= 0.1;
+		}
 	}
 
 	public BlockSkyStone() {