SpaceToad
7bb2351b67
Merge branch '6.1.x' of github.com:BuildCraft/BuildCraft into 6.1.x
...
Conflicts:
common/buildcraft/core/ItemMapLocation.java
2014-06-15 19:51:49 +02:00
SpaceToad
002caaca38
first attempt at overriding AI, for #1877
2014-06-15 19:50:55 +02:00
SpaceToad
b9df5af112
Merge pull request #1892 from tambry/Parameterize
...
Parameterize things
2014-06-15 19:48:55 +02:00
SpaceToad
ac28a810aa
fixed triggers and actions transparency
2014-06-15 19:46:33 +02:00
Raul Tambre
5ecbe57320
Parameterization and minor cleanup
2014-06-15 20:27:17 +03:00
SpaceToad
4c2b425d10
fixed builds
2014-06-15 17:33:09 +02:00
SpaceToad
4d955da51f
improved docking / undocking API, #1877
2014-06-15 17:20:54 +02:00
SpaceToad
19e07c11fa
implemented robot station states, for #1877
2014-06-15 16:56:57 +02:00
SpaceToad
7d2e546a66
Completed support for action parameters and parametrized pipe signal.
...
Finalized implementation of emerald gate.
Close #1880 .
2014-06-15 15:01:10 +02:00
SpaceToad
bc51e29746
Merge branch 'Prototik-gates' into 6.1.x
2014-06-15 12:32:23 +02:00
Prototik
c01bfe8783
Make support for sided gates
2014-06-15 14:18:32 +08:00
SpaceToad
254a533060
Allows to mark areas and path on top of specific locations.
...
Generalization of #1882
2014-06-15 03:28:35 +02:00
SpaceToad
44d4e4e3b9
started work on docking action, #1877
2014-06-15 02:41:00 +02:00
SpaceToad
0a9ffaf59f
fixed parameter setting in gate gui
2014-06-15 00:24:10 +02:00
SpaceToad
40268062db
started work on better pipe signal actions, for #1877
2014-06-15 00:19:30 +02:00
SpaceToad
31cc8b6438
removed unused texture
2014-06-15 00:17:54 +02:00
SpaceToad
2aa1530444
prepare icons for robot triggers / actions, #1877
2014-06-15 00:16:58 +02:00
SpaceToad
7a71e63861
Merge pull request #1885 from tambry/ContainerItemSensitive
...
Use ItemStack sensitive version of hasContainerItem()
2014-06-14 18:05:08 +02:00
SpaceToad
149e65d2c1
Merge branch '6.0.x' into 6.1.x
2014-06-14 18:02:56 +02:00
SpaceToad
e308a0a3e2
Merge pull request #1887 from tambry/PoolFixes
...
Replace .getAABBPool() and .getWorldVec3Pool() for 1.7.10 compatibility
2014-06-14 18:02:12 +02:00
SpaceToad
0ca64b0798
implemented a location recording, close #1882
2014-06-14 17:55:53 +02:00
Raul Tambre
eac76e9c77
Replace .getAABBPool() and .getWorldVec3Pool()
2014-06-14 18:45:06 +03:00
SpaceToad
50ce9c4856
Merge branch 'tambry-cleanup' into 6.1.x
2014-06-14 16:49:00 +02:00
SpaceToad
50d670593f
Merge branch 'cleanup' of https://github.com/tambry/BuildCraft into tambry-cleanup
2014-06-14 16:48:47 +02:00
SpaceToad
71687ec20c
fixed style, #1880
2014-06-14 15:34:14 +02:00
SpaceToad
4f8e82b153
Continuation on gates refactoring.
...
Moved some packets into RPCs.
Part of #1880 .
2014-06-14 15:29:45 +02:00
Raul Tambre
d8d42a3d17
Use ItemStack sensitive version of hasContainerItem
2014-06-13 22:12:56 +03:00
Raul Tambre
1dcabf262b
Code cleanup
2014-06-13 21:11:02 +03:00
SpaceToad
b1076d8556
fixed API builds
2014-06-13 13:36:02 +02:00
SpaceToad
98f7196d0f
Merge branch '6.1.x' of github.com:BuildCraft/BuildCraft into 6.1.x
2014-06-13 13:17:25 +02:00
SpaceToad
70c1cd0535
Started a major refactor of the trigger action system.
...
Triggers and actions are moving towards more factorization in statements.
Actions will now accept parameters.
Triggers and actions will accept up to 3 parameters.
Parameters will not only be stacks, in particular for pipe wire.
This is supporting in particular the emerald gate implementation, for #1880 .
2014-06-13 13:15:33 +02:00
SpaceToad
5e6bc27144
Merge pull request #1879 from tambry/forge1093
...
Update to Forge 1121 and fix 2 typos
2014-06-13 13:12:42 +02:00
Raul Tambre
df1e70cfd1
Updated to Forge 1121, fixed some typos, fix #1878
2014-06-13 12:20:59 +03:00
SpaceToad
66bfac926b
adjusted fetching time
2014-06-12 19:19:56 +02:00
SpaceToad
101f591f8f
Implemented leave cutter, close #1876
2014-06-12 18:29:02 +02:00
SpaceToad
e60950db9b
fixed bug detected by checkstyle
2014-06-12 13:49:05 +02:00
SpaceToad
6389baa9cb
Implemented planter robot, close #1874 .
2014-06-12 13:46:52 +02:00
SpaceToad
defa5cab45
fixed robot re-initialization problems, #1873
2014-06-11 22:51:41 +02:00
SpaceToad
1d642f052c
regular path finding is using a separate thread, #1873
2014-06-11 18:50:17 +02:00
SpaceToad
ce0c26f31d
lumberjack pathfinding is now done in a separate thread, #1873
2014-06-11 18:34:42 +02:00
SpaceToad
6c52e912c7
First pass of optimization, using a chunk buffer for properties.
...
Part of #1873
2014-06-11 16:58:09 +02:00
SpaceToad
aeef94a888
Merge branch '6.0.x' into 6.1.x
2014-06-11 01:39:54 +02:00
SpaceToad
27f9e05512
fixed style
2014-06-11 01:39:40 +02:00
SpaceToad
4931bc2954
Merge pull request #1872 from Dynious/6.0.x
...
Made sure Version IMC message is also sent after init phase
2014-06-11 01:36:12 +02:00
SpaceToad
878d5266bc
fixed previous check-in
2014-06-10 17:16:49 +02:00
SpaceToad
53b5176297
fixed registry cleanup
2014-06-10 17:10:07 +02:00
Dynious
aef8260877
Made sure Version IMC message is also sent after init phase
2014-06-10 16:27:12 +02:00
SpaceToad
83e84f2687
fixed style
2014-06-10 13:27:13 +02:00
SpaceToad
0ad90d29ce
Merge branch '6.1.x' of github.com:BuildCraft/BuildCraft into 6.1.x
2014-06-10 13:22:55 +02:00
SpaceToad
9e1a6ebf03
Implemented robot energy management - close #1867 .
...
Finished robot lumberjack - close #1869 .
Implemented docking station mutual exclusion - close #1868 .
2014-06-10 13:21:17 +02:00
