3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-08 06:23:59 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 7
8675 commits 313 branches 275 tags 719 MiB
Commit graph

8675 commits

This branch
This branch
All branches
Author SHA1 Message Date
Lipu Fei
3996230ff9 Load GlobalStack before ExtruderStacks for project loading 
CURA-3756
 2017-05-12 15:52:16 +02:00
Tim Kuipers
0d9514a5d0 Merge pull request #1821 from smartavionics/mb-smooth-spiralized-contours-not-per-model-or-extruder 
Just like magic_spiralize, smooth_spiralized_contours should not be settable per model/extruder. (CURA-3771)
 2017-05-12 14:53:18 +02:00
Jaime van Kessel
c1903dcccb Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-12 14:35:07 +02:00
Jaime van Kessel
167f616a7c Decreased interval of extruder timer 2017-05-12 14:34:45 +02:00
Lipu Fei
fe11819ce9 Handle "new" resolve strategy for definition&quality changes 
CURA-3756
 2017-05-12 14:34:41 +02:00
Lipu Fei
9ea0f48341 Check definition changes conflicts in preRead() 
CURA-3756
 2017-05-12 14:34:41 +02:00
Jaime van Kessel
ef2aa3b2b2 Empty InstanceContainers are now correctly handled by setActiveMaterial again 
CURA-3789
 2017-05-12 13:59:31 +02:00
Mark
f60765c56c Fix workspace dialog layout so checkbox and buttons dont get hidden 2017-05-12 13:24:58 +02:00
Mark
67aa6767c5 Add .DS_Store and *.qmlc 2017-05-12 13:23:29 +02:00
Jaime van Kessel
502e977c24 UM2E now has olson block upgrade selection as machine action 
CURA-3742
 2017-05-12 10:27:13 +02:00
Jaime van Kessel
9e56301048 Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-12 10:24:58 +02:00
Jaime van Kessel
7508a0a981 Changed infill buttons so they work with all languages 
CURA-3634
 2017-05-12 10:24:15 +02:00
Mark Burton
bf80e6efd5 Just like magic_spiralize, smooth_spiralized_contours should not be settable per model/extruder. 2017-05-12 09:10:21 +01:00
Lipu Fei
8a94f94258 WIP: use .userChanges property to replace user containers in project loading 
CURA-3756
 2017-05-11 14:54:00 +02:00
Lipu Fei
3baec9b742 WIP: set dirty after overriding a user container with deserialize() 
CURA-3756
 2017-05-11 14:53:04 +02:00
Lipu Fei
bb0e711577 WIP: fix material container renaming in project loading 
CURA-3756
 2017-05-11 14:20:11 +02:00
Lipu Fei
f436da8674 WIP: fix project loading and container renaming 
CURA-3756
 2017-05-11 14:20:11 +02:00
Jaime van Kessel
c5371842c2 Merge branch 'fix_per_model_settings_single_extrusion' of https://github.com/fieldOfView/Cura 2017-05-11 13:25:22 +02:00
Ghostkeeper
8ff3079b3e
Let CPE always use prime tower 
Also 0.8mm.
 2017-05-11 12:00:54 +02:00
Ghostkeeper
e3236bec4d
Make wording more consistent 
Contributes to issue CURA-3732.
 2017-05-11 11:22:18 +02:00
Jaime van Kessel
8e7637ae62 Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-11 11:08:47 +02:00
Jaime van Kessel
e2b39e7e33 Fixed spacing of infill options 
CURA-3732
 2017-05-11 11:08:23 +02:00
Ghostkeeper
078fd16109
Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-11 10:29:42 +02:00
Ghostkeeper
00aff6d2f2
Make feature labels more accurate for support 
It's used a bit differently.

Contributes to issue CURA-3773.
 2017-05-11 10:29:18 +02:00
Ghostkeeper
32ea311762
Merge branch 'time_estimate_per_feature' of https://github.com/14bitVoid/Cura into 14bitVoid-time_estimate_per_feature 2017-05-11 09:53:50 +02:00
Lipu Fei
9060bbf3b2 Update extruderCount when extrudersModel got changed 
CURA-3755

