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
ChrisTerBeke
205ac7c50c
Merge branch 'master' into CURA-4253_psp
2017-10-16 17:16:00 +02:00
ChrisTerBeke
5f12b5ac6a
set support interface pattern depending on density - CURA-4248
2017-10-16 17:13:29 +02:00
ChrisTerBeke
69d6ca986d
Update FDM printer definition to calculate PSP - CURA-4248
2017-10-16 16:48:49 +02:00
ChrisTerBeke
a444e5c883
update material xml parser to support psp values - CURA-4253
2017-10-16 15:55:46 +02:00
Buco
6fae0a3e09
Add Premium
...
Changed "setting_version" to 3
2017-10-16 15:43:35 +02:00
Jaime van Kessel
70f0e8752b
Add extra --headless flag to commandline
2017-10-16 15:05:51 +02:00
Lipu Fei
f4718162d3
Merge remote-tracking branch 'upstream/3.0'
2017-10-16 15:01:15 +02:00
Lipu Fei
8ef918829f
Fix quality profile upgrade for UM2 family
2017-10-16 15:00:29 +02:00
Lipu Fei
38b9df80f3
Merge remote-tracking branch 'upstream/3.0'
2017-10-16 14:54:40 +02:00
fieldOfView
ad8af82a58
Fix size of "beta" classifier on splash screen for HiDPI (windows) screens
2017-10-16 14:51:59 +02:00
Lipu Fei
aa7b456594
Fix custom quality profile upgrade for UM2 family
...
The custom quality profiles for the UM2 family used to be saved as
profiles for "fdmprinter". They now should be updated to set for
"ultimaker2".
2017-10-16 13:59:22 +02:00
A.Sasin
65eac37f30
Merge branch 'send_crashes'
...
CURA-4195
2017-10-16 13:48:26 +02:00
alekseisasin
eebe4028ff
Merge pull request #2610 from fieldOfView/fix_machinesettings_backend_crash
...
Fix crash when exiting Machine Settings
2017-10-16 13:46:03 +02:00
A.Sasin
b32f3f9f77
Adjusted Crash report message title
...
CURA-4195
2017-10-16 13:42:29 +02:00
Lipu Fei
fae65d7b83
Minor fixes for customized profile in simple mode
...
CURA-4333
- Update comments
- Disable the quality slider when there is a customized profile
2017-10-16 13:26:28 +02:00
Buco
95f018530f
Add Builder Premium
...
Tabs became spaces
2017-10-16 13:21:46 +02:00
Lipu Fei
9b8dc9bf55
Move simple-mode settings customization check into a separate file
...
CURA-4333
Simple-mode is a special mode so it makes more sense to put those code
in a separate file instead of in the more generic MachineManager.
2017-10-16 13:18:11 +02:00
Lipu Fei
e1234a09aa
Add the missing parseInt()s back
...
CURA-4333
2017-10-16 11:42:13 +02:00
Lipu Fei
94a624e105
Merge branch 'master' into CURA-4333_Notification_icon_for_recommended_mode
2017-10-16 11:37:55 +02:00
