diff --git a/core/Registration.java b/core/Registration.java index 7d5cce15b..b574cf184 100644 --- a/core/Registration.java +++ b/core/Registration.java @@ -324,7 +324,7 @@ public class Registration blocks.blockQuartzGlass = addFeature( BlockQuartzGlass.class ); blocks.blockQuartzVibrantGlass = addFeature( BlockQuartzLamp.class ); - blocks.blockQuartzPiller = addFeature( BlockQuartzPillar.class ); + blocks.blockQuartzPillar = addFeature( BlockQuartzPillar.class ); blocks.blockQuartzChiseled = addFeature( BlockQuartzChiseled.class ); blocks.blockQuartzTorch = addFeature( BlockQuartzTorch.class ); blocks.blockLightDetector = addFeature( BlockLightDetector.class ); diff --git a/crafting/CraftingLink.java b/crafting/CraftingLink.java index 70cc9af89..1dacb2d85 100644 --- a/crafting/CraftingLink.java +++ b/crafting/CraftingLink.java @@ -136,7 +136,7 @@ public class CraftingLink implements ICraftingLink if ( tie == null || tie.req == null || tie.req.req == null ) return input; - return tie.req.req.injectCratedItems( tie.req, input, mode ); + return tie.req.req.injectCraftedItems( tie.req, input, mode ); } public void markDone() diff --git a/helpers/DualityInterface.java b/helpers/DualityInterface.java index ede02f876..e6d588144 100644 --- a/helpers/DualityInterface.java +++ b/helpers/DualityInterface.java @@ -970,7 +970,7 @@ public class DualityInterface implements IGridTickable, ISegmentedInventory, ISt return craftingTracker.getRequestedJobs(); } - public IAEItemStack injectCratedItems(ICraftingLink link, IAEItemStack aquired, Actionable mode) + public IAEItemStack injectCraftedItems(ICraftingLink link, IAEItemStack aquired, Actionable mode) { int slot = craftingTracker.getSlot( link ); diff --git a/integration/modules/BC.java b/integration/modules/BC.java index 0e0f9f6c6..8a365f541 100644 --- a/integration/modules/BC.java +++ b/integration/modules/BC.java @@ -212,7 +212,7 @@ public class BC extends BaseModule implements IBC addFacade( b.blockFluix.stack( 1 ) ); addFacade( b.blockQuartz.stack( 1 ) ); addFacade( b.blockQuartzChiseled.stack( 1 ) ); - addFacade( b.blockQuartzPiller.stack( 1 ) ); + addFacade( b.blockQuartzPillar.stack( 1 ) ); try { diff --git a/integration/modules/FMP.java b/integration/modules/FMP.java index dfe360c9f..1186e6c16 100644 --- a/integration/modules/FMP.java +++ b/integration/modules/FMP.java @@ -66,7 +66,7 @@ public class FMP implements IIntegrationModule, IPartFactory, IPartConverter, IF public void Init() throws Throwable { createAndRegister( AEApi.instance().blocks().blockQuartz.block(), 0 ); - createAndRegister( AEApi.instance().blocks().blockQuartzPiller.block(), 0 ); + createAndRegister( AEApi.instance().blocks().blockQuartzPillar.block(), 0 ); createAndRegister( AEApi.instance().blocks().blockQuartzChiseled.block(), 0 ); createAndRegister( AEApi.instance().blocks().blockSkyStone.block(), 0 ); createAndRegister( AEApi.instance().blocks().blockSkyStone.block(), 1 ); diff --git a/parts/automation/PartExportBus.java b/parts/automation/PartExportBus.java index 906707533..e4108fbef 100644 --- a/parts/automation/PartExportBus.java +++ b/parts/automation/PartExportBus.java @@ -270,7 +270,7 @@ public class PartExportBus extends PartSharedItemBus implements IGridTickable, I } @Override - public IAEItemStack injectCratedItems(ICraftingLink link, IAEItemStack items, Actionable mode) + public IAEItemStack injectCraftedItems(ICraftingLink link, IAEItemStack items, Actionable mode) { InventoryAdaptor d = getHandler(); diff --git a/parts/misc/PartInterface.java b/parts/misc/PartInterface.java index d8b4a1638..94eddab76 100644 --- a/parts/misc/PartInterface.java +++ b/parts/misc/PartInterface.java @@ -381,9 +381,9 @@ public class PartInterface extends PartBasicState implements IGridTickable, ISeg } @Override - public IAEItemStack injectCratedItems(ICraftingLink link, IAEItemStack items, Actionable mode) + public IAEItemStack injectCraftedItems(ICraftingLink link, IAEItemStack items, Actionable mode) { - return duality.injectCratedItems( link, items, mode ); + return duality.injectCraftedItems( link, items, mode ); } @Override diff --git a/tile/misc/TileInterface.java b/tile/misc/TileInterface.java index 96c053f1e..8dce9064f 100644 --- a/tile/misc/TileInterface.java +++ b/tile/misc/TileInterface.java @@ -263,9 +263,9 @@ public class TileInterface extends AENetworkInvTile implements IGridTickable, IS } @Override - public IAEItemStack injectCratedItems(ICraftingLink link, IAEItemStack items, Actionable mode) + public IAEItemStack injectCraftedItems(ICraftingLink link, IAEItemStack items, Actionable mode) { - return duality.injectCratedItems( link, items, mode ); + return duality.injectCraftedItems( link, items, mode ); } @Override