3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-22 22:23:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8
12129 commits 305 branches 272 tags 787 MiB
Commit graph

12129 commits

This branch
This branch
All branches
Author SHA1 Message Date
ChrisTerBeke
31a04ed8da Also emit active quality changed when no dialog interaction occured - CURA-4447 2017-10-20 11:37:45 +02:00
ChrisTerBeke
e24242dc3c Merge branch 'master' into CURA-4447_UPDATE_INSTANCE_CONTAINER 2017-10-20 11:34:45 +02:00
ChrisTerBeke
64bcf4b44d Remove debug log when XML material file contains unused property 2017-10-20 10:22:09 +02:00
ChrisTerBeke
3fcf20c714 Merge pull request #2564 from BagelOrb/slicing_mode 
Adds a UI setting for the new slicing tolerance option in the engine.
 2017-10-20 09:49:05 +02:00
Diego Prado Gesto
d2d28fbdfb CURA-4470 Fix quality slider not selecting correct quality profile 
Compare selected quality by quality_type instead of id when loading a
project file from older versions of Cura.
 2017-10-19 20:49:11 +02:00
ChrisTerBeke
be046117c4 Sidable quality slider handle when switching to user created profile - CURA-4466 2017-10-19 18:00:03 +02:00
Tim Kuipers
823d11f0e1 rename slicing mode ==> slicing tolerance 2017-10-19 17:14:01 +02:00
Tim Kuipers
4650a12324 slicing mode 2017-10-19 17:14:01 +02:00
ChrisTerBeke
30281f17f3 Add simple mode settings flag for user created profile - CURA-4466 2017-10-19 17:03:31 +02:00
Ghostkeeper
f7e048aee5
Remove unused variable 
Contributes to issue CURA-4243.
 2017-10-19 16:37:03 +02:00
Ghostkeeper
2fc198a7ad
Move manual criterion into base criteria filter 
This code was filtering on certain criteria, and then filtering the results based on an additional metadata field. Let's just move that last field in the original criteria too...

Contributes to issue CURA-4243.
 2017-10-19 15:48:19 +02:00
Ghostkeeper
7745113704
Re-use stack variable 
We're creating the variable but then requesting the 0th element from the list each time... That can be more logical and more efficient.

Contributes to issue CURA-4243.
 2017-10-19 15:32:21 +02:00
ChrisTerBeke
3354f58ddb Remove BAM qualities 2017-10-19 15:14:28 +02:00
ChrisTerBeke
70cf86c65b Remove debug print - CURA-4447 2017-10-19 14:40:56 +02:00
ChrisTerBeke
e9336b9b9e Small cleanups for discard or keep behavior - CURA-4447 2017-10-19 14:39:32 +02:00
Diego Prado Gesto
1a47ec85ca Merge branch 'master' of https://github.com/Ultimaker/Cura 2017-10-19 13:58:19 +02:00
Diego Prado Gesto
b49610f0c8 Merge branch 'CURA-4248_BAM' 2017-10-19 13:57:30 +02:00
Diego Prado Gesto
0e74f9d881 CURA-4248 - Fix some mistakes in the formulas in quality profiles 2017-10-19 13:54:10 +02:00
Ghostkeeper
5a125aa514
Rename printCoreRow to variantRow 
Because on only one of our printers it's actually a print core. Internally we've always called it the variant.
 2017-10-19 13:38:08 +02:00
Lipu Fei
946b8ae92d Remove executable bit for non-executable files 2017-10-19 10:28:57 +02:00
Diego Prado Gesto
d3e8915b30 Merge branch 'master' into CURA-4248_BAM 2017-10-19 10:26:25 +02:00
Lipu Fei
475f6223d4 Remove executable bit for json files 2017-10-19 10:24:38 +02:00
A.Sasin
5a8fa92c3f Added semicolon 
CURA-4449
 2017-10-19 09:01:15 +02:00
Lipu Fei
d735921d42 Take into account the keep/discard interaction when emitting signals 
CURA-4248

When user switches to a different profile, the keep/discard dialog can
show up. Don't emit signals immediately if this interaction takes place
because it will trigger an unnecessary slice.
 2017-10-19 08:32:26 +02:00
