mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 04:52:25 +00:00
Merge branch 'development' into 1.8
Conflicts: src/main/java/mekanism/common/tile/TileEntityDynamicTank.java src/main/java/mekanism/common/tile/TileEntitySalinationValve.java src/main/java/mekanism/common/util/CableUtils.java
This commit is contained in:
commit
3b53614bd2
3 files changed
+7
-11
No files matched your search
@@ -48,7 +48,7 @@ import cpw.mods.fml.common.Optional.Method;
|
||||
|
||||
import cofh.api.energy.IEnergyContainerItem;
|
||||
|
||||
@Interface(iface = "micdoodle8.mods.galacticraft.api.entity.IEntityBreathable", modid = "Galacticrat API")
|
||||
@Interface(iface = "micdoodle8.mods.galacticraft.api.entity.IEntityBreathable", modid = "Galacticraft API")
|
||||
public class EntityRobit extends EntityCreature implements IInventory, ISustainedInventory, IEntityBreathable
|
||||
{
|
||||
public double MAX_ELECTRICITY = 100000;
|
||||
|
||||
Reference in new issue
Block a user