3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-06 13:34:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10
13325 commits 313 branches 275 tags 718 MiB
Commit graph

5897 commits

Author SHA1 Message Date
Lipu Fei
e91b955f1e
Merge pull request #3485 from Ultimaker/CURA-5059_reset_icon_visibility 
Cura 5059 reset icon visibility
 2018-03-13 16:11:58 +01:00
Ian Paschal
516772e1f7 Merge branch 'master' of https://github.com/Ultimaker/Cura 2018-03-13 13:29:03 +01:00
Ian Paschal
d10f0f7781 CURA-5071 Added brackets 2018-03-13 13:29:00 +01:00
Jack Ha
d6979bc89a CURA-4400 using an intermediate variable prevents an empty popup that occured now and then 2018-03-13 13:14:33 +01:00
Aleksei S
73517cd176 The infill denstiy was updated twice, first in Custom view and then in Recomended view 
CURA-5071
 2018-03-13 11:41:48 +01:00
Lipu Fei
40d3e09d90 Merge remote-tracking branch 'origin/master' into CURA-5059_reset_icon_visibility 2018-03-13 10:25:01 +01:00
Ghostkeeper
b4a40915bb
Code style: Brackets on new line 
Contributes to issue CURA-4606.
 2018-03-13 09:28:01 +01:00
Ghostkeeper
d904f677bc
Store extruder position of quality groups as int 
Instead of as a string with a number in it.
For the actual global stack's extruders we still need to convert to string, sadly. I could go refactor that too, but then I won't be going home until 23 o'clock or something.

Contributes to issue CURA-4606.
 2018-03-12 17:08:13 +01:00
Mark
981c47ed87 Put the support extruder dropdown behind the checkbox to prevent scrolling 2018-03-12 17:03:10 +01:00
Ian Paschal
8db4396ee7
Merge pull request #3436 from Ultimaker/feature_enable_disable_extruder 
CURA-4400 Feature enable disable extruder
 2018-03-12 16:42:25 +01:00
Ghostkeeper
05c034558d
Set default layer height via preferred quality type 
So the layer heights are correct for each quality type but the default is still 0.2mm.

Contributes to issue CURA-4981.
 2018-03-12 16:03:42 +01:00
Aleksei S
7574ab0883 Connect infill Lines checkbox did not work 2018-03-12 15:52:16 +01:00
Aleksei S
c3b659c5d4 Fix: reset icon dissapears for default values 
CURA-5059
 2018-03-12 15:15:19 +01:00
Jack Ha
1f8be6ad3c CURA-4400 moved default extruder value to value instead of default_value because of engine 2018-03-12 11:05:55 +01:00
Jack Ha
552618fcd4 CURA-4400 added function to find model index by extruder position in SettingExtruder 2018-03-12 09:56:08 +01:00
Jack Ha
d70cc072e9 Merge branch 'master' into feature_enable_disable_extruder 2018-03-12 09:06:24 +01:00
Ghostkeeper
2f1657f848
Update version numbers in variants 
These didn't match on my initial search-and-replace so I missed them.

Contributes to issue CURA-5054.
 2018-03-09 16:23:38 +01:00
Ghostkeeper
d8a066c1e7
Increment instance container version number instead of just quality_changes 
Otherwise when we load that quality_changes file we'll deny it because the instance container version number is wrong.

Contributes to issue CURA-5054.
 2018-03-09 16:14:24 +01:00
Andreea Scorojitu
a40be0c64a Add default_build_plate to expert view, CURA-5032 
The default build plate settings is now added in Expert view in SettingsVisibility
 2018-03-09 14:25:35 +01:00
Mark
af89209cde Changed rounding of prettyTime by accident 2018-03-09 14:02:04 +01:00
Lipu Fei
3550ef80e0 Fix quality management page QML 
CURA-5063
 2018-03-09 11:00:39 +01:00
Ian Paschal
c278942cec CURA-67 Don't enable by default 
`value` is set to !support and !tree support, both of which are typically disabled by default, making this setting's default value effectively `true` even though the line above says the default should be `false`.
 2018-03-09 10:26:48 +01:00
Ghostkeeper
a4f9c91d95
Add acceleration/jerk data for TEVO Tarantula 
Thanks to @SuperBoppy in ticket #3323.
 2018-03-09 09:30:32 +01:00
