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

2546 commits

Author SHA1 Message Date
SpaceToad
bc60546eb9 added energy management for builder robot, close #1908 2014-07-15 15:55:32 +02:00
SpaceToad
0b710d998a made progress in builder robot, for #1908 2014-07-15 12:49:55 +02:00
Semion Nadezhdin
78b3c7dfc0 fixup! Redesigned texture states system 2014-07-12 05:30:40 +04:00
Semion Nadezhdin
725644b5fc Redesigned texture states system 2014-07-12 05:11:18 +04:00
SpaceToad
bb72ff14ec Merge branch '6.0.x' into 6.1.x 
Conflicts:
	common/buildcraft/BuildCraftCore.java
 2014-07-12 00:33:53 +02:00
SpaceToad
068bb6f5fa Merge branch '5.0.x' into 6.0.x 
Conflicts:
	common/buildcraft/BuildCraftCore.java
 2014-07-12 00:30:31 +02:00
SpaceToad
91a6d08e3c fixed version requirements 2014-07-12 00:24:45 +02:00
SpaceToad
e515924e46 Merge branch '6.0.x' into 6.1.x 2014-07-11 22:48:09 +02:00
SpaceToad
9d4465bbc5 Merge branch '6.0.x' into 6.1.x 2014-07-11 22:26:44 +02:00
SpaceToad
ab4114dbe6 Merge branch '5.0.x' into 6.0.x 
Conflicts:
	common/buildcraft/BuildCraftEnergy.java
 2014-07-11 22:26:29 +02:00
Andrew Dudney
f9e9c6cb26 Changed build.gradle to use RunDir, changed deprecated fluid localized name functionality, changed deprecated biome type desert to sandy. 2014-07-11 14:12:02 -06:00
Andrew Dudney
c55db01daf Removed deprecated functionality and moved to equivalent. 2014-07-11 10:50:37 -06:00
Andrew Dudney
23e8abe00a Changed from assetDir to runDir, removed excess glPushAttrib 2014-07-11 10:43:58 -06:00
SpaceToad
4c6e7bb39e Merge branch '6.0.x' into 6.1.x 
Conflicts:
	api/buildcraft/api/power/PowerHandler.java
	build.gradle
	common/buildcraft/core/robots/EntityRobotPicker.java
	common/buildcraft/factory/TileRefinery.java
	common/buildcraft/transport/TileGenericPipe.java
 2014-07-11 09:00:08 +02:00
SpaceToad
3e401acfbe Merge branch '6.0.x-1.7.10' of https://github.com/adudney/BuildCraft into 6.0.x 
Conflicts:
	build.gradle
 2014-07-11 08:53:39 +02:00
SpaceToad
1791c485af Merge branch '5.0.x' into 6.0.x 
Conflicts:
	build.gradle
	common/buildcraft/transport/BlockGenericPipe.java
	common/buildcraft/transport/render/PipeItemRenderer.java
 2014-07-11 08:49:38 +02:00
SpaceToad
4144188467 fixed rendering problems, merged from 6.0.x, close #1934 2014-07-11 08:43:49 +02:00
SpaceToad
5ab655a226 Merge branch '6.1.x' of github.com:BuildCraft/BuildCraft into 6.1.x 2014-07-10 07:57:05 +02:00
SpaceToad
b462bc6dd7 fixed robot size, deactivate robot collisions 2014-07-10 07:56:52 +02:00
SpaceToad
a668977ff5 Merge pull request #1932 from simon816/pipe-item-color 
Add support for giving items a color when calling injectItem
 2014-07-10 07:23:06 +02:00
