GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-02 10:41:59 +08:00
Code Issues Packages Projects Releases Wiki Activity
16,722 Commits 295 Branches 267 Tags
Commit Graph

16722 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aleksei S
e8cf9e034d Catch All Exception except: SystemExit, KeyboardInterrupt, GeneratorException 
CURA-5939
 2018-12-06 13:41:50 +01:00
Aleksei S
84c85439ff The trigger_early_crash did not trigger early crash for testing purposes 
CURA-5939
 2018-12-06 12:00:26 +01:00
Ian Paschal
e8a933331c Clean-up printer status label 
Contributes to CL-1153
 2018-12-05 12:14:18 +01:00
Jaime van Kessel
325137db83
Merge pull request #4888 from Ultimaker/CURA-5982_fix_crash_no_material 
CURA-5982 Return empty material model for empty material
 2018-12-05 10:43:31 +01:00
Lipu Fei
4ff5e43a28 Handle Empty and Unknown material cases 
CURA-5982
 2018-12-04 17:24:51 +01:00
Lipu Fei
fb3c1fc11d Merge remote-tracking branch 'origin/master' into CURA-5982_fix_crash_no_material 2018-12-04 17:15:26 +01:00
Jaime van Kessel
fd6a8d7642 Merge branch 'master' of github.com:Ultimaker/Cura 2018-12-04 15:47:27 +01:00
Jaime van Kessel
b2238420fb Ensure that reset always correctly gets set to basic 
The old code that simply resetted the preferences was still active, but this could cause a race condition
in some situations. In those cases it would first set it to basic and then clear the preferences (thus
resulting in no settings being visible)

CURA-5981
 2018-12-04 15:46:13 +01:00
Simon Edwards
39c282fabe
Merge pull request #4925 from Ultimaker/CL-1153_printer_states_in_monitor 
CL-1153 printer states in monitor
 2018-12-04 15:30:12 +01:00
Ian Paschal
014a138fda Remove semi-colon 
Contributes to CL-1153
 2018-12-04 15:12:00 +01:00
Ian Paschal
1494daf671 Simplify preview icon logic 
Contributes to CL-1153
 2018-12-04 15:11:31 +01:00
Ian Paschal
ebb31409b8 Always return a string for preview icon 
Contributes to CL-1153
 2018-12-04 15:10:31 +01:00
Lipu Fei
43096c1baf Update USBPrinting version to 1.0.1 
CURA-5943
 2018-12-04 15:03:45 +01:00
Lipu Fei
02e7f90473 Fix module importing in USBPrinting 
CURA-5943
 2018-12-04 15:02:52 +01:00
Ian Paschal
96b9c7f3ea Fix multi-argument i18n string 
Contributes to CL-1153
 2018-12-04 11:40:56 +01:00
Ian Paschal
249a90199b Improve printer status handling 
Contributes to CL-1153
 2018-12-04 11:08:01 +01:00
Lipu Fei
9ec7428620 Fix setting visiblity current index 
CURA-5981
 2018-12-04 10:55:01 +01:00
Ian Paschal
ab245bbff6 Make "finishes at" single translatable string 
Contributes to CL-1153
 2018-12-04 10:23:26 +01:00
Ian Paschal
0363c1257c Improve exposed progress prop 
Contributes to CL-1153
 2018-12-04 10:18:09 +01:00
Ghostkeeper
f320000ce5
Change default profile of Aurora and Alfawise printers 
Instead of the default layer height, we should change the default quality profile.
This is necessary because the 'normal' quality profile doesn't define a layer height, so that should inherit from the 0.1mm default layer height. But if the printer turned the default into a 0.15mm layer height then that is wrong.
Maybe we should let the normal quality profile overwrite it to 0.1mm, always?

Contributes to issue CURA-5902.
 2018-12-03 17:23:44 +01:00
Ian Paschal
95400282b9 Simplify logic slightly 
Contributes to CL-1153
 2018-12-03 14:44:15 +01:00
Ian Paschal
cced42a55b Handle idle, unavailable, and unreachable states 
Contributes to CL-1153
 2018-12-03 14:41:45 +01:00
Ian Paschal
c9ed044205 Improve printer status and progress bar 
Contributes to CL-1153
 2018-12-03 14:41:22 +01:00
