Jack Ha
b2b9de7960
CURA-5396 added timeout options for auto detecting baud rate over USB serial
2018-06-07 13:50:40 +02:00
Jack Ha
49e49bfa58
Merge branch '3.4'
2018-06-07 09:34:30 +02:00
Diego Prado Gesto
fbdf950a7b
Merge pull request #3899 from fieldOfView/fix_sidebar_monitoringprint
...
Remove vestigial references to "monitoringPrint"
2018-06-06 19:08:58 +02:00
Diego Prado Gesto
ece2729744
CURA-5445 Remove the action when the Finish button is clicked. The
...
button will just close the dialog.
2018-06-06 19:02:40 +02:00
Ghostkeeper
c42b275c5d
Merge branch '3.4'
2018-06-06 16:58:01 +02:00
Diego Prado Gesto
1019f2dd65
CURA-5449 Do not check if the name is the correct group name if the
...
output device is manual create device and it is marked as temporary.
Wait until all the information is retrieved when the request finishes.
2018-06-06 14:54:26 +02:00
Jack Ha
702d23ad0e
CURA-5357 set showcase to max 3 items per row
2018-06-06 13:48:04 +02:00
Jack Ha
9fd9bd35dc
CURA-5357 show showcased items in downloads page
2018-06-06 13:41:53 +02:00
fieldOfView
19b8ca7c70
Remove vestigial references to "monitoringPrint"
2018-06-06 11:22:35 +02:00
Jack Ha
87293e089d
Merge branch 'master' of github.com:Ultimaker/Cura
2018-06-06 11:02:10 +02:00
Jack Ha
17b127e8c1
CURA-5249 replaced the extruder value of -1 by the more explicit defaultExtruderPosition, so now Cura is aware of the actual extruder position being used. Fixes linked icon next to support settings, like support_angle.
2018-06-06 11:00:09 +02:00
Diego Prado Gesto
753101a988
Uncomment the code that hides the material tab in the toolbox. Just for
...
master.<<
2018-06-05 15:43:36 +02:00
Lipu Fei
4598b7a831
Merge remote-tracking branch 'origin/3.4'
2018-06-05 09:55:57 +02:00
Lipu Fei
96ddf61f81
Merge pull request #3878 from Ultimaker/feature_update_old_plugins
...
Feature update old plugins
2018-06-05 09:55:07 +02:00
Lipu Fei
7f7a195627
Fix merge conflicts from 3.4
2018-06-05 09:02:52 +02:00
Lipu Fei
39b71add07
Reader classes are responsible for adding their mime types
...
CURA-5367
2018-06-05 08:35:24 +02:00
alekseisasin
fc116e1206
Merge pull request #3883 from Ultimaker/3.4-fix-upgrade
...
CURA-5440 fix 3.4 upgrade
2018-06-04 17:14:41 +02:00
Ian Paschal
71f41b8ada
CURA-5442 Final fixes
2018-06-04 17:00:59 +02:00
Lipu Fei
b45311fb34
Update 3.4 changelog
...
CURA-5433
2018-06-04 15:39:47 +02:00
Andreea Scorojitu
cec8881506
Update_changelog_3.4_Cura-5433
...
Updated the 3.4 change log to match the release notes
2018-06-04 15:21:36 +02:00
Lipu Fei
d80e66af02
Fix 21to22 upgrade
...
CURA-5440
2018-06-04 15:18:33 +02:00
Ian Paschal
096f0775a8
CURA-5442 Compare plugin registry to package manager
2018-06-04 11:49:42 +02:00
Jack Ha
c6ac344ed5
Merge branch '3.4'
2018-06-04 11:40:03 +02:00
Aleksei S
4922988e7d
Added .3mf extension to the MimeType
...
CURA-5367
2018-06-04 11:11:02 +02:00
Mark
0e11a165a3
add typing
2018-06-03 18:14:34 +02:00
Mark
30a05e6ba6
make sure old plugins are updatable
2018-06-03 12:57:08 +02:00
Ian Paschal
74ba10444e
CURA-5357 Prevent uninstall of plugins that are not-yet-installed
2018-06-01 14:31:52 +02:00
Lipu Fei
61a3668a4f
Merge remote-tracking branch 'origin/3.4'
2018-06-01 13:51:00 +02:00
Ian Paschal
cca51cb74b
Revert "Revert "CURA-5435 Attempt to fix "wobbly" text""
...
This reverts commit 9b5369a5b1b3b27bd9bdc5b393797980caa2a459.
2018-06-01 09:39:04 +02:00
Ian Paschal
9b5369a5b1
Revert "CURA-5435 Attempt to fix "wobbly" text"
...
This reverts commit bc1fa5c3f9b361ca7f0c764eea5dab7b56fbb9df.
2018-06-01 09:38:45 +02:00
Ian Paschal
bc1fa5c3f9
CURA-5435 Attempt to fix "wobbly" text
2018-06-01 09:38:37 +02:00
Jaime van Kessel
91a66d1290
Merge branch 'master' of github.com:Ultimaker/Cura
2018-05-31 17:21:27 +02:00
Jaime van Kessel
c988e0eccb
Also added "none" to the state list of prints_jobs not to be matched with printers
2018-05-31 17:20:53 +02:00
Mark
3fefdad14b
Round margins
...
CURA-5435
2018-05-31 15:22:49 +02:00
Mark
a8173344a3
Hidden materials
2018-05-31 14:45:57 +02:00
Lipu Fei
b3ef1bfd51
Simplify UserAgreement
2018-05-31 14:29:56 +02:00
Lipu Fei
eb949472e8
Merge remote-tracking branch 'origin/master' into WIP_improve_initialization
2018-05-31 13:47:27 +02:00
Lipu Fei
7d8472e588
Merge remote-tracking branch 'origin/3.4'
2018-05-31 12:25:33 +02:00
Lipu Fei
a468fc2cc4
Only load loading.gif when needed
...
Toolbox crashes on Mac OS X due to reaching the max limit of file
handlers. This seems to be caused by the loading the "loading.gif"
animation image. Probably because many widgets are created and each of
them has an animation image, and Qt (5.8?) seems to load everything at
the same time.
2018-05-31 12:21:53 +02:00
Jaime van Kessel
416f695610
Canceling sending job to cluster no longer results in "still sending print" message.
...
Previously it would always show this, requiring a restart of Cura before print could be sent. CL-913
2018-05-31 11:52:36 +02:00
Ruben D
33e49bebbe
Don't connect when aborting while the signal is not yet connected
...
Do this using try-except so that it is thread safe.
2018-05-31 10:59:17 +02:00
Ian Paschal
00fe180085
Hide Toolbox Showcase & Materials for 3.4
2018-05-30 16:29:55 +02:00
Lipu Fei
f1bb0e58e7
Do not use CuraVersion data if strings are empty
...
CURA-5357
2018-05-30 09:20:02 +02:00
Ian Paschal
13b3e4afa5
CURA-5357 Drag & dribble multiple packages like a plugable trickle, yo
...
Also improved interfacing with `CuraVersion.py`
2018-05-30 09:11:49 +02:00
Aleksei S
4d6753a1f1
remove unused code lines in firmware checker
...
CURA-4952
2018-05-29 18:33:38 +02:00
Aleksei S
b46a08f566
Add Reft and Right side aligned action buttons to the message box
...
CURA-4952
2018-05-29 18:15:16 +02:00
Diego Prado Gesto
77826b5a7d
Merge pull request #3863 from fieldOfView/fix_toolbox_compatibility_headers
...
Make headers non-transparent
2018-05-29 13:37:53 +02:00
Ian Paschal
47bd94608a
Merge pull request #3413 from BagelOrb/infill_support
...
settings for infill support
2018-05-29 13:13:35 +02:00
Ghostkeeper
0d89240bca
Copy support angle to infill support angle if used for hollow infill
...
This keeps the new profile as close to the profile in the previous version as possible.
Contributes to issue CURA-5108.
2018-05-29 12:51:41 +02:00
Ghostkeeper
db16a6275f
Add version upgrade for infill_hollow -> infill_support
...
The functionality is more or less the same, so in an attempt to keep people's profiles as similar as possible we translate this setting to the newer implementation.
2018-05-29 12:51:31 +02:00