Commit graph

3704 commits

Author SHA1 Message Date
asiekierka
81fb40883f Merge branch '6.3.x' of github.com:BuildCraft/BuildCraft into 6.4.x 2015-02-11 16:51:46 +01:00
Adrian Siekierka
8b362520e8 Merge pull request #2447 from hea3ven/6.3.x
fix the architect table sometimes modifiying the world when creating blu...
2015-02-07 21:03:29 +01:00
Hea3veN
696edcfe96 fix the architect table sometimes modifiying the world when creating blueprints, fixes #2424 2015-02-07 14:12:25 -03:00
asiekierka
20313b1e7f BuildCraft 6.3.6 - hotfix 2015-02-06 20:19:31 +01:00
asiekierka
86974d071e fix changelog 2015-02-06 19:56:20 +01:00
asiekierka
0dd57e7f27 BuildCraft 6.3.5 2015-02-06 19:39:24 +01:00
asiekierka
8d3cc17732 shh... [fixed assembly table networking/GUI] 2015-02-06 18:49:55 +01:00
Adrian Siekierka
c7ff24c624 Merge pull request #2444 from hea3ven/6.3.x
add builder support for most of the blocks in the factory module, fixes ...
2015-02-05 11:06:47 +01:00
Hea3veN
76e01f1005 add builder support for most of the blocks in the factory module, fixes #2430 2015-02-04 23:48:18 -03:00
Adrian Siekierka
2f2b2f638e Merge pull request #2431 from warlordjones/6.3.x
Bugfixes
2015-02-03 08:35:10 +01:00
Arona Jones
671d964f33 Fix #2426 and #2408. Partially Fix #2345. 2015-02-03 07:21:02 +00:00
Adrian Siekierka
d99214ac8e Merge pull request #2437 from hea3ven/lists_fix
fix lists only using the first stack per line, fixes #2422
2015-02-03 00:23:52 +01:00
Hea3veN
bda10c7513 fix sync issue of the accept equivalents button in lists, fixes #2411 2015-02-02 20:21:17 -03:00
Hea3veN
d52aa02453 fix lists only using the first stack per line, fixes #2422 2015-02-02 19:54:39 -03:00
asiekierka
5771b6b9e7 BuildCraft 6.3.4, fix #2423 and #2419 2015-01-31 00:42:54 +01:00
asiekierka
6bc4db05a7 fix compatibility with Artifice 2015-01-28 14:00:51 +01:00
asiekierka
173e068ed8 fix compatibility with Artifice 2015-01-28 14:00:42 +01:00
asiekierka
9c6a38eb6e filler parameters, early revision 2015-01-24 23:23:47 +01:00
asiekierka
281d7409f9 further cleanup - make robots respect IPipeTile 2015-01-24 09:46:02 +01:00
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