mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-21 04:22:26 +00:00
Merge branch 'development' into 1.8 (gosh darn conflicts)
Conflicts: src/api/java/ic2/api/Direction.java src/api/java/ic2/api/energy/NodeStats.java src/main/java/mekanism/common/Mekanism.java src/main/java/mekanism/common/block/BlockMachine.java src/main/java/mekanism/common/tile/TileEntityElectricBlock.java src/main/java/mekanism/common/util/MekanismUtils.java src/main/java/mekanism/generators/common/block/BlockGenerator.java
This commit is contained in:
commit
60bf7f5f3d
13 files changed
+123
-124
No files matched your search
@@ -18,7 +18,7 @@ import ic2.api.energy.tile.IEnergySink;
|
||||
|
||||
@InterfaceList({
|
||||
@Interface(iface = "buildcraft.api.power.IPowerReceptor", modid = "BuildCraftAPI|power"),
|
||||
@Interface(iface = "ic2.api.energy.tile.IEnergySink", modid = "IC2API", striprefs = true),
|
||||
@Interface(iface = "ic2.api.energy.tile.IEnergySink", modid = "IC2"),
|
||||
@Interface(iface = "cofh.api.energy.IEnergyHandler", modid = "CoFHAPI|energy"),
|
||||
@Interface(iface = "dan200.computercraft.api.peripheral.IPeripheral", modid = "ComputerCraft")
|
||||
})
|
||||
|
||||
Reference in new issue
Block a user