GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-24 23:29:00 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,268 Commits 291 Branches 265 Tags
Commit Graph

4268 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Arjen Hiemstra
7971ffdc08 Properly ignore Arcus debug messages 2016-07-27 18:03:20 +02:00
Arjen Hiemstra
823ab61cc5 Tweak convex hull node and transparent object shader 
Now we render at least a vague hint at lighting instead of nothing at
all.
 2016-07-27 18:03:20 +02:00
Ghostkeeper
6af0f28f32
Only show draft shield height if draft shield enabled 
We must've missed that one previously.

Contributes to issue CURA-1295.
 2016-07-27 17:50:34 +02:00
Jack Ha
bac3f73e6d Check ConvexHullHead vs ConvexHullHead collision. CURA-1776 2016-07-27 17:42:15 +02:00
Tim Kuipers
d1f4fadbfc Merge branch 'master' into feature_support_bottoms 2016-07-27 17:40:36 +02:00
Tim Kuipers
cd26794155 JSON fix: retrieve globalish support settings from support extruder (CURA-2003) 2016-07-27 17:27:57 +02:00
Jaime van Kessel
b29ff7feeb Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-27 14:14:35 +02:00
Jaime van Kessel
afed6eed93 Print montior also handles wait_for_cleanup correctly now 2016-07-27 14:14:13 +02:00
Jack Ha
4175e51dbb Corrected gantry height for ultimaker2.json (extended and go inherit). 
CURA-1979

Made same change in resources/definitions/ultimaker2.def.json as in
the original resources/machines/ultimaker2.json
 2016-07-27 14:10:01 +02:00
Tim Kuipers
358a48dfbb JSON fix: support_bottom_height now warns if below support_bottom_stair_step_dist (CURA-1013) 2016-07-27 12:14:25 +02:00
Tim Kuipers
b9b9a15f72 Merge branch 'master' into feature_support_bottoms 2016-07-27 11:18:02 +02:00
Simon Edwards
1e2147522d Increase the size of the backend log. 
Contributes to CURA-1509 Cura in slicing loop, Arcus Error (8)
 2016-07-27 11:03:11 +02:00
Ghostkeeper
5da3cd34e9
Improve inheritance function for speed_travel_layer_0 
This makes the speed_travel_layer_0 by default have the same ratio to the parent print speed as the travel speed has on other layers.
 2016-07-27 10:56:13 +02:00
Tim Kuipers
17b455d2ed JSON rename: Support Roof ==> Support Interface (CURA-1013) 
the support roof settings are now used for support bottoms as well
 2016-07-27 10:34:41 +02:00
Tim Kuipers
f4698c7cd4 feat: support_bottom_height and support_interface_height (CURA-1013) 2016-07-27 10:18:19 +02:00
Jaime van Kessel
32c5c1ad7a Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-27 09:54:47 +02:00
Jaime van Kessel
762ea15e78 Global inherited settings now use target (instead of active) stack to copy values 
Fixes multiple issues with support settings not being updated properly
 2016-07-27 09:54:02 +02:00
Thomas Karl Pietrowski
d96ce760f8 CURA-1223: 3MFReader: Doing selftest and fail on broken files 
This commit adds a selftest before the "result" gets returned.
It should break on this/these functions and popup a message about using
the online repair tool.
I compared the content of both files for a long time, googled about the
format, but wasn't able to find a proper fix.
More routines will likely need to be added here, but with those I have
it is working so far very well.

Sadly it is not possible to override the default message, so two
messages will appear. Additionally, the URL of the link is not
clickable/executable from the UX. Just acting like normal text.

Contributes to CURA-1223
 2016-07-26 20:21:00 +02:00
Thomas Karl Pietrowski
260b682864 CURA-1923: Slicinfo: Using UM.Job instead 
As suggested by @awhiemstra handling our "thread" here should be done
with UM.Job.
 2016-07-26 18:56:57 +02:00
fieldOfView
35107742d6 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-26 18:55:59 +02:00
fieldOfView
d64eff9947 Fix updating the Per Object Settings color swatch 
CURA-1971
 2016-07-26 18:54:55 +02:00
Thomas Karl Pietrowski
7ab0332a6d Merge branch 'master' of https://github.com/Ultimaker/Cura.git into master-CURA-1923 2016-07-26 18:38:23 +02:00
Thomas Karl Pietrowski
36f4f51804 Adding missing return 
Without the function would be still progressed of course.
 2016-07-26 18:25:54 +02:00
