Commit graph

5880 commits

Author SHA1 Message Date
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 9b5369a5b1.
2018-06-01 09:39:04 +02:00
Ian Paschal
9b5369a5b1 Revert "CURA-5435 Attempt to fix "wobbly" text"
This reverts commit bc1fa5c3f9.
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
fieldOfView
ac1dfcf15d Make headers non-transparent 2018-05-28 22:52:49 +02:00
Ian Paschal
8a35d52ddd Rename "cura_version" to "sdk_version" 2018-05-28 17:21:08 +02:00
Aleksei S
6a3eec07e2 Message stack shows properly messages
CURA-4952
2018-05-28 16:03:05 +02:00
Mark
6a7812a18f Textual fix for Marketing 2018-05-28 15:27:22 +02:00
Lipu Fei
f395f1eebc
Merge branch 'master' into WIP_improve_initialization 2018-05-28 13:37:26 +02:00
Lipu Fei
24b8ea4a4b Quality changes are now in the quality_changes folder
CURA-5296
2018-05-28 13:22:27 +02:00
Lipu Fei
57ca41291a Fix package upgrade
CURA-5296

The removal of already installed package is already handled by the
package manager in the package upgrade. Removing the package before the
download starts will make the package to be removed before the new
content is available and its license gets approved by the user.
2018-05-28 13:10:42 +02:00
Lipu Fei
ad131ab30c Fix downgrade packages to bundled version
CURA-5296
2018-05-28 11:18:24 +02:00
Jorge García
4bd87e2164
Fix for showing temperatures for Malyan M200 and Monoprice Mini 2018-05-26 13:15:36 +02:00
Jorge García
dc9813b916
Fix for detecting Malyan M200 and Monoprice Mini 2018-05-26 01:56:57 +02:00
Ghostkeeper
0d55b8b440
Resume after pausing without waiting for next ok
Previously the resume only worked because in the message receiving loop it would no longer ignore the next 'ok'. It doesn't actually send a message that would trigger an 'ok'. This only worked because we are polling every 2 seconds for the nozzle temperature which also happens to trigger an 'ok' response, which we interpret as a go-ahead for being able to send the next g-code line.
Now it's no longer dependent on the fact that we happen to also poll the temperatures, so the code is more stable. And it also resumes immediately instead of waiting for up to 2 seconds.
2018-05-25 12:04:00 +02:00
Ghostkeeper
7c0eb43a23
Fix unpausing after cancelling a print
The variable name is self._paused, not self._is_paused. This was doing nothing at all.
2018-05-25 11:44:37 +02:00
Ghostkeeper
f5a7707139
Show ConfigurationErrorMessage when loading faulty XML files
This is consistent with the rest of Cura's behaviour.
2018-05-25 11:24:31 +02:00
Diego Prado Gesto
5704a7b184 Merge branch 'master' into WIP_improve_initialization
Conflicts:
	cura/AutoSave.py
	cura/BuildVolume.py
	cura/CuraApplication.py

Contributes to CURA-5164
2018-05-25 09:40:42 +02:00
Ghostkeeper
945429195e
Move getCuraPackageManager to Uranium and initialize package manager there 2018-05-24 20:47:09 +02:00
ChrisTerBeke
fd2e692440 Merge branch '3.3' 2018-05-24 14:33:55 +02:00
ChrisTerBeke
965a24b225
Merge pull request #3691 from ohrn/usb-gcode-check
Only open USB ports if the printer understands gcode.
2018-05-24 14:08:52 +02:00
Ian Paschal
26e32dc08a Added missing colon 2018-05-24 11:46:46 +02:00
ChrisTerBeke
717c11005b Codestyle changes after merge 2018-05-24 10:58:55 +02:00
ChrisTerBeke
7d0b664c53
Merge pull request #3648 from JPFrancoia/master
Bug fixes and improvements for PauseAtHeight plugin
2018-05-24 10:56:16 +02:00