CovertJaguar
e523988ea2
Merge pull request #1042 from AartBluestoke/language_update
...
Liquid -> Fluid
2013-07-22 19:07:07 -07:00
Andrew Hill
45964dde3a
Liquid -> Fluid
2013-07-23 12:02:16 +10:00
CovertJaguar
fe9dc15423
Bump forge dependancy
2013-07-22 16:45:41 -07:00
CovertJaguar
a14ac77ec3
Add new Fluid blocks to softBlocks
2013-07-22 16:41:58 -07:00
CovertJaguar
8995ff79bf
Clean up some Gate code
2013-07-22 14:14:36 -07:00
CovertJaguar
5353a47aec
Merge pull request #1037 from viliml/patch-1
...
Update Pipe.java
2013-07-22 14:02:12 -07:00
viliml
440b342165
Update Pipe.java
...
Fixes https://github.com/BuildCraft/BuildCraft/issues/1035 .
resetGate() set's the gate to null which causes a NPE.
2013-07-22 21:00:37 +02:00
CovertJaguar
cc24ad490c
Merge pull request #1032 from viliml/patch-1
...
Convert strings to chat messages in quarry messages
2013-07-21 13:21:00 -07:00
viliml
32adf8a309
Convert strings to chat messages
...
Fixes https://github.com/BuildCraft/BuildCraft/issues/1027
2013-07-21 14:39:56 +02:00
CovertJaguar
502af8f9ae
Add sanity check to hasPlug()
2013-07-20 22:52:42 -07:00
CovertJaguar
937fb12900
And Jack'O'Lanterns too
2013-07-20 19:36:35 -07:00
CovertJaguar
488a83f9e4
Ban Redstone Lamps from Facades
2013-07-20 19:35:14 -07:00
CovertJaguar
4d8799019e
Simplify trigger registration
2013-07-20 18:45:58 -07:00
CovertJaguar
66bc9914ae
Fix Gate GUI
2013-07-20 18:06:17 -07:00
CovertJaguar
e0e66f7910
Fix formatting of PipeTransportFluid
2013-07-20 17:28:54 -07:00
CovertJaguar
897eee58dc
Finished Trigger updates
2013-07-20 17:25:41 -07:00
CovertJaguar
a19470092e
Trigger busy work
...
Adapted old Icon framework to new API, reducing amount of busy work
tremendously.
Mostly what remains is providing unique tags for the triggers.
2013-07-20 16:25:32 -07:00
CovertJaguar
311078d660
Limited Gate/Trigger rewrite
...
Moved most of the Gate logic out of Pipe and into Gate. Expect some NPEs
on pipe.gate.
Converted the Trigger/Action API to key off of unique Strings instead of
IDs. Legacy conversion code implemented as well so it shouldn't affect
worlds.
Simplified Trigger/Action Icon functions. No more indexes.
More busy work is needed to convert the existing Triggers to the new
code.
2013-07-20 15:58:55 -07:00
CovertJaguar
b320c1f371
Fix pipe rotation code
...
Closes #1022
2013-07-19 15:58:21 -07:00
CovertJaguar
4fd129170c
Mark drips client only
...
Might fix server issues *shrugs*
2013-07-19 15:22:26 -07:00
CovertJaguar
2302eacad4
Merge pull request #1017 from viliml/patch-3
...
Fix combustion engine GUI not rendering fluids properly
2013-07-19 07:47:52 -07:00
CovertJaguar
9c35934e46
Merge pull request #1020 from viliml/patch-5
...
Squashed the last texture bugs
2013-07-19 07:47:39 -07:00
CovertJaguar
776147fe92
Merge pull request #1018 from viliml/patch-4
...
Add missing case for EQUIPPED_FIRST_PERSON
2013-07-19 07:47:02 -07:00
CovertJaguar
0ce916dcd8
Improve Pump search Algo
...
Mainly just cleaned up the code and replaced the TreeSets with Deques.
Also made it so the pump will only keep the pumping the same type of
liquid it started on. If you wish to reset it to pump any liquid hit
with a wrench and the next liquid it pumps will be the new filter.
2013-07-19 07:09:18 -07:00
viliml
4db502dbf6
Update RenderingEntityBlocks.java
2013-07-19 15:20:09 +02:00
viliml
5b37c2e505
Update GuiFiller.java
2013-07-19 15:10:56 +02:00
viliml
cbc6e70969
Fix engine GUI not drawing the lendger "energy" icon properly
...
I'm starting to see a pattern here...
2013-07-19 15:03:49 +02:00
viliml
1b84d0c592
Add missing case for EQUIPPED_FIRST_PERSON
...
It needs to be on the 1.6 branch too!
2013-07-19 14:08:10 +02:00
viliml
a75604d371
Fix combustion engine GUI not rendering fluids properly
...
Same thing as the tank, block textures aren't in terrain.png any more!
2013-07-19 14:04:13 +02:00
CovertJaguar
108adc1a03
Fix possible exception
2013-07-18 22:19:43 -07:00
CovertJaguar
39855eed65
Add Fluid drip particles
2013-07-18 22:19:23 -07:00
CovertJaguar
bf46a1a6af
Merge pull request #1013 from viliml/patch-2
...
Fix tank not rendering fluids properly.
2013-07-18 14:24:11 -07:00
CovertJaguar
5357467349
Merge pull request #1012 from viliml/patch-1
...
Fix typo.
2013-07-18 14:23:49 -07:00
CovertJaguar
16c261c478
Merge pull request #1014 from tomason/npe-combustion
...
fix NPE when using combustion engine with empty tank
2013-07-18 14:23:11 -07:00
CovertJaguar
0af5268c6b
Merge pull request #1016 from tomason/pump-fix
...
Pump fix
2013-07-18 14:22:46 -07:00
tomason
ec5f7edf7f
fix array indexes
2013-07-18 19:29:24 +02:00
tomason
db1ff2e5c7
Lava is now lava
2013-07-18 19:23:24 +02:00
viliml
d61aacde16
Fix tank not rendering fluids properly.
...
Before every fluid in the tank was pink(no texture) because the texture path has changed in 1.6.
2013-07-18 15:44:14 +02:00
viliml
d9a06ceba0
Fix typo.
...
In case another mod adds a fuel fluid, and it's loaded before BC, without this fix the fuel buckets would place oil blocks.
2013-07-18 15:26:16 +02:00
tomason
fa577e2c1b
fix NPE when using combustion engine with empty tank
2013-07-18 11:56:08 +02:00
CovertJaguar
e3e9404b8a
GuiRefinery code cleanup
2013-07-17 16:25:25 -07:00
CovertJaguar
9cb75de1df
PipeLogic Smash
2013-07-17 16:24:57 -07:00
CovertJaguar
1860ebc300
Rewrite Iron/Wood logic into helper classes
2013-07-17 16:12:01 -07:00
CovertJaguar
4dbd28a0dc
Wooden Power pipe needs no logic
2013-07-17 15:16:21 -07:00
CovertJaguar
f5c601b570
Fix net code
2013-07-17 13:43:44 -07:00
CovertJaguar
21920e1556
Fix liquid textures
2013-07-17 13:43:34 -07:00
CovertJaguar
13534ddae6
Some clean-up of the refinery code
2013-07-17 11:55:54 -07:00
CovertJaguar
e49bddc867
Fix issues with PR #1011
...
See https://github.com/BuildCraft/BuildCraft/issues/1011
2013-07-17 11:51:16 -07:00
CovertJaguar
a4765c766e
Merge pull request #943 from dmillerw/master
...
Fixed pipes rendering in hand as flat texture
2013-07-17 11:21:32 -07:00
CovertJaguar
de2f39f4cb
Merge pull request #1011 from samoht-2401/mc16
...
Get things running / New 1.6 ressource directory
2013-07-17 11:16:00 -07:00
