tilera/electrodynamics
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

Fixed motor recipe

Browse source
This commit is contained in:
Calclavia 2014-03-16 17:18:07 +08:00
parent 6fefca72e2
commit ba3b254304
2 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
electrical/src/main/java/resonantinduction/electrical/Electrical.java
View file

@ -200,7 +200,7 @@ public class Electrical
/** Generators **/
GameRegistry.addRecipe(new ShapedOreRecipe(blockSolarPanel, "CCC", "WWW", "III", 'W', "wire", 'C', Item.coal, 'I', UniversalRecipe.PRIMARY_METAL.get()));
GameRegistry.addRecipe(new ShapedOreRecipe(blockMotor, "SRS", "SMS", "SWS", 'W', "wire", 'R', Item.redstone, 'M', UniversalRecipe.MOTOR.get(), 'S', UniversalRecipe.PRIMARY_METAL.get()));
GameRegistry.addRecipe(new ShapedOreRecipe(blockMotor, "SRS", "SMS", "SWS", 'W', "wire", 'R', Item.redstone, 'M', Block.blockIron, 'S', UniversalRecipe.PRIMARY_METAL.get()));
GameRegistry.addRecipe(new ShapedOreRecipe(blockThermopile, "ORO", "OWO", "OOO", 'W', "wire", 'O', Block.obsidian, 'R', Item.redstone));
/** Wire Compatiblity **/

6
electrical/src/main/java/resonantinduction/electrical/multimeter/PartMultimeter.java
View file

@ -21,7 +21,6 @@ import universalelectricity.api.electricity.IElectricalNetwork;
import universalelectricity.api.energy.IConductor;
import universalelectricity.api.energy.IEnergyNetwork;
import universalelectricity.api.net.IConnector;
import calclavia.api.atomicscience.ITemperature;
import calclavia.api.resonantinduction.IMechanicalNode;
import calclavia.lib.grid.INodeProvider;
import calclavia.lib.network.IPacketReceiver;
@ -311,11 +310,6 @@ public class PartMultimeter extends PartFace implements IConnector<MultimeterNet
getNetwork().pressureGraph.queue(((IPressureNodeProvider) tileEntity).getNode(FluidPressureNode.class, receivingSide).getPressure(receivingSide));
}
if (tileEntity instanceof ITemperature)
{
getNetwork().thermalGraph.queue(((ITemperature) tileEntity).getTemperature());
}
getNetwork().energyGraph.queue(CompatibilityModule.getEnergy(tileEntity, receivingSide));
/**