SpaceToad
87c7c9043f added render code for builder robots, for #1908 2014-07-10 07:15:40 +02:00
SpaceToad
addad59d08 made progress with robot builder, for #1908 2014-07-09 09:00:36 +02:00
simon816
7a941c1279 Add support for injecting colored items in pipes 2014-07-08 22:38:24 +01:00
SpaceToad
b71fe3cce8 made progress for builder robot, for #1920 2014-07-08 22:40:39 +02:00
SpaceToad
23d46e2bce made progress with builder robot, for #1908 2014-07-07 00:19:01 +02:00
SpaceToad
3ccb215cf9 fixed error in previous change 2014-07-06 23:06:56 +02:00
SpaceToad
4c731c533c started work on builder robot, for #1908 2014-07-06 16:59:37 +02:00
SpaceToad
fcab170b0b fixed style 2014-07-06 14:46:40 +02:00
SpaceToad
40c882de25 Various fixes in robot behavior. 2014-07-06 13:22:58 +02:00
SpaceToad
6de8ad01ea improved behavior of farmer robot 2014-07-06 00:21:37 +02:00
SpaceToad
6e824d55ab various robot fixes 2014-07-05 17:53:31 +02:00
SpaceToad
f60595c821 fixed gate rotation in schematic, close #1930 2014-07-05 15:15:15 +02:00
SpaceToad
72b1a3cfe6 fixed handling of byte arrays 2014-07-05 14:06:10 +02:00
SpaceToad
57c338b9af various fixes for gates 2014-07-05 13:29:09 +02:00
SpaceToad
ffcd8188de fixed various regressions with gates logic 2014-07-05 10:08:36 +02:00
Andrew Dudney
f2f563fd39 Changed to tabs from spaces 2014-07-04 14:45:34 -06:00
Andrew Dudney
59d36f31d0 Changed style to reflect CheckStyle 2014-07-04 14:35:36 -06:00
Andrew Dudney
ca5bbc3f17 Changed all deprecated functionality to it's equivalent, updated to 1.7.10-10.13.0.1160 2014-07-04 14:30:19 -06:00
SpaceToad
036f257505 fixed style 2014-07-04 19:36:04 +02:00
SpaceToad
2bb67431b8 added new triggers for energy request and storage detection, close #1897 2014-07-04 19:34:40 +02:00
SpaceToad
66ae784ed0 bucher -> butcher, close #1926 2014-07-04 09:03:24 +02:00
SpaceToad
4d35532ad1 made progress with ai load / save, for #1921 2014-07-04 08:59:23 +02:00
SpaceToad
5554cf41bc improved save / load of stations, for #1921 2014-07-03 09:32:57 +02:00
SpaceToad
59c22235bd fixed loading of picker robot, for #1921 2014-07-01 08:52:01 +02:00
SpaceToad
e9eafbc342 fixed style 2014-07-01 08:16:35 +02:00
SpaceToad
3372c3f997 finished bucher and shovelman, close #1924, close #1925 2014-07-01 08:15:44 +02:00
SpaceToad
4c86502701 started implementation of shovelman and bucher, #1924 and #1925 2014-07-01 00:33:00 +02:00
SpaceToad
1917f11f97 implemented filters for all robots, close #1922 2014-07-01 00:08:05 +02:00
SpaceToad
447bfb49d4 fixed style 2014-06-30 20:55:43 +02:00
SpaceToad
504911cff0 planter can now plant seeds, part of #1922 2014-06-30 20:54:50 +02:00
SpaceToad
c6a77d2a65 fixed style 2014-06-30 09:15:24 +02:00
SpaceToad
43e1e6d8c0 implemented filter for block breaking robots, for #1922 2014-06-30 09:14:30 +02:00
SpaceToad
7721d0d95d added farmer and harvester robots, part of #1922 2014-06-30 00:07:48 +02:00
SpaceToad
1ab3bcef10 finished initial save / load loop, for #1921 2014-06-29 18:57:46 +02:00
SpaceToad
27cf9473c6 made progress with robot loading / unloading, for #1921 2014-06-29 16:58:44 +02:00
SpaceToad
8ca47462d5 Progress made in robot life cycle. 
Robot now die if they have no more energy or if their station is destroyed.
Improved energy requirements (by default, all robots consume 0.1 MJ / cycle).
Part of #1921
 2014-06-29 16:07:19 +02:00
