GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-28 17:18:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
14,711 Commits 293 Branches 266 Tags
Commit Graph

14711 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jack Ha
b2b9de7960 CURA-5396 added timeout options for auto detecting baud rate over USB serial 2018-06-07 13:50:40 +02:00
Jack Ha
49e49bfa58 Merge branch '3.4' 2018-06-07 09:34:30 +02:00
Diego Prado Gesto
fbdf950a7b
Merge pull request #3899 from fieldOfView/fix_sidebar_monitoringprint 
Remove vestigial references to "monitoringPrint"
 2018-06-06 19:08:58 +02:00
Diego Prado Gesto
971d6306bf Merge branch '3.4' of github.com:Ultimaker/Cura into 3.4 2018-06-06 19:04:29 +02:00
Diego Prado Gesto
ece2729744 CURA-5445 Remove the action when the Finish button is clicked. The 
button will just close the dialog.
 2018-06-06 19:02:40 +02:00
Ghostkeeper
c42b275c5d
Merge branch '3.4' 2018-06-06 16:58:01 +02:00
Ghostkeeper
a15831c486
Update translation templates per language 
These are the templates from 3.4.

Contributes to issue CURA-5451.
 2018-06-06 16:57:33 +02:00
Ghostkeeper
0faaf3cd22
Update translation templates for Cura 3.4 
These are the translations for Cura 3.4. Fixed and in-place. Can't change translated texts any more.

Contributes to issue CURA-5451.
 2018-06-06 16:57:32 +02:00
Diego Prado Gesto
343c606df6 Merge branch '3.4' of github.com:Ultimaker/Cura into 3.4 2018-06-06 14:58:23 +02:00
Diego Prado Gesto
1019f2dd65 CURA-5449 Do not check if the name is the correct group name if the 
output device is manual create device and it is marked as temporary.
Wait until all the information is retrieved when the request finishes.
 2018-06-06 14:54:26 +02:00
Jack Ha
702d23ad0e CURA-5357 set showcase to max 3 items per row 2018-06-06 13:48:04 +02:00
Jack Ha
9fd9bd35dc CURA-5357 show showcased items in downloads page 2018-06-06 13:41:53 +02:00
fieldOfView
19b8ca7c70 Remove vestigial references to "monitoringPrint" 2018-06-06 11:22:35 +02:00
Jack Ha
87293e089d Merge branch 'master' of github.com:Ultimaker/Cura 2018-06-06 11:02:10 +02:00
Jack Ha
17b127e8c1 CURA-5249 replaced the extruder value of -1 by the more explicit defaultExtruderPosition, so now Cura is aware of the actual extruder position being used. Fixes linked icon next to support settings, like support_angle. 2018-06-06 11:00:09 +02:00
Ghostkeeper
4b581d09e7
Merge branch '3.4' 2018-06-06 10:59:14 +02:00
Ghostkeeper
da4932435c
Add fan speed to basic setting visibility 
It may not be what the users often want to change, but it is something that they may be expecting to see in the custom settings mode by default. It's something that you often think of as a typical setting but in reality you don't often want to change it. Let's get closer to what the user expects. Requested by the support team of Ultimaker.
 2018-06-06 10:56:58 +02:00
Aleksei S
dbd286e1cc Save as project the extruder counter starts from 1 2018-06-06 10:47:12 +02:00
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
Diego Prado Gesto
753101a988 Uncomment the code that hides the material tab in the toolbox. Just for 
master.<<
 2018-06-05 15:43:36 +02:00
Lipu Fei
6818342b90 Merge remote-tracking branch 'origin/3.4' 2018-06-05 13:34:04 +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
Mark
59602d8013 Revert "The prepare button slices, so it should be a slice button" 
This reverts commit a479176c63fe3c53a380b47d0d1abe3b2c80c4a0.
 2018-06-05 11:56:41 +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
Jack Ha
70d78f3cab CURA-5119 move settings out of wall overlap compensation 2018-06-05 10:36:34 +02:00
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