Commit graph

4572 commits

Author SHA1 Message Date
Adrian Siekierka
ff48e13d87 Merge pull request #3181 from smbarbour/7.1.x
Add support for nether wart harvesting
2016-01-10 08:59:49 +01:00
Scott M. Barbour
5c828301bc Fix style issues from other commits 2016-01-09 22:20:05 -06:00
Scott M. Barbour
25d8785e88 Fixed imports automatically switched to a * import in violation of the checkstyle. 2016-01-09 21:57:05 -06:00
Scott M. Barbour
c32de47be3 Added nether wart support for harvesting 2016-01-09 21:52:01 -06:00
Adrian Siekierka
0b827da7c4 Merge pull request #3152 from Geforce132/7.1.x
Fixed issue #3134.
2015-12-09 10:38:09 +01:00
Geforce132
9d63ba910b Fixed #3134 2015-12-08 21:01:09 -06:00
asiekierka
e807c53fee BuildCraft 7.1.14 2015-11-28 15:32:23 +01:00
Adrian Siekierka
12df50f8fa Merge pull request #3135 from ProgrammerHero/7.1.x
Allow builders to place floating tripwires
2015-11-27 18:01:52 +01:00
ProgrammerHero
fd007a0acb Allow builders to place floating tripwires 2015-11-20 12:08:47 -04:00
Adrian Siekierka
e2af94bcb4 Merge pull request #3130 from iTitus/fix-3128
Fix #3128
2015-11-15 21:04:33 +01:00
iTitus
036d84133b Only use the liquid's method when dealing with the server tile. 2015-11-15 13:05:51 +01:00
iTitus
24e56c79ee Fix #3128
Use the Fluid's method for getting the color multiplier. I don't think that this has a serious performance impact, except when mods do heavy things in that method.
2015-11-15 00:04:28 +01:00
SandGrainOne
207f85958b Moved IBlockDefaultTriggers to core 2015-11-14 20:50:36 +01:00
SandGrainOne
99ee6ab927 Added IBlockDefaultTriggers.
Prevent DefaultTriggerProvider from adding triggers, but allow other
providers to add their own. This is a more friendly version of
IOverrideDefaultTriggers.
2015-11-09 23:44:30 +01:00
Adrian Siekierka
16831f6947 Merge pull request #3123 from iTitus/fix-3119
Fix #3119
2015-11-09 10:28:00 +01:00
iTitus
ec39cec734 Fix #3119 2015-11-08 21:12:44 +01:00
Adrian Siekierka
294def3cee Merge pull request #3122 from iTitus/fix-3120
Fix #3120
2015-11-08 12:38:29 +01:00
iTitus
077f38ea13 Fix #3120
The inventory trigger now takes the max stacksize of the inventory into account.
2015-11-08 11:57:22 +01:00
asiekierka
ebbdbdaef7 BuildCraft 7.1.13 2015-11-07 16:55:22 +01:00
asiekierka
a24fa1c7ee improvements to robot breaking logic 2015-11-07 16:34:12 +01:00
asiekierka
09ef745ae1 fix buildcraft command crash 2015-11-07 14:22:10 +01:00
asiekierka
89b10bbd8f improve robot path handling 2015-11-07 11:49:37 +01:00
asiekierka
eebd393fc2 cleanup, fix #3102 2015-11-07 11:31:07 +01:00
asiekierka
aef5e7a628 fix #3112 2015-11-07 11:19:57 +01:00
asiekierka
7e9db9486e rendering improvements, add clear lens too while at it 2015-11-07 10:49:02 +01:00
asiekierka
8377eb94f7 add clear filters (as requested by Forecaster) 2015-11-07 10:19:35 +01:00
Adrian Siekierka
950426071d Merge pull request #3115 from Mazdallier/patch-2
Update en_US.lang
2015-11-06 18:40:53 +01:00
Mazdallier
a82b7f78cf Update en_US.lang
some mistakes
2015-11-06 15:40:19 +01:00
asiekierka
e14a1b81ef fix #3086, fix #3100, fix #3111 2015-11-04 15:22:45 +01:00
SandGrainOne
ef6e12f9ac Make default inventory triggers side sensitive.
Check if ISidedInventory has at least one slot available from the gate
side.
2015-11-03 22:27:03 +01:00
Adrian Siekierka
c7b3b25604 Merge pull request #3104 from Ghostlyr/patch-1
Need full localization
2015-10-28 06:12:24 +01:00
Ghostlyr
6784cbb91b Oops... 2015-10-28 07:39:12 +06:00
Ghostlyr
66b9e93e83 Update en_US.lang 2015-10-28 07:15:22 +06:00
Ghostlyr
0434c99647 Update ItemRobot.java 2015-10-28 07:09:04 +06:00
SandGrainOne
5a49b05448 Adding triggers for fuel and coolant.
Adding triggers for low levels of fuel and coolant in combustion
engines. The goal is to make it easier to refill with fluid containers
like wax capsules.
2015-10-27 22:12:36 +01:00
asiekierka
d32e50c16d BuildCraft 7.1.12 2015-10-25 11:36:51 +01:00
asiekierka
728da1fc38 fix #3089, revert pipe speed tweaks for now 2015-10-25 10:57:04 +01:00
asiekierka
9abd7e2a8a improve robot tool handling, fix #3090 2015-10-25 09:13:17 +01:00
asiekierka
d29a9bafd8 Merge branch 'transport-rework' into 7.1.x 2015-10-25 08:43:32 +01:00
asiekierka
c11a8d0889 fix #3092, fix #3087, fix #3085, fix #3091, fix #3083, fix #3082, fix #3081, add pipe speed tweaks, add #3088 2015-10-25 08:43:20 +01:00
asiekierka
f9da290cdd add oredict support to stained pipe recipe 2015-10-16 09:39:50 +02:00
asiekierka
394c7c33f4 remove 1.4.7 auto workbench loading code - why was this still here? 2015-10-16 09:11:23 +02:00
asiekierka
5481d14f25 BuildCraft 7.1.11 2015-10-15 19:58:34 +02:00
asiekierka
d2258ff497 fix #3079 2015-10-15 17:41:59 +02:00
asiekierka
b7cf71a7dd try to improve unstucking logic, fix #3075 2015-10-15 17:28:02 +02:00
asiekierka
fefead843b BuildCraft 7.1.10 2015-10-13 18:54:52 +02:00
asiekierka
57ea745c6f improvements to robot pathfinding 2015-10-13 18:14:56 +02:00
asiekierka
abd1330031 fix #3071 2015-10-12 19:31:31 +02:00
asiekierka
ca6b6647ed fix #3069 2015-10-12 19:03:25 +02:00
asiekierka
213fe63f91 fix #3072 properly + a bonus quarry bug 2015-10-12 17:11:26 +02:00