fieldOfView
adf2ac10b0
Fix check for succesfully imported 3MFReader & 3MFWriter modules
2017-03-30 13:56:19 +02:00
fieldOfView
2b761b87ac
Fail gracefully when libSavitar is not found
...
By catching the ImportError, this prevents the logs being clogged with exceptions in start and when the plugins preference page is touched.
2017-03-25 09:56:02 +01:00
Jaime van Kessel
f04d1efb8d
Removed file progress from removable output device, as writefile job now handles that itself
2017-03-24 16:32:39 +01:00
Jaime van Kessel
dafeab4e8a
Merge branch 'feature_CURA-3495_open_menu' of github.com:Ultimaker/Cura
2017-03-24 11:52:26 +01:00
Jaime van Kessel
298fa52da5
Merge branch '2.5' of github.com:Ultimaker/Cura
2017-03-24 11:51:16 +01:00
fieldOfView
33f20710d9
Ups the limit of the maximum cost of a spool of filament
...
This is necessary for currencies such as Japanese Yen or South Korean Won, where prices can easily exceed 1000. This PR sets the limit to 100,000,000. If the price of a spool exceeds this amount, perhaps the user should consider moving to a more stable country.
Fixes https://github.com/Ultimaker/Cura/issues/1567
2017-03-24 11:23:40 +01:00
Jaime van Kessel
4b7b8600ec
Shortened the logging of the auth key. Turned out it was extremely long
2017-03-24 11:22:57 +01:00
Jaime van Kessel
8d2e824205
Added even more logging
2017-03-24 11:17:59 +01:00
Jaime van Kessel
8572be99b9
Merge branch 'master' of github.com:Ultimaker/Cura
2017-03-24 11:05:21 +01:00
Jaime van Kessel
adab4a1110
Added "blurred" auth key logging.
...
The getSafeaAuthKey prints a key of the same length, but only the last 5 chars are real. The rest is blurred out with *
THis is a bit like how most payment services hide your credit card number.
2017-03-24 11:04:08 +01:00
Ghostkeeper
7688ce6582
Merge branch 'master' of github.com:Ultimaker/Cura
2017-03-24 10:50:28 +01:00
Ghostkeeper
e76c3f72e7
Lower QtQuick requirement further to 2.2
...
2.2 is required for the modifications we make to the Button objects.
2017-03-24 10:49:46 +01:00
Ghostkeeper
0f0b8cd5dd
Lower QtQuick requirement further to 2.2
...
2.2 is required for the modifications we make to the Button objects.
2017-03-24 10:47:47 +01:00
Lipu Fei
578f72c91e
Use "False" instead "false" in cfg files
...
CURA-3555
2017-03-24 10:44:44 +01:00
Jaime van Kessel
ba21a52827
Merge pull request #1570 from fieldOfView/fix_spool_cost_limit
...
Up the limit of the maximum cost of a spool of filament
2017-03-24 09:53:42 +01:00
Lipu Fei
7ad5a64b91
Add msg dialog for ignoring gcode in multiple file selection
...
CURA-3495
2017-03-24 09:53:12 +01:00
fieldOfView
6474f3eb25
Ups the limit of the maximum cost of a spool of filament
...
This is necessary for currencies such as Japanese Yen or South Korean Won, where prices can easily exceed 1000. This PR sets the limit to 100,000,000. If the price of a spool exceeds this amount, perhaps the user should consider moving to a more stable country.
Fixes https://github.com/Ultimaker/Cura/issues/1567
2017-03-24 09:12:48 +01:00
Jaime van Kessel
8023341090
Merge branch '2.5' of github.com:Ultimaker/Cura
2017-03-23 15:15:08 +01:00
Jaime van Kessel
ecbf0e1e28
Only add center to list for merge if there is one
2017-03-23 15:14:34 +01:00
Lipu Fei
a0f841e8eb
Prevent MachineSettings dialog go beyond the top of screen
2017-03-23 13:46:01 +01:00
Lipu Fei
96e9780273
Fix typo in changelog 2.5.0
2017-03-23 08:53:57 +01:00
Lipu Fei
08f6ee319e
Use default font for open file dialog text
...
CURA-3495
2017-03-23 08:46:48 +01:00
Lipu Fei
ef0a502dcf
Add { } around statements in "if"
...
Make nitpicking people happy :P
2017-03-22 21:05:45 +01:00
Lipu Fei
fa7dc3a708
Use onActivated for profile override combobox
2017-03-22 16:01:50 +01:00
Lipu Fei
e35d276e25
Complete Changelog for 2.5.0
...
CURA-3467
2017-03-22 15:20:57 +01:00
Jack Ha
33d16f8601
Added Not Supported profiles when second extruder is a 0.8 nozzle. CURA-3555
2017-03-22 14:51:53 +01:00
Jack Ha
bd10e50249
Merge branch 'master' of github.com:Ultimaker/Cura
2017-03-22 13:24:37 +01:00
Jack Ha
4eff58995d
Merge branch '2.5'
2017-03-22 13:24:32 +01:00
Jack Ha
79ea09d616
Merge branch '2.5' of github.com:Ultimaker/Cura into 2.5
2017-03-22 13:24:21 +01:00
Jack Ha
6dcd4d13e4
Removed quality profile aa0.8 PLA Not Supported. CURA-3555
2017-03-22 13:24:13 +01:00
Lipu Fei
f9e377ec43
Enable/disable Keep/Discard buttons according to selection
2017-03-22 13:07:58 +01:00
Lipu Fei
12918b02b5
CTRL-P only works when the button is enabled
...
CURA-3496
2017-03-22 12:01:41 +01:00
Jaime van Kessel
94c6b23418
Codestyle & removal unused imports
2017-03-22 11:38:55 +01:00
Jaime van Kessel
808df4c228
Merge branch '2.5' of github.com:Ultimaker/Cura
2017-03-22 11:03:27 +01:00
Lipu Fei
c6df3adddb
Update 2.5.0 BETA ChangeLog
...
CURA-3467
2017-03-22 10:26:01 +01:00
Jack Ha
72db7772f5
Merge branch '2.5'
2017-03-22 09:44:47 +01:00
Jack Ha
3d6e378289
Revert accidently added test-code.
2017-03-22 09:44:21 +01:00
Jack Ha
8275c419c1
Merge branch '2.5'
2017-03-22 09:34:06 +01:00
Jack Ha
40a7d2fecc
Added not supported quality profiles. CURA-3555
2017-03-22 09:33:17 +01:00
Jaime van Kessel
f379791d70
Merge branch '2.5' of github.com:Ultimaker/Cura
2017-03-21 14:43:58 +01:00
Jaime van Kessel
0752c4440c
Merge branch '2.5' of github.com:Ultimaker/Cura into 2.5
2017-03-21 14:43:30 +01:00
Jaime van Kessel
5489fc8caf
Added number of missing quality profiles
...
CURA-3555
2017-03-21 14:43:01 +01:00
Jack Ha
f2eebc165f
Merge branch '2.5'
2017-03-21 14:37:42 +01:00
jack
af43b2e8c4
Merge pull request #1554 from LipuFei/feature_CURA-3495_open_in_one
...
CURA-3495 Open project/models menu
2017-03-21 14:32:53 +01:00
jack
6d1a99ff33
Merge pull request #1556 from Ultimaker/feature_more_spacing_override_profile_combobox
...
Add more spacing between the label and combobox for override profile option
2017-03-21 14:12:40 +01:00
Lipu Fei
622ff4e662
Add default for preference "view/invert_zoom"
2017-03-21 13:56:12 +01:00
Lipu Fei
2d48809214
Also asks when opening a recent project file
...
CURA-3495
2017-03-21 13:56:11 +01:00
Lipu Fei
9e5513ade6
Use QUrl to parse fileUrl
...
CURA-3495
2017-03-21 13:56:11 +01:00
Lipu Fei
f3167bb84b
Add dialog for opening a project file
...
CURA-3495
2017-03-21 13:56:09 +01:00
Jaime van Kessel
70dbeaf256
Merge branch '2.5' of github.com:Ultimaker/Cura
2017-03-21 13:24:06 +01:00
