Commit graph

4021 commits

Author SHA1 Message Date
asiekierka
27decec743 Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft into 6.4.x
Conflicts:
	common/buildcraft/BuildCraftTransport.java
2015-02-11 16:52:14 +01:00
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
d7617679e5 Merge pull request #2450 from hea3ven/6.4.x
fix wooden pipes not respecting blocking bluggables, fixes #2443
2015-02-08 17:47:01 +01:00
Hea3veN
ac2bc7ab97 fix wooden pipes not respecting blocking bluggables, fixes #2443 2015-02-08 10:27:42 -03: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
1b1a075f49 Merge pull request #2440 from hea3ven/robot-new-pathfind
Robot new pathfind
2015-02-04 15:00:16 +01:00
Hea3veN
2afa5ceea4 fix style 2015-02-04 00:03:17 -03:00
Hea3veN
d362a062a9 added a registry for the robot ResourceId classes 2015-02-03 23:07:18 -03:00
Hea3veN
c873857807 new path finding algorithm for the block breaking robots 2015-02-03 23:06:04 -03:00
Adrian Siekierka
bb16f3f529 Merge pull request #2439 from hea3ven/6.4.x
added a registry for the robot AI classes
2015-02-03 20:05:19 +01:00
Hea3veN
57a608fbe8 added a registry for the robot AI classes 2015-02-03 08:41:14 -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
Adrian Siekierka
05f3b32b3c Merge pull request #2436 from BigXplosion/imcCoolant
Added IMC messages for adding or removing coolants
2015-02-02 17:16:07 +01:00
big_Xplosion
f65a28b968 Added IMC messages for adding or removing coolants 2015-02-02 16:16:21 +01:00
Adrian Siekierka
836c132c59 Merge pull request #2432 from warlordjones/6.4.x
Additional pipe sealant recipe and facade change
2015-02-01 20:33:14 +01:00
Arona Jones
8a43753090 That's not gonna work - check if the blockmaterial is considered solid instead 2015-02-01 16:17:58 +00:00
Arona Jones
a8da61a86b Ah, that disallows transparant facades - check rendertype instead 2015-02-01 16:11:18 +00:00
Arona Jones
086e99b167 Don't create facades for blocks not considered opaque cubes.
I feel like there is a hidden reason why this hasn't been implemented, but I can't see it...
2015-02-01 16:04:59 +00:00
Arona Jones
969dd1cae9 Make new recipe configurable 2015-02-01 15:57:36 +00:00
Arona Jones
4e2e84990a Add additional pipe sealant recipe using slimeballs 2015-02-01 15:53:48 +00: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