diff --git a/build.gradle b/build.gradle index 0dab70ba..87762012 100755 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ apply plugin: 'forge' // adds the forge dependency apply plugin: 'maven' // for uploading to a maven repo apply plugin: 'checkstyle' -version = "6.2.3" +version = "6.2.4" group= "com.mod-buildcraft" archivesBaseName = "buildcraft" // the name that all artifacts will use as a base. artifacts names follow this pattern: [baseName]-[appendix]-[version]-[classifier].[extension] diff --git a/buildcraft_resources/changelog/6.2.4 b/buildcraft_resources/changelog/6.2.4 new file mode 100644 index 00000000..74e74f1b --- /dev/null +++ b/buildcraft_resources/changelog/6.2.4 @@ -0,0 +1,2 @@ +Bugfixes: +* [#2290] 6.2.2 Regresion: Pipes don't connect to quarry (asie) diff --git a/buildcraft_resources/versions.txt b/buildcraft_resources/versions.txt index a9957525..9971fd5f 100755 --- a/buildcraft_resources/versions.txt +++ b/buildcraft_resources/versions.txt @@ -1,3 +1,3 @@ 1.6.4:BuildCraft:4.2.2 1.7.2:BuildCraft:6.0.16 -1.7.10:BuildCraft:6.2.3 +1.7.10:BuildCraft:6.2.4 diff --git a/common/buildcraft/factory/TileQuarry.java b/common/buildcraft/factory/TileQuarry.java index 2bd08039..99627b5e 100644 --- a/common/buildcraft/factory/TileQuarry.java +++ b/common/buildcraft/factory/TileQuarry.java @@ -35,6 +35,8 @@ import buildcraft.api.core.IAreaProvider; import buildcraft.api.core.SafeTimeTracker; import buildcraft.api.filler.FillerManager; import buildcraft.api.tiles.IHasWork; +import buildcraft.api.transport.IPipeConnection; +import buildcraft.api.transport.IPipeTile; import buildcraft.core.Box; import buildcraft.core.Box.Kind; import buildcraft.core.CoreConstants; @@ -49,7 +51,7 @@ import buildcraft.core.proxy.CoreProxy; import buildcraft.core.utils.BlockUtils; import buildcraft.core.utils.Utils; -public class TileQuarry extends TileAbstractBuilder implements IHasWork, ISidedInventory, IDropControlInventory { +public class TileQuarry extends TileAbstractBuilder implements IHasWork, ISidedInventory, IDropControlInventory, IPipeConnection { private static enum Stage { BUILDING, @@ -860,4 +862,9 @@ public class TileQuarry extends TileAbstractBuilder implements IHasWork, ISidedI public boolean doDrop() { return false; } + + @Override + public ConnectOverride overridePipeConnection(IPipeTile.PipeType type, ForgeDirection with) { + return type == IPipeTile.PipeType.ITEM ? ConnectOverride.CONNECT : ConnectOverride.DEFAULT; + } }