Ian Paschal
a28cae0a43 Improve date rendering 
- Use "Mon Dec 3 at 12:39" if 7 days or more away.
- Use  "Mon at 12:39" if within 7 days but more than one away.
- Use "tomorrow at 12:39" if one day away.
- Use "today at 12:39" if today.

Contributes to CL-1153
 2018-12-03 12:18:33 +01:00
Ian Paschal
3d80e28174 Add some typings 
Contributes to CL-1153
 2018-12-03 12:15:38 +01:00
Ian Paschal
665e2d3060 Move isActive and timeRemaining logic from QML to Python 
Contributes to CL-1153
 2018-12-03 12:15:25 +01:00
Jaime van Kessel
36a86adc0f Remove spammy log 2018-11-30 16:08:19 +01:00
Jaime van Kessel
ad26962cb9 Fix setting visibility not working in settingVisibilityPage 
CURA-5981
 2018-11-30 15:49:50 +01:00
Jaime van Kessel
a4a619370e Fix QML warnings 2018-11-30 15:33:57 +01:00
Jaime van Kessel
205b939b99 Merge branch 'remove_transitions' of github.com:Ultimaker/Cura 2018-11-30 15:30:53 +01:00
Jaime van Kessel
1a79372afd Fixed name of cocoon create 
For some reason it was added as if it was 2 machines at once. Since we already have a wanhao I3, i've changed this one to only be a profile for the Cocoon.
 2018-11-30 15:16:37 +01:00
Ghostkeeper
14a7b7b2ce
Merge branch 'update_example_postprocessing_script' 2018-11-29 15:33:03 +01:00
Mark
90aa8c1264 point people to a good example 2018-11-29 15:29:51 +01:00
Lipu Fei
c545d9df77 Add key check before accessing in ƒStartSliceJob 
CURA-5901
 2018-11-29 15:17:43 +01:00
Mark
d88a465737 Increase possible visible description lines in the Marketplace 2018-11-29 14:45:42 +01:00
Lipu Fei
b1b773e464
Merge pull request #4891 from Ultimaker/show_website_as_support_in_marketplace 
Show website for support
 2018-11-29 08:50:32 +01:00
Lipu Fei
b44ddec01f Change normal layer height of cocoon to 0.10 
CURA-5902

So it's different from Fine 0.15, otherwise you get duplicates.
 2018-11-29 08:35:40 +01:00
Ian Paschal
1f17896e78
Merge pull request #4899 from Ultimaker/monitor_tab_scroll_tweak 
Improve monitor tab temporary scroll bar
 2018-11-28 13:24:27 +01:00
Ian Paschal
14cee32cec Improve monitor tab temporary scroll bar 2018-11-28 12:20:09 +01:00
Jaime van Kessel
7d42fdf183 Add missing typing 2018-11-28 11:52:30 +01:00
Jaime van Kessel
0baa4d20b3 Gracefully handle the case where machine definition is no in the map 2018-11-28 11:42:54 +01:00
Jaime van Kessel
c0d1c35a2b Removed accidental copy paste 2018-11-28 11:35:48 +01:00
Jaime van Kessel
adf16310c7
Merge pull request #4883 from Ultimaker/CURA-5879_experimental_qualities 
CURA-5879 experimental qualities
 2018-11-28 11:34:21 +01:00
Simon Edwards
8262c2dfd6
Merge pull request #4889 from Ultimaker/CL-1150_restyle_monitor_printer_tile 
CL-1150 restyle monitor printer tile
 2018-11-28 11:31:11 +01:00
Jaime van Kessel
d9c3faaae2 Codestyle 
CURA-5879
 2018-11-28 11:19:37 +01:00
Jaime van Kessel
d09d8a6ae3 Minor codestyle fixes 
CURA-5879
 2018-11-28 11:18:36 +01:00
Ian Paschal
9029d10ed0 Remove debug statement 
Contributes to CL-1150
 2018-11-28 10:47:34 +01:00
Ian Paschal
370fa0fd14 Remove old sidebar 
Contributes to CL-1150
 2018-11-28 10:46:22 +01:00
Ian Paschal
d54a1cb41b Handle null print job more elegantly 
Contributes to CL-1150
 2018-11-28 10:46:12 +01:00
Ian Paschal
255a7fa1fb Fix binding loop 
Contributes to CL-1150
 2018-11-28 10:45:46 +01:00