alekseisasin
10127240b5 Merge pull request #2593 from petterreinholdtsen/patch-1 
List model/x3d+xml in the desktop file
 2017-10-18 18:06:22 +02:00
ChrisTerBeke
f4eb2ee256 Merge pull request #2612 from fieldOfView/fix_splashscreen_sub_version_size 
Fix size of "beta" classifier on splash screen for HiDPI screens
 2017-10-18 16:46:56 +02:00
ChrisTerBeke
3ddb277477 Remove double sidebar header item, fixes #2605 2017-10-18 16:01:14 +02:00
ChrisTerBeke
b2dbefc823 Update helper text for custom changes in recommended settings - CURA-4333 2017-10-18 15:44:02 +02:00
ChrisTerBeke
795eda64e3 Merge branch 'master' into CURA-4248_BAM 2017-10-18 15:08:51 +02:00
ChrisTerBeke
f07c5ab470 remove unused ignore 2017-10-18 14:31:03 +02:00
ChrisTerBeke
7d58208507 Fix BAM draft quality weight - CURA-4248 2017-10-18 14:19:11 +02:00
ChrisTerBeke
49af7a5643 Update BAM qualities - CURA-4248 2017-10-18 14:18:29 +02:00
ChrisTerBeke
5580f7ecbb Add BAM quality profiles 2017-10-18 14:08:09 +02:00
ChrisTerBeke
78ba3c3aa0 Move BAM equations to BAM quality profiles as they are very specific - CURA-4248 2017-10-18 13:51:06 +02:00
Ghostkeeper
b119119ed2
Merge branch '3.0' 2017-10-18 13:09:38 +02:00
Ghostkeeper
e897431c95
Fix default quality level for Creality CR-10 printers 
Instead of having a default layer height of 0.2mm, we change the default quality profile to be the one with a layer height of 0.2mm. This fixes up the quality slider.
 2017-10-18 13:03:33 +02:00
ChrisTerBeke
4b6f04604c Set values for support interface density and pattern depending on BAM settings - CURA-4248 2017-10-17 17:21:40 +02:00
Ghostkeeper
4d0c0f606e
Use new version for downloading plugins 2017-10-17 16:44:27 +02:00
A.Sasin
85f2a7c385 Added update to for Instance container to re calculate values and validate 
CURA-4447
 2017-10-17 15:01:49 +02:00
ChrisTerBeke
c0903f539e Merge branch 'master' into CURA-4248_psp 2017-10-17 13:07:22 +02:00
ChrisTerBeke
276232dae5 Merge pull request #2613 from Ultimaker/CURA-4333_Notification_icon_for_recommended_mode 
Cura 4333 notification icon for recommended mode
 2017-10-17 13:05:45 +02:00
ChrisTerBeke
91589ed29d Add surface energy property to get correct behaviour - CURA-4248 2017-10-17 13:03:29 +02:00
Diego Prado Gesto
40f548ba99 Merge branch 'CURA-4252_improve_zeroconf_service' 2017-10-17 13:02:58 +02:00
ChrisTerBeke
c553834a82 Merge branch 'master' into CURA-4248_psp 2017-10-17 12:45:28 +02:00
ChrisTerBeke
d426c259d0 Add material adhesion tendency setting, update support top and bottom distance values - CURA-4248 2017-10-17 12:39:26 +02:00
Diego Prado Gesto
b9a9ef8823 CURA-4457 Add parenthesis in conditional statement 2017-10-17 10:12:29 +02:00
Lipu Fei
44d5323779 Run crash dialog on Qt thread so the GUI gets updated correctly 
CURA-4195
 2017-10-17 09:38:43 +02:00
Lipu Fei
396d960f4a Fix code style 
CURA-4195
 2017-10-17 09:30:49 +02:00
ChrisTerBeke
04bef8473b Merge branch 'master' into CURA-4248_psp 2017-10-17 09:25:50 +02:00
Diego Prado Gesto
ac2484ea87 CURA-4457 Add parenthesis in conditional statement 2017-10-16 20:21:42 +02:00