GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-30 07:44:22 +08:00
Code Issues Packages Projects Releases Wiki Activity
18,687 Commits 289 Branches 260 Tags
Commit Graph

18687 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jaime van Kessel
38a9206898 Merge branch '4.0' of github.com:Ultimaker/Cura 2019-02-28 16:01:40 +01:00
Jaime van Kessel
a8128556f3 Don't drop refresh token if request failed 2019-02-28 14:54:59 +01:00
Jaime van Kessel
62f913802f Prevent crash if the connection was lost for auth token 2019-02-28 12:58:41 +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
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
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
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
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
Diego Prado Gesto
5d8eb3e6e5 Fix typo 2019-02-22 13:18:20 +01:00
Ghostkeeper
ac18d88d22
Merge branch 'wgaonar-master' 2019-02-22 12:55:14 +01:00
Ghostkeeper
c4e7775034
Merge branch 'master' of https://github.com/wgaonar/Cura into wgaonar-master 2019-02-22 12:33:40 +01:00
Jaime van Kessel
dd59b9167b Merge branch '4.0' of github.com:Ultimaker/Cura 2019-02-22 11:37:58 +01:00
Jaime van Kessel
ee1830e777 Make the duration test first zero the times before sending print duration message. 2019-02-22 11:33:23 +01:00
Jaime van Kessel
69d3813f98 No longer disable viewMenu when user loaded presliced g-code 2019-02-22 11:19:16 +01:00
Jaime van Kessel
198ea3c74f Ensure the model checker doesn't update a gazillion times on multiply 
CURA-6237
 2019-02-21 21:09:49 +01:00
Jaime van Kessel
7221b23457 Add a property to temporarily disable the material models from updating. 
This allows the QMl to stop the updating when it's not even visible
 2019-02-21 20:50:44 +01:00
Jaime van Kessel
41f2a0e222 Add a property to temporarily disable the material models from updating. 
This allows the QMl to stop the updating when it's not even visible
 2019-02-21 20:47:38 +01:00
Jaime van Kessel
7754b8a447 Only instantiate setting menus when it's visible 
This saves a bit of time on booting and prevents unneeded updates (
because it doesn't matter if a setting changes if no-one is watching!)
 2019-02-21 20:20:01 +01:00