Commit graph

2497 commits

Author SHA1 Message Date
AEnterprise
4cdfa5cddd more cleanup 2014-09-11 16:43:05 +02:00
AEnterprise
75079f2d9a fix indentation 2014-09-11 12:36:14 +02:00
AEnterprise
0a716a96bb Fix indentation 2014-09-11 09:30:11 +02:00
AEnterprise
35213b643a last style errors 2014-09-10 15:26:35 +02:00
AEnterprise
1da9ec0a26 second attempt at fixing style 2014-09-10 15:18:23 +02:00
AEnterprise
cfb63644b4 create events for external research 2014-09-10 14:43:06 +02:00
SpaceToad
f38a299702 fixed handling of energy for robot load and robot steam 2014-09-07 13:07:00 +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
SpaceToad
f814fa67f7 implemented capture of existing blueprints for composition, for #1544 2014-09-07 10:50:20 +02:00
SpaceToad
416180819b improved laser rendering for composite architects, #1544 2014-09-06 18:51:49 +02:00
SpaceToad
b9f10af73b fixed orientation of sub-blueprints, for #1544 2014-09-06 17:55:45 +02:00
SpaceToad
66e5e8387d fixed anchor rotations, for #1544 2014-09-06 17:44:18 +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
SpaceToad
a703d946b1 Merge branch 'iron-engine' of github.com:Prototik/BuildCraft into Prototik-iron-engine
Conflicts:
	common/buildcraft/energy/TileEngineIron.java
2014-09-06 12:28:50 +02:00
SpaceToad
ca9a9ec4a4 made progress with composite blueprints, for #1544 2014-09-06 11:49:52 +02:00
SpaceToad
9f71fdfe0e fixed style 2014-09-04 20:55:50 +02:00
asiekierka
e6dc8e83ef fix rounding errors temporaily by flooring and not rounding 2014-09-04 20:08:01 +02:00
asiekierka
1bd6026a2d Emerald Kinesis Pipes should not connect to each other 2014-09-04 20:01:37 +02:00
asiekierka
af6297c73b fix robots in API 2014-09-04 19:51:50 +02:00
asiekierka
4dc8449d46 fix lasers and GUIs 2014-09-04 19:35:37 +02:00
asiekierka
0bbd40e25f Merge branch '6.1.x' of https://github.com/BuildCraft/BuildCraft into 6.1.x 2014-09-04 19:23:15 +02:00
asiekierka
9f503283d0 tweaks to power behaviour 2014-09-04 19:19:29 +02:00
asiekierka
3f81bb3262 Emerald Kinesis Pipe 2014-09-04 13:07:37 +02:00
asiekierka
fd672003fa finish porting the pipe system 2014-09-04 12:17:43 +02:00
SpaceToad
97cfb13de6 initial work for composite blueprints, #1544 2014-09-04 08:49:23 +02:00
asiekierka
13368007f7 port wooden/emerald/emzuli item pipes 2014-09-03 20:17:20 +02:00
asiekierka
f477d66b00 port all pipes but two: wooden item pipe and wooden power pipe 2014-09-03 19:47:22 +02:00
asiekierka
95e77f77c3 fix TileEnergyEmitter mistake 2014-09-03 19:27:31 +02:00
asiekierka
cba7b0ba18 Port over everything but pipes. 2014-09-03 19:22:15 +02:00
asiekierka
ab84e095cd start removing the "new" MJ API, commit RedBuildCraft engine implementation 2014-09-03 11:21:08 +02:00
Prototik
ae184f76b2 Rewrite fuel/coolant api for iron engine
Add lava as fuel source
2014-08-29 19:08:34 +08:00
Prototik
fb6a30a06c Fix strange npe in facade item renderer 2014-08-29 15:27:01 +08:00
SpaceToad
77e68d2528 removed manual computations of guiLeft / guiTop 2014-08-29 00:33:15 +02:00
SpaceToad
c37a8a2985 fixed style 2014-08-29 00:07:27 +02: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
fb83ca8e99 fixed hanlding of filter on fluid unload, for #1985 2014-08-18 09:15:51 +02:00
SpaceToad
4f41d134a7 added control of wether an AI can be loaded from NBT 2014-08-18 09:07:57 +02:00
SpaceToad
846e186c9a fixed crafter robot not reseting 2014-08-18 08:49:02 +02:00
SpaceToad
85db514e0a Further bugfixes. 2014-08-17 17:40:12 +02:00
SpaceToad
d70184c3ae various minor fixes 2014-08-17 14:18:37 +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
a38bedf5fe start filter implementation for fluids, #1985 2014-08-17 10:21:33 +02:00
SpaceToad
2c69299172 finish first implementation of fluid transporter, #1985 2014-08-16 18:03:20 +02:00
SpaceToad
746b7d4b7a fixed style errors 2014-08-16 10:27:03 +02:00
SpaceToad
35c50e2da3 improved steam direction, for #1986 2014-08-16 10:20:56 +02:00
SpaceToad
fd777f9b67 Robot now show they contents, for #1986. 2014-08-15 19:33:59 +02:00
SpaceToad
4b5e9aa23e added smoke animation for #1986 and fixed various bugs 2014-08-15 18:48:51 +02:00
SpaceToad
bebd14a9dd started work on fluid-related robots, for #1985 2014-08-15 17:19:30 +02:00