Commit graph

3685 commits

Author SHA1 Message Date
asiekierka
f5c3220c53 Merge branch '6.3.x' of github.com:BuildCraft/BuildCraft into 6.4.x
Conflicts:
	common/buildcraft/robots/boards/BoardRobotPlanter.java
	common/buildcraft/transport/ItemFacade.java
	common/buildcraft/transport/TileGenericPipe.java
	common/buildcraft/transport/render/FacadeBlockAccess.java
2015-01-24 09:35:48 +01:00
asiekierka
f0e06e1662 make robots store energy in the ItemStack, make robots chargeable, begin refactoring rboots to separate module 2015-01-24 09:33:40 +01:00
asiekierka
a6f37fe4d7 also BuildCraft 6.3.3, quick hotfix 2015-01-23 09:22:55 +01:00
asiekierka
3fca102985 BuildCraft 6.3.3 2015-01-23 09:18:07 +01:00
asiekierka
f8ae10e2f2 BuildCraft 6.3.2 2015-01-22 23:37:52 +01:00
asiekierka
d635e79e32 optimize pass 1 workaround, try to fix #2398 2015-01-22 23:18:48 +01:00
asiekierka
960271dadd Merge branch '6.3.x' of github.com:BuildCraft/BuildCraft into 6.3.x 2015-01-22 23:12:37 +01:00
asiekierka
d21680fc5e fix #2404 2015-01-22 23:12:00 +01:00
Adrian Siekierka
aa9d9fd41c Merge pull request #2406 from RS485/6.3.x
Use IPipeTile insead of direct TGP access in BlockGenericPipe. [Make LP easier]
2015-01-22 22:09:51 +01:00
davboecki
63d05326f0 Make BlockGenericPipe use the IPipeTile to access Pipe and TileGenericPipe.
Allow non TGP implementation of IPipeTile to pass an internal version of Pipe.
2015-01-22 19:53:29 +01:00
asiekierka
1015627d07 make robots actually use energy, fix a massive bug - only in 6.4.x, though, as i do not want to break most robot builds in a patch release 2015-01-22 15:33:39 +01:00
asiekierka
ada7c2cf32 Merge branch '6.3.x' of github.com:BuildCraft/BuildCraft into 6.3.x 2015-01-22 14:32:02 +01:00
asiekierka
4257b6d70c fix SMP facade crash 2015-01-22 14:31:50 +01:00
asiekierka
a14eb3b55f add IFacadePluggable, let mods define their own IFacadePluggables and query facades; NPE fixes on rare world corruptions 2015-01-22 13:49:08 +01:00
Adrian Siekierka
ad4742f4ad Merge pull request #2403 from hea3ven/6.3.x
fix gate iteration when the "actions" are different than the "active act...
2015-01-22 12:54:28 +01:00
Hea3veN
d13d4e60c8 fix gate iteration when the "actions" are different than the "active actions", fixes #2350 2015-01-22 08:45:53 -03:00
Adrian Siekierka
5d0ea47670 Merge pull request #2402 from hea3ven/6.3.x
make the planter robot handle any IPlantable item/block and sugarcane, f...
2015-01-22 12:30:54 +01:00
Hea3veN
f2e3166a51 small performance optimization for the block breaking robots 2015-01-21 22:35:44 -03:00
Hea3veN
39410dc5af make the planter robot handle any IPlantable item/block and sugarcane, fixes #2370 2015-01-21 20:46:09 -03:00
asiekierka
7d9892bc13 fix #2397, minor tweaks 2015-01-18 16:37:55 +01:00
asiekierka
f8b2efbc35 make checks even more liberal (we still catch pistons and ExU pipes that way, but we also catch all glass types which is far more important) 2015-01-18 16:20:06 +01:00
Adrian Siekierka
3e5a2ae062 Merge pull request #2396 from hea3ven/6.3.x
fix docking stations staying linked when changing a robot's main link
2015-01-18 14:30:37 +01:00
asiekierka
5627c5dc7d further improvements to facade logic, CTM support 2015-01-18 15:28:18 +01:00
Hea3veN
b2d204cb2b fix docking stations staying linked when changing a robot's main link 2015-01-18 09:37:47 -03:00
asiekierka
e60fa8dfbb add addInformation passthrough, fix facade detection code - accidentally makes ChiselFacades redundant 2015-01-18 11:25:32 +01:00
asiekierka
24c084b598 remove redundant redundancy check, fix #2388 2015-01-18 11:11:03 +01:00
asiekierka
3be7ce1189 extend power number hiding to iron power pipes and creative engines 2015-01-18 11:06:18 +01:00
asiekierka
464ac75428 Merge branch 'hide-numbers' of https://github.com/immibis/BuildCraft into 6.3.x 2015-01-18 10:47:50 +01:00
asiekierka
5f4c49b83c almost all blocks and TEs are now CompatHookable 2015-01-17 21:13:58 +01:00
Adrian Siekierka
59473de6c0 Merge pull request #2391 from Kubuxu/patch-1
Make Travis builds logs less obscure.
2015-01-17 12:19:22 +01:00
Jakub Sztandera
a51aede654 Make Travis builds less obscure.
Option -S enables full stack trace logging which in case of Grovy is very obscure.
Default logging shows CheckStyle errors in console.
2015-01-17 11:21:42 +01:00
immibis
bd4b856106 Auto-workbenches will rebalance only when necessary, instead of every tick.
Also, moved balancing before jammed check. Otherwise, jammed autoworkbenches that could unjam themselves by balancing wouldn't do this.
2015-01-17 10:49:14 +01:00
immibis
6b3526e739 Auto-workbenches that cannot craft will not retry crafting again until any input slot changes.
Conflicts:
	common/buildcraft/factory/TileAutoWorkbench.java
