Commit graph

494 commits

Author SHA1 Message Date
Kyprus
c73f10752e Fixed missing import. 2012-07-22 20:39:40 -04:00
SirSengir
3d04befa64 Merge pull request #116 from Bart97/master
Add a work scheduled and work done triggers to the assembly table
2012-07-22 08:07:42 -07:00
Krapht
906df0a278 Merge branch 'master' into FacadesRefactor
Conflicts:
	common/net/minecraft/src/buildcraft/transport/Pipe.java
	common/net/minecraft/src/buildcraft/transport/PipeLogicDiamond.java
	common/net/minecraft/src/buildcraft/transport/PipeTransportLiquids.java
	common/net/minecraft/src/buildcraft/transport/TileGenericPipe.java
	common/net/minecraft/src/buildcraft/transport/TriggerPipeContents.java
	common/net/minecraft/src/buildcraft/transport/pipes/PipeItemsObsidian.java
	common/net/minecraft/src/buildcraft/transport/pipes/PipeItemsStripes.java
	common/net/minecraft/src/buildcraft/transport/pipes/PipeItemsWood.java
	common/net/minecraft/src/buildcraft/transport/pipes/PipeLiquidsSandstone.java
	common/net/minecraft/src/buildcraft/transport/pipes/PipeLiquidsVoid.java
	common/net/minecraft/src/buildcraft/transport/pipes/PipeLiquidsWood.java
	common/net/minecraft/src/buildcraft/transport/pipes/PipePowerWood.java
2012-07-22 13:14:25 +02:00
Bart
cdc429872a Added Work scheduled and Work done triggers to Assembly Table. 2012-07-22 14:02:53 +03:00
SirSengir
b50c4de239 Merge branch 'LiquidPipeRewrite' of github.com:SirSengir/BuildCraft into LiquidPipeRewrite 2012-07-22 09:43:58 +02:00
SirSengir
c6c6a0c9cb Merge branch 'master' into LiquidPipeRewrite 2012-07-22 09:43:03 +02:00
Krapht
40d96a1602 Added saving, liquid wooden pipes no longer allow liquid to go back into the tank, fixed so it works with iron liquid pipe 2012-07-21 23:55:45 +02:00
SirSengir
d6fa02ad35 Added interface for pipettes. 2012-07-21 19:56:31 +02:00
Krapht
500aab5925 Merge branch 'master' of github.com:SirSengir/BuildCraft into LiquidPipeRewrite 2012-07-21 13:18:49 +02:00
SirSengir
b4c529382f Added setter for capacity of ILIquidTanks. 2012-07-21 12:57:16 +02:00
Krapht
e1665f504b Merge branch 'master' of github.com:SirSengir/BuildCraft into LiquidPipeRewrite 2012-07-21 12:32:37 +02:00
SirSengir
53b3ec5dc0 Merge branch 'master' of github.com:SirSengir/BuildCraft 2012-07-21 10:56:33 +02:00
SirSengir
5bd849d60f Engines use float for energy now. 2012-07-21 10:55:40 +02:00
Krapht
c353aad072 Merge branch 'master' into LiquidPipeRewrite
Conflicts:
	common/net/minecraft/src/buildcraft/transport/PipeTransportLiquids.java
	common/net/minecraft/src/buildcraft/transport/TileGenericPipe.java
	common/net/minecraft/src/buildcraft/transport/TriggerPipeContents.java
