Commit graph

1652 commits

Author SHA1 Message Date
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
CovertJaguar
4c056e989c Power spikes mess with Request triggers 2013-07-31 14:28:22 -07:00
CovertJaguar
10d9d2bb10 Fix some minor isAir checks that were missed 2013-07-31 14:10:53 -07:00
CovertJaguar
a2d30930de Fix Iron Fluid Pipe rotation 2013-07-31 03:23:17 -07:00
SirSengir
658718e3ac Remove SideOnly in PacketPayload
SideOnly should only ever be a last resort.
2013-07-31 11:58:39 +02:00
CovertJaguar
d120512934 Some minor Pipe content render improvements 2013-07-31 01:56:53 -07:00
CovertJaguar
cf87c4229d Added disconnects to the version check 2013-07-29 20:35:42 -07:00
CovertJaguar
422f9855a4 Make Wrench full 3D 2013-07-29 12:19:16 -07:00
CovertJaguar
b390753cc5 Merge pull request #1068 from tommy1019/patch-5
Added "smart" refinery gui
2013-07-28 18:34:15 -07:00
tommy1019
de39b79ea0 Added "smart" refinery gui
Shift-left clicking clears the filter
Right clicking sets the filter to the current fluid in the corresponding tank
2013-07-28 20:21:47 -05:00
CovertJaguar
6150ff56b1 Merge pull request #1067 from tommy1019/patch-4
Fixed Texture fighting issues with Gates/Plugs
2013-07-28 17:00:45 -07:00
tommy1019
31d1e522e8 Fixed Texture fighting issues with Gates/Plugs 2013-07-28 17:56:11 -05:00
CovertJaguar
0a81c8fca7 Fixed Refinery GUI. Thanks Tommy!
Closes #1066
Closes #1062
2013-07-28 15:34:39 -07:00
CovertJaguar
ab64958955 Change TravItem position to primitives 2013-07-28 00:46:33 -07:00
CovertJaguar
fd3555a56a Fix injectItems
Closes #1064
2013-07-27 23:00:04 -07:00
CovertJaguar
87624d9572 Merge branch 'mc16' of https://github.com/BuildCraft/BuildCraft into mc16 2013-07-27 19:24:32 -07:00
CovertJaguar
a3565c71c6 Fix legacy Gate code on the Pipe
Why does NO ONE ever test builds on old worlds? Compatibility between MC
versions is a huge priority!
2013-07-27 19:23:50 -07:00
CovertJaguar
1d40cb2d2f Merge pull request #1061 from tommy1019/patch-2
Obsidian pipes can't pick up arrows players can't.
2013-07-27 18:51:40 -07:00
tommy1019
479ebc2f3f Obsidian pipes can't pick up arrows players can't. 2013-07-27 18:39:26 -05:00
CovertJaguar
54677904f0 Don't try to place Fluids with no block 2013-07-27 16:09:11 -07:00
CovertJaguar
5e7d6905e7 Fix typo 2013-07-27 13:52:28 -07:00
CovertJaguar
46d73fbc50 Fix AIOOB in RenderPipe
Closes #1059
2013-07-27 13:39:39 -07:00
CovertJaguar
d62148bb07 Merged EntityData and EntityPassiveItem
They have been replaced by TravelingItem. Which means yes, I broke the
various pipe hooks again.

Additionally IPipedItem and IEntityPassiveItemContribution have been
deleted. Contributions were replaced by a simple NBTCompoundTag field in
TravelingItem (which is essentially all that contributions were anyway).
2013-07-27 05:59:57 -07:00
CovertJaguar
d9636a7455 Fix shift-left clicking Lapis pipes
Unfortunately I need to fix a Forge bug to make them swing properly.
2013-07-27 00:07:33 -07:00
CovertJaguar
474d422bb6 Merge pull request #1058 from tommy1019/patch-1
Shift-right click on lapis pipe scrolls backwards.
2013-07-26 23:03:25 -07:00
tommy1019
339675aee8 Shift-right click on lapis pipe scrolls backwards. 2013-07-26 23:44:03 -05:00
CovertJaguar
71bd0a92fd Merge pull request #1055 from viliml/patch-2
Temporary solution to fluids eating other fluids
2013-07-26 20:51:25 -07:00
CovertJaguar
2abeb62d78 Merge pull request #1056 from FyberOptic/mc16
Assembly Table isInvalid() Crash Fix
2013-07-26 20:47:27 -07:00
FyberOptic
bffa773344 Assembly Table isInvalid() Crash Fix
Solution for #1054.  Avoids crash from name conflict with .isInvalid()
between ILaserTarget interface and TileEntity class, in relation to
TileAssemblyTable and TileAdvancedCraftingTable.
2013-07-26 13:02:12 -04:00
viliml
c057307f33 Temporary solution to fluids eating other fluids
This will work for BC, untill the Forge devs decide what would be the best universal approach. For now this is a solution to prevent the issue for Oil and Fuel, using the rule "first fluid wins".
2013-07-26 14:20:05 +02:00