Commit graph

3881 commits

Author SHA1 Message Date
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
asiekierka
850b8f6dfd restore hoe stripes handler 2015-03-02 14:42:10 +01:00
asiekierka
69c46124eb fix #2517 2015-03-02 13:15:58 +01:00
asiekierka
82877d8cdd clean up redundant stripes code 2015-03-02 13:12:28 +01:00
asiekierka
8fcf8f9c13 add compat hooks for facades 2015-03-02 12:59:33 +01:00
Adrian Siekierka
ba1efae728 Merge pull request #2516 from hea3ven/6.4.x
fix infinite loop when looping through direction parameters and no pipes...
2015-02-28 17:42:22 +01:00
Hea3veN
83abc39f7a fix infinite loop when looping through direction parameters and no pipes are connected 2015-02-28 12:08:01 -03:00
Adrian Siekierka
f2c8a8f83a Merge pull request #2515 from hea3ven/6.4.x
fix robots flying away when searching for a station to recharge
2015-02-28 14:32:16 +01:00
Hea3veN
9e3bdbe1cf fix robots flying away when searching for a station to recharge 2015-02-28 10:27:04 -03:00
asiekierka
dfe3e6033d Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft into 6.4.x 2015-02-28 09:38:41 +01:00
asiekierka
35f80f9366 [Non-breaking API] Added IList, IMapLocation APIs 2015-02-28 09:38:31 +01:00
asiekierka
7477e1626f Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft into 6.4.x 2015-02-27 23:59:52 +01:00
asiekierka
f980782956 fix wireless robot charging and #2509 2015-02-27 23:59:35 +01:00
Adrian Siekierka
22677ecd62 Merge pull request #2511 from hea3ven/6.4.x
fix entity stripes handler duplicating items, fixes #2510
2015-02-27 23:43:57 +01:00
Hea3veN
0643af40c2 fix entity stripes handler duplicating items, fixes #2510 2015-02-27 19:41:04 -03:00
asiekierka
c481ef4637 further cleanup in power code 2015-02-27 14:21:08 +01:00
Adrian Siekierka
f785beb172 Merge pull request #2507 from Vexatos/patch-1
Fixed Forge version dependency
2015-02-27 14:00:19 +01:00
Vexatos
692a9fbf60 Fixed Forge version dependency 2015-02-27 13:59:28 +01:00
asiekierka
d6dce9ee44 Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft 2015-02-26 23:17:44 +01:00
asiekierka
9cd089bdc0 real BC 6.4.1, fix incorrect filler texture 2015-02-26 22:54:15 +01:00
asiekierka
9306baa0e8 BuildCraft 6.4.1 2015-02-26 22:49:15 +01:00
asiekierka
2f744f1c6b remove dropBrokenBlocks option (was mostly dummy), add markerRange config (currently capped at 64) 2015-02-26 19:07:29 +01:00
asiekierka
78f8a059b4 clean up TODOs, restore pipe item sounds 2015-02-26 17:16:52 +01:00