Commit graph

3953 commits

Author SHA1 Message Date
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
asiekierka
5516eca5e1 update changelog, texture 2015-03-25 15:32:57 +01:00
asiekierka
0faccaf1d3 new auto workbench implementation - allows for stackables 2015-03-25 12:20:07 +01:00
asiekierka
ce01c5773e allow placing machines on any side of a marker box 2015-03-24 17:29:27 +01:00
asiekierka
3608844213 Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft into 6.4.x 2015-03-24 16:42:38 +01:00
asiekierka
1bfab4373d Fix #2585 2015-03-24 16:42:18 +01:00
asiekierka
df4e416532 forgot these 2015-03-23 23:19:26 +01:00
asiekierka
7fa702a3ae robot code changes - @hea3ven please review 2015-03-23 23:16:00 +01:00
Adrian Siekierka
358e9a6b4e Merge pull request #2583 from davboecki/patch-1
Fix #2582.
2015-03-23 17:37:28 +01:00
davboecki
9bf8885297 Fix #2582. 2015-03-23 17:13:58 +01:00
asiekierka
097492883d fix addOrStripPipePluggable ignoring false, add global event handlers, clean up 2015-03-22 19:11:38 +01:00
asiekierka
0b329169ae API, etc. improvements 2015-03-22 14:06:05 +01:00
asiekierka
971f3614c9 Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft into 6.5.x 2015-03-22 12:59:35 +01:00
asiekierka
aad7319590 add display list caching to builder/filler rendering, remove duplicate code, minor optimizations 2015-03-22 10:13:11 +01:00
asiekierka
04fe3c31a7 BuildCraft 6.4.4 2015-03-22 00:34:34 +01:00
asiekierka
7bf6f02da3 Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft into 6.4.x 2015-03-22 00:31:30 +01:00
asiekierka
16bceed0d0 fix #2574 2015-03-22 00:30:52 +01:00
asiekierka
0a20b53c6d add RF power support to Auto Workbenches 2015-03-21 20:01:01 +01:00
asiekierka
bcb2a40fa5 make StatementParameterItemStacks override the description and output the item stack desc 2015-03-21 18:31:37 +01:00
asiekierka
b59ce91945 no more recursive list matching 2015-03-21 18:21:42 +01:00
asiekierka
ed76c9a4f1 Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft into 6.5.x
Conflicts:
	common/buildcraft/BuildCraftTransport.java
2015-03-21 18:12:37 +01:00
asiekierka
69e9173a12 changes to robot accept/request behaviour 2015-03-21 18:11:22 +01:00