Merge branch 'pr/648'

This reverts commit 66fcbc4d69.

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Mon Sep 14 12:28:28 PDT 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip

gradlew

@@ -169,4 +169,4 @@ if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
   cd "$(dirname "$0")"
 fi
 
-exec "$JAVACMD" "$@"
+exec "$JAVACMD" "$@"

src/main/java/nc/multiblock/turbine/block/BlockTurbineRotorBlade.java

@@ -14,7 +14,10 @@ import net.minecraft.world.*;
 import net.minecraftforge.fml.relauncher.*;
 
 public class BlockTurbineRotorBlade extends BlockTurbinePart implements IBlockRotorBlade {
-	
+
+	// Bounding box pulled from the rotor blade model
+	private final AxisAlignedBB bbox = new AxisAlignedBB(2D, 0D, 7D, 14D, 16D, 9D);
+
 	private final TurbineRotorBladeType bladeType;
 	
 	public BlockTurbineRotorBlade(TurbineRotorBladeType bladeType) {
@@ -51,7 +54,12 @@ public class BlockTurbineRotorBlade extends BlockTurbinePart implements IBlockRo
 	public AxisAlignedBB getCollisionBoundingBox(IBlockState blockState, IBlockAccess worldIn, BlockPos pos) {
 		return NULL_AABB;
 	}
-	
+
+	@Override
+	public AxisAlignedBB getSelectedBoundingBox(IBlockState state, World worldIn, BlockPos pos) {
+		return bbox;
+	}
+
 	@Override
 	public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) {
 		if (player == null) {

src/main/java/nc/multiblock/turbine/block/BlockTurbineRotorStator.java

@@ -14,6 +14,9 @@ import net.minecraft.world.*;
 import net.minecraftforge.fml.relauncher.*;
 
 public class BlockTurbineRotorStator extends BlockTurbinePart implements IBlockRotorBlade {
+
+	// Bounding box pulled from the rotor stator model
+	private final AxisAlignedBB bbox = new AxisAlignedBB(7D, 0D, 2D, 9D, 16D, 14D);
 	
 	public BlockTurbineRotorStator() {
 		super();
@@ -39,7 +42,12 @@ public class BlockTurbineRotorStator extends BlockTurbinePart implements IBlockR
 	public AxisAlignedBB getCollisionBoundingBox(IBlockState blockState, IBlockAccess worldIn, BlockPos pos) {
 		return NULL_AABB;
 	}
-	
+
+	@Override
+	public AxisAlignedBB getSelectedBoundingBox(IBlockState state, World worldIn, BlockPos pos) {
+		return bbox;
+	}
+
 	@Override
 	public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) {
 		if (player == null) {

src/main/resources/assets/nuclearcraft/patchouli_books/guide/zh_cn/entries/machines/processors.json

@@ -66,7 +66,7 @@
             "anchor": "electrolyzer",
             "type": "machines/single_machine",
             "block": "nuclearcraft:electrolyzer",
-            "text": "使用电能分解电子。"
+            "text": "使用电能分解分子。"
         },
         {
             "anchor": "assembler",