Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
2850 commits 1 branch 0 tags 19 MiB
Commit graph

2850 commits

This branch
This branch
All branches
Author SHA1 Message Date
SpaceToad
81bc0fe11b finalized recipe refactoring, close #1861 2014-06-06 09:00:11 +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
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
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
SpaceToad
3f925ae0e9 completed a first robot+board, #1732 2014-05-29 21:58:08 +02:00
SpaceToad
ce55fe5eb1 fixed redstone board writing, #1732 2014-05-29 15:07:18 +02:00
SpaceToad
d8d57e822f Merge branch '6.0.x' into 6.1.x 2014-05-29 14:17:29 +02:00
SpaceToad
b7a89c6cc8 Merge pull request #1856 from Prototik/inbt-serializable 
INBT serializable for @NetworkData
 2014-05-29 14:14:39 +02:00
SpaceToad
10e7429847 Merge pull request #1854 from Prototik/tile-marker-crash 
Fix tile marker crash
 2014-05-29 11:31:45 +02:00
SpaceToad
e204fa275d Merge branch '6.1.x' of github.com:BuildCraft/BuildCraft into 6.1.x 2014-05-29 11:30:18 +02:00
SpaceToad
a106b17da6 Merge pull request #1850 from Prototik/mjapi 
Next impovements of MjAPI
 2014-05-29 11:29:50 +02:00
SpaceToad
e7b680f29e made progress for robot implementation, #1732 2014-05-29 11:28:34 +02:00
SpaceToad
a3c2854791 Merge pull request #1852 from Prototik/pump-drain-crash 
Fix pump crash
 2014-05-29 11:22:35 +02:00
Prototik
d3e3f8bf21 Add support for custom nbt-based serialize classes for @NetworkData 2014-05-28 14:16:40 +08:00
Prototik
173db45f4b Fix tile marker crash 2014-05-27 16:18:22 +08:00
Prototik
9640255442 Next impovements of MjAPI 2014-05-27 16:12:58 +08:00
Prototik
f9748a5bfc Fix pump crash 2014-05-27 11:52:44 +08:00
SpaceToad
e6ff3d7825 fixed style of previous check-in, #1732 2014-05-27 00:27:24 +02:00
SpaceToad
7acb8b4592 made progress with robot recipes and boards, #1732 2014-05-27 00:25:39 +02:00
SpaceToad
379ea6e278 fixed style and removed unused files 2014-05-26 23:00:01 +02:00
SpaceToad
5046cc445b added missing icons, #1732 2014-05-26 09:35:10 +02:00
SpaceToad
34d285a448 started work on redstone boards, #1732 2014-05-26 09:34:28 +02:00
SpaceToad
e5e8e4da4b Merge branch '6.0.x' into 6.1.x 2014-05-25 17:54:28 +02:00
SpaceToad
e8c1da1b75 Merge branch 'Prototik-mjapi-engines' into 6.1.x 2014-05-25 17:48:17 +02:00
SpaceToad
111ad6032e Merge branch 'mjapi-engines' of https://github.com/Prototik/BuildCraft into Prototik-mjapi-engines 2014-05-25 17:48:03 +02:00
SpaceToad
972d39f678 fixed docking algorithms for robots, #1732 2014-05-25 17:47:36 +02:00
Prototik
0a4c84f558 Massive overhaul of energy system 2014-05-25 23:13:38 +08:00
SpaceToad
5060da651f progress with robot AI and fixed pathfinding, #1732 2014-05-25 17:08:53 +02:00
SpaceToad
79ddf23192 migrated robot picker to the new path resolver, #1732 2014-05-25 16:28:20 +02:00
SpaceToad
ae43e9cdb9 Merge pull request #1848 from Prototik/energy-converter-crash 
Energy converter crash
 2014-05-25 12:47:43 +02:00
SpaceToad
45db58473e added test for robot pathfinding, for #1732 2014-05-25 12:36:05 +02:00
SpaceToad
58f342287a fixed test name 2014-05-25 12:18:04 +02:00
SpaceToad
ce757bc37f completed basic test, for #1486 2014-05-25 12:11:56 +02:00