Merge remote-tracking branch 'remotes/origin/1.10.2-v1' into 1.11 #betabuild

# Conflicts:
#	build.gradle
#	src/main/java/techreborn/client/container/ContainerAlloyFurnace.java
#	src/main/java/techreborn/items/tools/ItemWrench.java
This commit is contained in:
modmuss50 2016-12-07 13:52:48 +00:00
commit 3f8128d890
7 changed files with 73 additions and 23 deletions

View file

@ -63,6 +63,7 @@ public class TechRebornDevCommand extends CommandBase {
blocksToRemove.add(Blocks.GRASS);
blocksToRemove.add(Blocks.DIRT);
blocksToRemove.add(Blocks.STONE);
blocksToRemove.add(Blocks.END_STONE);
for (int x = 0; x < 25; x++) {
for (int z = 0; z < 25; z++) {
for (int y = 0; y < playerMP.posY; y++) {