2015-01-17 10:49:08 +01:00
immibis
3082c198c4 Added hidePowerNumbers and hideFluidNumbers options. 2015-01-17 19:32:38 +13:00
asiekierka
ded664beaf fix #2385, add #2381 2015-01-15 12:11:48 +01:00
Adrian Siekierka
93192ee735 Merge pull request #2378 from Kubuxu/6.3.x
Fix JavaDoc for Java8 compability
2015-01-13 06:58:11 +01:00
Kuba Sztandera
cf2a8f6f3f Fix CheckSyle error 2015-01-11 15:33:03 +01:00
Kuba Sztandera
dcdf4be684 Fix JavaDoc for Java8 compability 2015-01-11 15:23:10 +01:00
asiekierka
74fc202ea6 make BuildCraft properly detect previously registered fluids, make oil move a lot slower - closes #2376 2015-01-11 15:12:30 +01:00
Adrian Siekierka
a88ce4ea03 Merge pull request #2377 from Vexatos/6.3.x
Make swimming in oil a lot harder
2015-01-11 13:54:15 +01:00
Vexatos
1efa254037 Make swimming in oil a lot harder 2015-01-11 13:43:01 +01:00
asiekierka
be1d1f2fc9 fix version number 2015-01-10 18:46:08 +01:00
asiekierka
7eaf537ecf the real BuildCraft 6.3.1 - make pluggables easier to remove, make pluggables pop directly into your inventory when removed 2015-01-10 18:42:55 +01:00
asiekierka
dd2e3ab3e9 BuildCraft 6.3.1 2015-01-10 17:31:33 +01:00
asiekierka
e49136f096 fix #2362 2015-01-10 17:03:35 +01:00
asiekierka
f7601c4564 fix #2368 2015-01-10 16:50:58 +01:00
asiekierka
9db83e3a83 fix #2366 2015-01-07 16:27:17 +01:00
asiekierka
bfa726e928 BuildCraft 6.3.0 2015-01-06 15:20:28 +01:00
asiekierka
9e3423eeef api/bccompat changes, add support for powering chutes 2015-01-06 14:57:21 +01:00
asiekierka
65a135123a add experimental code to power kinesis pipes with redstone engines for energy extraction, add proper IInjectable support, add more compat hooks (for IItemDuct) 2015-01-06 12:29:47 +01:00