Projects >> Additional-Buildcraft-Objects-Mod >>54427940e765adf7ed44abc7410dcc9578209772

Chunk
Conflicting content 
			pipePowerSwitch = createPipe(pipePowerSwitchID, PipePowerSwitch.class, "Power Switch Pipe", 1, BuildCraftTransport.pipePowerGold, Block.lever, null);

<<<<<<< HEAD
			triggerEngineControl = new TriggerEngineSafe(triggerEngineControlID);
=======
			pipePowerIron = createPipe(pipePowerIronID, PipePowerIron.class, "Iron Power Pipe", 1, Item.redstone, BuildCraftTransport.pipeItemsIron, null);

			pipePowerDiamond = createPipe(pipePowerDiamondID, PipePowerDiamond.class, "Diamond Power Pipe", 1, Item.redstone, BuildCraftTransport.pipeItemsDiamond, null);
			
			triggerEngineControl = new TriggerEngineControl(triggerEngineControlID);
>>>>>>> 790b46f54bc8cc76f20c0b1eb209fa9a1508a71c
			actionSwitchOnPipe = new ActionSwitchOnPipe(actionSwitchOnPipeID);

			ActionManager.registerTriggerProvider(new ABOTriggerProvider());
Solution content 
			pipePowerSwitch = createPipe(pipePowerSwitchID, PipePowerSwitch.class, "Power Switch Pipe", 1, BuildCraftTransport.pipePowerGold, Block.lever, null);

			pipePowerIron = createPipe(pipePowerIronID, PipePowerIron.class, "Iron Power Pipe", 1, Item.redstone, BuildCraftTransport.pipeItemsIron, null);

			pipePowerDiamond = createPipe(pipePowerDiamondID, PipePowerDiamond.class, "Diamond Power Pipe", 1, Item.redstone, BuildCraftTransport.pipeItemsDiamond, null);
			
			triggerEngineControl = new TriggerEngineSafe(triggerEngineControlID);
			actionSwitchOnPipe = new ActionSwitchOnPipe(actionSwitchOnPipeID);

			ActionManager.registerTriggerProvider(new ABOTriggerProvider());
File
ABO.java
Developer's decision
Combination
Kind of conflict
Attribute
Method invocation