3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-16 11:17:49 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 7
7424 commits 304 branches 270 tags 779 MiB
Commit graph

7424 commits

This branch
This branch
All branches
Author SHA1 Message Date
fieldOfView
20f76b62fe Hide "Request Access" buttons when access request is active 
CURA-2277 & CURA-2276
 2016-09-14 16:40:20 +02:00
fieldOfView
f11308e74e Allow syncing materials & printcores from the Printers preference pane 
CURA-2276
 2016-09-14 16:21:00 +02:00
Ghostkeeper
5c5d188889
Remove support_area_smoothing setting 
Contributes to issue CURA-2296.
 2016-09-14 15:41:32 +02:00
Ghostkeeper
5c49adc52e
Also return tuple if upgrading failed 
It is checked if the file data is None or empty (the upgrade is then considered 'failed'). But to unpack the file data, it needs to be a tuple.

Contributes to issue CURA-844.
 2016-09-14 15:41:32 +02:00
fieldOfView
151fcfdda6 Update method order for readability 2016-09-14 15:15:54 +02:00
fieldOfView
98f0fd2a08 Merge branch 'master' of https://github.com/Ultimaker/JediWifiPrintingPlugin 2016-09-14 15:01:10 +02:00
fieldOfView
15d933ed73 Show Extruders, PrintCores, Materials on Printer preference pane 
CURA-2276
 2016-09-14 15:00:41 +02:00
fieldOfView
a47ffb2288 Remove commented out code 2016-09-14 14:57:26 +02:00
fieldOfView
549766e5f6 Fix layout of buttons on profile page 
CURA-2368
 2016-09-14 14:15:34 +02:00
fieldOfView
ab50ac0d89 Don't show possibly incorrect materials in print monitor 2016-09-14 13:59:00 +02:00
Jaime van Kessel
98a759196d Simplified Buildvolume 
CURA-2245
 2016-09-14 13:25:29 +02:00
Jaime van Kessel
cc38705a68 Use right extruder for material 2016-09-14 12:55:11 +02:00
Jaime van Kessel
02c1a8d069 Fixed wrong indenting 2016-09-14 12:52:15 +02:00
Jaime van Kessel
8b71364ee8 Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-14 11:44:41 +02:00
Jaime van Kessel
e12acb8110 We now remove all material containers instead of the active machine variant 
CURA-2210
 2016-09-14 11:44:08 +02:00
Ghostkeeper
0c760d04d3
Update translation template 
A string freeze is in effect now.

Contributes to issue CURA-570.
 2016-09-14 11:23:51 +02:00
Tim Kuipers
479f9ea6d2 refactor: global_inherits_stack ==> limit_to_extruder (CURA-2308) 2016-09-14 10:46:57 +02:00
fieldOfView
e43dbcd0b7 Code style 
CURA-2235
 2016-09-14 09:37:53 +02:00
fieldOfView
6334f74fc6 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-09-14 08:52:05 +02:00
fieldOfView
72b4442320 Show warning in layerview that wireprint display is not accurate 
CURA-2288
 2016-09-14 08:50:46 +02:00
fieldOfView
21e413ca4f Hide extruder, nozzle & material selection in Print Monitor 2016-09-14 08:19:57 +02:00
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
a754952f5e Close connection now also ensures that cached machine & material ids are reset 
CURA-2354
 2016-09-13 17:43:57 +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
400401929d User message now also states what the mismatch between cura and printer is 
CURA-2285
 2016-09-13 14:36:36 +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
Jack Ha
d8d1bd92d3 Merge branch 'master' of github.com:Ultimaker/JediWifiPrintingPlugin 2016-09-13 11:47:07 +02:00
Jack Ha
1cf92d432d Typo. CURA-2277 2016-09-13 11:46:55 +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
Jaime van Kessel
2c29085a20 Merge branch 'master' of github.com:Ultimaker/JediWifiPrintingPlugin 2016-09-13 11:17:44 +02:00
Jaime van Kessel
cb05bbadd0 Explicitly set it to bool to prevent warnings 2016-09-13 11:05:09 +02:00