GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-14 15:38:04 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,199 Commits 290 Branches 260 Tags
Commit Graph

5199 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
fieldOfView
e422eb6ee5 Fix sidebar height when switching to UM2 
When switching from a multiextrusion printer to the UM2, sometimes too much whitespace would be left for the sidebar header
 2016-09-14 08:15:43 +02:00
Jaime van Kessel
4d84584f59 Simplified statement as per review 
CURA-2271
 2016-09-13 17:31:15 +02:00
Jaime van Kessel
7caecd0a41 Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-13 17:28:08 +02:00
Jaime van Kessel
76e57c940d Added more specific error message when trying to slice with incompatible material 
CURA-2271
 2016-09-13 17:27:29 +02:00
Tim Kuipers
ad91c71c2b Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-13 16:45:45 +02:00
Tim Kuipers
9cd6a8c1ae JSON feat: machine_name as a setting for the 3D printer model type (CURA-2360) 2016-09-13 16:44:55 +02:00
Jack Ha
bfdb5e68a1 Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-13 15:09:46 +02:00
Jack Ha
31b0f74874 Change url of cura stats. CURA-1445 2016-09-13 15:09:33 +02:00
Ghostkeeper
89fb92edbd
Disable upgrading current settings altogether 
The current settings in 2.1 specified a machine instance. In 2.2 they specify a machine definition. There is not enough information in one file to be able to translate that.

Contributes to issue CURA-844.
 2016-09-13 14:58:13 +02:00
Jaime van Kessel
b707c8d806 XML profile now returns serialization data even if it's read only 
This way exporting read only profiles is possible again.

CURA-2359
 2016-09-13 14:57:00 +02:00
Jaime van Kessel
d6e95d2734 Added error state for container state if serialization data is none 
CURA-2359
 2016-09-13 14:54:17 +02:00
Jaime van Kessel
db512d3b05 Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-13 14:49:09 +02:00
Jaime van Kessel
4db1db302b Changed guid to GUID in the filter 
We use the veriable as upper.
 2016-09-13 14:35:45 +02:00
Simon Edwards
0fdd9279bb Resolvement strategy for bed adhesion and prime tower enable. 
Contributes to CURA-2232 No resolvement strategy for prime_tower_enable and platform adhesion
 2016-09-13 14:07:18 +02:00
Tim Kuipers
bab9e8a28a JSON fix: always display support interface extruder (CURA-2308) 
The interface extruder determines whether an interface should be enabled
 2016-09-13 13:40:44 +02:00
jack
7d5eb493c7 Merge pull request #967 from thopiekar/master-CURA-1445 
[CURA-1445] Adding hashes
 2016-09-13 12:55:01 +02:00
Jaime van Kessel
cb50c61293 Added missing import statement 
CURA-2276
 2016-09-13 12:51:37 +02:00
Jaime van Kessel
4088cc0f7e Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-13 11:54:48 +02:00
Jaime van Kessel
570843bbb0 Filtering containers now also takes quality_definition into account 
CURA-1780
 2016-09-13 11:54:16 +02:00
fieldOfView
c43b277901 Fixed double import 
3rd time lucky?
 2016-09-13 11:53:46 +02:00
fieldOfView
d907bfb5e3 Fixed copy/paste error 2016-09-13 11:52:18 +02:00
fieldOfView
ebd9332823 Fix imports 2016-09-13 11:49:27 +02:00
Simon Edwards
8086646de1 When reverting a user setting be sure to delete it from all of the stacks, global and extruder. 
Contributes to CURA-2232 No resolvement strategy for prime_tower_enable and platform adhesion
 2016-09-13 11:33:33 +02:00
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
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
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
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
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
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