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

5638 commits

Author SHA1 Message Date
Ghostkeeper
13124ae983
Don't make filter_out_tiny_gaps a child setting of fill_perimeter_gaps 
Parent settings are not used by the engine. Or they shouldn't be, because the parent settings are disabled by the front-end when all of their child settings are overwritten. Then you'd have a parent setting that is used by the engine but you can't modify it. Also, the command-line slicing doesn't load parent settings since it can't parse categories and such.
 2017-11-27 13:58:34 +01:00
Ghostkeeper
65ea8a614c
Don't make filter_out_tiny_gaps a child setting of fill_perimeter_gaps 
Parent settings are not used by the engine. Or they shouldn't be, because the parent settings are disabled by the front-end when all of their child settings are overwritten. Then you'd have a parent setting that is used by the engine but you can't modify it. Also, the command-line slicing doesn't load parent settings since it can't parse categories and such.
 2017-11-27 13:54:29 +01:00
Jaime van Kessel
083eee2e9d Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite 2017-11-27 13:43:39 +01:00
Jaime van Kessel
00eeb835ac ManualPrinterControl uses correct functions again 
CL-541
 2017-11-27 10:22:30 +01:00
Jaime van Kessel
5036eccd32 Moved multiple components to their own files 
CL-541
 2017-11-27 10:15:28 +01:00
Ghostkeeper
e0f0e098ff
Use MaterialsModel for materialsModel 
This specialized InstanceContainersModel has an override that makes the model a bit more efficient when non-materials get their metadata updated.

Contributes to issue CURA-4243.
 2017-11-27 09:54:40 +01:00
Diego Prado Gesto
fa00a17c78 Make UI changes in the Simulation View for adapting the color gradient 
in the Feedrate color scheme. Due to the travel speed is normally very
high compared with the other speeds in the model, the gradient is now
gradual instead of linear in order to show more changes in the low
values and less changes in the high values.
Adapt also the button styles and themes' colors.
Set the play/pause button to the left and reduce the size.
 2017-11-26 21:21:18 +01:00
Ruben D
ffef26097d
Merge branch '3.1' 2017-11-26 18:48:42 +01:00
Ruben D
0d0bcb8aea
Clip text that exceeds the width of the text box. 
For #2802.
 2017-11-26 18:48:27 +01:00
Ruben D
8847325cf8
Remove limit on length for integer arrays 
The integer arrays were limited because the text in the text field is not properly clipped. I found a fix for that.

Fixes #2802.
 2017-11-26 18:47:58 +01:00
Dinow
e7477359bb Update fdmprinter for 3.1 2017-11-25 00:31:48 +08:00
Diego Prado Gesto
d0c1569da6 Merge branch 'fieldOfView-feature_simulation_ux_tweaks' 2017-11-24 15:48:39 +01:00
Ghostkeeper
a0ae7489f8
Less technical term for X/Y offset of infill 
Just in the description. It's good to describe a setting using different words than the setting name.

Contributes to issue CURA-4601.
 2017-11-24 13:16:14 +01:00
Jaime van Kessel
57de028608 re-implemented abort & pause for legacy um3 
CL-541
 2017-11-24 11:26:30 +01:00
Jaime van Kessel
57406100ef Fixed status icon in monitor tab 
CL-541
 2017-11-24 10:55:24 +01:00
Ghostkeeper
9ecfd5510a
Clarify description for when bed temperature is 0 
Fixes #2674.
 2017-11-24 10:42:09 +01:00
Diego Prado Gesto
0b434978dd CURA-4561 Add tooltip also to the Cancel button. 2017-11-24 10:34:38 +01:00
ChrisTerBeke
46a575b84f Merge branch 'master' of https://github.com/Ultimaker/Cura 2017-11-24 10:31:30 +01:00
ChrisTerBeke
7d1db1b165 Merge branch '3.1' 2017-11-24 10:31:22 +01:00
Jaime van Kessel
9d7cd72691 JobData is now shown in monitor screen again 
CL-541
 2017-11-24 09:38:10 +01:00
Jaime van Kessel
219e285b20 Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite 2017-11-24 09:23:21 +01:00
Jaime van Kessel
c523a6ddf6 Progress is now shown for LegacyPrinter while printing 
CL-541
 2017-11-24 09:22:50 +01:00
