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

6996 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ghostkeeper
b1f3280b2d
No longer say this is a secret plug-in 
It is no longer secret since the UM3 is released.

Contributes to issue CURA-2737.
 2016-10-19 13:03:23 +02:00
Tim Kuipers
aad3da85e9 JSON refactor: move retraction_hop_after_extruder_switch to Travel category (CURA-2727) 2016-10-19 12:59:28 +02:00
Jack Ha
8aec11e7c3 Merge branch 'master' into feature_config_dir_lock 2016-10-19 12:43:50 +02:00
Simon Edwards
9e6f340943 Move z hop settings to Travel category 
CURA-2727
 2016-10-18 15:49:03 +02:00
fieldOfView
d3e3c0c659 Fix translation of machines page and some other references to Uranium 
CURA-570
 2016-10-18 15:34:52 +02:00
Jack Ha
9195961806 Fixed translation of 4 words in profilespage. remains of CURA-570 2016-10-18 15:05:18 +02:00
Simon Edwards
6d1f766ef3 Fixed for the inheritance icon and custom profiles. 
CURA-2674 Inheritance icon not shown for saved profile.
 2016-10-18 13:18:56 +02:00
Ghostkeeper
7427730123
Update question to sync printer configuration 
UX designer wanted to have the text changed.

Contributes to issue CURA-2634.
 2016-10-18 12:56:15 +02:00
Jaime van Kessel
cc549932c4 ConvexHull decorater no longer crashes if node has no MeshData 
Fixes CURA-2706
 2016-10-18 11:48:23 +02:00
Jack Ha
a030b5bfc3 Fix gcode profile. CURA-2718 2016-10-18 10:26:02 +02:00
Jack Ha
0511906263 Revert "Fix gcode profile. CURA-2718" 
This reverts commit deb3606429.
 2016-10-18 10:18:06 +02:00
Jack Ha
deb3606429 Fix gcode profile. CURA-2718 2016-10-18 09:55:45 +02:00
Ghostkeeper
96e516c676
Allow for saving multiple scene nodes at the same time 
The selection saving saves the entire current selection and their child nodes.

Contributes to issue CURA-2617.
 2016-10-17 15:53:33 +02:00
Ghostkeeper
b3e3053323
Move automatic file name generating to separate function 
This will make it easier to have multiple nodes here in the future. I'll have to modify this function for that, but I'll do that in a separate commit.

Contributes to issue CURA-2617.
 2016-10-17 15:53:33 +02:00
Ghostkeeper
be356bae37
Allow for writing multiple meshes at the same time 
This is an API break in Uranium. It has no effect on this plug-in since this plug-in always writes the entire g-code anyway.

Contributes to issue CURA-2617.
 2016-10-17 15:52:55 +02:00
fieldOfView
e2d32ef963 Change references from Uranium to Cura 2016-10-17 14:17:28 +02:00
fieldOfView
98a2ebc157 Fix translation of machines page and some other references to Uranium 
CURA-570
 2016-10-17 14:10:02 +02:00
Jack Ha
1cd5052666 Fixed translation of 4 words in profiles page. CURA-570 2016-10-17 13:57:24 +02:00
Jaime van Kessel
9c73c248ed Merge branch '2.3' of github.com:Ultimaker/Cura 2016-10-16 16:14:47 +02:00
Jaime van Kessel
cda8fd5827 Revert buttons now work for single extrusion machines again 2016-10-16 16:14:05 +02:00
Jaime van Kessel
807a92957f Merge branch '2.3' of github.com:Ultimaker/Cura 2016-10-16 14:45:52 +02:00
Jaime van Kessel
95f2b84fb5 Fixed importing profiles for machines with inheritance 2016-10-16 14:20:04 +02:00
Jaime van Kessel
87fc0db543 Merge branch '2.3' of github.com:Ultimaker/Cura 2016-10-16 13:16:21 +02:00
Jaime van Kessel
3afd813e5e Profiles page is now correctly updated when single extrusion machine is used 2016-10-15 19:23:07 +02:00
Jaime van Kessel
a3df53c1e1 Quality_changes are now taken into account for UM3Extended 
CURA-2690
 2016-10-15 18:36:05 +02:00
