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 |
|
CovertJaguar
|
d99505c713
|
Fix block renderer to not be hugely inefficient.
|
2014-06-10 03:28:35 -07:00 |
|
SpaceToad
|
bdda0fb476
|
Refactored Robot AI system into smaller units.
|
2014-06-10 00:22:22 +02:00 |
|
SpaceToad
|
b83f2ae6dc
|
fixed style
|
2014-06-09 17:43:16 +02:00 |
|
SpaceToad
|
1605a36c03
|
lumberjack robot now manages its axe and corresponding damage, #1869
|
2014-06-09 17:40:56 +02:00 |
|
SpaceToad
|
0d978677de
|
added lumberjack animation, for #1869
|
2014-06-09 00:56:58 +02:00 |
|
SpaceToad
|
253c398f12
|
fixed robots dying
|
2014-06-08 14:14:16 +02:00 |
|
SpaceToad
|
b8aeb05dd0
|
fixed previous check-in
|
2014-06-08 13:59:43 +02:00 |
|
SpaceToad
|
73bb09ca93
|
fixed robots going through block edges
|
2014-06-08 13:31:31 +02:00 |
|
SpaceToad
|
cf393474ef
|
minor fixes for #1869
|
2014-06-08 12:46:17 +02:00 |
|
SpaceToad
|
efcabd31a1
|
More work on lumberjacks.
RPC now support entity messages.
Robots now support item synchronization between client and server.
Lumberjack now use a variable tool.
for #1869
|
2014-06-08 11:58:55 +02:00 |
|
SpaceToad
|
10fd47b0b9
|
fixed style, #1869
|
2014-06-07 23:13:34 +02:00 |
|
SpaceToad
|
82b34ac62f
|
implemented lumberjack wood search and cut, #1869
|
2014-06-07 23:11:55 +02:00 |
|
SpaceToad
|
00521143b6
|
Merge branch '6.0.x' into 6.1.x
|
2014-06-07 18:57:09 +02:00 |
|
SpaceToad
|
92bfbe4e27
|
added missing lang properties
|
2014-06-07 18:56:38 +02:00 |
|
SpaceToad
|
9e58783add
|
made progress with lumberjack implementation, #1869
|
2014-06-07 18:56:07 +02:00 |
|
SpaceToad
|
daae576b87
|
Merge pull request #1870 from da3dsoul/6.0.x
Fix isFullFluidBlock -> fix Floodgates
|
2014-06-07 18:40:29 +02:00 |
|
da3dsoul
|
576be235f7
|
Fix isFullFluidBlock -> fix Floodgates
A recommit to 6.0.x instead of master
|
2014-06-07 10:57:19 -04:00 |
|
SpaceToad
|
87c18afb76
|
minor style fix
|
2014-06-07 16:46:16 +02:00 |
|
SpaceToad
|
41479f2021
|
fixed style
|
2014-06-07 16:45:14 +02:00 |
|
SpaceToad
|
926764b0b5
|
picker board not takes parameters into account, #1732
|
2014-06-07 16:43:05 +02:00 |
|
SpaceToad
|
1518ccdcf6
|
implemented connection between UI and board parameters, #1732
|
2014-06-07 16:10:18 +02:00 |
|
SpaceToad
|
1a74389a5c
|
added additional random parameters for robot, #1732
|
2014-06-07 11:25:32 +02:00 |
|
SpaceToad
|
da32818bad
|
Merge branch '6.1.x' of github.com:BuildCraft/BuildCraft into 6.1.x
|
2014-06-06 09:00:23 +02:00 |
|
SpaceToad
|
81bc0fe11b
|
finalized recipe refactoring, close #1861
|
2014-06-06 09:00:11 +02:00 |
|
SpaceToad
|
05cf55b224
|
Merge pull request #1864 from Prototik/builder-fluid
Fix builder fluid support
|
2014-06-03 09:20:24 +02:00 |
|
SpaceToad
|
55bc2ef39a
|
Merge pull request #1863 from Prototik/transparent-facade-texture
Fix transparent facade item texture
|
2014-06-03 09:02:02 +02:00 |
|
SpaceToad
|
eda4d58c9e
|
further fixes to the integration table, #1861
|
2014-06-03 09:00:43 +02:00 |
|
Prototik
|
27754198ac
|
Fix fluid energy requirement
|
2014-06-03 11:07:49 +08:00 |
|
Prototik
|
6eec57c35f
|
Fix transparent facade item texture
|
2014-06-03 10:50:20 +08:00 |
|
SpaceToad
|
fd926ff0e0
|
Merge pull request #1862 from Prototik/builder-fluid
Make Builder support fluids via containers/pipes
|
2014-06-02 18:16:10 +02:00 |
|
Prototik
|
091ae87333
|
Make Builder support fluids via containers/pipes
|
2014-06-02 23:33:03 +08:00 |
|
SpaceToad
|
ed1675ada5
|
fixes in the integration table, #1861
|
2014-06-02 17:20:35 +02:00 |
|
SpaceToad
|
a5b9a8870e
|
fixed style errors
|
2014-06-02 16:34:05 +02:00 |
|
SpaceToad
|
cfb9095139
|
Initial refactoring of recipe mechanics.
Assembly table should be ok, integration table and refinery still to go.
For #1851
|
2014-06-02 16:29:13 +02:00 |
|
SpaceToad
|
fbf2cef772
|
Merge branch 'integration-table-advanced-recipe' of https://github.com/Prototik/BuildCraft into Prototik-integration-table-advanced-recipe
|
2014-06-01 15:17:22 +02:00 |
|
SpaceToad
|
02e8ef057e
|
removed unused files and graphic components
|
2014-06-01 15:16:39 +02:00 |
|
SpaceToad
|
5a2100804b
|
Merge branch '6.1.x' of github.com:BuildCraft/BuildCraft into 6.1.x
|
2014-06-01 15:13:35 +02:00 |
|
SpaceToad
|
e193d634cf
|
made progress in board parameters, #1732
|
2014-06-01 15:13:23 +02:00 |
|
SpaceToad
|
f005f28bb6
|
Merge pull request #1859 from tambry/oilfuelopacity
Fixed oil and fuel opacity
|
2014-06-01 13:26:16 +02:00 |
|
Prototik
|
1c49dddf35
|
Advanced integration recipe
|
2014-06-01 18:35:35 +08:00 |
|
Raul Tambre
|
742391e504
|
Fix oil and fuel opacity
|
2014-06-01 10:48:31 +03:00 |
|
SpaceToad
|
7898637b33
|
prepare version 6.0.16
|
2014-05-31 18:16:42 +02:00 |
|
SpaceToad
|
6150c5b09e
|
Merge branch '6.0.x' into 6.1.x
|
2014-05-31 18:09:33 +02:00 |
|
SpaceToad
|
8bff372360
|
Merge branch '5.0.x' into 6.0.x
Conflicts:
common/buildcraft/BuildCraftBuilders.java
common/buildcraft/BuildCraftCore.java
common/buildcraft/BuildCraftEnergy.java
common/buildcraft/BuildCraftFactory.java
common/buildcraft/BuildCraftSilicon.java
common/buildcraft/BuildCraftTransport.java
common/buildcraft/builders/network/PacketHandlerBuilders.java
common/buildcraft/core/network/PacketHandler.java
common/buildcraft/core/network/PacketTileState.java
common/buildcraft/factory/network/PacketHandlerFactory.java
common/buildcraft/silicon/network/PacketHandlerSilicon.java
common/buildcraft/transport/network/PacketHandlerTransport.java
|
2014-05-31 18:09:23 +02:00 |
|
SpaceToad
|
d946f8d936
|
tentative fix for packet leaks, #1855
|
2014-05-31 15:26:43 +02:00 |
|
SpaceToad
|
e99f0a3c4b
|
made progress with boards and parameters, #1732
|
2014-05-30 09:04:00 +02:00 |
|
SpaceToad
|
7b20cab4be
|
fixed style
|
2014-05-29 22:00:42 +02:00 |
|