SpaceToad
|
27f858e2b5
|
Merge branch '5.0.x' into 6.0.x
Conflicts:
common/buildcraft/transport/PipeConnectionBans.java
|
2014-05-05 19:35:24 +02:00 |
|
SpaceToad
|
766495e75b
|
Merge branch '6.0.x' of github.com:BuildCraft/BuildCraft into 6.0.x
|
2014-05-05 19:10:36 +02:00 |
|
SpaceToad
|
a76e98b98d
|
removed obsolete properties
|
2014-05-05 19:10:24 +02:00 |
|
SandGrainOne
|
7b6f66db02
|
Fixed pipe connection bans
Fixes #1707
|
2014-05-05 19:00:03 +02:00 |
|
SpaceToad
|
682ce455c1
|
Merge pull request #1705 from tambry/gitignoreeclipseprefs
Ignore some Eclipse preferences
|
2014-05-05 18:53:01 +02:00 |
|
SpaceToad
|
4a086cd55b
|
Merge pull request #1704 from tambry/typo
Fix a typo
|
2014-05-05 18:51:53 +02:00 |
|
Raul Tambre
|
1fe4200a7d
|
No need to commit some Eclipse preferences
|
2014-05-05 19:33:33 +03:00 |
|
Raul Tambre
|
eb62240e02
|
Fix a typ
|
2014-05-05 19:03:24 +03:00 |
|
SpaceToad
|
fe5e734b64
|
Added provision for blueprints with non existing blocks and entities.
Close #1702
|
2014-05-05 17:01:48 +02:00 |
|
SpaceToad
|
03dfd35b47
|
stairs are standalone blocks
|
2014-05-05 16:27:01 +02:00 |
|
SpaceToad
|
3629e76ad0
|
tanks are standalone blocks
|
2014-05-05 16:22:22 +02:00 |
|
SpaceToad
|
b45ba8a93d
|
engines are standalone blocks
|
2014-05-05 16:20:56 +02:00 |
|
SpaceToad
|
f4866fa883
|
improved movements of building items
|
2014-05-05 16:18:04 +02:00 |
|
SpaceToad
|
29239111ad
|
fixed potential NPE
|
2014-05-05 16:09:30 +02:00 |
|
SpaceToad
|
62e21a45b8
|
fixed builder position error when no energy, fix #1701
|
2014-05-05 15:33:47 +02:00 |
|
SpaceToad
|
2dd5eac515
|
prepare 6.0.9 version
|
2014-05-05 14:55:28 +02:00 |
|
SpaceToad
|
9877f8df63
|
fixed javadoc errors
|
2014-05-05 14:54:39 +02:00 |
|
SpaceToad
|
27a7d1390b
|
Merge branch '5.0.x' into 6.0.x
|
2014-05-05 14:46:24 +02:00 |
|
SpaceToad
|
a49fcc0bcc
|
Merge pull request #1684 from anti344/5.0.x
Tweak for users without BC-Localization installed.
|
2014-05-05 14:45:05 +02:00 |
|
SpaceToad
|
faced2a2c6
|
Merge branch 'tambry-16stack' into 6.0.x
|
2014-05-05 14:43:00 +02:00 |
|
SpaceToad
|
250db91750
|
Merge branch '16stack' of https://github.com/tambry/BuildCraft into tambry-16stack
|
2014-05-05 14:42:13 +02:00 |
|
SpaceToad
|
4612cb6e9f
|
Merge branch 'Prototik-gate-triggers-plugs' into 6.0.x
|
2014-05-05 14:38:15 +02:00 |
|
SpaceToad
|
f02dda793d
|
Merge branch 'gate-triggers-plugs' of https://github.com/Prototik/BuildCraft into Prototik-gate-triggers-plugs
|
2014-05-05 14:37:51 +02:00 |
|
Prototik
|
960e98dc3d
|
Make block gate triggers by plugs
|
2014-05-05 20:29:28 +08:00 |
|
Raul Tambre
|
38f74d42f0
|
Also some blueprint and template cleanup
|
2014-05-05 15:11:45 +03:00 |
|
Raul Tambre
|
6aaf47b7f9
|
Make blank blueprints and templates stack to 16
|
2014-05-05 15:06:03 +03:00 |
|
SpaceToad
|
52bedc0bd4
|
minor adjustments in building items display and costs
|
2014-05-05 13:52:26 +02:00 |
|
SpaceToad
|
cf54f0e68a
|
improved biome setting for oil generation
|
2014-05-05 12:55:40 +02:00 |
|
SpaceToad
|
7fdc3feb37
|
Merge branch 'Prototik-power-legacy' into 6.0.x
|
2014-05-05 11:15:49 +02:00 |
|
SpaceToad
|
5ad4b53120
|
minor refactorings
|
2014-05-05 11:15:17 +02:00 |
|
SpaceToad
|
ebe0b1c0f6
|
Merge branch 'power-legacy' of https://github.com/Prototik/BuildCraft into Prototik-power-legacy
|
2014-05-05 11:01:19 +02:00 |
|
SpaceToad
|
668738f4fe
|
removed obsolete property
|
2014-05-05 10:57:41 +02:00 |
|
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
|
ae1776e449
|
Merge branch 'tambry-16stack' into 6.0.x
|
2014-05-05 10:12:16 +02:00 |
|
SpaceToad
|
890f14bcfe
|
Merge branch '16stack' of https://github.com/tambry/BuildCraft into tambry-16stack
|
2014-05-05 10:11:36 +02: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
|
efecafdf9a
|
Fix rendering of blueprints and templates
|
2014-05-04 22:34:26 +03: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 |
|