Merge branch 'master' into development

This commit is contained in:
Ben Spiers committed 2014-11-11 12:52:27 +00:00
commit 64d0f8a5cc
1 file changed
+1
@@ -34,6 +34,7 @@ import ic2.api.tile.IEnergyStorage;
@InterfaceList({
@Interface(iface = "ic2.api.energy.tile.IEnergySink", modid = "IC2"),
@Interface(iface = "ic2.api.energy.tile.IEnergySource", modid = "IC2"),
@Interface(iface = "ic2.api.tile.IEnergyStorage", modid = "IC2"),
@Interface(iface = "cofh.api.energy.IEnergyHandler", modid = "CoFHAPI|energy"),
})