3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-22 14:13:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8
6705 commits 305 branches 272 tags 787 MiB
Commit graph

6705 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jaime van Kessel
4900a8f380 Added message to warn user if calibration was not properly done 
CURA-2731
 2016-10-26 14:52:30 +02:00
Ghostkeeper
07e7521792
Fix spelling mistake 
This is not a bijvoeglijk naamwoord, so it must not get an E at the end.

Contributes to issue CURA-2751.
 2016-10-26 13:41:23 +02:00
Jaime van Kessel
601bf20a96 Changed the entry point of the material guid to non-depricated spot 
We depricated the GUID as entry point, but all printers support both right now.
 2016-10-26 13:38:09 +02:00
Jaime van Kessel
a581942869 Merge branch '2.3' of github.com:Ultimaker/Cura 2016-10-26 13:13:27 +02:00
Ghostkeeper
8da87a2996 Merge branch 'feature_show_origin' of https://github.com/fieldOfView/Cura into fieldOfView-feature_show_origin 2016-10-26 11:37:32 +02:00
Ghostkeeper
53a4e5e6c0
Remove infill_overlap_mm from Nylon profiles 
This is the result of this week's profile updates from our material tests.
 2016-10-26 11:15:14 +02:00
Ghostkeeper
2edcf36a83
Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-10-26 10:52:49 +02:00
Simon Edwards
cc33b3be22 Change for the "Advanced" tab to "Custom". 
CURA-2751 Change settings label "Simple" to "Recommended"
 2016-10-26 10:43:00 +02:00
Ghostkeeper
6c3b4b7f29
Prevent race condition before global container stack is made 
Just properly check if there is a global container stack.
 2016-10-26 09:50:42 +02:00
Ghostkeeper
861837ef41 Make generic quality profiles global 
This way they will also be put in the global profile.

Contributes to issue CURA-2723.
 2016-10-26 09:43:11 +02:00
fieldOfView
55191b722a Codestyle & documentation 2016-10-25 23:06:23 +02:00
fieldOfView
fef15c706f Render an indication of the origin of the machine 2016-10-25 22:51:44 +02:00
Jaime van Kessel
dd79be6595 Merge branch '2.3' of github.com:Ultimaker/Cura 2016-10-25 16:50:55 +02:00
Ghostkeeper
f72e6be10e Fix setting the quality_type of imported profile 
The metadata entry was renamed a while ago.

Contributes to issue CURA-2785.
 2016-10-25 16:36:26 +02:00
Ghostkeeper
623f9cb4fc Abort importing profile if we have no global container stack 
You shouldn't be able to trigger it anyway, but if you do, it'll give a proper error that the import failed.

Contributes to issue CURA-2785.
 2016-10-25 16:36:17 +02:00
Ghostkeeper
7e5ffe79b6 Cache global container stack 
We'll need it multiple times. Could be a bit faster.

Contributes to issue CURA-2785.
 2016-10-25 16:36:07 +02:00
Jaime van Kessel
b4339bda0e Fixed logger isuse with importing profile 
CURA-2785
 2016-10-25 16:26:52 +02:00
Arjen Hiemstra
30e14478af Replace quality profiles with optimised versions of Ruben's script 
With the global quality profiles merged this now works properly.

CURA-2645
 2016-10-25 15:40:52 +02:00
Ghostkeeper
aef0880a1f
Fix setting the quality_type of imported profile 
The metadata entry was renamed a while ago.

Contributes to issue CURA-2785.
 2016-10-25 13:24:56 +02:00
Ghostkeeper
d439015773
Abort importing profile if we have no global container stack 
You shouldn't be able to trigger it anyway, but if you do, it'll give a proper error that the import failed.

Contributes to issue CURA-2785.
 2016-10-25 13:20:02 +02:00
Ghostkeeper
06521d7c49
Cache global container stack 
We'll need it multiple times. Could be a bit faster.

Contributes to issue CURA-2785.
 2016-10-25 13:16:41 +02:00