SpaceToad
487b0cc7e6 fixed knight robot 2014-06-29 12:34:09 +02:00
SpaceToad
99309b381a improved carrier robot behavior and adjusted energy consumption 2014-06-29 11:55:19 +02:00
Parker Young
341ff4e972 Updated to 1.7.10 
This version isn't backwards compatiable because of changes in the CompressedStreamTools. I don't know if you want to push an update to the 5.0.x branch, but I thought I'd do it, just in case you did.
 2014-06-28 11:57:16 -04:00
SpaceToad
2d0f4f43ce Merge branch '6.0.x' into 6.1.x 2014-06-28 17:17:09 +02:00
SpaceToad
bb3618aaf9 Further work in robot carrier control. 
Items can now be filtered.
It's now possible to put items in a pipe.
For #1877.
 2014-06-28 17:15:34 +02:00
Raul Tambre
10d0287df1 Fixed laser data not existing in some cases 2014-06-28 15:48:53 +03:00
SpaceToad
16b2dc311e fixed else statement, for #1877 2014-06-28 14:14:32 +02:00
SpaceToad
ada0ab4311 generalized working area control, for #1877 2014-06-28 14:13:28 +02:00
SpaceToad
ecd0464379 added area control for lumberjack and planter, for #1877 2014-06-28 14:05:02 +02:00
SpaceToad
8e58dd97de decrease load of picker robots 2014-06-28 11:04:37 +02:00
SpaceToad
48b5564171 Merge branch '6.1.x' of github.com:BuildCraft/BuildCraft into 6.1.x 2014-06-28 00:52:12 +02:00
SpaceToad
ab699b2480 no need for systematic cycle latency with sleep implementation 2014-06-28 00:51:47 +02:00
SpaceToad
ceeadf9e50 Delete ActionRobotGoToStation.java 
Delete duplicate file.
 2014-06-28 00:32:14 +02:00
SpaceToad
f61c3cacaa added station robot forbid, for #1877 2014-06-28 00:31:00 +02:00
SpaceToad
ae112cf5d0 Fixed file casing. 2014-06-28 00:02:18 +02:00
SpaceToad
008c36b570 Merge branch '6.1.x' of github.com:BuildCraft/BuildCraft into 6.1.x 2014-06-27 23:42:50 +02:00
SpaceToad
9f1187c3aa implemented robot sleep / wakeup, for #1873 and #1877 2014-06-27 23:42:30 +02:00
Prototik
600b035b36 Fixed builds under unix 2014-06-27 15:11:30 +08:00
SpaceToad
e4e477a241 implement miner robot, close #1915 2014-06-26 23:07:51 +02:00
SpaceToad
fe47f56cf1 fixed style 2014-06-26 20:55:46 +02:00
SpaceToad
e68677f906 finished implementation of bomber, close #1913 2014-06-26 20:54:56 +02:00
SpaceToad
cb68a5c563 removed duplicated code in statements 2014-06-26 08:59:04 +02:00
SpaceToad
3c409ca0b9 started work on bomber, for #1913 2014-06-26 08:51:28 +02:00
SpaceToad
3d9a2ee9de first version of knight robot, close #1911 2014-06-26 00:20:57 +02:00
SpaceToad
63bf1ca0df Merge pull request #1910 from tambry/facadeLoadFix6.1 
Fix ghost facades from pre-6.0.x worlds
 2014-06-25 22:56:13 +02:00
SpaceToad
35c592f041 finished implementation of career, close #1907 2014-06-25 22:54:11 +02:00
Raul Tambre
a91c5e8649 Fix ghost facades from pre-6.0.x worlds 
Essentially same as #1905
 2014-06-25 10:05:05 +03:00
SpaceToad
b400c561e3 fixed style 2014-06-25 09:00:25 +02:00
SpaceToad
dfc759de6c Started work on carrier robot, for #1907. 2014-06-24 07:32:50 +02:00
Raul Tambre
78a06e5f35 Fixed ghost facades from pre-6.0.x 2014-06-23 11:41:27 +03:00
SpaceToad
7c9993568c Added a limit to block scanning. For #1873 2014-06-23 08:32:33 +02:00
SpaceToad
afc9ce619e Fixed writing of polymorphic classes. 
Fixes #1903 and probably many others.
 2014-06-23 08:31:56 +02:00
