3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-23 06:33:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
14841 commits 305 branches 272 tags 787 MiB
Commit graph

14841 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ghostkeeper
77feb95191
Don't crash when failing to reload file 
Now it shows a message that it failed to load the file.
 2018-05-29 11:06:07 +02:00
Lipu Fei
1c3bae3fe4 Show keep/discard dialog upon material change if there are user changes 
CURA-5417
 2018-05-29 10:52:06 +02:00
Lipu Fei
9627eb0fc1 Only exclude explicitly specified materials in the "exclude_materials" field 
CURA-5344
 2018-05-29 10:46:42 +02:00
Jack Ha
09452b65df Merge branch 'master' of github.com:Ultimaker/Cura 2018-05-29 09:32:14 +02:00
Jack Ha
8a6996e920 If an object does not have a convex hull, it does not crash the ArrangeObjectsJob 2018-05-29 09:32:06 +02:00
Ghostkeeper
504889b472
Remove Alternate Cross 3D Pockets setting 
It is no longer used in the new implementation of cross infill.
 2018-05-29 07:31:59 +02:00
fieldOfView
ac1dfcf15d Make headers non-transparent 2018-05-28 22:52:49 +02:00
Lipu Fei
3b0b6d300b Only set user-specified job name when the editting is finished 
CURA-5280
 2018-05-28 17:35:22 +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
43fcb183ae Remove unnecessary code 
CURA-5296
 2018-05-28 13:10:32 +02:00
Lipu Fei
ad131ab30c Fix downgrade packages to bundled version 
CURA-5296
 2018-05-28 11:18:24 +02:00
Lipu Fei
689b88a024 Do not change prefix for user-specified job names 
CURA-5280
 2018-05-28 09:53:49 +02:00
fieldOfView
94813d9e0d Fix untranslatable text 2018-05-25 21:40:57 +02:00
fieldOfView
87555a38c4 Fix text rendering in the ConfigurationMenu 2018-05-25 21:40:30 +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
Ghostkeeper
d6e7b96437
Set machine preset to be equal to Replicator 1 Dual 
This was in the original Cura 15.06 plug-in.
 2018-05-25 10:49:16 +02:00
Diego Prado Gesto
74ef906949 CURA-5164 Reuse method savePreferences 2018-05-25 10:15:04 +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
Ghostkeeper
0f4f55cf6b
Move CuraPackageManager to Uranium 
This is just what's left that was specific to Cura.
 2018-05-24 20:18:42 +02:00
Ian Paschal
220c99cf3b
Merge pull request #3613 from maximkulkin/avoid-printed-supports 
Add travel_avoid_supports setting support
 2018-05-24 15:36:40 +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
ChrisTerBeke
2422ee38e8 Fix init py in backups module 2018-05-24 09:46:18 +02:00
ChrisTerBeke
809cab4ea5
Cleanup for cfd1b7b813 2018-05-23 19:18:11 +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
Jack Ha
260dee54fb CURA-5370 also take into account the machine size when Arranging in readMeshFinished 2018-05-23 16:57:50 +02:00
Lipu Fei
a0a8af07dc Upon manual job name change, only save the real base name 
CURA-5280

Remove the machine prefix in the base name, otherwise when the machine
gets changed, the job name will become
"<new-machine>_<old_machine>_basename".
 2018-05-23 16:42:13 +02:00
Ian Paschal
fb307fbbf5
Merge pull request #3846 from Ultimaker/improve-arranger 
CURA-5370 Small refactor for Arranger:
 2018-05-23 16:40:19 +02:00
Lipu Fei
196bd3a730 Add non-thumbnail-visible flag for creating previews 
CURA-5373

Addition to the non-slicable meshes, the support meshes should also not
be included in the previews.
 2018-05-23 16:32:38 +02:00
Ian Paschal
e89bd91960 CURA-5280 Preserve manually entered project name 
Heeeehhhhh? Why didn't this line get staged with the file?
 2018-05-23 16:31:22 +02:00
Ian Paschal
d14f4ac678 CURA-5280 Preserve manually entered project name 
Manual override of job name should also set the base name so that when the printer prefix is updated, it the prefix can be added to the manually added name, not the old base name.

This was a bit tricky because if you enter a job name, is that the job name or the base name? My answer is that it's both, and if you update your printer for the job, it will append a new prefix.

If this is not the desired behavior, and in fact once a custom name is set nothing can change it, then line 78 should be removed.
 2018-05-23 16:28:35 +02:00
Jack Ha
827cb33b6e CURA-5370 Update copyright and comments 2018-05-23 16:04:18 +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
Jack Ha
a3ac20172b CURA-5370 The minimum offset between objects in the Arranger is now determined by the brim/skirt/... setting 2018-05-23 12:54:18 +02:00
Diego Prado Gesto
39768e29cc CURA-5164 First add the resources and then initialize the package 
manager.
 2018-05-23 12:12:58 +02:00
Diego Prado Gesto
b7fe43e68c Merge branch 'master' into WIP_improve_initialization 2018-05-23 11:36:12 +02:00