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

2053 commits

Author SHA1 Message Date
SpaceToad
888da3081f Merge pull request #1720 from tambry/architecttablefocus 
On opening Architect GUI focus textfield
 2014-05-06 19:39:13 +02:00
Raul Tambre
c93d36acd6 On opening Architect GUI focus textfield 2014-05-06 20:02:57 +03:00
SpaceToad
5131374073 Added configuration for blueprint input / output folders. 
Changed default blueprint output folder.
Added capability of defining several blueprint input folders for the library.
Close #1717.
 2014-05-06 18:56:22 +02:00
SpaceToad
962a8f7fbe Merge pull request #1715 from Prototik/update-messages 
Localize update messages
 2014-05-06 15:41:42 +02:00
Prototik
25774bbdf1 Change visibility for the things in TravelingItem 2014-05-06 21:25:29 +08:00
Prototik
93806cecca Localize update messages 2014-05-06 20:02:41 +08:00
SpaceToad
e0c7b8c573 Merge branch 'average' of https://github.com/Prototik/BuildCraft into Prototik-average 2014-05-06 11:20:51 +02:00
SpaceToad
7cdddf3361 Improved blueprint unique id recognition in file names. 
Increased length of blueprint names and use standard text UI in the architect.
Close #1713
 2014-05-06 11:14:35 +02:00
Prototik
93d1fb49e6 Add AverageUtil and using it for energy rate computing in assembly 
tables
 2014-05-06 15:40:10 +08:00
SpaceToad
c09772d5d4 Added a more generic air storage avoidance in blueprints, close #1712. 2014-05-06 09:38:16 +02:00
SpaceToad
658e10b12d fixed max size of library slots, close #1710 2014-05-06 00:10:51 +02:00
SpaceToad
99f1a27ccd Merge branch 'architecttableimprovement' of https://github.com/tambry/BuildCraft into tambry-architecttableimprovement 2014-05-06 00:05:23 +02:00
SpaceToad
21fd683e58 Re-activated version check and changelog extracting, now based on github files. 
Close #1709
 2014-05-05 23:54:23 +02:00
Raul Tambre
ee7c3a8f7f Fix being able to place items in architect table output 2014-05-05 21:52:02 +03:00
SpaceToad
a66ba2f637 fixed version checking 2014-05-05 20:31:23 +02:00
SpaceToad
eee2c2272f fixed last java warnings 2014-05-05 19:45:11 +02:00
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
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
9877f8df63 fixed javadoc errors 2014-05-05 14:54:39 +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
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
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
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
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
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