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

11418 Commits

Author SHA1 Message Date
Lipu Fei
9968a79863 Merge remote-tracking branch 'origin/master' into WIP_onboarding 2019-03-06 11:29:56 +01:00
Lipu Fei
4979b401b3 Disable prime blob by default for CFFF 
CURA-6282
 2019-03-06 11:02:55 +01:00
Diego Prado Gesto
730564345b Add a small padding at the bottom 
Otherwise the button is very close to the list of objects.
 2019-03-06 10:38:18 +01:00
Ghostkeeper
76d9503777
Replace travel_speed with speed_travel 
The setting key was renamed in version 15.6.
 2019-03-05 17:43:00 +01:00
Ghostkeeper
0fe9e660b1
Don't show Silicone for UM printers that are incompatible with it anyway 
It's still an open bug that we show materials of which all configurations are incompatible with the printer.

Contributes to issue CURA-6262.
 2019-03-05 15:36:31 +01:00
Ghostkeeper
df8d060a00
Increment setting_version 
This must be up-to-date with the setting version that Cura currently uses, in order to ensure that the settings have the same names and the same functionality.
The settings that are set by these profiles are all nozzle-dimensional settings that haven't changed since 3.5, so we don't need to actually change the settings right now.

Contributes to issue CURA-6262.
 2019-03-05 14:37:45 +01:00
Remco Burema
c1cde2ebc0 Merge branch 'WIP_onboarding' of https://github.com/Ultimaker/Cura into WIP_onboarding 2019-03-05 14:15:17 +01:00
Lipu Fei
56060b1e64 WIP: Add add printer page, network part 2019-03-05 12:06:51 +01:00
Ghostkeeper
c665a481dd
Show settings that influence draft/ooze shields if enabled 
The skirt/brim speeds currently affect the draft and ooze shields. So if the draft or ooze shield is enabled, show those settings.

Contributes to #5373.
 2019-03-05 10:45:25 +01:00
Diego Prado Gesto
982f7085b3 Merge branch 'master' into feature_model_list 2019-03-05 10:36:05 +01:00
Diego Prado Gesto
ad65fd6381 Modify style of the ObjectSelector 
I got input from our designer to do it. When it's closed the panel is not intrusive, but when opened it shows a background color to make it readable.
 2019-03-05 10:33:27 +01:00
Jaime van Kessel
6157cb6f91 Merge branch '4.0' of github.com:Ultimaker/Cura 2019-03-04 16:00:56 +01:00
Diego Prado Gesto
2ac2299c09 Merge branch 'master' into feature_model_list 2019-03-03 21:22:06 +01:00
Diego Prado Gesto
8e3fb6196d Add animation when expand/collapse panel 2019-03-03 21:18:34 +01:00
Diego Prado Gesto
7b030a8235 Move the objectsList to the bottom 
Now it appears as a panel that you can expand/collapse. For now the background is transparent waiting for the designs to be clear.
 2019-03-03 20:10:14 +01:00
Remco Burema
113c37f555 Start work on 'AddPrinterByIp' for WelcomePages. [CURA-6057] 2019-03-01 13:17:15 +01:00
Satish
c98a73f8fd Added id's to printer button, installed plugins, material fields and profile tab for integration tests 2019-03-01 12:47:29 +01:00
Ghostkeeper
180156da78
Correct whitespace 
Change tabs to spaces according to our style standards. And remove a bunch of unnecessary white lines to make it easier to read.
 2019-03-01 11:45:08 +01:00
ValentinPitre
ca2be26463 Add TiZYX Evy Dual Extruder 3D printer 2019-03-01 00:34:45 +01:00
Mark
eccfebf39d Update material packages for 4.0 release 2019-02-28 16:11:51 +01:00
Lipu Fei
6ebfaff61e WIP: Fixes and add cloud page 2019-02-28 08:33:28 +01:00
Lipu Fei
9c66921538 WIP: dos2unix new files 2019-02-28 08:07:44 +01:00
Lipu Fei
51c773fd80 WIP: Make reusable widget CuraProgressBar 2019-02-28 08:06:28 +01:00
Lipu Fei
92730a09a2 WIP: Add data collections page 2019-02-28 07:48:05 +01:00
Andrew Finkle
5581cd5c2c Added definition, extruder, material, and variants for Discov3ry Complete 2019-02-27 11:55:25 -05:00
Andrew Finkle
3f765a9ca2 Revert "Create structur3d_discov3ry1_complete_um2plus.json" 
This reverts commit 05e889621ecaba1eec47216fb5393fd7cfb65ed0.
 2019-02-27 10:29:58 -05:00
