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

18251 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ghostkeeper
12d3af8d93
Fix type error 
The typing was added by Nallath just now but it is giving an error for me.
The private access is allowed here because we're implementing it in the same class, even though it is a different instance.

This fixes the type error a bit more strictly than what lfei just did at the same time as me.
 2019-01-28 13:50:32 +01:00
Lipu Fei
54ce6a3676 Fix typing 2019-01-28 13:40:42 +01:00
Ghostkeeper
c5eb3b0e25
Allow floating point in bed temperature 
This is consistent with the hotend temperature. Only we round it just before outputting it to g-code because the g-code doesn't support it.
This fixes a typing error that my IDE gave me.
 2019-01-28 13:35:22 +01:00
Jaime van Kessel
ad5a6a4153 Added missing typing 2019-01-25 14:09:41 +01:00
Jaime van Kessel
67a63e7954 Add test for gcodeListDecorator 
It's super simple, but hey, it's also easy to write.
 2019-01-25 14:04:53 +01:00
Jaime van Kessel
c7e3b1dcaf Addded test for removing machine action 2019-01-25 14:00:26 +01:00
Jaime van Kessel
76cfb19dfb Removed unused function & added more typing 2019-01-25 13:52:41 +01:00
Jaime van Kessel
0fded58988 Add / fix typing 2019-01-25 13:35:24 +01:00
Ghostkeeper
33abbd4c89
Merge branch '4.0' 2019-01-25 12:03:38 +01:00
Ghostkeeper
91dc3713ae
Initialise idle count properly 
This is a field so it should always get initialised in the __init__ function.

Fixes #5218.
 2019-01-25 12:03:21 +01:00
Simon Edwards
064e61c262
Merge pull request #5215 from Ultimaker/CL-1175_context_menu_for_cant_print_jobs 
CL-1175 Context menu for cant print jobs
 2019-01-25 10:53:15 +01:00
Ghostkeeper
41c840adbc
Cast plug-in path of self to str 
Because it can't be None.
 2019-01-24 17:34:22 +01:00
Ghostkeeper
d535008e08
Don't repeat the plug-in name 
If it changes, this will crash Cura.
 2019-01-24 17:31:08 +01:00
Ian Paschal
673734ee12 Show print job context menu if state == "error" 
Contributes to CL-1175
 2019-01-24 09:52:56 +01:00
Ghostkeeper
cbed8038e9
Don't say that creating a profile needs to provide a 'new' name 
It's weird to ask for a new name if the profile is completely new.

Made together with a change in Uranium for CURA-6086.
 2019-01-23 17:35:33 +01:00
Ian Paschal
5d2a914180 Always show context menu for print jobs 
Contributes to CL-1175
 2019-01-23 15:54:11 +01:00
Ian Paschal
4438f0d9a3 Add dark mode to new context menu 
Contributes to CL-1212
 2019-01-23 15:34:28 +01:00
Ian Paschal
f5379dda55 Fix improperly removed method 2019-01-23 14:48:38 +01:00
Ian Paschal
e19323d38b Fix mising theme key 2019-01-23 14:47:59 +01:00
Ian Paschal
9de3fb9bb4
Merge pull request #5187 from Ultimaker/CL-1165_missing_cloud_info 
CL-1165 missing cloud info
 2019-01-23 12:12:12 +01:00
Ian Paschal
e204696b61 Add dark theme 
Contributes to CL-1165
 2019-01-23 12:10:06 +01:00
Ian Paschal
1097f16011 Add theme (and dark mode) 
Contributes to CL-1165
 2019-01-23 12:08:20 +01:00
Ian Paschal
32072e3bfe Merge remote-tracking branch 'origin/4.0' into CL-1165_missing_cloud_info 2019-01-23 12:05:06 +01:00
Ian Paschal
776410e5d9
Merge pull request #5208 from Ultimaker/CL-1212_monitor_dark_theme 
CL-1212 Monitor tab dark theme
 2019-01-23 11:37:19 +01:00
