GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 04:49:04 +08:00
Code Issues Packages Projects Releases Wiki Activity
14,643 Commits 295 Branches 268 Tags
Commit Graph

14643 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ghostkeeper
e152fd641b
Remove trailing slash in Windows configuration path 
It shouldn't matter, but we're getting crash reports from this path so let's try this.
 2018-06-06 09:57:44 +02:00
Lipu Fei
4652c3be0f Always try to remove old package files before installing new 
CURA-5442
 2018-06-05 12:47:01 +02:00
Mark
c5929ce26c Revert "The prepare button slices, so it should be a slice button" 
This reverts commit a0263676e1305c2cc4b778ed5cfb7215e938705a.
 2018-06-05 12:00:21 +02:00
Diego Prado Gesto
4af107dc81 Merge branch '3.4' of github.com:Ultimaker/Cura into 3.4 2018-06-05 11:00:54 +02:00
Diego Prado Gesto
1285e1b5e5 CURA-5357 Move the plugin info in packages.json only when the 
installation succeeded.
 2018-06-05 11:00:05 +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
bbd019f9e5 Fix job name UI binding 
CURA-5367

UI should always refer to PrintInformation for the job name.
 2018-06-05 08:58:09 +02:00
Lipu Fei
39b71add07 Reader classes are responsible for adding their mime types 
CURA-5367
 2018-06-05 08:35:24 +02:00
Lipu Fei
98aaaba594 Only update job_name to unnamed but not base_name 
CURA-5367

Only update job_name to "unnamed" if it's empty. Do not change
base_name.
 2018-06-05 08:33:59 +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
jack
f9df0a542a
Merge pull request #3866 from Ultimaker/fix_retraction_amount 
Fix retraction amount
 2018-06-04 15:59:36 +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
Diego Prado Gesto
dfd9fc2ae9 Revert "CURA-5404 Remove retraction_amount values that must be in the material" 
This reverts commit a969d3c5eab54fc904b37611029a704c24c4a120.
 2018-06-04 14:43:00 +02:00
Diego Prado Gesto
36e72ae744 Merge branch '3.4' into fix_retraction_amount 2018-06-04 14:42:39 +02:00
Lipu Fei
e518d07f5a No need to give parent to ExtruderStack 2018-06-04 13:22:08 +02:00
Jack Ha
402015aa05 Merge branch '3.4' of github.com:Ultimaker/Cura into 3.4 2018-06-04 12:53:21 +02:00
Jack Ha
79d6a9a614 CURA-5434 fixed arrange to all build plates by reversing hull_shape and offset_shape 2018-06-04 12:53:13 +02:00
Ian Paschal
096f0775a8 CURA-5442 Compare plugin registry to package manager 2018-06-04 11:49:42 +02:00
Aleksei S
8113481b94 Merge branch '3.4' of github.com:Ultimaker/cura into 3.4 2018-06-04 11:48:19 +02:00
Aleksei S
a9095f2b77 After command "Undo" the project name was empty 
CURA-5367
 2018-06-04 11:46:51 +02:00
Jack Ha
4ddbf44373 Merge branch '3.4' of github.com:Ultimaker/Cura into 3.4 2018-06-04 11:39:45 +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
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
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
Mark
a0263676e1 The prepare button slices, so it should be a slice button 2018-06-01 13:36:50 +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
0a573408d9 Merge branch '3.4' of github.com:Ultimaker/Cura into 3.4 2018-06-01 12:59:10 +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
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
Lipu Fei
bb313c45a9 Set job name to "unnamed" if user types in nothing 
CURA-5367
 2018-05-31 16:25:58 +02:00
Lipu Fei
30cbdfed69 Make sure that file extensions are always lowered 
CURA-5367
 2018-05-31 15:37:48 +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
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
Diego Prado Gesto
931d4716e1 CURA-5404 Retrieve the material settings' values from the variant before 
retrieving it from the definition if there are not defined in the material.
 2018-05-30 16:58:11 +02:00
Ian Paschal
00fe180085 Hide Toolbox Showcase & Materials for 3.4 2018-05-30 16:29:55 +02:00
Ghostkeeper
86d4f0583c
Make showing of support density image dependent on support pattern 
Because that's what it's actually depending on.

Contributes to issue CURA-4513.
 2018-05-30 13:37:25 +02:00
Jack Ha
b5ab25ed55 Merge branch '3.4' of github.com:Ultimaker/Cura into 3.4 2018-05-30 10:58: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
Ghostkeeper
6ea5924c95
Remove Try Multiple Line Thicknesses setting 
This setting is now always enabled, hard-coded in the engine.
 2018-05-30 10:35:50 +02:00
Jack Ha
b43806fd4b Merge branch '3.4' of github.com:Ultimaker/Cura into 3.4 2018-05-30 09:45:11 +02:00
Jack Ha
3395610b67 CURA-5357 fix boo boo, rename variable 2018-05-30 09:44:59 +02:00