Commit graph

1694 commits

Author SHA1 Message Date
CovertJaguar
e705cec237 Merge pull request #1112 from ItsMeElConquistador/master
Fix pipe rendering (issue #1111)
2013-08-14 14:26:08 -07:00
CovertJaguar
7522478dd3 Merge pull request #1118 from SandGrainOne/master
isActive method can give NullPointerException
2013-08-14 02:23:50 -07:00
Flow86
60cb434da3 fixes #1120 again
<CovertJaguar> though personally it would be better to make the hook return the value to adjust it by
2013-08-14 10:31:45 +02:00
Flow86
91b2550956 Update PipeTransportPower.java
fixes #1120
2013-08-14 10:20:12 +02:00
SandGrainOne
a70cabb598 isActive method could give NullPointerException
A pump with an empty "block list" would cause NullPointerException if
isActive was called.
2013-08-13 20:22:55 +02:00
ElConquistador
a36f245e70 Fix pipe rendering (issue #1111) 2013-08-11 20:19:50 +02:00
CovertJaguar
95cbf27ba7 Merge branch 'master' of https://github.com/BuildCraft/BuildCraft 2013-08-09 01:41:42 -07:00
CovertJaguar
ae59a6cc88 Change how pump handles water.
Added config "consumeWater" which defaults to false. If false, pumps will not remove water source blocks if it detects more than 9 blocks of water in the area.

This should significantly reduce chunk rerenders and search cost (search terminates after 9 blocks). Essentially making a water pump nearly as computer friendly as an Aqueous Accumulator.
2013-08-09 01:36:01 -07:00
CovertJaguar
0ae4035dab Reduce redundant code in pipe world renderer 2013-08-09 01:30:03 -07:00
SirSengir
05b8bf355c 4.0.1 build. 2013-08-09 10:05:08 +02:00
CovertJaguar
c1e6c5d498 Fix AWB dupe
And make it less likely to happen again in the future.

Also cleaned up some fluid stuff.
2013-08-08 17:30:30 -07:00
CovertJaguar
2023ccb79a SST Tracker should use total time
Closed #1107
2013-08-08 17:26:28 -07:00
CovertJaguar
a6561628f4 Fix build.xml 2013-08-08 17:26:05 -07:00
SirSengir
78769e52a7 Merge branch 'mc16' 2013-08-08 08:45:59 +02:00
SirSengir
1aa8009f81 4.0.0 build. 2013-08-08 08:42:24 +02:00
CovertJaguar
7c8104c682 Merge branch 'master' of https://github.com/BuildCraft/BuildCraft 2013-08-07 14:54:30 -07:00
CovertJaguar
81b2c7043a Merge mc16 into master 2013-08-07 14:54:17 -07:00
CovertJaguar
a53a724b41 Revert STT changes
They were broken if you have more than one world.
2013-08-07 14:42:55 -07:00
SirSengir
358b58321a Fix missing default perdition calculator. 2013-08-07 16:05:04 +02:00
CovertJaguar
d6b8fd6f15 Oops that wasn't supposed to make it in 2013-08-07 02:01:46 -07:00
CovertJaguar
9472dea734 Revert "An attempt to improve PowerHandler cpu usage"
This reverts commit e85d99b047.
2013-08-06 22:48:07 -07:00
CovertJaguar
e85d99b047 An attempt to improve PowerHandler cpu usage 2013-08-06 21:50:42 -07:00
CovertJaguar
fc3e3d19cb Some performance improvements related to STT 2013-08-06 21:22:44 -07:00
CovertJaguar
91a84f2062 Changed IPipeConnection to return three states
And fix engines connecting to pipes. This is why I shouldn't code at 5
AM.
2013-08-06 14:47:45 -07:00
CovertJaguar
447b914fb5 Rework Pipe connection rules (again) 2013-08-06 04:58:35 -07:00
CovertJaguar
671caa458d Fix Utils.checkPipeConnections() 2013-08-06 03:55:08 -07:00
CovertJaguar
defc41f5d1 More stuff for Soaryn 2013-08-04 17:16:40 -07:00
CovertJaguar
66481d5b62 Fix Soaryn's broken stuff 2013-08-04 16:02:53 -07:00
CovertJaguar
ee1a89f1c3 Add NPE check
Fixes #1090
2013-08-04 16:02:31 -07:00
CovertJaguar
15acae3c54 Merge pull request #1093 from viliml/patch-3
Update BuildCraftEnergy.java
2013-08-04 15:45:06 -07:00
CovertJaguar
65789f5e89 Merge pull request #1089 from kiljacken/mc16
Add missing imports
2013-08-04 15:44:16 -07:00
viliml
321d8d1f2b Update BuildCraftEnergy.java
Fixes https://github.com/BuildCraft/BuildCraft/issues/1091.
2013-08-04 22:23:23 +02:00
Emil Lauridsen
3b90e2ed35 Add missing imports 2013-08-04 16:33:38 +02:00
CovertJaguar
a5be4d79c4 Merge pull request #1088 from Soaryn/patch-1
Fixes Fluid Color Render
2013-08-04 02:00:02 -07:00
Soaryn
c62c33c11e Fixed spacing 2013-08-03 22:42:06 -04:00
Soaryn
fff440836b Adds Missed call for color 2013-08-03 22:22:24 -04:00
Soaryn
1dd3c3a58f Adds Missed call for color 2013-08-03 22:11:41 -04:00
Soaryn
89980dceb2 Adds FluidStack color to pipes Render 2013-08-03 22:02:40 -04:00
Soaryn
cb8a139f01 Adds FluidStack color to tank Render 2013-08-03 21:43:15 -04:00
Soaryn
fee9c44fe7 Adds FluidStack color to refinery Render 2013-08-03 21:42:29 -04:00
Soaryn
333e38d5b2 Adds color to Refinery Fluids
Note, this needs a FluidStack to be complete. This only covers basic Fluid Colors
2013-08-03 21:40:57 -04:00
Soaryn
95fa107860 Adds colorFluid Helper to FluidRenderer 2013-08-03 21:38:57 -04:00
CovertJaguar
b0f72a94ab Add container null check 2013-08-01 00:13:52 -07:00
CovertJaguar
67a9f6389e Forgot some bits 2013-08-01 00:00:23 -07:00
CovertJaguar
f3602d2205 Let Items decide if they like an Inventory 2013-07-31 23:57:09 -07:00
CovertJaguar
5b45375870 Typo boo! 2013-07-31 23:23:31 -07:00
CovertJaguar
3985e58970 endReached should control further processing 2013-07-31 23:22:01 -07:00
CovertJaguar
617d06c3b0 Flood Gate now shuts off on redstone signal 2013-07-31 15:42:00 -07:00
CovertJaguar
ddd2c0f3a1 Fix pump output 2013-07-31 15:41:35 -07:00
CovertJaguar
fad6b9f469 Adjust Iron Fluid Pipe Texture to match Item Pipe 2013-07-31 15:16:18 -07:00