Commit graph

330 commits

Author SHA1 Message Date
asiekierka
e5dccdc229 recompress all textures with pngout, move texture masters to misc 2014-10-18 10:17:57 +02:00
asiekierka
c3a12170c7 update localization - fix misspelling and add boards tab 2014-10-15 18:24:10 +02:00
SpaceToad
d67b916ab9 Merge pull request #2011 from RufusStark/6.1.x
Quartz Fluid Pipe and Flow Rate Multiplier
2014-09-09 07:15:07 +01:00
RufusStark
7a436c5a31 ActionValve and ActionParameterDirection 2014-09-08 21:41:48 -05:00
SpaceToad
fd928abbfc added missing construction mark name 2014-09-07 13:04:39 +02:00
SpaceToad
579252a473 Further progress on composite blueprints (#1544).
Markers now display if they're recording a composition or not.
Architects save / load their sub-blueprints.
Composition links have a maximum reach.
2014-09-07 11:52:15 +02:00
RufusStark
2f17a302e7 Merge remote-tracking branch 'upstream/6.1.x' into 6.1.x 2014-09-06 20:06:52 -05:00
SpaceToad
416180819b improved laser rendering for composite architects, #1544 2014-09-06 18:51:49 +02:00
SpaceToad
0381a4edd0 Merge branch '6.0.x' into 6.1.x
Conflicts:
	build.gradle
	common/buildcraft/transport/render/FacadeItemRenderer.java
2014-09-06 12:32:59 +02:00
asiekierka
13dcc7841d Forgot to push fixed lang file 2014-09-04 20:06:47 +02:00
asiekierka
3f81bb3262 Emerald Kinesis Pipe 2014-09-04 13:07:37 +02:00
SpaceToad
1c23818474 prepare version 6.0.18 2014-09-02 21:22:58 +02:00
RufusStark
35ef452017 add Quartz Fluid Pipe (20mb/t) 2014-09-01 01:18:31 -05:00
SpaceToad
1dc5d83ea2 Merge branch '6.1.x' of github.com:BuildCraft/BuildCraft into 6.1.x 2014-08-29 00:03:19 +02:00
SpaceToad
72758ba9a9 implemented list item, close #1999 2014-08-29 00:03:05 +02:00
SpaceToad
f9b769bdde Implemented pump robot, close #1985.
Fixed race conditions with robot registry.
2014-08-18 23:32:11 +02:00
SpaceToad
2d6e0a2c59 added 6.1.1 changelog 2014-08-17 17:43:41 +02:00
SpaceToad
73198c4a7b Implemented filters for crafting robots.
Crafting robots now only answers to stack requests.
2014-08-17 11:37:30 +02:00
SpaceToad
2c69299172 finish first implementation of fluid transporter, #1985 2014-08-16 18:03:20 +02:00
SpaceToad
bebd14a9dd started work on fluid-related robots, for #1985 2014-08-15 17:19:30 +02:00
SpaceToad
1bd39d326a implemented delivery robot, for #1984 2014-08-15 10:55:28 +02:00
SpaceToad
3b9b1af204 further work in requesting orders, for #1973 2014-08-14 23:24:53 +02:00
SpaceToad
221a4416e5 implemented stack requesting mechanism, for #1973 2014-08-14 18:58:17 +02:00
SpaceToad
a2871a566a Merge branch '6.0.x' into 6.1.x
Conflicts:
	buildcraft_resources/assets/buildcraft/lang/en_US.lang
2014-08-05 08:57:14 +02:00
SpaceToad
9ceaabfead started work on crafting robot and related blocks, for #1973 2014-08-05 08:55:45 +02:00
SpaceToad
d2592b3f89 added changelog for 6.1.0 2014-08-03 14:00:43 +02:00
SpaceToad
0e408c5538 made progress for science book, for #1951 2014-08-03 11:38:35 +02:00
Mitchell
0106f11648 Update en_US.lang
Fix one more small grammar error
2014-08-02 21:22:50 -03:00
Mitchell
206f31848a Update en_US.lang
Fix Grammar Mistakes
2014-07-31 15:07:51 -03:00
SpaceToad
420fee4d34 added missing changelog 2014-07-29 08:54:22 +02:00
SpaceToad
48d95b1e26 made progress with research book, for #1951 2014-07-27 23:05:35 +02:00
SpaceToad
d10c570466 start work on science book 2014-07-25 08:40:47 +02:00
SpaceToad
1e04358334 Generalized packet slicing.
Added texture for zone planner.
2014-07-21 17:45:59 +02:00
SpaceToad
e155b9b761 robots can now work on a zone defined from a map 2014-07-21 14:34:21 +02:00
SpaceToad
b117a23c5d added multi-area selection capabilities 2014-07-20 23:41:43 +02:00
SpaceToad
bb72ff14ec Merge branch '6.0.x' into 6.1.x
Conflicts:
	common/buildcraft/BuildCraftCore.java
2014-07-12 00:33:53 +02:00
SpaceToad
6ac6ea4734 prepare release 6.0.17 for Minecraft 1.7.10 2014-07-11 23:57:44 +02:00
SpaceToad
23d46e2bce made progress with builder robot, for #1908 2014-07-07 00:19:01 +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
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
4c86502701 started implementation of shovelman and bucher, #1924 and #1925 2014-07-01 00:33:00 +02:00
SpaceToad
43e1e6d8c0 implemented filter for block breaking robots, for #1922 2014-06-30 09:14:30 +02:00
SpaceToad
7721d0d95d added farmer and harvester robots, part of #1922 2014-06-30 00:07:48 +02:00
SpaceToad
d38ab37cc0 added missing captions 2014-06-28 18:14:31 +02:00
SpaceToad
bb3618aaf9 Further work in robot carrier control.
Items can now be filtered.
It's now possible to put items in a pipe.
For #1877.
2014-06-28 17:15:34 +02:00
SpaceToad
f61c3cacaa added station robot forbid, for #1877 2014-06-28 00:31:00 +02:00
SpaceToad
9f1187c3aa implemented robot sleep / wakeup, for #1873 and #1877 2014-06-27 23:42:30 +02:00
SpaceToad
e4e477a241 implement miner robot, close #1915 2014-06-26 23:07:51 +02:00