GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-23 04:59:26 +08:00
Code Issues Packages Projects Releases Wiki Activity
12,129 Commits 290 Branches 263 Tags
Commit Graph

12129 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aleksei S
49ae078396 Adjust 3d view and add Camera View to the menu bar 
CURA-4642
 2018-01-03 16:45:26 +01:00
Lipu Fei
cbf6f55fd8 Fix perfered material search in auto-update 
CURA-4708
 2018-01-03 16:42:57 +01:00
ChrisTerBeke
80324900b0
Merge pull request #3068 from fieldOfView/feature_multiextruder_replacement_patterns 
Multiextruder gcode snippet replacement patterns
 2018-01-03 16:31:25 +01:00
Lipu Fei
47a12b4128 Prefer materials from the same brand in auto-update 
CURA-4708
 2018-01-03 16:29:19 +01:00
Lipu Fei
b181860f1c Fix afterOnEditingFinished() 
CURA-4708
 2018-01-03 16:29:18 +01:00
ChrisTerBeke
5a9e3a8efd Fix front view button rotation, cleanup view buttons onClicked 2018-01-03 16:18:31 +01:00
Lipu Fei
392be23281 Fix SettingView stakc ID binding 
CURA-4708
 2018-01-03 15:58:30 +01:00
Jack Ha
9e5f0e10b9 CURA-4525 add comment and type hint 2018-01-03 15:49:31 +01:00
Jack Ha
62487e8ea2 CURA-4525 cleanups and change comment and added new-lines 2018-01-03 15:41:08 +01:00
Jack Ha
3991dee14c Merge branch 'CURA-4525-multi-build-plate-merge' of github.com:Ultimaker/Cura into CURA-4525-multi-build-plate-merge 2018-01-03 15:22:09 +01:00
Jack Ha
e7e5729006 CURA-4525 deselect after move to build plate and build plate change 2018-01-03 15:21:56 +01:00
Ian
e0c2a9e4c7 Fix for CURA-4111 
When centering a scene node, TranslateOperation is used in lieu of SetTransformOperation, to avoid combinations of mirror operations behaving like rotation operations. Instead, any given node is simply translated to 0,0,0.
 2018-01-03 15:13:56 +01:00
ChrisTerBeke
08322d0a5e Move all decorators in the scene subfolder 2018-01-03 15:09:19 +01:00
ChrisTerBeke
62b06b063b Also move other operations into operations subfolder 2018-01-03 15:06:20 +01:00
ChrisTerBeke
a5630e5c54 Move all arranging related code into a subfolder 2018-01-03 15:05:06 +01:00
Jack Ha
2f965cc053 CURA-4525 switch locations of build plates and objects list 2018-01-03 14:18:40 +01:00
ChrisTerBeke
7eb507484b hide sidebar header when in monitoring mode 2018-01-03 14:12:45 +01:00
ChrisTerBeke
1686f951c9 Finish styling mode switch buttons 2018-01-03 14:02:35 +01:00
Jack Ha
bfa33c721c CURA-4525 solved merge conflicts 2018-01-03 13:52:55 +01:00
ChrisTerBeke
4f77b2ea6d More layout and font fixes 2018-01-03 13:50:06 +01:00
ChrisTerBeke
1476e95adc Fix mode switching buttons functionality 2018-01-03 13:45:18 +01:00
Jack Ha
dd989a1a51 CURA-4525 refresh objects list of all items after changing build plate 2018-01-03 13:43:09 +01:00
ChrisTerBeke
b7aadbe3c3 Fix extruder dropdown text model 2018-01-03 13:08:20 +01:00
ChrisTerBeke
1fa3031486 Fix text color for extruder comboboxes 2018-01-03 12:52:40 +01:00
Jack Ha
cb1484ee63 CURA-4525 update size and margins of objects list 2018-01-03 12:52:32 +01:00
ChrisTerBeke
3a2b2d3333 Also fix combobox list item heights for extruder dropdowns 2018-01-03 12:48:33 +01:00
Jack Ha
c8243a0ddd CURA-4525 fix convex hull, changed size of object list 2018-01-03 12:47:09 +01:00
ChrisTerBeke
1fe653b231 Fix combobox dropdown item height 2018-01-03 12:47:08 +01:00
Lipu Fei
6997c2d2dc Add timeout for Jenkinsfile 2018-01-03 11:58:14 +01:00
ChrisTerBeke
77c8ac3950 Layout fixes for controls 2.0 2018-01-03 11:46:20 +01:00
Lipu Fei
f6168c07f0 Fix material_diameter bindings for metarial menu and page 
CURA-4708
 2018-01-03 11:27:30 +01:00
