SpaceToad
cf52bdaa45
Merge branch 'gate-and-ui' of https://github.com/Prototik/BuildCraft into Prototik-gate-and-ui
2014-05-08 18:22:03 +02:00
SpaceToad
f344a4aed2
Merge pull request #1748 from tambry/architectshiftclickfix
...
Fix shift-clicking in architect table, fix #1740
2014-05-08 18:20:48 +02:00
SpaceToad
0eb0b01cbf
Merge pull request #1747 from Prototik/drop-blueprint
...
Drop blueprint if no space available in builder
2014-05-08 18:18:39 +02:00
Prototik
7ca9e6987d
Draw only half of indicator for AND gates when not all triggers active
2014-05-08 23:54:02 +08:00
Raul Tambre
27d095a00c
Fix shift-clicking in architect table, fix #1740
2014-05-08 17:50:31 +03:00
Prototik
1c17929fa5
Drop blueprint if no space available in builder
2014-05-08 22:26:41 +08:00
SpaceToad
7bb2808ff0
Merge branch '6.0.x' of github.com:BuildCraft/BuildCraft into 6.0.x
2014-05-08 15:41:42 +02:00
SpaceToad
a70597a61a
Merge branch 'Prototik-mjapi' into 6.0.x
2014-05-08 15:41:05 +02:00
SpaceToad
f15419219d
Merge branch 'mjapi' of https://github.com/Prototik/BuildCraft into Prototik-mjapi
2014-05-08 15:40:41 +02:00
SpaceToad
8ca978b0e1
Merge pull request #1744 from Prototik/builder-comparator
...
Fix comparator requirements for builder
2014-05-08 15:36:52 +02:00
SpaceToad
915b9e2baf
Merge pull request #1743 from Prototik/builder-energy
...
Fix read/write nbt in builders
2014-05-08 15:35:42 +02:00
SpaceToad
7d9d6f8e8d
Merge branch 'Prototik-drop-stripes' into 6.0.x
2014-05-08 15:32:15 +02:00
SpaceToad
3fcebdd40f
Merge branch 'drop-stripes' of https://github.com/Prototik/BuildCraft into Prototik-drop-stripes
2014-05-08 15:30:54 +02:00
SpaceToad
6d4ac68dce
Merge branch 'tambry-blueprintlibrarypagebuttons' into 6.0.x
2014-05-08 15:30:01 +02:00
Prototik
31ac41aae6
Fix comparator requirements for builder
2014-05-08 20:25:33 +08:00
Prototik
246375c5ac
Update MjAPI (implementation and docs)
2014-05-08 19:11:54 +08:00
Prototik
fe2a5e6559
Fix read/write nbt in builders
2014-05-08 18:58:31 +08:00
Prototik
bfc6f02505
Fix server crash while drop items in stripes pipe too
2014-05-08 13:19:25 +08:00
Raul Tambre
2f7ae5a3f2
Disable/enable page buttons in blueprint library
2014-05-08 08:16:01 +03:00
SpaceToad
771f42977c
Merge pull request #1736 from ninehous/patch-1
...
Update GuiBlueprintLibrary.java
2014-05-07 23:56:31 +02:00
ninehous
990e07f8cd
Update GuiBlueprintLibrary.java
...
Fixed a formatting error.
2014-05-07 23:09:54 +03:00
SpaceToad
eaf44a00ef
Merge branch 'tambry-blueprintlibrarydisabledelete' into 6.0.x
2014-05-07 20:45:59 +02:00
Raul Tambre
821ab3a9c3
Enable/disable delete button when selected or not
2014-05-07 21:35:13 +03:00
SpaceToad
646c694f80
removed redundant handling of custom items, for #1730
2014-05-07 20:11:19 +02:00
SpaceToad
4585c15e83
added double plant to the list of ignored blocks, close #1729
2014-05-07 20:07:42 +02:00
SpaceToad
f895948f41
Merge branch 'tambry-librarygetnamewhenshift' into 6.0.x
2014-05-07 19:58:41 +02:00
SpaceToad
f63a16bd95
removed useless override to slotClick
2014-05-07 19:58:21 +02:00
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
