3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-09 14:55:03 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
14651 commits 313 branches 275 tags 719 MiB
Commit graph

3890 commits

Author SHA1 Message Date
Jack Ha
c6ac344ed5 Merge branch '3.4' 2018-06-04 11:40:03 +02:00
Jack Ha
14294936c5 CURA-5434 reversed the role of offset_shape_arr and hull_shape_arr, to fix one-at-a-time arranging 2018-06-04 11:39:37 +02:00
Ian Paschal
74ba10444e CURA-5357 Prevent uninstall of plugins that are not-yet-installed 2018-06-01 14:31:52 +02:00
Ghostkeeper
4157636552
Merge branch '3.4' 2018-06-01 14:03:05 +02:00
Ghostkeeper
2fbcc22123
Fix adding printers due to unused 'parent' parameter 
The 'parent' parameter was unused, so I removed it. But I didn't remove all things that called it, apparently. I just removed some. I didn't try the stackbuilder.

Contributes to issue CURA-5330.
 2018-06-01 14:02:32 +02:00
Lipu Fei
e859861517 No need to set parent for ExtruderStack 2018-06-01 13:55:28 +02:00
Lipu Fei
41e94cd2a1 Fix merge problems from 3.4 2018-06-01 13:51:43 +02:00
Lipu Fei
61a3668a4f Merge remote-tracking branch 'origin/3.4' 2018-06-01 13:51:00 +02:00
Diego Prado Gesto
85560abca3 CURA-5439 Show the keep or discard changes dialog also when the user 
applies a configuration using the Sync button.
 2018-06-01 13:26:14 +02:00
Diego Prado Gesto
a4b46be2c5 CURA-5427 Force the material models to update when the machine changes and so 
when the extruder stack changes.
- What happen was that when the extruder model needed to update, the
material model was not updated correctly and so when changing a material, the
node was incorrect.
 2018-06-01 12:58:08 +02:00
Lipu Fei
30cbdfed69 Make sure that file extensions are always lowered 
CURA-5367
 2018-05-31 15:37:48 +02:00
Lipu Fei
eb949472e8 Merge remote-tracking branch 'origin/master' into WIP_improve_initialization 2018-05-31 13:47:27 +02:00
Jack Ha
ed0a0dd765 Fix multiply object in a rare case that an object is just too big 2018-05-30 10:58:19 +02:00
Lipu Fei
fae9bc838b Update CURA_* setups in CuraVersion.py.in and CMakeLists.txt 
CURA-5357
 2018-05-30 09:18:45 +02:00
Lipu Fei
9223122fc8 Add CuraCloudAPIRoot into CuraVersion.py.in and CMakeLists.txt 
CURA-5357
 2018-05-30 09:13:27 +02:00
Lipu Fei
80d4989843 Show keep/discard user settings dialog upon variant change 
CURA-5417
 2018-05-30 09:03:36 +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
Lipu Fei
fed0a015ee Clear is_user_specified_job_name flag when setting a project file name 
CURA-5280
 2018-05-29 15:56:01 +02:00
Lipu Fei
7cf2832183 Fix quality_group is None check in _setQualityGroup() 
CURA-5423
 2018-05-29 13:43:32 +02:00
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
8a6996e920 If an object does not have a convex hull, it does not crash the ArrangeObjectsJob 2018-05-29 09:32:06 +02:00
Lipu Fei
f395f1eebc
Merge branch 'master' into WIP_improve_initialization 2018-05-28 13:37:26 +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
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
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
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
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
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
Lipu Fei
44b046e401
Merge pull request #3786 from Ultimaker/feature-backup-manager 
Backup Manager and API
 2018-05-23 11:28:43 +02:00
Ian Paschal
775ec91762
Merge pull request #3848 from fieldOfView/feature_select_after_loading 
Select models after loading
 2018-05-23 11:26:07 +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
Jack Ha
7136b8649a CURA-5388 disable automatic_push_free / Ensure models are kept apart by default 2018-05-23 10:48:19 +02:00
fieldOfView
6b0045265c Move getting preference out of for loop 2018-05-23 10:07:17 +02:00
fieldOfView
fb8f735566 Make selecting objects on load optional and opt-in 2018-05-23 10:05:08 +02:00
Lipu Fei
92fa725ad6 Application.saveSettings() should save everything 2018-05-23 10:00:21 +02:00