Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
296 commits 1 branch 0 tags 19 MiB
Commit graph

201 commits

Author SHA1 Message Date
Krapht
414b6e5aa4 Merge branch 'master' of github.com:SirSengir/BuildCraft into FacadesRefactor 2012-07-24 21:36:37 +02:00
SirSengir
5662915ecb Merge pull request #120 from bartbes/WoodenPipeNPE 
Fix NullPointerException on wooden pipes when the inventory is empty / also closes #117
 2012-07-23 08:01:06 -07:00
Bart van Strien
60c13e0f70 Fix NullPointerException on wooden pipes when the inventory is empty 2012-07-23 16:57:15 +02:00
Kyprus
c73f10752e Fixed missing import. 2012-07-22 20:39:40 -04: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
22d7a716fe Replaced old ISpecialInventory in transport. 2012-07-20 09:19:46 +02: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
SirSengir
4078a8367c Refactored LiquidTank to be an interface, added fill and drain functions. 2012-07-18 13:42:51 +02:00
Krapht
ef3f12d333 Fixed display power sync, liquid sync still broken 2012-07-18 02:26:34 +02:00
SirSengir
6ac8ec1db6 Moved assembly table recipes to API. 2012-07-17 22:40:36 +02:00
SirSengir
8bf5f2b703 Added function to set liquid on LiquidTank.java 2012-07-17 21:28:56 +02:00
SirSengir
305947fe66 Converted refinery, tank and pump to use ITankContainer. 2012-07-17 18:21:11 +02:00
SirSengir
45a4c299dd Completing new API for liquids. 2012-07-17 17:49:05 +02:00
Krapht
24e342abbc Adds sync to renderstate (works in SMP), however, pipe-content sync is now broken, as are any gate interfaces for gates that you have not placed yourself. Also fixes autarchic gates being converted to non-autarchic gates. 2012-07-17 00:12:15 +02:00
Krapht
68a911f36a Fixed hardcoded texturefile 2012-07-16 17:48:06 +02:00
Krapht
6138cd3811 Merge branch 'FacadesRefactor' of github.com:SirSengir/BuildCraft into FacadesRefactor 2012-07-16 01:26:01 +02:00