Merge branch 'development' of https://bitbucket.org/calclavia/resonant-induction into development
Conflicts: archaic/src/main/java/resonantinduction/archaic/fluid/tank/TileTank.java
This commit is contained in:
commit
02cf4dd618
2 changed files with 14 additions and 1 deletions
|
@ -3,11 +3,11 @@ package resonantinduction.archaic.fluid.tank;
|
|||
import calclavia.lib.content.module.TileBlock.IComparatorInputOverride;
|
||||
import calclavia.lib.content.module.TileRender;
|
||||
import calclavia.lib.render.FluidRenderUtility;
|
||||
import calclavia.lib.utility.render.RenderBlockUtility;
|
||||
import calclavia.lib.render.RenderUtility;
|
||||
import calclavia.lib.utility.FluidUtility;
|
||||
import calclavia.lib.utility.WorldUtility;
|
||||
import calclavia.lib.utility.inventory.InventoryUtility;
|
||||
import calclavia.lib.utility.render.RenderBlockUtility;
|
||||
import net.minecraft.client.renderer.RenderBlocks;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
|
|
@ -0,0 +1,13 @@
|
|||
package resonantinduction.electrical
|
||||
|
||||
import calclavia.lib.content.prefab.{TraitElectrical, TraitInventory}
|
||||
import net.minecraft.block.material.Material
|
||||
|
||||
/**
|
||||
* @since 22/03/14
|
||||
* @author tgame14
|
||||
*/
|
||||
class TileDistributor() extends TraitInventory(Material.rock) with TraitElectrical
|
||||
{
|
||||
|
||||
}
|
Loading…
Reference in a new issue