3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-14 18:27:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
7424 commits 302 branches 270 tags 773 MiB
Commit graph

7424 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ghostkeeper
de45d25f0b
Update material profiles for ABS 
This is a weekly update from Tom.
 2016-10-20 14:01:30 +02:00
Jack Ha
a23a922eec Drag profile into Cura; added importProfile(s), exportProfile to ContainerManager. CURA-787 2016-10-20 13:55:39 +02:00
Simon Edwards
28f00e2089 Merge branch '2.3' 2016-10-20 12:59:51 +02:00
Simon Edwards
d228f6ce9f CURA-2751 Change settings label "Simple" to "Recommended" 2016-10-20 12:51:19 +02:00
Ghostkeeper
3c9ebfab8f
Merge branch '2.3' 
Conflicts:
	resources/definitions/fdmprinter.def.json
	resources/materials/generic_abs.xml.fdm_material
	resources/materials/generic_cpe.xml.fdm_material
	resources/materials/generic_nylon.xml.fdm_material
	resources/materials/generic_pla.xml.fdm_material
	resources/materials/ultimaker_abs_black.xml.fdm_material
	resources/materials/ultimaker_abs_blue.xml.fdm_material
	resources/materials/ultimaker_abs_green.xml.fdm_material
	resources/materials/ultimaker_abs_grey.xml.fdm_material
	resources/materials/ultimaker_abs_orange.xml.fdm_material
	resources/materials/ultimaker_abs_pearl-gold.xml.fdm_material
	resources/materials/ultimaker_abs_red.xml.fdm_material
	resources/materials/ultimaker_abs_silver-metallic.xml.fdm_material
	resources/materials/ultimaker_abs_white.xml.fdm_material
	resources/materials/ultimaker_abs_yellow.xml.fdm_material
	resources/materials/ultimaker_cpe_black.xml.fdm_material
	resources/materials/ultimaker_cpe_blue.xml.fdm_material
	resources/materials/ultimaker_cpe_dark-grey.xml.fdm_material
	resources/materials/ultimaker_cpe_green.xml.fdm_material
	resources/materials/ultimaker_cpe_light-grey.xml.fdm_material
	resources/materials/ultimaker_cpe_red.xml.fdm_material
	resources/materials/ultimaker_cpe_transparent.xml.fdm_material
	resources/materials/ultimaker_cpe_white.xml.fdm_material
	resources/materials/ultimaker_cpe_yellow.xml.fdm_material
	resources/materials/ultimaker_nylon_black.xml.fdm_material
	resources/materials/ultimaker_nylon_transparent.xml.fdm_material
	resources/materials/ultimaker_pla_black.xml.fdm_material
	resources/materials/ultimaker_pla_blue.xml.fdm_material
	resources/materials/ultimaker_pla_green.xml.fdm_material
	resources/materials/ultimaker_pla_magenta.xml.fdm_material
	resources/materials/ultimaker_pla_orange.xml.fdm_material
	resources/materials/ultimaker_pla_pearl-white.xml.fdm_material
	resources/materials/ultimaker_pla_red.xml.fdm_material
	resources/materials/ultimaker_pla_silver-metallic.xml.fdm_material
	resources/materials/ultimaker_pla_transparent.xml.fdm_material
	resources/materials/ultimaker_pla_white.xml.fdm_material
	resources/materials/ultimaker_pla_yellow.xml.fdm_material

Contributes to issue CURA-2737.
 2016-10-20 12:41:31 +02:00
Jack Ha
d4f7a0e16c Bugfix in logging when trying to import broken profile. CURA-787 2016-10-20 11:39:01 +02:00
Ghostkeeper
aa9516451d Merge branch '2.3.1' into 2.3 2016-10-20 11:04:28 +02:00
Tim Kuipers
e0b6679b91 JSON feat: infill_hollow (CURA-2748) 2016-10-19 18:14:03 +02:00
Jack Ha
98688bf013 Changed MachineManager.isActiveStackValid to MachineManager.areStacksValid. CURA-2730 2016-10-19 15:46:22 +02:00
Ghostkeeper
f799f40fee
Ignore materials folder 
We should not add any new materials here.

