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

19026 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jaime van Kessel
17fdc86e50 Fix typing 
CURA-6179
 2019-02-27 11:59:50 +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
Jaime van Kessel
21c6bba1ce Add the discovered printer functionality 
This can be used in the add machine wizard to short circuit the creation of a printer.
So instead of first selecting a printer and then connecting it, it will be possible to have
a list that contains all network discovered printers (from all plugins that can do this).

This means we can select one of those printers and directly add it (thus no longer needing that step)

CURA-6179
 2019-02-27 11:05:54 +01:00
Jaime van Kessel
7ed1ee4365
Merge pull request #5365 from Ultimaker/fix-token-expiry 
Fix token expiry
 2019-02-27 10:56:00 +01:00
ChrisTerBeke
9ba342c541 Fix codestyle failure on float conversion 2019-02-27 10:43:15 +01:00
ChrisTerBeke
365f67cbf8 Have some overlap in token expiry to prevent unauthorized issues 2019-02-27 10:32:30 +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
ChrisTerBeke
03c7fbe527 Merge branch '4.0' of https://github.com/Ultimaker/Cura into 4.0 2019-02-26 15:41:03 +01: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
3de9cab1e2
Merge pull request #5363 from Ultimaker/backup-list-response-error-handling 
Add extra validation to backup list response
 2019-02-26 11:16:40 +01:00
ChrisTerBeke
53cc9cd188 Add extra validation to backup list response 2019-02-26 11:09:57 +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
889bc8a529 Merge branch 'kerog777-Felix_Profile' 2019-02-24 19:03:07 +01: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
kerog777
4270cb065e Update to starting gcode 
Refined starting code to use proper replacement parameters and be more
compatible with firmware, which heats both nozzles to 120C as part of
the Z homing process.  So now it heats the bed, then homes, then heats
to the layer 0 print temperature.

Also upped the material flow from 87 (value used in manufacturer’s
Simplify3D profile) to 95, which works better for me.  87 seems really
low.
 2019-02-23 09:28:51 -08:00
kerog777
0943331213 Merge remote-tracking branch 'Ultimaker/master' into Felix_Profile 2019-02-23 09:15:35 -08:00
Lipu Fei
7291026bec Fix material container removal 
CURA-6237
 2019-02-22 15:13:53 +01:00
Jaime van Kessel
b165b9625f Removed unused code and fix styling for some comments 2019-02-22 15:08:51 +01:00
Jaime van Kessel
3494055de7 Add some debug prints to the test that ocasionally fails on the CI 2019-02-22 15:01:53 +01:00
Jaime van Kessel
5f4907da5c Added tests for NetworkedPrinterOutputDevice 2019-02-22 14:57:22 +01:00
Jaime van Kessel
905787b9b3 Merge branch 'master' of github.com:Ultimaker/Cura 2019-02-22 13:50:16 +01:00
Jaime van Kessel
b5c270f00a Add stubs for MachineManager testing 
It also adds a first test that checks if the setActiveMachine
 2019-02-22 13:49:31 +01:00
Lipu Fei
4d3211e651 Merge remote-tracking branch 'origin/4.0' 2019-02-22 13:38:29 +01:00
Lipu Fei
2694ef98e0
Merge pull request #5338 from Ultimaker/CURA-6232_config_menu_tab_fix 
Fix tab-bar of config.-menu always on idex 0 on reshow. [CURA-6232]
4.0-beta 		2019-02-22 13:37:10 +01:00
Diego Prado Gesto
271573d0ae Fix typo... again 2019-02-22 13:19:04 +01:00
Diego Prado Gesto
4d030572ba Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2019-02-22 13:18:36 +01:00