GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-11 04:19:00 +08:00
Code Issues Packages Projects Releases Wiki Activity
14,737 Commits 290 Branches 260 Tags
Commit Graph

14737 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lipu Fei
4598b7a831 Merge remote-tracking branch 'origin/3.4' 2018-06-05 09:55:57 +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
7f7a195627 Fix merge conflicts from 3.4 2018-06-05 09:02:52 +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
Ghostkeeper
02a3067a0c
Reset infill line distance when changing density via recommended mode 
Otherwise the change has no effect.

Contributes to issue CURA-5324.
 2018-06-04 16:58:13 +02:00
Ghostkeeper
21dd29f035
Merge branch 'master' of ssh://github.com/Ultimaker/Cura 2018-06-04 16:54:54 +02:00
Ghostkeeper
bd145c451b
Brackets on new line 
As far as I've seen them when I scrolled through this.

Contributes to issue CURA-5324.
 2018-06-04 16:49:49 +02:00
Jack Ha
4a878e5b1d Merge branch 'master' of github.com:Ultimaker/Cura 2018-06-04 16:30:15 +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
Ghostkeeper
258a90d850
Fix parameter 
Oops again. I should not do this when I have 30 seconds left on the clock.

Contributes to issue CURA-5330.
 2018-06-04 13:00:57 +02:00
Ghostkeeper
360d4f14e4
Fix broken import 
Oops.

Contributes to issue CURA-5330.
 2018-06-04 12:59:44 +02:00
Ghostkeeper
68ddf443a1
Use explicit key-word arguments instead of kwargs 
Makes it easier to use, and better self-documenting.

Contributes to issue CURA-5330.
 2018-06-04 12:58:56 +02:00
Jack Ha
f29b4326cc Merge branch '3.4' 2018-06-04 12:54:07 +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
c6ac344ed5 Merge branch '3.4' 2018-06-04 11:40:03 +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
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
Mark
a479176c63 The prepare button slices, so it should be a slice button 2018-06-01 13:42:48 +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
Ghostkeeper
abc3cde568
No longer call initialize() since it's included in __init__ 
We now always run initialize() after __init__ in Uranium.
 2018-05-31 21:28:21 +02:00
Jaime van Kessel
91a66d1290 Merge branch 'master' of github.com:Ultimaker/Cura 2018-05-31 17:21:27 +02:00