Andrew Finkle
05e889621e Create structur3d_discov3ry1_complete_um2plus.json 2019-02-27 10:29:28 -05:00
Lipu Fei
72866683e6 WIP: Add Whats new page 2019-02-27 16:00:45 +01:00
Ghostkeeper
b723beb435
Pre-heat to initial layer temperature instead of normal temperature 
Because that's what it's going to start printing with.
 2019-02-27 15:58:30 +01:00
Ghostkeeper
970fa69166
Merge branch 'patch-2' of https://github.com/h0x91b/Cura into h0x91b-patch-2 2019-02-27 15:55:57 +01:00
Ghostkeeper
470871a0d2
Merge branch 'master' of https://github.com/radfahrer/Cura into radfahrer-master 2019-02-27 15:31:57 +01:00
Lipu Fei
14fdf68871 WIP: Add User Agreement page and fixes 2019-02-27 15:28:39 +01:00
Lipu Fei
ac012e8f09 WIP: Add Welcome Page and use CTRL+Alt+D to trigger 2019-02-27 12:45:28 +01:00
Lipu Fei
3b63f92d55 WIP: Add base QMLs for WelcomeDialog 2019-02-27 12:45:28 +01:00
Ghostkeeper
1c6cce316a
Merge branch '4.0' 2019-02-27 11:47:47 +01:00
Ghostkeeper
9fba8f5381
Update metadata of translation templates 
It's now 2019, and Cura 4.0.

Contributes to issue CURA-6257.
 2019-02-27 11:47:29 +01:00
Ghostkeeper
c44a207744
Remove duplicate property 
I think this is the result of a merge conflict or something. This entry should not be dependent on the number of bottom layers so I'm keeping the first one.
 2019-02-27 10:23:46 +01:00
Ghostkeeper
e2adc1791f
Merge branch '4.0' 2019-02-26 17:08:30 +01:00
Ghostkeeper
bedb52fb60
Update translation templates for every language 
This way the translators can simply fill in the blanks.

Contributes to issue CURA-6257.
 2019-02-26 16:54:50 +01:00
Ghostkeeper
fbbadc4543
Update translation templates for Cura 4.0 
These are the new strings that will now have to be translated.

Contributes to issue CURA-6257.
 2019-02-26 16:53:34 +01:00
Daniel Green
bfa13e6146 Merge branch 'master' of github.com:radfahrer/Cura 2019-02-26 07:25:42 -08:00
Daniel Green
5219b1ff9b Removes unnecessary fields. 2019-02-26 07:21:46 -08:00
Ghostkeeper
fae4c9ee8d
Merge branch '4.0' 2019-02-26 15:35:17 +01:00
Ghostkeeper
d6c73175c7
Reduce minimum screen size 
With dual extrusion printers, this reduces the width so much that the material name is just ellipses in the top screen, but at least it's still usable. With single extrusion printers this is fine.
 2019-02-26 15:34:23 +01:00
Jaime van Kessel
5c354eb6a3 Switch the order of name & id in addMachine call 
This makes it possible for the name to not be set, in which case it will
default to the name provided by the definition

CURA-6179
 2019-02-26 10:45:18 +01:00
Arseniy Pavlenko
5a7be399f6
Bug: on Tevo Tornado nozzle and bed are turned off on start. 
Changed "[extruder0_temperature]" to "{material_print_temperature}", because "[extruder0_temperature]" is replaced by an empty string in actual g-code generated by Cura 3.6.
Generated g-code is turn off heating at all on mine Tornado right before cleaning nozzle which is harmful and unacceptable...

Bad g-code example:

M104 S
M109 S
M109 R
 2019-02-25 21:32:24 +03:00
Ghostkeeper
b7efc1baf0
Change tabs to spaces 
We use spaces to indent, normally.
 2019-02-25 11:19:51 +01:00
Daniel Green
1d4298a27f Fixes the version setting. Adds start and end g-code 2019-02-24 17:40:46 -08:00
Diego Prado Gesto
33a713ad92 Fix indentation and remove spaces 2019-02-24 19:01:13 +01:00
Daniel Green
f8bc2e7b07 Adds a printer definition for the FLSUN QQ 2019-02-23 18:21:52 -08:00