Commit graph

2640 commits

Author SHA1 Message Date
Raul Tambre
5781a9c01f In library set player even when shift clicked
Was quite an annoying small bug.
Was trying to put some blueprints in blueprint library, but they well
wouldn't simply appear in the list.
Came out the uploading and downloading player is only set when the slot
is clicked.
2014-05-07 20:29:11 +03:00
SpaceToad
2bbe4b132b fixed previous checkin 2014-05-07 11:57:55 +02:00
SpaceToad
de119ab52e fixed template soft block detection 2014-05-07 11:56:32 +02:00
SpaceToad
adb369c9c0 Merge branch 'Prototik-blueprints-downloads' into 6.0.x 2014-05-07 11:49:36 +02:00
SpaceToad
6345f4eace Merge branch 'Prototik-tables-actions' into 6.0.x 2014-05-07 11:44:43 +02:00
SpaceToad
308bf078a9 Merge branch 'tables-actions' of https://github.com/Prototik/BuildCraft into Prototik-tables-actions 2014-05-07 11:44:02 +02:00
SpaceToad
6aab1f2346 Default download location is computed only once, as to make it more explicit
to the user where things are located and how to fix.
2014-05-07 11:26:28 +02:00
SpaceToad
41358a2f5f Merge branch 'blueprints-downloads' of https://github.com/Prototik/BuildCraft into Prototik-blueprints-downloads 2014-05-07 10:58:09 +02:00
SpaceToad
5fece7b5ec Merge branch 'undergroundminer3-6.0.x' into 6.0.x 2014-05-07 10:44:29 +02:00
Prototik
082794a7d2 Implement On/Off actions for the all tables 2014-05-07 16:15:37 +08:00
Prototik
d80ab96714 Using XDG for retrieving downloads dir on Linux/Mac. 2014-05-07 15:18:48 +08:00
undergroundminer3
ae06682617 Dont' break other mods' gui s when holding a pipe
Restore the OpenGl to the state we found it,
instead of forcing the transparency to be turned off.
2014-05-06 21:03:36 -04:00
SpaceToad
492b2805bf prepare 6.0.10 release 2014-05-06 23:34:58 +02:00
SpaceToad
deee15abf9 slightly improved pipe drops behavior depending on speed 2014-05-06 23:24:39 +02:00
SpaceToad
710f9bd453 Merge branch 'tambry-architecttabletextfield' into 6.0.x 2014-05-06 20:52:04 +02:00
SpaceToad
d5786a3034 fixed style 2014-05-06 20:51:56 +02:00
SpaceToad
036a904617 Merge branch 'architecttabletextfield' of https://github.com/tambry/BuildCraft into tambry-architecttabletextfield 2014-05-06 20:50:23 +02:00
SpaceToad
6ae68757c7 Avoid using client-only setVelocity, but set it manually, close #1722. 2014-05-06 20:47:56 +02:00
SpaceToad
53ed55da8d Merge branch '6.0.x' of github.com:BuildCraft/BuildCraft into 6.0.x 2014-05-06 19:42:28 +02:00
SpaceToad
f80a475792 Merge branch 'tambry-blueprintlibraryslots' into 6.0.x 2014-05-06 19:42:19 +02:00
SpaceToad
c21e3a2639 Merge branch 'blueprintlibraryslots' of https://github.com/tambry/BuildCraft into tambry-blueprintlibraryslots 2014-05-06 19:41:05 +02:00
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
b81cd59fb9 In architect GUI table allow key repeat events 2014-05-06 20:12:40 +03: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
Raul Tambre
48cb35c124 Make some blueprint library slots output slots 2014-05-06 19:50:53 +03:00
SpaceToad
3e4378f565 added back old architecture textures, close #1718 2014-05-06 17:42:58 +02:00
SpaceToad
962a8f7fbe Merge pull request #1715 from Prototik/update-messages
Localize update messages
2014-05-06 15:41:42 +02:00
SpaceToad
a03ed3293e Merge pull request #1716 from Prototik/traveling-item
Change visibility for the things in TravelingItem
2014-05-06 15:40:20 +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
663e682af8 Merge branch 'Prototik-average' into 6.0.x 2014-05-06 11:22:20 +02: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
6f7e8d46cf Merge branch 'tambry-architecttableimprovement' into 6.0.x 2014-05-06 00:06:08 +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
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