Merge branch 'master' into 1.8.8

# Conflicts:
#	ToAddBack/partSystem/parts/CablePart.java
This commit is contained in:
modmuss50 2015-12-12 17:39:23 +00:00
commit fb6b5135e4
2 changed files with 10 additions and 2 deletions

View file

@ -409,8 +409,16 @@ public class CablePart extends ModPart implements IEnergyConductor, INetworkTile
} else if (entity instanceof IEnergyTile) { } else if (entity instanceof IEnergyTile) {
return true; return true;
} else { } else {
<<<<<<< HEAD:ToAddBack/partSystem/parts/CablePart.java
if (ModPartUtils.hasPart(entity.getWorldObj(), entity.getPos().getX(), entity.getPos().getY(), entity.getPos().getZ(), this.getName())) { if (ModPartUtils.hasPart(entity.getWorldObj(), entity.getPos().getX(), entity.getPos().getY(), entity.getPos().getZ(), this.getName())) {
CablePart otherCable = (CablePart) ModPartUtils.getPartFromWorld(entity.getWorldObj(), new Location(entity.getPos().getX(), entity.getPos().getY(), entity.getPos().getZ()), this.getName()); CablePart otherCable = (CablePart) ModPartUtils.getPartFromWorld(entity.getWorldObj(), new Location(entity.getPos().getX(), entity.getPos().getY(), entity.getPos().getZ()), this.getName());
=======
if (ModPartUtils.hasPart(entity.getWorldObj(), entity.xCoord, entity.yCoord, entity.zCoord, this.getName())) {
CablePart otherCable = (CablePart) ModPartUtils.getPartFromWorld(entity.getWorldObj(), new Location(entity.xCoord, entity.yCoord, entity.zCoord), this.getName());
if(otherCable == null || dir == null){
return false;
}
>>>>>>> master:src/main/java/techreborn/partSystem/parts/CablePart.java
int thisDir = Functions.getIntDirFromDirection(dir); int thisDir = Functions.getIntDirFromDirection(dir);
int thereDir = Functions.getIntDirFromDirection(dir.getOpposite()); int thereDir = Functions.getIntDirFromDirection(dir.getOpposite());
boolean hasconnection = otherCable.connections[thereDir]; boolean hasconnection = otherCable.connections[thereDir];

View file

@ -69,9 +69,9 @@ configurations {
def ENV = System.getenv() def ENV = System.getenv()
if (ENV.BUILD_NUMBER) { if (ENV.BUILD_NUMBER) {
version = "0.7.1." + "${System.getenv().BUILD_NUMBER}" version = "0.7.2." + "${System.getenv().BUILD_NUMBER}"
} else { } else {
version = "0.7.1.BUILD" version = "0.7.2.BUILD"
} }
minecraft { minecraft {