3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-09 06:45:09 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
5414 commits 313 branches 275 tags 719 MiB
Commit graph

5414 commits

This branch
This branch
All branches
Author SHA1 Message Date
Arjen Hiemstra
448d7d890c Merge branch '2.3' 
* 2.3:
  Set encoding to utf-8 when writing files
  Remove manually specified utf-8 encoding
  SettingInstanceManager now also watches containerchanged of extruder stacks
 2016-10-24 14:30:22 +02:00
Arjen Hiemstra
bfec96f584 Set encoding to utf-8 when writing files 
Since we assume utf-8 in a lot of places.

Contributes to CURA-2692
 2016-10-24 14:28:20 +02:00
Arjen Hiemstra
be0e48664a Remove manually specified utf-8 encoding 
Since SaveFile now defaults to UTF-8
 2016-10-24 14:28:20 +02:00
Jaime van Kessel
7b65297a31 Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-10-24 13:51:37 +02:00
Jaime van Kessel
7f1b060ef9 SettingInstanceManager now also watches containerchanged of extruder stacks 
CURA-2674
 2016-10-24 13:50:49 +02:00
Arjen Hiemstra
3d63df7471 Merge branch '2.3' 
* 2.3:
  Use the machine/extruder ID as base for duplicated profile ID
  Fix "critical" error when starting with no active machine
 2016-10-24 13:40:57 +02:00
Arjen Hiemstra
f952b45a62 Use the machine/extruder ID as base for duplicated profile ID 
Instead of using the ID of the duplicated container, which would cause
the profile ID to be the old ID with the new ID appended.

Fixes CURA-2782
 2016-10-24 13:38:22 +02:00
fieldOfView
df78bc47af Fix "critical" error when starting with no active machine 2016-10-24 11:01:14 +02:00
Ghostkeeper
80e4c44484
Merge branch 'fieldOfView-fix_isActiveQualitySupported' 2016-10-24 11:00:40 +02:00
Ghostkeeper
e6ed890d5f Merge branch 'fix_isActiveQualitySupported' of https://github.com/fieldOfView/Cura into fieldOfView-fix_isActiveQualitySupported 2016-10-24 10:57:30 +02:00
Ghostkeeper
ddf5e8a663
Merge branch 'themaninthesuitcase-printrbot_play' 2016-10-24 10:34:07 +02:00
fieldOfView
5ce237502c Fix "critical" error when starting with no active machine 2016-10-23 11:25:26 +02:00
Chris Pearson
9686c9db1c Add definition for Printrbot Play with heated bed upgrade. 2016-10-22 17:36:21 +01:00
Chris Pearson
8330b953e8 Add definition and mesh for Printrbot Play. 2016-10-22 16:36:06 +01:00
Tim Kuipers
981907d26a Revert "Revert "JSON feat: carve_multiple_volumes (CURA-2712)"" 
This reverts commit 2bff94ba9f.

reapplies 8ee22738bc
 2016-10-21 16:21:08 +02:00
Tim Kuipers
86d682daae Merge branch '2.3' 2016-10-21 16:20:52 +02:00
Tim Kuipers
2bff94ba9f Revert "JSON feat: carve_multiple_volumes (CURA-2712)" 
This reverts commit 8ee22738bc.
 2016-10-21 16:20:39 +02:00
Tim Kuipers
8ee22738bc JSON feat: carve_multiple_volumes (CURA-2712) 2016-10-21 16:07:03 +02:00
Ghostkeeper
9c4f8ab8fb
Update change log 
This is what we have for 2.3.1 so far.

Contributes to issue CURA-2755.
 2016-10-21 14:59:41 +02:00
Ghostkeeper
58dba9bcb3
Dynamically get unit of layer height 
If the unit of layer height would become something else than mm eventually, it'll still be correct here.

Contributes to issue CURA-2737.
 2016-10-21 14:03:28 +02:00
Ghostkeeper
19678c1126
Display layer height after profile name in drop-down 
There is no styling in this drop-down, as it is provided by the OS. Just a dash and the layer height will do.

Contributes to issue CURA-2737.
 2016-10-21 14:00:43 +02:00
Ghostkeeper
c92ccee1e4
Add layer height role to profiles model 
This layer height computation is rather complex, but because the items are now computed in a separate function, we can safely overwrite that and the update is made only once in the UI.

Contributes to issue CURA-2737.
 2016-10-21 13:59:23 +02:00
Ghostkeeper
e02284b1f0
Expose determineQualityAndQualityChangesForQualityType 
It is needed to get the quality belonging to a certain quality changes ID that is not on the global stack. We already had this function that does just that.

Contributes to issue CURA-2737.
 2016-10-21 13:11:08 +02:00
Ghostkeeper
afd3dd6eec
Make separate theme colour for detail text 
I would use the normal font colour with a lower alpha value here, but it seems that rendering text with transparency doesn't work in Qt.

Contributes to issue CURA-2737.
 2016-10-21 13:06:49 +02:00
Ghostkeeper
16491d8d23
Robustly get layer height even if quality has none 
If the quality profile doesn't define a layer height (which it currently always has) then this should still get the proper layer height. It proceeds properly down the stack now.

Contributes to issue CURA-2737.
 2016-10-21 11:51:10 +02:00
Ghostkeeper
57b0275384
Show layer height in profile selection menu 
It's shown in the 'inactive' font colour, which isn't entirely semantically correct but has the behaviour we want regardless of how the theme changes in the future.

Contributes to issue CURA-2723.
 2016-10-20 17:16:06 +02:00
Ghostkeeper
021023a932
Add property to get the current profile's layer height 
This will then be displayed in the profile selection menu.

Contributes to issue CURA-2723.
 2016-10-20 17:14:45 +02:00
Ghostkeeper
de45d25f0b
Update material profiles for ABS 
This is a weekly update from Tom.
 2016-10-20 14:01:30 +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
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