Commit graph

4016 commits

Author SHA1 Message Date
asiekierka
931bc0523f Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft into 6.5.x 2015-04-12 14:30:42 +02:00
asiekierka
c018abbb04 BuildCraft 6.4.11 2015-04-12 14:30:23 +02:00
asiekierka
605ef0fe28 fix up zone planner gui, add tablet improvements, merge, etc 2015-04-12 14:27:47 +02:00
asiekierka
ed5fd2b375 BuildCraft 6.4.10 2015-04-11 08:41:23 +02:00
asiekierka
6af362a89d further 1355+ fluid fixes 2015-04-11 08:22:09 +02:00
asiekierka
b6ac3bb406 Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft into 6.5.x 2015-04-10 21:04:27 +02:00
asiekierka
bce4720a2b last-minute changelog update 2015-04-10 20:50:10 +02:00
Adrian Siekierka
27570d8db5 Merge pull request #2626 from hea3ven/6.4.x
fix fluid dupe with the pump robot
2015-04-10 19:45:49 +02:00
asiekierka
b291458e4a BuildCraft 6.4.9 2015-04-10 20:43:42 +02:00
asiekierka
445957588f cleanup, add warning checks for invalid item/block names in MappingRegistry 2015-04-10 20:34:55 +02:00
asiekierka
5c767249a6 fix fluid pipe crash on Forge 1355+ 2015-04-10 16:03:08 +02:00
asiekierka
4fc8db5339 fix robot crash post-refactor 2015-04-10 16:01:45 +02:00
Hea3veN
3e859b38d9 fix fluid dupe with the pump robot 2015-04-10 07:35:28 -03:00
asiekierka
a364104d47 fix pipe plug crash, add font parsing to tablets 2015-04-09 22:19:40 +02:00
asiekierka
27b385d1d0 Merge branch '6.5.x' of github.com:BuildCraft/BuildCraft into 6.5.x 2015-04-09 18:48:45 +02:00
asiekierka
5a2dc4db3c add early tablet code, add facade non-laser recipe option, minor tweaks and refactors 2015-04-09 18:48:34 +02:00
Adrian Siekierka
cb031d826d Merge pull request #2622 from hea3ven/robot-fixes
add a new Load/Unload area for robots
2015-04-09 13:15:36 +02:00
Hea3veN
413cfc595d add a new Load/Unload area for robots 2015-04-08 20:47:03 -03:00
Adrian Siekierka
4652f19f28 Merge pull request #2610 from hea3ven/robot-fixes
Robot fixes
2015-04-07 13:24:00 +02:00
Hea3veN
7ab7019691 make robots drop as items when shift right click with wrench 2015-04-07 08:10:04 -03:00
Hea3veN
7e5270685e allow robots to continue working if there is no available recharging station 2015-04-07 08:09:52 -03:00
Hea3veN
9ee5947397 robots now shutdown in stead of dropping as items 2015-04-07 08:09:29 -03:00
Hea3veN
7a80a80fad cleanup fluid carrier robot 2015-04-07 08:06:39 -03:00
Hea3veN
2889c2bdb4 cleanup carrier and bomber robot 2015-04-07 08:06:24 -03:00
Hea3veN
63472e04f2 make sure all robot AI properly handle errors in delegate AIs 2015-04-07 08:06:07 -03:00
Hea3veN
542add1ff7 fix formatting of the robot position in the debugger 2015-04-06 19:15:51 -03:00
Hea3veN
5ad693bea8 refactor common robot ai code 2015-04-06 19:15:51 -03:00
Hea3veN
d76f164f0d fix robots ignoring gate configuration on load 2015-04-06 19:15:51 -03:00
Hea3veN
0945972f60 robotics package cleanup 2015-04-06 19:15:51 -03:00
Hea3veN
7c0a2ebbb5 fix compiler error 2015-04-06 19:15:51 -03:00
asiekierka
5de8bb327b Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft into 6.5.x
Conflicts:
	build.gradle
	common/buildcraft/core/recipes/FlexibleRecipe.java
2015-04-06 21:21:49 +02:00
asiekierka
180a020fc7 BuildCraft 6.4.8 2015-04-06 21:20:38 +02:00
asiekierka
1f9280c4b4 fix #2616 2015-04-06 20:00:04 +02:00
asiekierka
7f52097896 add weighted fluid sorting for diamond fluid pipes, mirroring diamond item pipes 2015-04-06 09:53:31 +02:00
asiekierka
0509624c89 fix for Java 6/7 2015-04-06 09:37:32 +02:00
asiekierka
32dfc3cdf7 output fake player UUID/name to console on postInit to help server owners 2015-04-05 14:56:57 +02:00
asiekierka
9d93d515f0 rewrite fluid extraction pipe mechanics 2015-04-05 14:44:03 +02:00
asiekierka
a6048f22a2 fixes to render refreshing 2015-04-05 12:11:45 +02:00
Hea3veN
d73f176950 fix robots changing color when picking leaf blocks 2015-04-05 11:45:35 +02:00
asiekierka
aeea0dddf4 optimize pipe chunk updates properly 2015-04-05 11:43:56 +02:00
asiekierka
ad4d418f78 more zone plan changes 2015-04-05 10:39:42 +02:00
asiekierka
24441a1ae5 Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft into 6.5.x
Conflicts:
	build.gradle
	common/buildcraft/transport/BlockGenericPipe.java
	common/buildcraft/transport/pipes/PipeFluidsWood.java
2015-04-03 23:18:40 +02:00
asiekierka
eeaef4d9e0 BuildCraft 6.4.7 2015-04-03 22:03:51 +02:00
asiekierka
26691038ea Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft into 6.4.x 2015-04-03 21:59:56 +02:00
asiekierka
93d136f61b work around multiple fluids in pipes issues 2015-04-03 21:54:44 +02:00
Adrian Siekierka
1e4b647331 Merge pull request #2611 from hea3ven/6.4.x
fix an error when loading robot resources
2015-04-03 20:04:14 +02:00
Hea3veN
34b98eba9d fix an error when loading robot resources 2015-04-03 12:39:01 -03:00
asiekierka
fb1c7a5561 BlockGenericPipe now returns proper pipe icon, might help WAILA icon rendering 2015-04-03 13:45:44 +02:00
asiekierka
93df0d82be fix some pipe empty render pass bugs, try to fix TCon fluid pipe loss and fluid pipe massive liquid extraction buffers
Conflicts:
	common/buildcraft/transport/render/PipeRendererWorld.java
2015-04-03 13:35:25 +02:00
asiekierka
9d655ec110 fix some pipe empty render pass bugs, try to fix TCon fluid pipe loss and fluid pipe massive liquid extraction buffers 2015-04-03 13:34:53 +02:00