Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'nightly' into marmot

Browse source
This commit is contained in:
SpaceToad 2014-01-06 20:24:58 +01:00
commit 78f62ffffb
3 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
buildcraft_resources/build.number
View file

@ -1,3 +1,3 @@
#Build Number for ANT. Do not edit!
#Sat Nov 30 16:28:06 PST 2013
build.number=53
#Sat Jan 04 11:45:52 PST 2014
build.number=57

8
buildcraft_resources/changelog/4.2.2 Normal file
View file

@ -0,0 +1,8 @@
#4.2.2
- New: Iron Fluid Pipes now get orientation triggers as well. (Speiger)
- Fix: Engines no longer drop double the items. (CovertJaguar)
- Fix: Filler Pattern selection is less derpy. (CovertJaguar)
- Fix: Desert Oil Biome should decorate. (CovertJaguar)
- Fix: Advanced Crafting Table now properly supports custom IRecipes with variable outputs. (CovertJaguar)

3
common/buildcraft/BuildCraftEnergy.java
View file

@ -17,7 +17,6 @@ import buildcraft.core.DefaultProps;
import buildcraft.core.InterModComms;
import buildcraft.core.Version;
import buildcraft.core.fluids.BCFluid;
import buildcraft.core.network.PacketHandler;
import buildcraft.core.proxy.CoreProxy;
import buildcraft.core.triggers.BCTrigger;
import buildcraft.energy.BlockBuildcraftFluid;
@ -63,7 +62,7 @@ import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
@Mod(name = "BuildCraft Energy", version = Version.VERSION, useMetadata = false, modid = "BuildCraft|Energy", dependencies = DefaultProps.DEPENDENCY_CORE)
@NetworkMod(channels = {DefaultProps.NET_CHANNEL_NAME}, packetHandler = PacketHandler.class, clientSideRequired = true, serverSideRequired = true)
@NetworkMod(channels = {DefaultProps.NET_CHANNEL_NAME}, clientSideRequired = true, serverSideRequired = true)
public class BuildCraftEnergy {
public final static int ENERGY_REMOVE_BLOCK = 25;