Commit graph

378 commits

Author SHA1 Message Date
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
SpaceToad
3c409ca0b9 started work on bomber, for #1913 2014-06-26 08:51:28 +02:00
SpaceToad
3d9a2ee9de first version of knight robot, close #1911 2014-06-26 00:20:57 +02:00
SpaceToad
dfc759de6c Started work on carrier robot, for #1907. 2014-06-24 07:32:50 +02:00
SpaceToad
4428b44674 Started work on actions to provide / request items, for #1877. 2014-06-22 17:09:25 +02:00
SpaceToad
c3f5e44565 implemented close pipe action, close #1902 2014-06-22 15:03:16 +02:00
SpaceToad
ac28a810aa fixed triggers and actions transparency 2014-06-15 19:46:33 +02:00
SpaceToad
254a533060 Allows to mark areas and path on top of specific locations.
Generalization of #1882
2014-06-15 03:28:35 +02:00
SpaceToad
44d4e4e3b9 started work on docking action, #1877 2014-06-15 02:41:00 +02:00
SpaceToad
31cc8b6438 removed unused texture 2014-06-15 00:17:54 +02:00
SpaceToad
2aa1530444 prepare icons for robot triggers / actions, #1877 2014-06-15 00:16:58 +02:00
SpaceToad
0ca64b0798 implemented a location recording, close #1882 2014-06-14 17:55:53 +02:00
SpaceToad
70c1cd0535 Started a major refactor of the trigger action system.
Triggers and actions are moving towards more factorization in statements.
Actions will now accept parameters.
Triggers and actions will accept up to 3 parameters.
Parameters will not only be stacks, in particular for pipe wire.
This is supporting in particular the emerald gate implementation, for #1880.
2014-06-13 13:15:33 +02:00
SpaceToad
101f591f8f Implemented leave cutter, close #1876 2014-06-12 18:29:02 +02:00
SpaceToad
6389baa9cb Implemented planter robot, close #1874. 2014-06-12 13:46:52 +02:00
SpaceToad
00521143b6 Merge branch '6.0.x' into 6.1.x 2014-06-07 18:57:09 +02:00
SpaceToad
92bfbe4e27 added missing lang properties 2014-06-07 18:56:38 +02:00
SpaceToad
1a74389a5c added additional random parameters for robot, #1732 2014-06-07 11:25:32 +02:00
Prototik
6eec57c35f Fix transparent facade item texture 2014-06-03 10:50:20 +08:00
Prototik
091ae87333 Make Builder support fluids via containers/pipes 2014-06-02 23:33:03 +08:00
SpaceToad
02e8ef057e removed unused files and graphic components 2014-06-01 15:16:39 +02:00
SpaceToad
e193d634cf made progress in board parameters, #1732 2014-06-01 15:13:23 +02:00
SpaceToad
7898637b33 prepare version 6.0.16 2014-05-31 18:16:42 +02:00
SpaceToad
e99f0a3c4b made progress with boards and parameters, #1732 2014-05-30 09:04:00 +02:00
SpaceToad
3f925ae0e9 completed a first robot+board, #1732 2014-05-29 21:58:08 +02:00
SpaceToad
7acb8b4592 made progress with robot recipes and boards, #1732 2014-05-27 00:25:39 +02:00
SpaceToad
379ea6e278 fixed style and removed unused files 2014-05-26 23:00:01 +02:00
SpaceToad
5046cc445b added missing icons, #1732 2014-05-26 09:35:10 +02:00
SpaceToad
34d285a448 started work on redstone boards, #1732 2014-05-26 09:34:28 +02:00
SpaceToad
e9b84c7121 made progress for implementation of testing framework, #1846 2014-05-24 21:05:23 +02:00
SpaceToad
c23a5573f4 Merge branch '6.1.x' into 6.1.x-pathfinding 2014-05-24 13:37:44 +02:00
SpaceToad
8039dacff8 started to work on tester item 2014-05-24 13:35:22 +02:00
SpaceToad
625b21719d Merge branch '6.0.x' into 6.1.x 2014-05-18 21:39:02 +02:00
SpaceToad
6c4dbb4297 prepare hotfix 6.0.15 2014-05-18 21:29:59 +02:00
SpaceToad
77708e8bff Merge branch 'transparent-facades' of https://github.com/Prototik/BuildCraft into Prototik-transparent-facades 2014-05-18 17:04:52 +02:00
SpaceToad
13c8562fa1 Merge branch '6.0.x' into 6.1.x 2014-05-18 16:57:07 +02:00
SpaceToad
b63fb22db4 prepare 6.0.14 release 2014-05-18 16:00:46 +02:00
Prototik
3cfa2c5e14 Support for transparent facades 2014-05-18 16:38:52 +08:00
Prototik
6db270d407 Really advanced phased facades 2014-05-17 22:30:09 +08:00
dmillerw
8b92fcfa88 Added localization for phased facade 2014-05-15 19:37:20 -07:00
SpaceToad
2fddee9389 prepare 6.0.13 release 2014-05-13 21:26:19 +02:00
SpaceToad
9dec031449 fixed spelling mistake 2014-05-11 19:53:18 +02:00
SpaceToad
af402df7f9 prepare 6.0.12 release 2014-05-11 18:47:48 +02:00
SpaceToad
1fc3890b96 prepare 6.0.11 release 2014-05-10 23:51:41 +02:00
SpaceToad
49747b054e Minimal texture change, derived from #1773, close #1207. 2014-05-10 17:08:17 +02:00
SpaceToad
492b2805bf prepare 6.0.10 release 2014-05-06 23:34:58 +02:00
SpaceToad
3e4378f565 added back old architecture textures, close #1718 2014-05-06 17:42:58 +02:00
Prototik
93806cecca Localize update messages 2014-05-06 20:02:41 +08:00
SpaceToad
7cdddf3361 Improved blueprint unique id recognition in file names.
Increased length of blueprint names and use standard text UI in the architect.
Close #1713
2014-05-06 11:14:35 +02:00
SpaceToad
21fd683e58 Re-activated version check and changelog extracting, now based on github files.
Close #1709
2014-05-05 23:54:23 +02:00
SpaceToad
fe5e734b64 Added provision for blueprints with non existing blocks and entities.
Close #1702
2014-05-05 17:01:48 +02:00
Prototik
aa68c3cd81 Add MjAPILegacy for providing an old-style api for the new power api.
Add Energy Converter block for the same things in game.
2014-05-05 16:21:25 +08:00
SpaceToad
c2341c4aaa Merge branch '5.0.x' into 6.0.x 2014-05-04 12:21:27 +02:00