3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-29 13:51:12 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
10921 commits 344 branches 300 tags 757 MiB
Commit graph

10921 commits

This branch
This branch
All branches
Author SHA1 Message Date
fieldOfView
f527da2f3c Add message to layerview about incompatibility with wireprinting 
The message is not currently shown yet, but added before the string freeze. CURA-2288
 2016-09-13 11:01:26 +02:00
Jaime van Kessel
1ce6c3a4f1 Added defaults to requestAcces 
Cura-2277
 2016-09-13 10:53:41 +02:00
fieldOfView
224e6d37a8 Add materialNames property to get user-facing texts from printer 
inb4 string-freeze
CURA-2276
 2016-09-13 10:53:21 +02:00
fieldOfView
8d6f7c06c1 Replace "Show Engine Log" with "Show Configuration Folder" 
inb4 string freeze
 2016-09-13 10:46:33 +02:00
Jack Ha
665ea9b222 Merge branch 'master' of github.com:Ultimaker/JediWifiPrintingPlugin 2016-09-13 09:50:16 +02:00
Jack Ha
6069182175 Added UM3InfoComponents.qml to CMakeLists to the file also gets installed in the build 2016-09-13 09:50:04 +02:00
Jaime van Kessel
6435e8ce6f Request is now only triggered on right actions 
CURA-2279
 2016-09-13 09:49:17 +02:00
fieldOfView
2bd53d4ce4 Add stub (invisible) menuitems to get material/nozzle from printer 
In preparation to stringfreeze. CURA-2276
 2016-09-13 09:25:10 +02:00
fieldOfView
e583425bfa Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-09-12 20:51:43 +02:00
fieldOfView
c5d0942ee2 Add "Connect" and "Request Access" buttons to sidebar monitor 
Functionality is not 100% proven, but the required strings are in
CURA-2277
 2016-09-12 18:54:28 +02:00
fieldOfView
e945403845 Make requesting authentication public 
Contributes to CURA-2277
 2016-09-12 18:53:12 +02:00
fieldOfView
b14bc477bf Update status text for consistency 2016-09-12 18:46:09 +02:00
Tim Kuipers
4757422070 Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-12 17:41:58 +02:00
Ghostkeeper
a8db414b2a Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-12 17:39:34 +02:00
Tim Kuipers
2039406cdc Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-12 17:39:30 +02:00
fieldOfView
f306bb93d3 Move sidebar action button style into styles.qml 2016-09-12 17:32:46 +02:00
fieldOfView
a90ed439f0 Show printer state on Printers preference pane 
CURA-2276
 2016-09-12 17:32:46 +02:00
fieldOfView
411a7bdb84 Update i18n context for consistency 2016-09-12 17:32:46 +02:00
Jaime van Kessel
c38b2dcbd3 Tool panel switching now properly triggers focus change 
CURA-2197
 2016-09-12 17:32:46 +02:00
Jack Ha
c25e2d4a60 Undo material edit update resolve. Contributes to CURA-2159 2016-09-12 17:32:33 +02:00
Jack Ha
a5f0f87af0 Fix updating resolved values when changing material. Contributes to CURA-2159 2016-09-12 17:32:32 +02:00
Jaime van Kessel
1ebd34ac1e Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-12 17:06:52 +02:00
Jaime van Kessel
442fd3ae3d Tool panel switching now properly triggers focus change 
CURA-2197
 2016-09-12 17:05:05 +02:00
fieldOfView
4bfa0f3bb1 Move sidebar action button style into styles.qml 2016-09-12 16:53:59 +02:00
fieldOfView
0693c0284b Show printer state on Printers preference pane 
CURA-2276
 2016-09-12 16:49:55 +02:00
fieldOfView
aa39a44219 Update i18n context for consistency 2016-09-12 16:41:24 +02:00
Jaime van Kessel
68cfdfbe70 Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-12 16:16:18 +02:00
Jack Ha
1c1be7d444 Undo material edit update resolve, breaks UM3. Contributes to CURA-2159 2016-09-12 16:16:02 +02:00
Jaime van Kessel
a390315577 Speed_support_infill now points to right extruder stack 
CURA-2308
 2016-09-12 16:15:36 +02:00
fieldOfView
b82889f84e Only show access request message when the user requested access 2016-09-12 15:59:45 +02:00
Jack Ha
72b3dffa22 Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-12 15:48:41 +02:00
Jack Ha
8304f17efd Fix updating resolved values when changing material. Contributes to CURA-2159 2016-09-12 15:48:30 +02:00
fieldOfView
0e0569a37c Update user-facing messages for consistency 
Make sure we have a consistent terminology; requesting access vs pairing/authentication.
 2016-09-12 15:40:43 +02:00
Jaime van Kessel
8f65ed4c4e 0 is now seen as a correct value by QualitySettingsModel 
CURA-2293
 2016-09-12 15:36:57 +02:00
Jaime van Kessel
e5dd54008c Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-12 14:57:39 +02:00
Jaime van Kessel
b21684c079 Added missing global_extruder_nr for few settings 
CURA-2308
 2016-09-12 14:57:11 +02:00
Jaime van Kessel
cd56f22321 Merge branch 'bugfix_global_inherits_stack' of github.com:Ultimaker/Cura 2016-09-12 14:52:11 +02:00
Jack Ha
2cde439964 Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-12 14:40:41 +02:00
Jack Ha
d173952a3a Update materialmenu when changing material type. Contributes to CURA-2159 2016-09-12 14:40:32 +02:00
Jaime van Kessel
8a8dd20c00 Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-12 14:38:56 +02:00
Jaime van Kessel
b17f8b5dd6 Added min width & height to machine action popup. 2016-09-12 14:38:23 +02:00
Jack Ha
1e0394fb48 Cleanup, forgot to remove debugging stuff. Contributes to CURA-2159 2016-09-12 14:22:23 +02:00
fieldOfView
af4cfac6ac Add a link to a network connection troubleshooting guide 
CURA-2035
 2016-09-12 14:19:34 +02:00
Jack Ha
78c119dbde Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-12 13:55:14 +02:00
Jack Ha
fb3f03b446 Fixed XML setMetaDataEntry for changing too much meta data. Contributes to CURA-2159 2016-09-12 13:55:05 +02:00
fieldOfView
220abd2cdc Fix i18n context 2016-09-12 13:49:00 +02:00
Jaime van Kessel
31bc3d2575 Added maintenance state to display qml 
CURA-2235
 2016-09-12 13:38:30 +02:00
fieldOfView
930dd76109 Merge branch 'master' of https://github.com/Ultimaker/JediWifiPrintingPlugin 2016-09-12 13:36:51 +02:00
fieldOfView
e09de5257a Fix text about connection state in print monitor 2016-09-12 13:36:39 +02:00
Jaime van Kessel
fcefda9eaf Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-12 13:31:33 +02:00