Jack Ha
53764a8274 CURA-4400 use extrudersEnabledCount for recommended mode's extruder number visibility 2018-03-08 15:39:23 +01:00
Jack Ha
5135a972a2 CURA-4400 code style 2018-03-08 14:32:10 +01:00
Jack Ha
961b868424 CURA-4400 fix updating quality slider 2018-03-08 09:47:22 +01:00
Jack Ha
3b8d470323 Merge branch 'master' into feature_enable_disable_extruder 2018-03-08 09:35:49 +01:00
Ian Paschal
a704f59034
Merge pull request #3175 from smartavionics/mb-add-bridge-settings 
Add bridge settings to experimental category.
 2018-03-07 16:30:08 +01:00
Jack Ha
32ce458516 CURA-4400 solved merge conflict 2018-03-06 17:05:39 +01:00
Jack Ha
095d9fbdf6 CURA-4400 Bugfix do not handle layer scene nodes in solidview 2018-03-06 17:01:30 +01:00
Jack Ha
63e679e4a0 CURA-4400 updated UM3 machine_head_with_fans_polygon 2018-03-06 16:28:00 +01:00
Lipu Fei
eb84e6aa3e Disable not supported custom profiles 
CURA-5051
 2018-03-06 15:47:49 +01:00
Lipu Fei
31b7374689 Fix material settings saving upon dialog close 
CURA-4606

Force to trigger a lose focus on all editing fields so their
onEditingFinished callback will get triggered.
 2018-03-06 13:40:32 +01:00
Lipu Fei
ff0d694e72 Select the activated material when material management page shows up 
CURA-4606
 2018-03-06 11:55:24 +01:00
Mark Burton
1ed5a00198 Added skin densities and layer 3 settings + tweaked various defaults. 2018-03-06 10:47:28 +00:00
Jack Ha
bad637eb14 CURA-4400 fixed merge conflicts 2018-03-05 16:47:40 +01:00
Jaime van Kessel
2de587a8c6 Made some changes so the code also works with lower versions of Qt & pyQt 2018-03-05 15:32:46 +01:00
Jack Ha
37d02da1f1 CURA-4400 restore correct default extruder, added extruders_enabled_count and use that in fdmprinters (result: i.e. one at a time can be enabled by disabling an extruder) 2018-03-05 14:01:39 +01:00
Lipu Fei
3004b146ad Fix: move createQualityChanges() to QualityManager 
CURA-4606
 2018-03-05 13:36:13 +01:00
Lipu Fei
6199e8e15a Fix merge conflicts with master 2018-03-05 13:27:00 +01:00
Ghostkeeper
08f114ee6e
Don't make print estimates translateable 
This was very very confusing for our translators. And all of the translators basically came down to the same translation: Leave it untranslated. So let's make it a bit easier on them and don't allow this to be translated.
If we really want the currency to be translated to the correct position, Qt has currency printing in its locale as an option too.
 2018-03-05 13:02:11 +01:00
Lipu Fei
a29a6122f1 Merge remote-tracking branch 'origin/master' into refactoring_machine_manager 2018-03-05 11:29:21 +01:00
Lipu Fei
072c85bacf Put authors back for 3rd party variants 2018-03-05 11:16:47 +01:00
Ian Paschal
1c7fdfd871 CURA-5032 Incorporated additional feedback 2018-03-05 11:13:38 +01:00
Lipu Fei
c99fca0890 Put adhesion_type back to imade3d profiles 2018-03-05 11:09:54 +01:00
Lipu Fei
6d97fd8dc2 Revert "WIP: Fix quality profiles for abax_pri3" 
This reverts commit c338e1b7d6.
 2018-03-05 11:01:52 +01:00
Lipu Fei
eb5ce04229 Fix code style in materialspage 2018-03-05 10:59:10 +01:00
Lipu Fei
caca5e5021 Fix code style in materialspage 2018-03-05 10:57:36 +01:00
Mark
17920bcf87
Merge pull request #3207 from FABtotum/master 
TPU FAbtotum's profiles
 2018-03-05 09:54:21 +01:00
Mark Burton
4a498fd622 Tweak various bridge setting values & descriptions. 2018-03-04 21:56:44 +00:00