Adam Rumjahn
43c9df5703
Deactivate G32 auto leveling before print 
don't need this any more on the new printers
 2017-11-23 20:14:43 -05:00
Jack Ha
6f708fef8f Merge branch 'master' of github.com:Ultimaker/Cura 2017-11-23 15:27:32 +01:00
Jack Ha
b6410ecf12 CURA-4561 prepare button upgrades 2017-11-23 15:27:22 +01:00
Mark
49705492ce Merge branch '3.1' 2017-11-23 14:37:31 +01:00
Lipu Fei
dad2dfda89 No need to set currentItem after a material is imported 
CURA-4546
 2017-11-23 14:08:10 +01:00
Aleksei Sasin
1141368682 Hide icons if monitor view is selected CURA-4527 2017-11-23 12:54:53 +01:00
Mark
835a0fb5d3 Merge branch 'master' of github.com:Ultimaker/Cura 2017-11-23 10:39:00 +01:00
Mark
aee838c8c1 Merge branch '3.1' 2017-11-23 10:38:48 +01:00
Mark
3477b902ab
Merge pull request #2834 from Ultimaker/CURA-4527_view_orientation 
Cura 4527 view orientation
 2017-11-23 09:56:26 +01:00
Lipu Fei
6b132a13de
Merge pull request #2786 from 0r31/discoeasy200_profile 
Improve discoeasy200 profile
 2017-11-23 00:25:07 +01:00
Diego Prado Gesto
2042cdf155 Merge branch 'master' of https://github.com/Ultimaker/Cura 2017-11-22 20:11:24 +01:00
Diego Prado Gesto
b776afaf3d CURA-4509 Changing layout of the print time information tooltip, 
now in two lines per feature. This is for avoid trimming the labels
because they depend on the language.
 2017-11-22 20:09:39 +01:00
anraf1001
a0222eebb5 Polish translation - continued 2017-11-22 19:41:49 +01:00
Dinow
b0e61c6e59 update from pot files 2017-11-22 23:46:19 +08:00
anraf1001
474e146c46 Polish translation - updated version 2017-11-22 16:34:57 +01:00
Dinow
187e4babdc import from 3.0 2017-11-22 23:34:46 +08:00
Ghostkeeper
97000d8538
Merge branch '3.1' 2017-11-22 12:45:33 +01:00
Ghostkeeper
3823cca936
Disable Russian translation since it's incomplete 
The maintainer of this translation didn't want to continue spending time to keep his translation up-to-date.

Contributes to issue CURA-4601.
 2017-11-22 12:45:21 +01:00
Ghostkeeper
dfe29fa482
Merge branch '3.1' 2017-11-22 12:41:57 +01:00
Ghostkeeper
ffa418660a
Update Korean translations for 3.1 
This adds empty translations and updates the line numbers and such. The original Korean translations for 3.0 are still retained.

Contributes to issue CURA-4601.
 2017-11-22 12:41:31 +01:00
Ghostkeeper
62113df3bd
Update Korean translations with 3.0 translations 
These are so wrong that Cura won't start with these translations loaded. We're asking for corrections.

Contributes to issue CURA-4601.
 2017-11-22 12:41:31 +01:00
Aleksei S
d7b230269b The icons changed 
CURA-4527
 2017-11-22 11:10:25 +01:00
Diego Prado Gesto
10ec02840e Merge branch 'feature_simulation_ux_tweaks' of https://github.com/fieldOfView/Cura into fieldOfView-feature_simulation_ux_tweaks 2017-11-22 09:55:57 +01:00
Jack Ha
82a7b3718d Merge branch 'master' of github.com:Ultimaker/Cura 2017-11-22 09:42:13 +01:00
Jack Ha
0a2a9a2589 CURA-4533 added setting 'Filter out tiny gaps' 2017-11-22 09:42:03 +01:00
Ghostkeeper
628e88a7e4
Update translation templates for every language 
These files are to be sent to the translators. Their old translations have been retained but new strings were added.

Contributes to issue CURA-4601.
 2017-11-21 16:59:56 +01:00
Jaime van Kessel
f987e6d977 Functionality properties (canPause, canPreHeatBed, etc) are now in the Controller. 
It's actually up to the controller to say something about this, so this location makes more sense

CL-541
 2017-11-21 16:59:17 +01:00
Jaime van Kessel
0fe91db636 Moved HeatedBedBox to own qml file 
CL-541
 2017-11-21 16:52:37 +01:00