Arjen Hiemstra
b0d6d7034a Ensure we re-evaluate the inheritance icon binding when it changes 
Contributes to CURA-2752
 2016-10-25 13:11:04 +02:00
Ghostkeeper
35f43df2f6
Make generic quality profiles global 
This way they will also be put in the global profile.

Contributes to issue CURA-2723.
 2016-10-25 13:06:42 +02:00
fieldOfView
29b357894d Fix homing UM2/UM2+ when printing with RepRap flavor 2016-10-25 11:57:15 +02:00
Jaime van Kessel
a3ff918dde Merge pull request #1075 from fieldOfView/fix_um2_start_gcode 
Fix homing UM2/UM2+ when printing with RepRap flavor
 2016-10-25 11:56:34 +02:00
Ghostkeeper
e3ae3d50f9
Merge branch '2.3' 2016-10-25 11:50:20 +02:00
Arjen Hiemstra
bef3666a88 Still show the inherit button even when the revert is visible 
It was not a bug like I assumed

Contributes to CURA-2752
 2016-10-25 11:40:05 +02:00
Ghostkeeper
e6c68bcdc9
Add fallback if no unit is known for layer_height 
If there is no unit known, it is interpreted as there being no unit. There is currently mm, but if we changed that it is probably on purpose so we write no unit.

Contributes to issue CURA-2723.
 2016-10-25 11:28:41 +02:00
Jaime van Kessel
844b9729f4 Fixed critical errors when first adding UM3 2016-10-25 11:16:54 +02:00
Jaime van Kessel
ecbe4b264a Added handling for key not found in extruder map 2016-10-25 11:02:41 +02:00
Ghostkeeper
3e3e6e6b1b
Fix call to _configureProfile 
The footprint of the function changed, but the call wasn't updated, apparently. I pulled new_name up from one of the if-statements since they need to be computed for both branches now (and they are the same).

Contributes to issue CURA-2785.
 2016-10-24 17:39:36 +02:00
Arjen Hiemstra
aed23ca17e Merge branch '2.3' 
* 2.3:
  Expand logic for showing the inherit button in SettingItem
  Add a method to get overrides for a specified (extruder)stack
  Add global profiles for UM3 so this can be tested without dependencies
  Account for empty material when switching quality changes
  Set the global variant and material to empty for multi-extrusion machines
  Also properly set global profile when changing quality_changes profiles
  Add support for global quality profiles
 2016-10-24 17:10:41 +02:00
Arjen Hiemstra
8ce81fec9f Expand logic for showing the inherit button in SettingItem 
Hide it if the revert button is visible and make the overrides check
limit_to_extruder in addition to the active stack.

Contributes to CURA-2752
 2016-10-24 17:10:26 +02:00
Arjen Hiemstra
bdaa4a5a6d Add a method to get overrides for a specified (extruder)stack 
Since the main getOverrides method only accounts for the active extruder
and we sometimes need to check other extruders in case of
limit_to_extruder.

Contributes to CURA-2752
 2016-10-24 17:10:26 +02:00
Jaime van Kessel
b718109f72 Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-10-24 15:33:33 +02:00
fieldOfView
c0824260a3 Fix homing UM2/UM2+ when printing with RepRap flavor 2016-10-24 14:45:26 +02:00
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
53f360ca1c Merge branch 'global_quality_profiles' of github.com:Ultimaker/Cura into 2.3 2016-10-24 14:23:50 +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
Arjen Hiemstra
588f49fa5f Add global profiles for UM3 so this can be tested without dependencies 
Contributes to CURA-2652
 2016-10-24 11:19:49 +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
Arjen Hiemstra
2c2bf7823f Account for empty material when switching quality changes 
Contributes to CURA-2652
 2016-10-24 10:57:18 +02:00
Arjen Hiemstra
78ac4ef999 Set the global variant and material to empty for multi-extrusion machines 
For multi-extrusion machines, we do not want variant or material
profiles in the stack, because these are extruder specific and may cause
wrong values to be used for extruders that did not specify a value in
the extruder.

Contributes to CURA-2652
 2016-10-24 10:57:18 +02:00