Commit graph

4174 commits

Author SHA1 Message Date
asiekierka
eeaef4d9e0 BuildCraft 6.4.7 2015-04-03 22:03:51 +02:00
asiekierka
26691038ea Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft into 6.4.x 2015-04-03 21:59:56 +02:00
asiekierka
93d136f61b work around multiple fluids in pipes issues 2015-04-03 21:54:44 +02:00
Adrian Siekierka
1e4b647331 Merge pull request #2611 from hea3ven/6.4.x
fix an error when loading robot resources
2015-04-03 20:04:14 +02:00
Hea3veN
34b98eba9d fix an error when loading robot resources 2015-04-03 12:39:01 -03:00
asiekierka
fb1c7a5561 BlockGenericPipe now returns proper pipe icon, might help WAILA icon rendering 2015-04-03 13:45:44 +02:00
asiekierka
93df0d82be fix some pipe empty render pass bugs, try to fix TCon fluid pipe loss and fluid pipe massive liquid extraction buffers
Conflicts:
	common/buildcraft/transport/render/PipeRendererWorld.java
2015-04-03 13:35:25 +02:00
asiekierka
9d655ec110 fix some pipe empty render pass bugs, try to fix TCon fluid pipe loss and fluid pipe massive liquid extraction buffers 2015-04-03 13:34:53 +02:00
asiekierka
27beeb2542 forgot to push new robot API, push new zone planner GUI project 2015-04-03 13:34:25 +02:00
asiekierka
a9c7c1a2e8 refactors to robot docking station code, allow TEs to provide a singular docking station (wip) 2015-04-03 13:16:22 +02:00
asiekierka
27bee0a886 Make mining well build plain pipes for free again. Pondering on the MiniMiner. 2015-04-03 11:56:03 +02:00
asiekierka
ec8308ae50 Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft into 6.5.x 2015-04-03 10:03:41 +02:00
asiekierka
2c72127495 fix engine rendering bug that spilled back into BC 6 2015-04-03 09:54:43 +02:00
asiekierka
b977138ec4 more null checks 2015-04-03 09:30:27 +02:00
asiekierka
9b06dff367 use BitSet for templates and blueprints rather than BlockIndex Sets 2015-04-02 21:13:10 +02:00
asiekierka
bf8403fd4e fix combustion engine never resetting its fuel value... did anyone ever test these things? 2015-04-02 14:58:01 +02:00
asiekierka
4e52c134fb Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft into 6.4.x 2015-04-02 14:50:51 +02:00
asiekierka
d6f5063c42 begin work on ingame config 2015-04-02 14:46:57 +02:00
asiekierka
341f311ab6 make mining.depth work with quarries 2015-04-02 08:15:19 +02:00
asiekierka
aeb580cd78 add comparator support for tanks 2015-04-01 23:12:44 +02:00
asiekierka
a1e67124cd further cleanup, fixes 2015-04-01 22:08:52 +02:00
asiekierka
9363e6478c fix compile error, add facade recipes without Silicon 2015-04-01 18:07:33 +02:00
asiekierka
4378884e78 Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft into 6.5.x 2015-04-01 16:28:29 +02:00
asiekierka
16d6770c07 BuildCraft 6.4.6 2015-04-01 16:21:30 +02:00
asiekierka
c5f99464b8 fix #2600, #2591, #2589, #2584, etc 2015-04-01 16:15:10 +02:00
asiekierka
d570950059 fix #2593 2015-04-01 15:26:52 +02:00
asiekierka
f54f0a4c9f add hollow tabs to creative (#2587) 2015-04-01 15:05:33 +02:00
asiekierka
97a40ea176 add particle FX setting for robots, add heat-up for lasers, fix up fancy pipe rendering 2015-04-01 15:00:17 +02:00
asiekierka
cfa504a02e add #2567, #2599 2015-04-01 09:53:28 +02:00
asiekierka
59b7a660e2 fix #2602, #2603 2015-04-01 08:13:06 +02:00
asiekierka
835974e530 checkstyle fixes, module fixes, prepare for early beta release 2015-03-31 23:21:00 +02:00
asiekierka
71c45e60ae add new Auto Workbench texture 2015-03-31 18:39:22 +02:00
asiekierka
fa447318a4 add round-robin sorting to diamond pipes, fix #2372, fix minor lens bugs 2015-03-31 18:01:00 +02:00
asiekierka
99dd73e70f [API change] Make the Redstone Board API rely on energy cost and not probability 2015-03-30 21:45:07 +02:00
Hea3veN
4dfca53a35 fix en error in the planter when path length == 1 2015-03-29 20:40:29 +02:00
Hea3veN
9dd279dd9b fix the search robot ai running for too long if no valid blocks are available 2015-03-29 20:40:23 +02:00
asiekierka
60d2135bb4 Merge branch '6.5.x' of gitlab.com:asiekierka/BuildCraft into 6.5.x 2015-03-29 14:32:48 +02:00
asiekierka
ccf758d807 fixes 2015-03-29 14:32:38 +02:00
Adrian Siekierka
bdb6fbdcf7 Merge branch '6.5.x' into '6.5.x'
fixes

See merge request !1
2015-03-29 11:32:48 +00:00
Hea3veN
cac6f5cac7 fix robots looking for tools outside of their work area, fixes #2556 2015-03-28 10:25:39 -03:00
Hea3veN
e9e7d4b6c6 fix en error in the planter when path length == 1 2015-03-28 10:06:25 -03:00
Hea3veN
a1f195e896 fix the search robot ai running for too long if no valid blocks are available 2015-03-28 10:04:19 -03:00
Hea3veN
e8fd472d2a fix errors with openjdk compiler 2015-03-28 09:59:07 -03:00
asiekierka
dd686999c0 minor tweaks to bpt code 2015-03-27 22:50:57 +01:00
asiekierka
493c261d9e finish laser table renders 2015-03-26 22:40:59 +01:00
asiekierka
cef844212d Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft into 6.5.x
Conflicts:
	build.gradle
2015-03-25 16:31:22 +01:00
asiekierka
5adaf78a02 BuildCraft 6.4.5 2015-03-25 15:42:26 +01:00
asiekierka
60802f5045 try to fix #2584 2015-03-25 15:35:19 +01:00
asiekierka
7f6c2ff5fb Merge branch '6.5.x' of gitlab.com:asiekierka/BuildCraft into 6.5.x 2015-03-25 15:34:31 +01:00
asiekierka
91194fc36d update changelog, texture 2015-03-25 15:34:00 +01:00