Krapht
|
723fec37a0
|
Merge pull request #128 from ZeldoKavira/master
A bug from that refactoring update that stops building
|
2012-07-25 10:37:45 -07:00 |
|
ZeldoKavira
|
7fc41d8d29
|
Fix import bug from refactoring
|
2012-07-25 13:32:54 -04:00 |
|
SirSengir
|
140a86e8aa
|
Merge pull request #125 from ZeldoKavira/master
PipeLoss Config, NPE fix on iron engine and quarry
|
2012-07-25 09:39:21 -07:00 |
|
ZeldoKavira
|
879a268f40
|
Merge remote-tracking branch 'SenGir/master'
|
2012-07-25 12:21:18 -04:00 |
|
ZeldoKavira
|
739ef3e450
|
Iron Engine Fix, removed the iron engine explosion options
|
2012-07-25 12:07:09 -04:00 |
|
SirSengir
|
ef603b0d42
|
Fixed namespace.
|
2012-07-25 12:45:15 +02:00 |
|
SirSengir
|
6589f16ea9
|
Moved common API to seperate subpackage.
|
2012-07-25 12:17:22 +02:00 |
|
SirSengir
|
0fe5c6a31e
|
Moved blueprint related API to seperate subpackage.
|
2012-07-25 12:06:15 +02:00 |
|
SirSengir
|
4194aacfad
|
Moved transport related API into own subpackage.
|
2012-07-25 12:00:15 +02:00 |
|
SirSengir
|
fbdefd5d5d
|
Merge branch 'master' of github.com:SirSengir/BuildCraft
Conflicts:
common/net/minecraft/src/buildcraft/factory/BlockFrame.java
common/net/minecraft/src/buildcraft/factory/BlockPlainPipe.java
common/net/minecraft/src/buildcraft/transport/PipeLogicDiamond.java
common/net/minecraft/src/buildcraft/transport/PipeTransportPower.java
common/net/minecraft/src/buildcraft/transport/TileGenericPipe.java
common/net/minecraft/src/buildcraft/transport/pipes/PipeLiquidsWood.java
|
2012-07-25 11:54:43 +02:00 |
|
ZeldoKavira
|
1ca0d48e31
|
PipeLoss config option and rare quarry NPE fix
|
2012-07-25 01:57:15 -04:00 |
|
Krapht
|
beca597140
|
Added saving of facades to NBT
|
2012-07-25 00:36:12 +02:00 |
|
Krapht
|
b6dcb9749f
|
Added netsync for liquids
|
2012-07-24 23:53:57 +02:00 |
|
Krapht
|
414b6e5aa4
|
Merge branch 'master' of github.com:SirSengir/BuildCraft into FacadesRefactor
|
2012-07-24 21:36:37 +02:00 |
|
SirSengir
|
ed1c5590f6
|
Renamed and moved ILegacyPipeConnection.java out of API.
|
2012-07-24 12:19:04 +02:00 |
|
SirSengir
|
d3b7045810
|
Move TileNetworkData.java from API to core.
|
2012-07-24 12:13:19 +02:00 |
|
SirSengir
|
2184f902f1
|
Removed obsolete imports.
|
2012-07-24 12:11:23 +02:00 |
|
SirSengir
|
81b5004112
|
Merge branch 'master' of github.com:SirSengir/BuildCraft
|
2012-07-24 12:09:49 +02:00 |
|
SirSengir
|
6562aa1810
|
Removed obsolete API functions and classes.
|
2012-07-24 12:07:47 +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 |
|
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 |
|