Commit graph

3286 commits

Author SHA1 Message Date
SpaceToad
4144188467 fixed rendering problems, merged from 6.0.x, close #1934 2014-07-11 08:43:49 +02:00
SpaceToad
368cdb234e Merge pull request #1919 from Parker8283/5.0.x
Updated to 1.7.10
2014-07-11 08:04:17 +02:00
Parker
08dd853bf5 Bumped to Forge 1179 2014-07-10 16:59:18 -04:00
SpaceToad
5ab655a226 Merge branch '6.1.x' of github.com:BuildCraft/BuildCraft into 6.1.x 2014-07-10 07:57:05 +02:00
SpaceToad
b462bc6dd7 fixed robot size, deactivate robot collisions 2014-07-10 07:56:52 +02:00
SpaceToad
a668977ff5 Merge pull request #1932 from simon816/pipe-item-color
Add support for giving items a color when calling injectItem
2014-07-10 07:23:06 +02:00
SpaceToad
87c7c9043f added render code for builder robots, for #1908 2014-07-10 07:15:40 +02:00
SpaceToad
addad59d08 made progress with robot builder, for #1908 2014-07-09 09:00:36 +02:00
simon816
7a941c1279 Add support for injecting colored items in pipes 2014-07-08 22:38:24 +01:00
SpaceToad
b71fe3cce8 made progress for builder robot, for #1920 2014-07-08 22:40:39 +02:00
SpaceToad
23d46e2bce made progress with builder robot, for #1908 2014-07-07 00:19:01 +02:00
SpaceToad
3ccb215cf9 fixed error in previous change 2014-07-06 23:06:56 +02:00
SpaceToad
4c731c533c started work on builder robot, for #1908 2014-07-06 16:59:37 +02:00
SpaceToad
1153dd3c9f started library of default blueprints 2014-07-06 16:52:37 +02:00
SpaceToad
fcab170b0b fixed style 2014-07-06 14:46:40 +02:00
SpaceToad
40c882de25 Various fixes in robot behavior. 2014-07-06 13:22:58 +02:00
SpaceToad
6de8ad01ea improved behavior of farmer robot 2014-07-06 00:21:37 +02:00
SpaceToad
6e824d55ab various robot fixes 2014-07-05 17:53:31 +02:00
Andrew Dudney
2935e7288f Reverted version change 2014-07-05 08:58:23 -06:00
SpaceToad
f60595c821 fixed gate rotation in schematic, close #1930 2014-07-05 15:15:15 +02:00
SpaceToad
72b1a3cfe6 fixed handling of byte arrays 2014-07-05 14:06:10 +02:00
SpaceToad
57c338b9af various fixes for gates 2014-07-05 13:29:09 +02:00
SpaceToad
ffcd8188de fixed various regressions with gates logic 2014-07-05 10:08:36 +02:00
Andrew Dudney
f2f563fd39 Changed to tabs from spaces 2014-07-04 14:45:34 -06:00
Andrew Dudney
59d36f31d0 Changed style to reflect CheckStyle 2014-07-04 14:35:36 -06:00
Andrew Dudney
ca5bbc3f17 Changed all deprecated functionality to it's equivalent, updated to 1.7.10-10.13.0.1160 2014-07-04 14:30:19 -06:00
SpaceToad
036f257505 fixed style 2014-07-04 19:36:04 +02:00
SpaceToad
2bb67431b8 added new triggers for energy request and storage detection, close #1897 2014-07-04 19:34:40 +02:00
SpaceToad
66ae784ed0 bucher -> butcher, close #1926 2014-07-04 09:03:24 +02:00
SpaceToad
4d35532ad1 made progress with ai load / save, for #1921 2014-07-04 08:59:23 +02:00
SpaceToad
5554cf41bc improved save / load of stations, for #1921 2014-07-03 09:32:57 +02:00
SpaceToad
59c22235bd fixed loading of picker robot, for #1921 2014-07-01 08:52:01 +02:00
SpaceToad
e9eafbc342 fixed style 2014-07-01 08:16:35 +02:00
SpaceToad
3372c3f997 finished bucher and shovelman, close #1924, close #1925 2014-07-01 08:15:44 +02:00
SpaceToad
4c86502701 started implementation of shovelman and bucher, #1924 and #1925 2014-07-01 00:33:00 +02:00
SpaceToad
1917f11f97 implemented filters for all robots, close #1922 2014-07-01 00:08:05 +02:00
SpaceToad
447bfb49d4 fixed style 2014-06-30 20:55:43 +02:00
SpaceToad
504911cff0 planter can now plant seeds, part of #1922 2014-06-30 20:54:50 +02:00
SpaceToad
c6a77d2a65 fixed style 2014-06-30 09:15:24 +02:00
SpaceToad
43e1e6d8c0 implemented filter for block breaking robots, for #1922 2014-06-30 09:14:30 +02:00
SpaceToad
99d93d46e4 fixed API build 2014-06-30 00:19:04 +02:00
SpaceToad
7721d0d95d added farmer and harvester robots, part of #1922 2014-06-30 00:07:48 +02:00
SpaceToad
1ab3bcef10 finished initial save / load loop, for #1921 2014-06-29 18:57:46 +02:00
SpaceToad
27cf9473c6 made progress with robot loading / unloading, for #1921 2014-06-29 16:58:44 +02:00
SpaceToad
8ca47462d5 Progress made in robot life cycle.
Robot now die if they have no more energy or if their station is destroyed.
Improved energy requirements (by default, all robots consume 0.1 MJ / cycle).
Part of #1921
2014-06-29 16:07:19 +02:00
SpaceToad
487b0cc7e6 fixed knight robot 2014-06-29 12:34:09 +02:00
SpaceToad
99309b381a improved carrier robot behavior and adjusted energy consumption 2014-06-29 11:55:19 +02:00
SpaceToad
d38ab37cc0 added missing captions 2014-06-28 18:14:31 +02:00
Parker Young
341ff4e972 Updated to 1.7.10
This version isn't backwards compatiable because of changes in the CompressedStreamTools. I don't know if you want to push an update to the 5.0.x branch, but I thought I'd do it, just in case you did.
2014-06-28 11:57:16 -04:00
SpaceToad
2d0f4f43ce Merge branch '6.0.x' into 6.1.x 2014-06-28 17:17:09 +02:00