3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-19 12:47:49 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5
6996 commits 306 branches 270 tags 779 MiB
Commit graph

6996 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Jaime van Kessel
1d91827664 NetworkPrinter now uses printerState to store global state 
CURA-2235
 2016-09-12 13:31:07 +02:00
Jaime van Kessel
8dbe67a6bf Added printer state to output device 
CURA-2235
 2016-09-12 13:30:43 +02:00
Jack Ha
717437647b Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-12 13:30:26 +02:00
Jack Ha
df536e158b Fixed XmlMaterialProfile serialize for booleans. Contributes to CURA-2159 2016-09-12 13:30:14 +02:00
Jaime van Kessel
c1d04ac600 Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-12 13:00:47 +02:00
Jaime van Kessel
44092f0b96 Printers with a quality_definition now also create quality changes using that definition 
CURA-1780
 2016-09-12 13:00:01 +02:00
Ghostkeeper
12b967ddb2
Remove debug code 
Don't know who it was or why or when, but it shouldn't be there.
 2016-09-12 12:58:35 +02:00
Jaime van Kessel
f914ef5424 We now save the auth data right away in order to prevent mismatches 
CURA-2279
 2016-09-12 11:59:25 +02:00
Jaime van Kessel
03c28537f2 Added function to save a single stack to file. 
CURA-2279
 2016-09-12 11:58:51 +02:00
Jaime van Kessel
feae612d55 Look at the correct stack for variant 
CURA-2313
 2016-09-12 10:54:57 +02:00
Jaime van Kessel
820d91486f Printer setting mismatches are now also logged as warnings 
CURA-2313
 2016-09-12 10:44:56 +02:00
Jaime van Kessel
ae161748ef Material type is now only checked if we actually use that extruder 
CURA-2313
 2016-09-12 10:39:58 +02:00
fieldOfView
edb1a143ea Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-09-12 10:38:25 +02:00
fieldOfView
8930eae9cd Allow plugins to add additional components to print monitor buttons 
CURA-2277
 2016-09-12 10:38:09 +02:00
fieldOfView
8722a15883 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-09-12 10:35:21 +02:00
fieldOfView
55c0095b30 Allow plugins to add additional components to Machines detail pane 
CURA-2276
 2016-09-12 10:35:00 +02:00
Ghostkeeper
93d9b98cf5
Merge branch 'master' of https://github.com/Apsu/Cura into Apsu-master 2016-09-12 09:30:54 +02:00
Ghostkeeper
951fbc09f1 Add descriptions for all third-party plug-ins 
From memory.
 2016-09-12 01:57:57 +02:00
Ghostkeeper
866737e830 Add X3G Writer to list of third-party plug-ins 
Shameless self-plug.
 2016-09-12 01:55:01 +02:00
Jaime van Kessel
c671815004 Merge branch '2.3' of github.com:Ultimaker/JediWifiPrintingPlugin 2016-09-09 17:29:01 +02:00
Jaime van Kessel
244332a807 Merge branch '2.3' of github.com:Ultimaker/Cura 2016-09-09 17:28:20 +02:00
Ghostkeeper
8249200121
Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-09-09 17:26:12 +02:00
Ghostkeeper
03c3b2ac2f
Make empty profile for current settings when upgrading from UM2+ 
This change causes the stack to make a new profile at the top to store current settings in.

Contributes to issue CURA-844.
 2016-09-09 17:23:13 +02:00
fieldOfView
66fc85c6b2 Fix revert accident 2016-09-09 17:10:45 +02:00
Jaime van Kessel
f294d580a9 Zipping the data no longer causes GUI to freeze 
CURA-2286
 2016-09-09 16:46:04 +02:00