Diego Prado Gesto
551111bd60 Close the configuration panel when the user syncs with a configuration 2019-01-23 11:24:28 +01:00
Jaime van Kessel
aac82a0852 Merge branch '4.0' of github.com:Ultimaker/Cura 2019-01-23 11:18:27 +01:00
Ghostkeeper
9a0a084339
Code style 2019-01-23 11:11:40 +01:00
Jaime van Kessel
fa3e4fe69a Merge branch 'CURA-6094_brim_width_crash_4_0' of github.com:Ultimaker/Cura into 4.0 2019-01-23 09:52:07 +01:00
ChrisTerBeke
92eb361ba1 Make cloud API error a generic message to not scare the user 2019-01-23 09:37:32 +01:00
Byeon Ho cheol
7492122a54 4904 cubicon device (#4963) 
* Add Cubicon 3D Printer device profiles.
 - 3DP-110F
 - 3DP-210F
 - 3DP-310F
Cubicon: http://www.3dcubicon.com/en/cubicon/

* Add missed profile file.

* Remove platform mesh files.
Do not necessary platform mesh in Cubicon devices.
 2019-01-22 16:44:04 +01:00
Jaime van Kessel
3d1351c2c3 Merge branch 'master' of https://github.com/jbkim/Cura 2019-01-22 16:20:53 +01:00
Jaime van Kessel
0942bebaf8 Move troubleshoot link to help menu 2019-01-22 16:19:29 +01:00
Jinbuhm Kim
18cea54780 Fix material menu issue 2019-01-22 21:22:28 +09:00
Jinbuhm Kim
d1d344d739 change the extruder name & file name 2019-01-22 20:56:44 +09:00
Ian Paschal
283de789c2 Remove comment 
Contributes to CL-1212
 2019-01-22 12:00:50 +01:00
Lipu Fei
9bc748ffa1 Fix scrolling with configurations 
CURA-6125
 2019-01-22 11:48:41 +01:00
Ian Paschal
76240bb458 Remove unused comment 
Contributes to CL-1212
 2019-01-22 11:13:27 +01:00
Jinbuhm Kim
db17116b37 Fix Json error 2019-01-22 11:56:18 +09:00
Remco Burema
aae06fe0fa Prevent calculations with brim width larger than build-plate. [CURA-6094] 2019-01-21 17:47:13 +01:00
Remco Burema
ccfa6ebb92 Set proper maximum values for brim width and line-count. [CURA-6094] 2019-01-21 17:47:01 +01:00
Ian Paschal
e212bbfb01 Add some translations which were forgotten 2019-01-21 17:13:34 +01:00
Ian Paschal
bc9831abd1 Add color theming to monitor tab 
Contributes to CL-1212
 2019-01-21 17:10:41 +01:00
Ian Paschal
406ef20802 Revert "Add theme colors" 
This reverts commit 2e5eb611442b992ca0da60dc22a9e16538c48fa9.
 2019-01-21 14:05:24 +01:00
Ian Paschal
2e5eb61144 Add theme colors 
Contributes to CL-1212
 2019-01-21 13:07:16 +01:00
Diego Prado Gesto
5e3dedf62b Merge branch '4.0' 2019-01-20 21:25:19 +01:00
Ian Paschal
1369c98ea6 Center extruder numbers on Ubuntu 
This one is for you @christerbeke
 2019-01-18 16:02:23 +01:00
Lipu Fei
c602c1cf15 Use MachineManager.activeMachine instead of Application.globalstack 
CURA-6117
 2019-01-18 14:08:53 +01:00
Lipu Fei
c83f815838 Fix tests 2019-01-18 13:46:37 +01:00
Jaime van Kessel
a51289d7ce Merge branch 'not_activate_when_no_materials' of github.com:Ultimaker/Cura 2019-01-18 11:19:28 +01:00
Jaime van Kessel
f7b4bd50ae Merge branch 'fix_xray_zfighting' of https://github.com/fieldOfView/Cura 2019-01-18 11:16:40 +01:00