Contributes to issue CURA-2737.
 2016-10-19 15:02:36 +02:00
Ghostkeeper
35430a5e9e
Add missing Ultimaker 3 platform mesh 
Forgot to commit that one.

Contributes to issue CURA-2737.
 2016-10-19 14:53:09 +02:00
Ghostkeeper
1eab172f7c
Remove duplicate materials from Cura 
These should get installed from the fdm_materials repository now, so it shouldn't be complaining about any missing files... Let's see what the build server thinks of that.

Contributes to issue CURA-2737.
 2016-10-19 14:50:41 +02:00
Tim Kuipers
fd50d9e316 JSON fix: added comment in cool_min_layer_time description about Minimum Speed (CURA-2720) 2016-10-19 14:44:58 +02:00
Ghostkeeper
06ff2a9da6
Publish Ultimaker 3 definitions and profiles 
The Ultimaker 3 is now released, so we can make this data public. These are the Ultimaker 3 definition files (with their physical properties as Cura requires them, such as build volume) as well as its extruders, print cores, quality profiles and build plate mesh. And also for the Ultimaker 3 Extended. Modifications to the material profiles will be published in the fdm_materials repository.

Contributes to issue CURA-2737.
 2016-10-19 13:35:00 +02:00
Ghostkeeper
d79a3add40 Update warning for material change on printer again 
It's been changed 7 times since the last update in Cura. I hope that our new UX makes up his mind.

Contributes to issue CURA-2634.
 2016-10-19 13:15:52 +02:00
Ghostkeeper
6b7ecfb4e0 Update warning for material change on printer 
When the material changed on the printer, this dialogue is shown. It needed to have new text.

Contributes to issue CURA-2634.
 2016-10-19 13:15:52 +02:00
Ghostkeeper
2dda58a951 Update terminology of PrintCore to print core 
Contributes to issue CURA-2632.
 2016-10-19 13:15:52 +02:00
Ghostkeeper
f277b24290 Fix typo in English translation 
Can't fix the actual typo in code due to the string freeze though.

Contributes to issue CURA-570.
 2016-10-19 13:15:52 +02:00
Ghostkeeper
6434948bfd Make Dutch translation consistent 
Capitalisation issues abound. Also a few translations itself.

Contributes to issue CURA-570.
 2016-10-19 13:15:52 +02:00
Ghostkeeper
cea0d5165f Missed a capital letter 
As did the translation bureau...

Contributes to issue CURA-570.
 2016-10-19 13:15:52 +02:00
Ghostkeeper
10347011f7 Improve Dutch translation 
Many consistency issues, mainly with capital letters.

Contributes to issue CURA-570.
 2016-10-19 13:15:52 +02:00
Ghostkeeper
9cb3fb8990 Fix inconsistencies in Dutch translation 
Only the Cura translation was checked so far...

Contributes to issue CURA-570.
 2016-10-19 13:15:52 +02:00
Ghostkeeper
af5216490e Remove duplicate strings 
These were giving problems when you generate the .mo files.

Contributes to issue CURA-570.
 2016-10-19 13:15:52 +02:00
Ghostkeeper
cc92d22e51 Add translation for UM3NetworkPrinting plug-in 
These translations have not yet been checked. I'll get to that now.

Contributes to issue CURA-570.
 2016-10-19 13:15:52 +02:00
Tim Kuipers
c7c3d24974 fix: adhesion_extruder_nr moved category also for default visibility (CURA-2707) 2016-10-19 13:14:22 +02:00
Tim Kuipers
8cebaedd0c JSOn refactor: moved support extruder settings to support catgegory (CURA-2707) 2016-10-19 13:14:06 +02:00
Tim Kuipers
9780895812 JSON fix: retraction_hop_after_extruder_switch only visible for dual extrusion (CURA-2727) 2016-10-19 13:05:10 +02:00
Ghostkeeper
2d3e4dc2b0
Merge branch '2.3' 
Contributes to issue CURA-2737.
 2016-10-19 13:04:36 +02:00
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