The Timer delay is not reliable for updating the extruder Tabs.
So we now rely on the modelChanged signal of the ExtrudersModel
to do the update.
 2017-05-11 09:47:37 +02:00
Mark
04611b06af Fix two spelling errors 
TRI-1450
 2017-05-10 20:14:03 +02:00
fieldOfView
93c5b382ba Fix selecting settings for Per Model Settings with single extrusion printers 2017-05-10 17:37:35 +02:00
Ghostkeeper
e187b96455
Add period after sentence 
Contributes to issue CURA-3742.
 2017-05-10 17:15:47 +02:00
Tim Kuipers
4abcc8b3f1 JSON fix: magic_spiralize had child setting (CURA-3771) 
it shouldn't have a child setting because that child is not the underlying setting used by the engine.
Parent settings are frontend-only settings which are merely used to let the user edit multiple leaf settings at once.
 2017-05-10 16:31:53 +02:00
Jaime van Kessel
2b1ca54227 Reset all first start actions for UM2go 
CURA-3742
 2017-05-10 16:28:34 +02:00
Jaime van Kessel
9e58829aba Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-10 16:25:45 +02:00
Jaime van Kessel
fd340a1270 Empty containers now also trigger extruder model update 2017-05-10 16:25:23 +02:00
Jack Ha
79561f44b1 Fix project load, new non existing machine. CURA-3756 2017-05-10 16:16:57 +02:00
Jaime van Kessel
27d6bebf32 Adding a new printer now activates it again 
CURA-3783
 2017-05-10 16:12:01 +02:00
Jack Ha
502b6b6f08 Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-10 15:37:31 +02:00
Jack Ha
d9f0e1fd4b WIP project loading - at least it mostly works again. CURA-3756 2017-05-10 15:37:22 +02:00
Ghostkeeper
d18e96972e
Rename TPU Normal Print to TPU Draft Print 
The profile name is 'Draft' so this makes it easier to find. This also makes it consistent with the rest of the profile file names. It's good to do this before we need to make a version upgrade for it.
 2017-05-10 15:28:19 +02:00
Ghostkeeper
69eb981259
Remove nozzle offsets from printer definition 
This setting is only defined in fdmextruder, so it can't be used here.
 2017-05-10 14:02:38 +02:00
Jaime van Kessel
51c08d4f53 Merge branch 'feature_extra_gradual_infill_icon' of github.com:Ultimaker/Cura 2017-05-10 14:00:15 +02:00
Ghostkeeper
9bb6aadc66
Remove non-existing nozzle offset settings 
They seem to be auto-generated or some sort.
 2017-05-10 13:59:02 +02:00
Jaime van Kessel
bfb76540d0 InstanceContainerchanged is now also on a timer. 
This greatly reduces the signal storm resulting from changing quality / material in multi extrusion machines.

CURA-3780
 2017-05-10 13:22:34 +02:00
Jaime van Kessel
7a4ca25193 Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-10 13:17:15 +02:00
Jaime van Kessel
e313794b12 Fixed posponing of certain events 
CURA-3780
 2017-05-10 13:16:49 +02:00
Lipu Fei
77864f4237 WIP: Fix definition_changes handling in 3mf reader 
CURA-3756
 2017-05-10 13:07:45 +02:00
Lipu Fei
577fc0f082 Fix WorkspaceDialog to include resolve for definition_changes 
CURA-3756
 2017-05-10 13:07:45 +02:00
Ghostkeeper
6f355d9006
Make 3DMaker Starter visible again 
For some reason it was made invisible in 4e3e466a11. It just works fine.
 2017-05-10 12:01:59 +02:00
Jaime van Kessel
740346e0d8 Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-10 11:57:17 +02:00
Ghostkeeper
2e3059600e
Convert ASCII STL files to binary STL 
For some people (perhaps platform-dependent) reading ASCII STL files is giving problems.

It has smaller file size too, and nobody is going to read these STL files with a text editor anyway.
 2017-05-10 11:55:24 +02:00
Jaime van Kessel
2375c832be Revert "ReplaceQuality changes only emits signals if there was a change" 
This reverts commit 9a387f9ee2.
 2017-05-10 11:50:17 +02:00