Merge branch '7.1.x' of github.com:BuildCraft/BuildCraft into 7.1.x
This commit is contained in:
commit
d2f9826d19
3 changed files with 2 additions and 5 deletions
|
@ -22,7 +22,7 @@ apply plugin: 'forge' // adds the forge dependency
|
|||
apply plugin: 'maven' // for uploading to a maven repo
|
||||
apply plugin: 'checkstyle'
|
||||
|
||||
version = "7.1.17"
|
||||
version = "7.1.18"
|
||||
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]
|
||||
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
1.6.4:BuildCraft:4.2.2
|
||||
1.7.2:BuildCraft:6.0.16
|
||||
1.7.10:BuildCraft:7.1.17
|
||||
1.7.10:BuildCraft:7.1.18
|
||||
|
|
|
@ -34,7 +34,6 @@ import buildcraft.api.events.BlockInteractionEvent;
|
|||
import buildcraft.api.transport.IItemPipe;
|
||||
import buildcraft.core.lib.block.BlockBuildCraft;
|
||||
import buildcraft.core.lib.render.ICustomHighlight;
|
||||
import buildcraft.core.lib.utils.Utils;
|
||||
|
||||
public abstract class BlockEngineBase extends BlockBuildCraft implements ICustomHighlight {
|
||||
private static final AxisAlignedBB[][] boxes = {
|
||||
|
@ -260,8 +259,6 @@ public abstract class BlockEngineBase extends BlockBuildCraft implements ICustom
|
|||
|
||||
/**
|
||||
* Checks to see if this block has an engine tile for the given metadata.
|
||||
*
|
||||
* Used for checking in {@link Utils#isRegistered(net.minecraft.item.ItemStack)}
|
||||
*/
|
||||
public abstract boolean hasEngine(int meta);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue