Commit graph

2561 commits

Author SHA1 Message Date
Prototik
aa68c3cd81 Add MjAPILegacy for providing an old-style api for the new power api.
Add Energy Converter block for the same things in game.
2014-05-05 16:21:25 +08:00
SpaceToad
c31654c864 Merge branch '6.0.x' of github.com:BuildCraft/BuildCraft into 6.0.x 2014-05-04 23:38:53 +02:00
SpaceToad
5387fe1889 Merge branch 'tambry-6.0.x' into 6.0.x 2014-05-04 23:38:45 +02:00
Raul Tambre
5033dace6c Fix the fix for the fix of red dot 2014-05-04 22:07:26 +03:00
SpaceToad
61157af356 Merge pull request #1695 from jk-5/patch-1
See #1690. Let checkstyle fail builds when some rules are violated
2014-05-04 20:31:31 +02:00
jk-5
7e5fe9f7bb Fix checkstyle 2014-05-04 20:21:50 +02:00
Raul Tambre
37b765083c Better fix to laser dot, fix #1692 2014-05-04 20:58:30 +03:00
SpaceToad
049f9c41ba Merge pull request #1694 from AbrarSyed/patch-1
fixed readme for gradle dependencies
2014-05-04 18:42:34 +02:00
SpaceToad
e230d9a3f2 factorized out some of the code 2014-05-04 18:34:08 +02:00
SpaceToad
949d8054c4 Merge branch '6.0.x' of https://github.com/AEnterprise/BuildCraft into AEnterprise-6.0.x 2014-05-04 18:27:01 +02:00
SpaceToad
aca1678591 requirements extraction is now cleaner 2014-05-04 18:25:28 +02:00
Abrar Syed
ff66d5d63a fixed readme for gradle dependencies 2014-05-04 11:17:16 -05:00
AEnterprise
810ff8b07d fix space before ) on the realBueprintDeployer 2014-05-04 18:17:10 +02:00
AEnterprise
01bf28a77d fix for the blueprint deployer 2014-05-04 17:11:38 +02:00
SpaceToad
decc8ccf10 added missing tranformation in deployer 2014-05-04 15:57:59 +02:00
SpaceToad
f4fa14b956 Merge branch '6.0.x' of github.com:BuildCraft/BuildCraft into 6.0.x 2014-05-04 14:33:46 +02:00
SpaceToad
4518b0f247 added missing network update call after removing blueprint 2014-05-04 14:33:34 +02:00
SpaceToad
ebde06a0cd Merge pull request #1690 from jk-5/patch-1
Update .travis.yml
2014-05-04 13:32:24 +02:00
jk-5
7baa39e6eb Don't be quiet and print full errors when something goes wrong 2014-05-04 13:10:58 +02:00
jk-5
0730aa491f Update .travis.yml 2014-05-04 13:05:42 +02:00
SpaceToad
70329a4aaa Merge pull request #1686 from Prototik/travis
Travis integration
2014-05-04 13:00:04 +02:00
Prototik
5a08fa6de9 Travis integration 2014-05-04 18:50:11 +08:00
SpaceToad
ee979545ba Merge branch 'Prototik-pumps' into 6.0.x 2014-05-04 12:24:10 +02:00
SpaceToad
eb4c9982b1 Merge branch 'pumps' of https://github.com/Prototik/BuildCraft into Prototik-pumps 2014-05-04 12:23:09 +02:00
SpaceToad
c2341c4aaa Merge branch '5.0.x' into 6.0.x 2014-05-04 12:21:27 +02:00
Prototik
ecd10b9772 Fix pumps 2014-05-04 14:20:52 +08:00
Prototik
94e928de57 Enable checkstyle gradle plugin. 2014-05-04 12:06:32 +08:00
SandGrainOne
ad7587785d Corrected wire tooltip in gates 2014-05-04 02:33:28 +02:00
SpaceToad
8b22700803 fixed previous commit 2014-05-03 22:32:31 +02:00
SpaceToad
5bde6b9dfc localize architect strings, close #1682 2014-05-03 22:30:16 +02:00
SpaceToad
fcb7a94982 removed absolute paths 2014-05-03 22:17:10 +02:00
SpaceToad
4def61f450 prepare 6.0.8 version 2014-05-03 20:17:12 +02:00
SpaceToad
fe64c95faa fixed save/load of facades, for #1679 2014-05-03 20:13:47 +02:00
SpaceToad
bf86c7f7d7 added eclipse preferences of code style 2014-05-03 19:03:50 +02:00
SpaceToad
7b77008d97 Updated coding standard, and enforce it in the entire BuildCraft codebase.
Close #1662.
2014-05-03 18:59:52 +02:00
SpaceToad
f4a6d621e3 added facade tab back 2014-05-03 09:51:44 +02:00
Prototik
cb69f11cf9 Split creative tabs by blocks, items and pipes 2014-05-03 10:25:14 +08:00
SpaceToad
56699cf352 added support to throwing blocks in stripes pipe 2014-05-02 23:31:33 +02:00
SpaceToad
3b3100e9cf added potion support in stripe pipe, close #1675 2014-05-02 23:22:34 +02:00
SpaceToad
4d81b743d0 made code more clear, and implemented explicit support for blocks, fix #1668 2014-05-02 22:46:33 +02:00
SpaceToad
c355208be4 added missing rotation to the blueprint deployer, for #1671 2014-05-02 20:41:59 +02:00
SpaceToad
830ba84c87 added blueprint deployer, for #1673 2014-05-02 20:16:20 +02:00
SpaceToad
dd0bc3a41f fixed ignored items not clearing space, for #1671 2014-05-02 19:48:49 +02:00
SpaceToad
04bf86b06f removed final modifier to traveling item, close #1667 2014-05-02 19:38:44 +02:00
SpaceToad
bf13a23a75 Merge branch 'Prototik-dropped-item' into NextGen 2014-05-02 19:36:48 +02:00
Prototik
1e927da66a Fix direction for dropped items 2014-05-03 01:04:22 +08:00
SpaceToad
9c48334c57 minor API cleanup 2014-05-02 09:07:08 +02:00
SpaceToad
5e3b0126ac implemented control over energy requirements, for #1664 2014-05-02 09:01:28 +02:00
SpaceToad
d2b1e5b8f7 Merge branch 'Prototik-mjapi' into NextGen 2014-05-02 08:16:16 +02:00
Prototik
4144075082 Add MjAPI.getEnergyStored() and maxCapacity() 2014-05-02 11:17:06 +08:00