SpaceToad
2e209805b8 separate normal terminaison from abort 2014-06-22 23:31:07 +02:00
SpaceToad
e4ab3b0fa0 Kill path finding jobs upon interruption, for #1873. 2014-06-22 17:57:10 +02:00
SpaceToad
eeb637d59f Generalized latency property, for #1873 2014-06-22 17:49:22 +02:00
SpaceToad
4428b44674 Started work on actions to provide / request items, for #1877. 2014-06-22 17:09:25 +02:00
SpaceToad
c3f5e44565 implemented close pipe action, close #1902 2014-06-22 15:03:16 +02:00
SpaceToad
a670949a9c Gates are now specifically providing actions specific to their side, 
for #1895.
 2014-06-22 13:02:12 +02:00
SpaceToad
8801cdedc9 removed PacketCoordinates from mapped packets, as it's only derived 2014-06-22 12:04:42 +02:00
SpaceToad
79c1ad7b7d fixed indentation 2014-06-22 12:01:40 +02:00
SpaceToad
5591de3654 Merge branch '6.0.x' into 6.1.x 2014-06-22 11:52:00 +02:00
SpaceToad
0d4f021dd3 Merge branch '6.1.x' of github.com:BuildCraft/BuildCraft into 6.1.x 2014-06-22 11:51:30 +02:00
SpaceToad
9577c53313 Fixed gate extension ids synchronization, for #1895. 
Added a new concept of NetworkId, allowing to transfer ids over the network
instead of strings.
RPCs are now all handled the same way (except RPC Pipes, to be completed when
actually used).
 2014-06-22 11:49:59 +02:00
SpaceToad
bcc0f37e82 Merge pull request #1893 from tambry/MoreParameterization 
Even more parameterization and cleanup!
 2014-06-17 21:42:21 +02:00
SpaceToad
ff0307702e Inventory triggers should not be side specific by default, following #1886 2014-06-16 23:37:42 +02:00
Raul Tambre
753e4693bc Prevent possible crash when rendering a marker 2014-06-16 21:23:33 +03:00
SpaceToad
fa98a71d18 Redstone output is send to all sides again, following up on #1886. 2014-06-16 08:52:23 +02:00
SpaceToad
3630875761 Made redstone input back to non-side specific behavior. This follows behavior 
of other blocks, although side-sensitive parameter could be added. Following
up on #1886.
 2014-06-16 08:39:23 +02:00
SpaceToad
cd10225538 fixed bug when no station is found 2014-06-16 03:23:16 +02:00
SpaceToad
68ef23dbdf removed OBE comment 2014-06-16 03:00:29 +02:00
SpaceToad
afbfe26fa0 Factorised station scan code. 
Fixed world property analysis.
 2014-06-16 02:59:43 +02:00
SpaceToad
6f8466a8f4 fixed stack tooltip display in advanced UIs 2014-06-16 00:09:08 +02:00
SpaceToad
c6430035ff first attempt with AI overriding, #1877 2014-06-15 23:54:20 +02:00
SpaceToad
220ee62c10 fixed gate activation feedback 2014-06-15 21:05:53 +02:00
Raul Tambre
5292bc6f19 Even more parameterization and cleanup 2014-06-15 22:05:06 +03:00
SpaceToad
e53f267d06 fixed and / or computation with parameter actions 2014-06-15 20:52:08 +02:00
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
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
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
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
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
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
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
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
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
7f5a993a07 minor tweaks in documentation 2014-06-08 12:50:18 +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
Dynious
b80c95ea03 Added Version Checker integration and fixed changelog grabbing 2014-06-08 11:17:34 +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
9e58783add made progress with lumberjack implementation, #1869 2014-06-07 18:56:07 +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
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
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
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
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
e7b680f29e made progress for robot implementation, #1732 2014-05-29 11:28:34 +02:00