Commit graph

3877 commits

Author SHA1 Message Date
asiekierka
eeaef4d9e0 BuildCraft 6.4.7 2015-04-03 22:03:51 +02:00
asiekierka
26691038ea Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft into 6.4.x 2015-04-03 21:59:56 +02:00
asiekierka
93d136f61b work around multiple fluids in pipes issues 2015-04-03 21:54:44 +02:00
Adrian Siekierka
1e4b647331 Merge pull request #2611 from hea3ven/6.4.x
fix an error when loading robot resources
2015-04-03 20:04:14 +02:00
Hea3veN
34b98eba9d fix an error when loading robot resources 2015-04-03 12:39:01 -03:00
asiekierka
fb1c7a5561 BlockGenericPipe now returns proper pipe icon, might help WAILA icon rendering 2015-04-03 13:45:44 +02:00
asiekierka
93df0d82be fix some pipe empty render pass bugs, try to fix TCon fluid pipe loss and fluid pipe massive liquid extraction buffers
Conflicts:
	common/buildcraft/transport/render/PipeRendererWorld.java
2015-04-03 13:35:25 +02:00
asiekierka
2c72127495 fix engine rendering bug that spilled back into BC 6 2015-04-03 09:54:43 +02:00
asiekierka
b977138ec4 more null checks 2015-04-03 09:30:27 +02:00
asiekierka
bf8403fd4e fix combustion engine never resetting its fuel value... did anyone ever test these things? 2015-04-02 14:58:01 +02:00
asiekierka
4e52c134fb Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft into 6.4.x 2015-04-02 14:50:51 +02:00
asiekierka
a1e67124cd further cleanup, fixes 2015-04-01 22:08:52 +02:00
asiekierka
16d6770c07 BuildCraft 6.4.6 2015-04-01 16:21:30 +02:00
asiekierka
c5f99464b8 fix #2600, #2591, #2589, #2584, etc 2015-04-01 16:15:10 +02:00
asiekierka
d570950059 fix #2593 2015-04-01 15:26:52 +02:00
asiekierka
f54f0a4c9f add hollow tabs to creative (#2587) 2015-04-01 15:05:33 +02:00
Hea3veN
4dfca53a35 fix en error in the planter when path length == 1 2015-03-29 20:40:29 +02:00
Hea3veN
9dd279dd9b fix the search robot ai running for too long if no valid blocks are available 2015-03-29 20:40:23 +02:00
asiekierka
dd686999c0 minor tweaks to bpt code 2015-03-27 22:50:57 +01:00
asiekierka
5adaf78a02 BuildCraft 6.4.5 2015-03-25 15:42:26 +01:00
asiekierka
60802f5045 try to fix #2584 2015-03-25 15:35:19 +01:00
asiekierka
3608844213 Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft into 6.4.x 2015-03-24 16:42:38 +01:00
asiekierka
1bfab4373d Fix #2585 2015-03-24 16:42:18 +01:00
Adrian Siekierka
358e9a6b4e Merge pull request #2583 from davboecki/patch-1
Fix #2582.
2015-03-23 17:37:28 +01:00
davboecki
9bf8885297 Fix #2582. 2015-03-23 17:13:58 +01:00
asiekierka
aad7319590 add display list caching to builder/filler rendering, remove duplicate code, minor optimizations 2015-03-22 10:13:11 +01:00
asiekierka
04fe3c31a7 BuildCraft 6.4.4 2015-03-22 00:34:34 +01:00
asiekierka
7bf6f02da3 Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft into 6.4.x 2015-03-22 00:31:30 +01:00
asiekierka
16bceed0d0 fix #2574 2015-03-22 00:30:52 +01:00
Adrian Siekierka
f41a483268 Merge pull request #2573 from hea3ven/robot-fixes
Robot fixes
2015-03-21 17:12:51 +01:00
Hea3veN
e1135ed183 fix a ConcurrentModificationException on the planter, fixes #2566 2015-03-21 10:22:29 -03:00
Hea3veN
45882961ca fix planters sometimes not finding valid planting blocks 2015-03-21 10:02:29 -03:00
Adrian Siekierka
e408a91ae8 Merge pull request #2569 from Unh0lyTigg/patch-1
Slimeballs don't have meta
2015-03-20 14:28:58 +01:00
Robert Allen
9966ad3a4e Slimeballs don't have meta 2015-03-19 13:43:39 -07:00
Adrian Siekierka
591b7e9908 Merge pull request #2558 from Kubuxu/robots-fix1
Potential fix for block breaking robots hanging up on air blocks.
2015-03-15 10:12:35 +01:00
Kubuxu
dd6c019bfc Potential fix for block breaking robots hanging up on air blocks. 2015-03-15 09:09:38 +01:00
asiekierka
41ea53ecb6 update versions.txt 2015-03-10 08:13:10 +01:00
asiekierka
5541c8e7fd BuildCraft 6.4.3 2015-03-10 08:11:23 +01:00
Adrian Siekierka
868a7db9ad Merge pull request #2548 from hea3ven/6.4.x
fix robot dupe when unloaded on a station other than the main link
2015-03-10 06:56:45 +01:00
Hea3veN
6b3409736d fix robot dupe when unloaded on a station other than the main link 2015-03-09 19:13:42 -03:00
asiekierka
d77aa4e9fa Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft into 6.4.x 2015-03-09 21:24:15 +01:00
asiekierka
d3288d107a Merge with 6.5.x energy value tweaks 2015-03-09 21:24:02 +01:00
asiekierka
457f69e5e0 tweak energy values in robots 2015-03-09 21:23:35 +01:00
asiekierka
d4a66f73eb Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft into 6.4.x 2015-03-09 21:21:46 +01:00
asiekierka
af2ea54b6d fix sleep usage being too high 2015-03-09 21:21:18 +01:00
asiekierka
8b05cc921d make robots try to recharge at a bit less than max 2015-03-09 21:21:13 +01:00
Adrian Siekierka
a7764683e0 Merge pull request #2544 from warlordjones/6.4.x
Should fix #2541
2015-03-09 20:22:34 +01:00
Arona Jones
c03df68e9a Possible fix for #2541 2015-03-09 14:18:48 +00:00
Adrian Siekierka
c0dee8dd29 Merge pull request #2543 from hea3ven/6.4.x
fix planters not working with zone planner areas
2015-03-09 06:52:30 +01:00
Hea3veN
61ffce7622 fix planters not working with zone planner areas 2015-03-08 19:48:17 -03:00