3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-13 01:37:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
17030 commits 302 branches 270 tags 770 MiB
Commit graph

5045 commits

Author SHA1 Message Date
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
ChrisTerBeke
c491cb4707
Merge pull request #3597 from fieldOfView/fix_multiextruder_usb_temperatures 
[3.3] Fix getting multiple extruder temperatures from USB printer
 2018-05-24 10:52:30 +02:00
ChrisTerBeke
3045007f5b Small codestyle changes after merge 2018-05-24 10:39:37 +02:00
ChrisTerBeke
25d9b875ea
Merge pull request #3593 from fieldOfView/feature_separate_stage_qml 
Separate qml files for Prepare and Monitor stages
 2018-05-24 10:37:02 +02:00
Diego Prado Gesto
ddd7b056f3 CURA-5164 Make the mesh readers compliant with the new signature of the mesh reader. Also adapt the tests. 2018-05-23 17:17:41 +02:00
Lipu Fei
de455a9a64 Use gcode.gz as extension for GzWriter 
CURA-5343

We have the custom save file dialog on OS X now so there is no need to
use .gz to bypass the extension problem on the native dialog.
 2018-05-23 15:48:30 +02:00
Diego Prado Gesto
b7fe43e68c Merge branch 'master' into WIP_improve_initialization 2018-05-23 11:36:12 +02:00
Lipu Fei
cfd1b7b813 Fix AutoSave conflicts with BackupManager 
- Move AutoSave out of the plugins. It's a built-in module now.
 - Add enable/disable saving data on CuraApplication.
 - Avoid saving data in backup restore
 2018-05-23 11:25:47 +02:00
ChrisTerBeke
41aa31cb2d Merge branch 'master' into feature-backup-manager 2018-05-23 11:07:02 +02:00
Lipu Fei
92fa725ad6 Application.saveSettings() should save everything 2018-05-23 10:00:21 +02:00
Diego Prado Gesto
ba234f5c8a Remove debug prints 2018-05-23 09:38:16 +02:00
Diego Prado Gesto
b8417bcccb If the label tag exists in the xml material file, but without any string 
in it, the label.text return None and then it makes Cura crashing when
creating the models.
This is intended to fix the issue #3750
 2018-05-23 09:34:21 +02:00
ChrisTerBeke
a91916cc1d
Merge branch 'master' into feature-backup-manager 
* master:
  Adds release notes link in version upgrade messagebox CURA-5348
  CURA-5385 Project summary should use scroll view
  CURA-5296 Small QML bug fix
  Enabled drag-n-drop for curapackages
  CURA-5296 Added "canDowngrade" functionality
  Fix CURA_PACKAGES_VERSION
  CURA-5254 Keep track of the latest manual entry key, so it is then selected in the list.
  CURA-5296 Improve button styling
  Add CURA_PACKAGES_VERSION to CMakeLists.txt
  Add CuraPackageVersion
  Remove extra "if" statement and unused code
  Fix support blocker on older (legacy) opengl
  Correct the test to hide bed temperature when no heated bed is present.
 2018-05-22 19:03:09 +02:00
Ian Paschal
7861840886 CURA-5296 Small QML bug fix 2018-05-22 16:04:38 +02:00
Ian Paschal
0b0fb4cd2f CURA-5296 Added "canDowngrade" functionality 
Shows "Downgrade" instead of "Uninstall" for bundled packages with an upgrade installed.
 2018-05-22 14:52:22 +02:00
Diego Prado Gesto
1262d47b15 Merge branch 'master' of github.com:Ultimaker/Cura 2018-05-22 12:06:11 +02:00
Diego Prado Gesto
eea9b7ab46 CURA-5254 Keep track of the latest manual entry key, so it is then 
selected in the list.
 2018-05-22 12:05:33 +02:00
Ian Paschal
95a4edb8de CURA-5296 Improve button styling 2018-05-22 11:34:41 +02:00
ChrisTerBeke
15ef3d1d10 Merge branch 'master' into feature-backup-manager 2018-05-18 17:27:05 +02:00
Aleksei S
fc01811792 Merge branch 'master' of github.com:Ultimaker/cura 2018-05-18 17:22:54 +02:00
Aleksei S
314f913510 Remove extra "if" statement and unused code 2018-05-18 17:21:59 +02:00
ChrisTerBeke
e7f70d68c7 Focus on IP address field when adding networked printer 2018-05-18 17:19:14 +02:00
Mark
850f6f9b15 Change name to Community materials 2018-05-17 16:46:32 +02:00
ChrisTerBeke
ddc9da63b8
Still raise exception when loading incorrect material file 2018-05-16 19:22:02 +02:00
ChrisTerBeke
c13b77d8a1
Do not load material when no GUID is present instead of crashing Cura 2018-05-16 19:18:09 +02:00
Diego Prado Gesto
e38b31c0eb Merge branch 'master' into WIP_improve_initialization 2018-05-16 16:57:51 +02:00
ChrisTerBeke
419d521e09 Merge branch 'master' into feature-backup-manager 2018-05-16 13:41:57 +02:00
Ghostkeeper
310aee07ac
Code style: Brackets on new line 
As per our code style regulation.

Contributes to issue CURA-5296.
 2018-05-16 13:39:43 +02:00
ChrisTerBeke
d27ac3cf31 Merge branch 'master' into feature-backup-manager 2018-05-15 16:50:25 +02:00
Jack Ha
9281c23555 Fix uninstallable user package which was also bundled; make update package somewhat better by not trying to uninstall builtin package 2018-05-15 16:23:54 +02:00
Jack Ha
fd73751b91 Make the ToolboxProgressButton labels actually overrideable 2018-05-15 16:10:01 +02:00
ChrisTerBeke
4e90e6c2e3 Merge branch 'master' into feature-backup-manager 2018-05-15 14:05:58 +02:00
ChrisTerBeke
bb94ad904a fix 2018-05-15 14:05:40 +02:00
ChrisTerBeke
b7f26ddcc7 Small code improvements 2018-05-15 13:29:01 +02:00
ChrisTerBeke
c9145c6661 Small code improvements 2018-05-15 13:28:33 +02:00
ChrisTerBeke
82a1c95d98 Merge branch 'master' into feature-backup-manager 2018-05-15 12:56:19 +02:00