Jaime van Kessel
b3f0c257e4 Flattend profiles are now set to dirty 
This fixes issue where profiles used in g-code writer were saved
 2016-07-26 13:37:28 +02:00
Jaime van Kessel
05b2c147e0 Combined material & hotend message 
Even if all data is different, the update is correctly handled

CURA-1909
 2016-07-26 13:28:53 +02:00
Jaime van Kessel
beca64a5c2 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-26 12:10:58 +02:00
Jaime van Kessel
8540e10469 Updating multiple materials with one message box now works 
CURA-1909
 2016-07-26 12:10:25 +02:00
fieldOfView
336dd406b1 Add a reusable mechanism for plugins to add controls to designated areas in the GUI 
contributes to CURA-271
 2016-07-26 11:58:25 +02:00
Jack Ha
9fc09e5bf3 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-26 11:46:26 +02:00
Jack Ha
3703ed9eb0 Fix overlapping object with raft/brim/skirt in one-at-a-time mode. 
head_and_fans is extended by an extra margin to prevent overlapping.
CURA-1776

Also fixed: showing one-at-a-time head convex at start.
 2016-07-26 11:45:06 +02:00
fieldOfView
ac4b6c092f Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-26 10:17:05 +02:00
Jaime van Kessel
76723c2412 Removed 50 ms delay in staring top layer calculation 2016-07-26 09:55:04 +02:00
Thomas Karl Pietrowski
8597b5c9be CURA-1923: SliceInfo: Sending data threaded 
The idea is to make the sending process, so it won't block the UI until the data is sent or the timeout has reached.
This commit does the following:
* Increasing the timeout to 5s
-> As we are sending our data threaded now this won't hurt. At least for clients in slow networks.
* Moving section for "sending data to info_url" into a seperate thread.
* Starting the thread instead and collecting all threads in a list
* Removing all threads from the list, if they have already finished their work.
* When the SliceInfo Extension gets __del__'d, it will wait for the threads until they finish.

Contributes to CURA-1923
 2016-07-25 22:25:26 +02:00
fieldOfView
85f53be9e2 Tone down striped shader colors 2016-07-25 21:59:37 +02:00
fieldOfView
785d7cf6d1 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-25 18:01:23 +02:00
fieldOfView
4014cb11f9 Reinstate UMO wizard 
CURA-1732
 2016-07-25 18:00:17 +02:00
Tim Kuipers
07e876d06f Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-25 17:46:57 +02:00
Tim Kuipers
8cdf20c6bf Merge branch 'Johan3DV-layerview_dev' 2016-07-25 17:44:24 +02:00
fieldOfView
5f26372b96 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-25 17:39:57 +02:00
fieldOfView
1057634e47 Remove (non-functional) layer number from print monitor 
CURA-1940
 2016-07-25 17:39:43 +02:00
Jack Ha
d82249e260 Fix for one-at-a-time. CURA-1707 2016-07-25 17:09:06 +02:00
Jack Ha
d77f6e86e4 Added an extruded convex hull as a raft instead of a grey plane. 
- New shader transparent_object.shader
- Raft thickness is calculated in BuildVolume and used in
  ConvexHullDecorator, notified by a Signal.
- Removed old grey plane from BuildVolume.
- Vertex data below build plane is no longer discarded (caused convex
  hulls that are too small).
- Uses new functions in MeshBuilder (update Uranium as well).

CURA-1707
 2016-07-25 16:45:38 +02:00
Tim Kuipers
c6e9e62e73 Merge branch 'layerview_dev' of https://github.com/Johan3DV/Cura into Johan3DV-layerview_dev 2016-07-25 16:41:13 +02:00
Jaime van Kessel
2d34e2b28e Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-25 15:44:55 +02:00
Jaime van Kessel
70242ba502 Saving a file no longer causes a re-slice 
CURA-1933
 2016-07-25 15:44:16 +02:00
fieldOfView
0e557feb4b Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-25 14:58:22 +02:00
fieldOfView
7ce5e71b4c Code cleanup 2016-07-25 14:58:12 +02:00
Tim Kuipers
6b3a25a491 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-25 14:50:11 +02:00
Tim Kuipers
59e8525855 JSON fix: flow temp graph reenabled (CURA-1174) 2016-07-25 14:50:05 +02:00
Jaime van Kessel
b28cf14288 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-25 13:51:27 +02:00