Commit graph

2549 commits

Author SHA1 Message Date
asiekierka
f49b04da37 Fix facade recipe desynchronization on client and server. Closes #2042
This bug was caused by tterrag's pull request having a hasNoNullIcons
function, which returned false on the server side, not letting any
facade recipe through. The new approach relies on replacing non-existant
textures with a transparent oeeN
2014-10-15 15:51:57 +02:00
asiekierka
3f752cca4b Merge branch '6.0.x' of github.com:BuildCraft/BuildCraft into 6.1.x 2014-10-15 15:41:19 +02:00
Tyson Brown
a698f56719 Fixed incorrect chunk positions in SpringPopulate and OilPopulate. 2014-10-08 13:15:36 -04:00
AEnterprise
84c6b57ae5 fix robot event 2014-09-20 11:52:18 +02:00
AEnterprise
8d6dc8c29b fix merge conflict 2014-09-20 11:46:31 +02:00
SpaceToad
51075b886c Merge pull request #2024 from AEnterprise/6.1.x
add event to detect and prevent the placement of robots
2014-09-20 10:40:00 +01:00
AEnterprise
6ee4b2de2e fix style and coppyright notices 2014-09-20 11:30:33 +02:00
ShetiPhian
1dfd5479e5 Set toolClass of ItemWrench to "wrench"
Allows other mods to use the BuildCraft wrench (for things other then rotation) without needing to know the itemstack or implementing the API.
2014-09-19 22:20:23 -04:00
AEnterprise
daff831569 make markers and builder send BC block placement events 2014-09-19 16:05:02 +02:00
AEnterprise
9330dd18d9 also need coordinates for the pipe placement location 2014-09-18 17:25:28 +02:00
AEnterprise
fb706ae1ab detect interaction with pipes (for gates, plugs and robot stations) 2014-09-17 18:13:00 +02:00
AEnterprise
b01533e1d5 make it possible to differenciate between the lasertables and engines 2014-09-17 15:41:45 +02:00
AEnterprise
cdc7ea054b filtered buffer wasn't sending blockInteraction event 2014-09-17 13:41:27 +02:00
AEnterprise
21a5f00199 somehow the old import didn't get removed 2014-09-16 21:32:41 +02:00
AEnterprise
d3d6f88a1c make refinery extend BlockBuildcraft 2014-09-16 21:20:42 +02:00
AEnterprise
78091876ad fix mining well not calling super when placed down 2014-09-16 21:07:37 +02:00
AEnterprise
e28a74b771 make blockTank extend BlockBuildcraft 2014-09-16 20:35:05 +02:00
AEnterprise
0c11181e85 add event to detect and prevent the placement of robots 2014-09-16 17:39:18 +02:00
SpaceToad
857b0c42ca Merge pull request #2022 from ChatFawkes/patch-1
Change tooltips to use RF instead of MJ
2014-09-15 18:25:03 +01:00
SpaceToad
97f1b11ce1 Merge pull request #2023 from AEnterprise/6.1.x
fix game crashing when placing robot without a redstone board installed
2014-09-15 18:21:43 +01:00
AEnterprise
df1cf3c6d1 fix style (again) 2014-09-15 08:44:45 +02:00
AEnterprise
e78fc8a778 fix game crashing when placing robot without a redstone board installed 2014-09-15 08:33:45 +02:00
ChatFawkes
4af697a5e6 Change tooltips to use RF instead of MJ 2014-09-15 00:59:00 -04:00
SpaceToad
446bf4454b fixed quarry pumping out frames, close #1941 2014-09-15 00:44:57 +02:00
SpaceToad
1d9dcd6ae2 Merge branch '6.1.x' of github.com:BuildCraft/BuildCraft into 6.1.x 2014-09-14 20:53:06 +02:00
SpaceToad
1ec9d92699 added variable timeout for schematic, down to 1. close #1971 2014-09-14 20:52:53 +02:00
SpaceToad
9fc636d272 Merge pull request #2020 from AEnterprise/6.1.x
fix progressbar in the lasertables
2014-09-14 16:46:35 +01:00
AEnterprise
dec9be8f51 fix progressbar in the lasertables 2014-09-14 17:44:15 +02:00
SpaceToad
2c5c282f2f fixed potential integer overflow 2014-09-14 17:30:45 +02:00
SpaceToad
3d3085dd06 fixed precision loss in average computation, close #2016 2014-09-14 17:28:14 +02:00
SpaceToad
69ff44dc9f Fixed wood pipe accepting energy from other pipes, following RF migration.
Part of #2016.
2014-09-14 16:59:07 +02:00
SpaceToad
2e76b90191 Merge pull request #2018 from AEnterprise/6.1.x
fix MJ->RF migration with blocks that where already in the world
2014-09-14 15:25:34 +01:00
AEnterprise
aab946140b fix style, remove unnecesairy check 2014-09-14 16:18:57 +02:00
AEnterprise
5e526416c4 fix MJ->RF migration with blocks that where already in the world 2014-09-14 15:58:37 +02:00
SpaceToad
fca62af54b fixed style 2014-09-14 15:44:38 +02:00
SpaceToad
bc317bdec0 Merge branch '6.1.x' of github.com:BuildCraft/BuildCraft into 6.1.x 2014-09-14 15:43:20 +02:00
SpaceToad
4e843c5104 fixed deadlock when getting properties from main thread 2014-09-14 15:43:09 +02:00
AEnterprise
1ef8640417 no need to compute item if not droped 2014-09-14 15:15:44 +02:00
AEnterprise
903ec1c107 fix blueprint not dropping form construction marker
fix construction marker accepting more then 1 blueprint
2014-09-14 13:16:27 +02:00
SpaceToad
b906f7b7a8 attempt at moving MJ => RF units, for #2015 2014-09-14 12:30:04 +02:00
SpaceToad
ff527353c5 fixed save / load of input/output states, fix #2011 2014-09-14 10:57:49 +02:00
SpaceToad
cdd9ae1199 fixed indentation 2014-09-14 10:44:27 +02:00
SpaceToad
55f4efb65c re-activated engine pumping, following RF migration 2014-09-14 10:27:15 +02:00
SpaceToad
93961e9d9e fixed powered tile detection for engines, following RF migration 2014-09-14 09:41:11 +02:00
SpaceToad
411ec984f0 fixed icon setting 2014-09-14 09:40:46 +02:00
SpaceToad
b268433b4c fixed RF battery save / load 2014-09-13 10:57:29 +02:00
SpaceToad
fd8d8531a1 Merge pull request #2014 from AEnterprise/6.1.x
create events for external research
2014-09-13 09:42:18 +01:00
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