Jaime van Kessel
d12219cab8 Right profile is now checked again in dropdown 
CURA-2690
 2016-10-15 17:10:26 +02:00
Jaime van Kessel
ff24def63c Use globalProfileId to check if we need to show changed settings 
CURA-2690
 2016-10-15 17:05:55 +02:00
Jaime van Kessel
49b84facac Merge branch '2.3' of github.com:Ultimaker/JediWifiPrintingPlugin 2016-10-15 14:34:35 +02:00
Ghostkeeper
4769b22138
Sort profiles on extruder position before exporting 
In the importer the extruders are sorted on extruder position. In the exporter they need to be in the same order.

Contributes to issue CURA-2655.
 2016-10-14 11:46:39 +02:00
Ghostkeeper
b04e98c4b0 Merge pull request #993 from nickthetait/gh-issue-980 
Matchup JSON formatting for fdmprinter with code conventions
 2016-10-14 11:15:55 +02:00
fieldOfView
a8ebdc8e39 Merge branch '2.3' of https://github.com/Ultimaker/Cura into 2.3 2016-10-13 21:23:11 +02:00
fieldOfView
a291131aca Fix qml warning when no printer is connected 2016-10-13 21:18:17 +02:00
Ghostkeeper
7d53b955c1 Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-10-13 20:56:35 +02:00
fieldOfView
89f4224a46 Merge branch 'master' of https://github.com/Ultimaker/JediWifiPrintingPlugin 2016-10-13 18:53:37 +02:00
fieldOfView
4cc6fb0878 Remove unused label 
Cleanup before release
 2016-10-13 18:53:22 +02:00
nickthetait
1bc2f1e189 More formatting updates 2016-10-13 08:11:15 -06:00
nickthetait
bf331f39af Merge branch 'um-master' into gh-issue-980 
Conflicts:
	resources/definitions/fdmprinter.def.json
 2016-10-13 08:01:00 -06:00
Simon Edwards
e2a66b33e0 Merge branch '2.3' 2016-10-13 14:54:13 +02:00
Simon Edwards
2153ee8651 Merge pull request #1042 from Ultimaker/restore_to_default_not_per_extruder 
Only reset the setting for the currently selected extruder.
 2016-10-13 14:53:17 +02:00
Simon Edwards
8b487130d2 Take 'linked' settings into account when reverting. 
CURA-2640 Restore to default not per extruder
 2016-10-13 14:33:29 +02:00
Simon Edwards
79a62ec45f Only reset the setting for the currently selected extruder. 
CURA-2640 Restore to default not per extruder
 2016-10-13 13:48:15 +02:00
fieldOfView
fe60b2fab8 Add missing elide for "Print Setup" label 
And fix some code style
 2016-10-13 13:18:51 +02:00
Ghostkeeper
ce6e3982fe
Make resolve function of bed temperature use max 
We want the bed to have the highest temperature of the two. This causes some melting for softer materials, but it is required for harder materials to stick to the build plate.
 2016-10-13 13:15:16 +02:00
fieldOfView
3a55ec324c Merge branch '2.3' of https://github.com/Ultimaker/Cura into 2.3 2016-10-13 11:31:20 +02:00
fieldOfView
c9ee7afcb8 Remove superfluous if statement 
CURA-2600
 2016-10-13 11:31:07 +02:00
Ghostkeeper
8951efd140
Improve log message 
Instead of always reporting that it waits 30s, it reports the actual time it waits.

Contributes to issue CURA-2630.
 2016-10-13 11:26:10 +02:00
Simon Edwards
a3ffc9e46f A small fix for the case when Cura is starting up and there is no printer. 
CURA-2271 Warn for unsupported material/printcore combinations
 2016-10-13 11:12:43 +02:00
Simon Edwards
f7fe59c707 A small fix for the case when Cura is starting up and there is no printer. 
CURA-2271 Warn for unsupported material/printcore combinations
 2016-10-13 11:10:40 +02:00
Simon Edwards
8b75dd5f97 Merge branch '2.3' 2016-10-13 10:59:32 +02:00
Simon Edwards
f659d01da1 Make the labels in the quality menus match those from the selected extruder. 
CURA-2271 Warn for unsupported material/printcore combinations
 2016-10-13 10:55:32 +02:00