ChrisTerBeke
27ca743e58 Merge branch 'master' into qtquick-controls-2.0 2018-01-03 11:03:17 +01:00
Aleksei S
43db2ee2f9 Added ElideRight for the text which is out of boundaries 
CURA-4692
 2018-01-03 10:34:23 +01:00
Ghostkeeper
192db52d48
Spelling 
We hold American English, at least for user-visible parts.
 2018-01-02 16:27:13 +01:00
Ghostkeeper
1aebe32ba6
Fix winding order of left endpoint triangles 
Otherwise the left side is invisible due to backface culling.
 2018-01-02 16:16:52 +01:00
Lipu Fei
b246a102ed Fix MachineSettings dialog 
CURA-4708

- Move material diameter and nozzle size to extruder tabs
- Fix value bindings
 2018-01-02 12:40:43 +01:00
ChrisTerBeke
0b7519dff2
Merge pull request #3033 from Ultimaker/CURA-4708_fix_definition_changes_extruder_stacks 
CURA-4708 Fix definition_changes containers for extruder stacks
 2018-01-02 10:53:52 +01:00
Lipu Fei
2e4ffc83b5 Add material_diameter to fdmextruder definition 
CURA-4708
 2018-01-02 10:50:06 +01:00
Lipu Fei
16dfc094eb Fix version upgrade 30 to 31 
CURA-4708

A merge mistake. No need to be there.
 2018-01-02 10:47:21 +01:00
Lipu Fei
70d5d4415f
Merge branch 'master' into CURA-4708_fix_definition_changes_extruder_stacks 2018-01-02 10:41:44 +01:00
Mark Burton
f82753b766 Move optimize_wall_printing_order from experimental section to shell. 
Still not enabled by default yet but perhaps in the future after it has been tested more it will be.
 2018-01-02 09:39:20 +00:00
Ghostkeeper
2e197f0f34
Move all per-extruder settings 
Also move things that we didn't think of previously, such as extruder offsets. You can't enter them as a user in the interface if it was single-extrusion, but you could've edited the files.

Contributes to issue CURA-4708.
 2018-01-02 08:36:46 +01:00
Ghostkeeper
a87465186e
Fix off-by-one bug when importing profiles with extruder stacks 
Since machine_extruders contains only the extruder stacks (not the global stack) but profile_index counts through all stacks including the global stack, we need to increase the length of machine_extruders by 1 when comparing.
I also swapped the comparison around since I think it's more logical this way around.

Contributes to issue CURA-4738.
 2018-01-02 08:19:31 +01:00
Torbjørn
5104a48bcc Added 3D model for Tevo Black Widow + small fix 
Roel Versteeg (Rovex) has kindly agreed to let us use his model of the printer, https://www.thingiverse.com/thing:1933864
Since the model is a bit to detailed for our use I have spoken with Jon MC (security0051) that had already modified for better fit in editor. https://www.thingiverse.com/thing:2592417. He has also agreed to let us use his version.
 2017-12-31 23:15:00 +01:00
fieldOfView
308d220bf3 Add an "initial_extruder_nr" pattern 2017-12-31 12:30:00 +01:00
fieldOfView
7a0b49ca2f Allow specifying the extruder stack to use for each replacement pattern 
The replacement pattern is (optionally) extended with an extruder_nr: {setting_key,extruder_nr}. The extruder_nr can either be a number (-1 for the global stack, 0 or higher for an extruder), or a setting keyword such as support_extruder_nr etc.

Contributes to #1296
 2017-12-31 11:29:37 +01:00
Torbjørn
948497c9a8 Major update of Quality profiles and definitions 
Removed has_materials, quality over quantity
 2017-12-31 03:23:19 +01:00
Ruben D
689a18ee57
Rename sidebar_collapsed and code style 
sidebar_collapsed is more consistent with other options and setting names we use. Better change it before the next release rolls out otherwise we'd have to do a version upgrade.
Also changed some code style things to be in line with our guidelines.

Contributes to issue CURA-4234.
 2017-12-30 19:35:46 +01:00
Ruben D
147278e455
Merge branch 'thetobby-patch5' 2017-12-30 18:30:36 +01:00
Ruben D
a645e2647a
Merge branch 'patch5' of github.com:thetobby/Cura into thetobby-patch5 2017-12-30 18:30:22 +01:00