Commit graph

3987 commits

Author SHA1 Message Date
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
asiekierka
c4e1e73c27 fix #2574 2015-03-21 17:41:55 +01:00
Adrian Siekierka
f41a483268 Merge pull request #2573 from hea3ven/robot-fixes
Robot fixes
2015-03-21 17:12:51 +01:00
Hea3veN
e1135ed183 fix a ConcurrentModificationException on the planter, fixes #2566 2015-03-21 10:22:29 -03:00
Hea3veN
45882961ca fix planters sometimes not finding valid planting blocks 2015-03-21 10:02:29 -03:00
asiekierka
8e6901a66b fixes to stripes pipe behaviour 2015-03-21 13:08:09 +01:00
asiekierka
2186fbdd48 new features to stripes pipes 2015-03-21 11:20:07 +01:00
asiekierka
5cb7c9fe00 add stripes pipe direction control, add stripes handler priority system to API, add IBlueprintItem API thing 2015-03-20 17:03:46 +01:00
asiekierka
36ec39a59e improvements to Stripes Pipes 2015-03-20 15:07:12 +01:00
Adrian Siekierka
e408a91ae8 Merge pull request #2569 from Unh0lyTigg/patch-1
Slimeballs don't have meta
2015-03-20 14:28:58 +01:00
asiekierka
fd00ca3138 finish initial modularization refactor 2015-03-20 10:47:52 +01:00
asiekierka
18add8b847 write global zone map system to replace earlier zone planner system 2015-03-19 22:01:52 +01:00
Robert Allen
9966ad3a4e Slimeballs don't have meta 2015-03-19 13:43:39 -07:00
asiekierka
1053a74e35 update, cleanup 2015-03-18 09:19:47 +01:00
asiekierka
96492136c5 update 2015-03-17 08:24:14 +01:00
asiekierka
88f71fdca9 add nameable map locations, fix zone planner rendering issues 2015-03-16 19:57:00 +01:00
asiekierka
54088c2249 add assembly table, advanced crafting table and charging table models; improve pipe/gate speed further; add NEI support for gate recipes 2015-03-16 16:46:18 +01:00