2012-07-21 02:12:00 +02:00
Krapht
3a4f867b34 Fixed the averaging to not overwrite the actual liquids 2012-07-21 01:57:19 +02:00
Krapht
e785c910fd Added hooks for validate, invalidate and onChunkUnload 2012-07-21 01:20:07 +02:00
Krapht
888fdb459a Added renderer support for liquid meta, added liquid avarages to smooth liquid rendering, extracted some methods 2012-07-21 01:12:53 +02:00
SirSengir
81b58867a5 Fixed lava not being accepted as combustion engine fuel. 2012-07-21 00:00:01 +02:00
SirSengir
910fee26a7 Added coolant for combustion engines to API. 2012-07-20 23:43:27 +02:00
Krapht
589f6ad4de Added bouncing and cleaned up code 2012-07-20 21:08:27 +02:00
SirSengir
b318fc818e Merge branch 'master' of github.com:SirSengir/BuildCraft 2012-07-20 20:26:53 +02:00
SirSengir
556b5da7ff Changed overlooked hardcoded types to use interfaces. 2012-07-20 20:26:20 +02:00
SirSengir
9931e31b41 Merge pull request #112 from CovertJaguar/patch-4
Fixed potential liquid duplication bug when filling containers.
2012-07-20 11:14:52 -07:00
SirSengir
52c807b8fd Refactored action and trigger API to use interfaces. 2012-07-20 20:13:05 +02:00
Krapht
2045547ff0 Repaired liquid triggers 2012-07-20 20:06:53 +02:00
CovertJaguar
6f3f3544f7 Fixed potential liquid duplication bug when filling containers with capacity greater than a bucket. 2012-07-20 10:58:52 -07:00
Krapht
77529c04b2 Center drains equally from all inputs 2012-07-20 19:38:27 +02:00
Krapht
63a496062f Removed stackTagCompound from liquidstacks, it doesn't play nice with liquidpipes 2012-07-20 19:37:30 +02:00
Krapht
5db9fb2e72 Merge branch 'master' into LiquidPipeRewrite
Conflicts:
	common/net/minecraft/src/buildcraft/transport/PipeLogicDiamond.java
2012-07-20 18:48:32 +02:00
SirSengir
372d090a67 Fixed addition to generic inventories. 2012-07-20 16:02:04 +02:00
SirSengir
b8ed333b73 Merge branch 'master' of github.com:SirSengir/BuildCraft 2012-07-20 12:47:29 +02:00
Krapht
088a47bfb9 Merge pull request #103 from psxlover/master
Set the brightness before rendering a marker.
2012-07-20 00:52:36 -07:00
Krapht
b06adb30c6 Merge pull request #109 from CovertJaguar/patch-3
Some efficiency improvements to the pipe renderer.
2012-07-20 00:51:22 -07:00
SirSengir
22d7a716fe Replaced old ISpecialInventory in transport. 2012-07-20 09:19:46 +02:00
Lars Stadel Linnet
2c53cfe913 Added chmod +x flag for 2 OSX specific files required for running install.sh from Forge 2012-07-20 08:58:47 +02:00
CovertJaguar
2e6f9acf60 Increased number of items for render from 5 to 10 2012-07-19 22:46:27 -07:00
CovertJaguar
5631c80eb6 Increased max number of items rendered from 3 to 5. 2012-07-19 22:20:46 -07:00
CovertJaguar
ec95590e0f Increased render distance. 2012-07-19 22:00:07 -07:00
CovertJaguar
e090b748b8 Reduced render distance. 2012-07-19 20:25:40 -07:00
CovertJaguar
1482cc41ac Limited number of items that can be rendered. 2012-07-19 20:09:15 -07:00
CovertJaguar
ecf58dc38f Various efficiency improvements to pipe rendering. 2012-07-19 19:33:49 -07:00
CovertJaguar
47eff20cb5 Added distance check to pipe render code limiting rendering to 32 blocks away. 2012-07-19 19:02:33 -07:00
Krapht
0b38427203 Started rewrite of liquid pipes for the new liquid API, will only connect to TEs that implement the new one.
Missing: center pipesection pulling fairly from multiple inputs, bounceback timeout when target tile haven't accepted liquid in a while.
Other: Netsync, NBT save, code cleanup, triggers,
2012-07-20 02:04:36 +02:00
SirSengir
4efd07332a Refactored everything outside of .transport to use ITankContainer and new ISpecialInventory. 2012-07-19 21:24:56 +02:00
SirSengir
be7bb5d31b More work on inventory interfaces. 2012-07-19 14:18:43 +02:00
SirSengir
d6f5adac9e Added new inventory interfaces. (Not functional yet!) 2012-07-18 23:03:50 +02:00
Krapht
4f88ded2f7 Fixed the changed location of AssemblyTable recipes 2012-07-18 19:41:58 +02:00
SirSengir
4d93993797 Fixed PneumaticPowerFramework.java 2012-07-18 17:42:54 +02:00
Krapht
618e04a910 Merge branch 'master' into FacadesRefactor 2012-07-18 17:40:22 +02:00
SirSengir
a617ef9ef9 Moved power framework API to new format. 2012-07-18 17:17:10 +02:00