Commit graph

3853 commits

Author SHA1 Message Date
asiekierka
1bfab4373d Fix #2585 2015-03-24 16:42:18 +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
Adrian Siekierka
e6df71f1f0 Merge pull request #2540 from Kubuxu/carrier
Make carrier robots load to full from one station
2015-03-08 18:17:04 +01:00
Kubuxu
1c8b0b48ba
Make carrier robots load to full from one station 2015-03-08 14:54:54 +01:00
Adrian Siekierka
14a5b25d64 Merge pull request #2539 from Thog/fix-2537
Knights now search IMob instead of EntityMob (Fix #2537)
2015-03-08 14:30:14 +01:00
Thog
9214f48459 Knights now search IMob instead of EntityMob (Fix #2537) 2015-03-08 14:11:07 +01:00
asiekierka
a210ddd349 Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft into 6.4.x 2015-03-07 23:24:45 +01:00
asiekierka
801b4492c9 Merge with 6.5.x tree 2015-03-07 23:24:35 +01:00
viliml
c93ce3a326 Stop the cooling when it round the use to zero 2015-03-07 23:23:20 +01:00
asiekierka
b0bf96d5ef fixed redstone engine extraction system in wooden power pipes 2015-03-07 23:22:47 +01:00
asiekierka
436de92c7e fix charging table patch 2015-03-07 00:21:49 +01:00
Adrian Siekierka
e8f967d9b3 Merge pull request #2532 from Kubuxu/dance
Fix picker robots dancing if two items are in same block
2015-03-06 23:57:19 +01:00
Kubuxu
01b1951139 Fix picker robots dancing if two items are in same block
Signed-off-by: Kubuxu <kubuxu@gmail.com>
2015-03-06 23:54:38 +01:00
asiekierka
c82fa36033 fix charging table storing negative RF 2015-03-06 20:27:01 +01:00
Adrian Siekierka
31742b3c96 Merge pull request #2531 from marcin212/master
Fix block break robots going into sleep mode after successfully harvesti...
2015-03-06 17:40:33 +01:00
marcin212
bc9e61cc67 Fix block break robots going into sleep mode after successfully harvesting block. Close #2528 2015-03-06 17:35:48 +01:00
asiekierka
e970f4b5ec fix version number in script - gah 2015-03-03 20:09:05 +01:00
asiekierka
727c0e205b Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft 2015-03-03 20:08:16 +01:00
asiekierka
883e8b479e fix changelog 2015-03-03 20:07:43 +01:00
asiekierka
dfa3f5f557 BuildCraft 6.4.2 2015-03-03 20:06:19 +01:00
asiekierka
5e550e84d6 fix laser texturing, fix TriggerEnergy more 2015-03-03 18:49:49 +01:00
asiekierka
70e8dbde7a fix #2506 - regression 2015-03-03 17:56:12 +01:00
asiekierka
00a72e8f20 fix #2502 2015-03-03 17:31:19 +01:00
asiekierka
6b53d1f4c9 fix TriggerEnergy behaviour to pre-6.4.0 properly and fully 2015-03-03 17:29:42 +01:00
Adrian Siekierka
def1c49f50 Merge pull request #2522 from hea3ven/6.4.x
refactor some common code of AIRobotSearchBlockBlockBase, fixes #2518
2015-03-03 08:44:35 +01:00
Hea3veN
cd1a0dda88 refactor some common code of AIRobotSearchBlockBlockBase, fixes #2518 2015-03-02 21:40:17 -03:00