3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-12 01:07:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
16749 commits 302 branches 270 tags 770 MiB
Commit graph

16749 commits

This branch
This branch
All branches
Author SHA1 Message Date
DavidGergely
05bfee8158 Fix UM3extended 0.25 variant file 
Set ultimaker3_extended_aa0.25.inst.cfg to be the same as the ultimaker3_aa0.25.inst.cfg.
 2018-08-14 15:26:52 +02:00
Jaime van Kessel
94b9782110 Added preview image to print cluster monitor 
CL-894
 2018-08-14 14:54:27 +02:00
Diego Prado Gesto
1364370ede Fix global stack tests. 
Contributes to CURA-5628.
 2018-08-14 13:49:37 +02:00
Jaime van Kessel
78ebdb13f4 Cluster monitor page now shows queue instead of added printers 
CL-894
 2018-08-14 13:34:05 +02:00
Diego Prado Gesto
c8af4f45ce Decouple the creation of the stack containers from the process that add 
them to the container registry, that is done in CuraApplication.

That allow us to have access to the empty containers and so we can unit
test easily without mocking up stuff.

Contributes to CURA-5628.
 2018-08-14 13:25:56 +02:00
Lipu Fei
746644e6ed Merge branch 'master' of github.com:Ultimaker/Cura 2018-08-14 12:02:23 +02:00
Lipu Fei
5869644b0b Fix typo 2018-08-14 12:02:11 +02:00
Diego Prado Gesto
db7f1242cd Fix some unit tests. 
Add fixtures to the conftest file and clean-up the code a bit.

Contributes to CURA-5628
 2018-08-14 10:41:38 +02:00
Jaime van Kessel
d46c754616 Merge branch 'master' of github.com:Ultimaker/Cura into cura_connect_UI_rework 2018-08-14 09:37:44 +02:00
Diego Prado Gesto
be021b8fac Merge branch 'master' of github.com:Ultimaker/Cura 2018-08-13 17:04:52 +02:00
Diego Prado Gesto
848e99a4ba Don't show the hint message when the buildplate selector is shown. 
Contributes to CURA-5570.
 2018-08-13 17:04:13 +02:00
Ian Paschal
f91254c7c0 Fix typo in comment 2018-08-13 15:27:01 +02:00
Ghostkeeper
6ffe0a9083
Fix indent and typo 2018-08-13 14:47:51 +02:00
Lipu Fei
e0ad7a9fb4 Add answer commments to some puzzling code 2018-08-13 14:24:25 +02:00
Lipu Fei
8e891b69b0 Move type hinting imports into TYPE_CHECKING block 2018-08-13 13:48:00 +02:00
Lipu Fei
25e6fd8bec Fix incorrect type hinting 2018-08-13 13:47:26 +02:00
Lipu Fei
42b509cd4a Fix a wrong type hinting 2018-08-13 13:44:07 +02:00
Ian Paschal
5ede82eddc
Merge pull request #4233 from Ultimaker/CURA-5538-fix-on-at-a-time 
CURA-5538 Fix one at a time
 2018-08-13 13:14:30 +02:00
Lipu Fei
d45d6add40 Add collision detection in on-at-a-time iterator 2018-08-13 12:56:41 +02:00
Diego Prado Gesto
152005ab14
Merge pull request #4184 from Ultimaker/CURA-5570_beyond_comprehension 
CURA-5570 More decision points in material and quality lookup!
 2018-08-13 12:06:29 +02:00
Diego Prado Gesto
b1c073aab6 CURA-5570 Expose the CuraSDKVersion to qml and show the buildplate 
selector only when "dev" version is selected.
 2018-08-13 11:50:50 +02:00
Lipu Fei
bd47dfef75 Revert "Revert "Merge pull request #4203 from Ultimaker/CURA-5538-fix-one-at-a-time-order-2"" 
This reverts commit 89ed2bcff8.
 2018-08-13 11:23:10 +02:00
Diego Prado Gesto
98a0bb5002 CURA-5570 Remove a check that caused empty list of profiles. 2018-08-13 11:15:32 +02:00
alekseisasin
792a275ccf
Merge pull request #4231 from Ultimaker/CURA-5595_code_style_fixes 
Code style fixes
 2018-08-13 10:47:11 +02:00
Ian Paschal
3fad11e07f Code style fixes 
Contributes to CURA-5595
 2018-08-13 10:45:03 +02:00
Aleksei S
787948f401 Removed "Preparing" button state 
CURA-5551
 2018-08-13 10:42:22 +02:00
Diego Prado Gesto
de1b8edb72 Merge branch 'master' into CURA-5570_beyond_comprehension 2018-08-13 09:57:36 +02:00
alekseisasin
7af6672547
Merge pull request #4137 from Ultimaker/CURA-5595_add_custom_button_to_menu 
Cura 5595 add custom button to menu
 2018-08-13 09:56:32 +02:00
Diego Prado Gesto
825a3cd08f CURA-5570 Fix the configuration sync feature. 
It crashed Cura because it was using an outdated signature of the method
getMaterialNodeByType.
 2018-08-13 09:55:57 +02:00
Diego Prado Gesto
429cbc11c6
Merge pull request #4210 from fieldOfView/fix_support_eraser_rendering 
Fix rendering support eraser cubes
 2018-08-10 16:52:39 +02:00
Ian Paschal
16db297613 Some final tweaks 
Contributes to CURA-5595
 2018-08-10 16:28:02 +02:00
Ian Paschal
6d237b09e8 Proposed improvement on API naming 2018-08-10 16:08:54 +02:00
Aleksei S
a1bc2f3ebf Merge branch 'master' into CURA-5595_add_custom_button_to_menu 2018-08-10 15:51:38 +02:00
Ghostkeeper
f91c696e4b
Clarify error message a bit more 
The QA engineer was a bit confused by this one. Let's make the language a bit easier.
 2018-08-10 13:17:20 +02:00
Ghostkeeper
6924d28ee7
Disambiguate translation of 'Settings' from 'Preferences' 
The 'settings' entry contains the set-up of the printer so Konfiguration is a better word there.

Discovered during investigation of #3971.
 2018-08-10 11:52:52 +02:00
Ian Paschal
89ed2bcff8 Revert "Merge pull request #4203 from Ultimaker/CURA-5538-fix-one-at-a-time-order-2" 
This reverts commit 82e1a7c5fc, reversing
changes made to 1915659393.
 2018-08-10 11:45:25 +02:00
alekseisasin
c190c8d05a
Merge pull request #3999 from fieldOfView/fix_firmware_upload 
Fix firmware upload on Windows
 2018-08-10 11:39:53 +02:00
Ghostkeeper
f247c328c6
Show shortcut key in tool tooltips 
In brackets. I couldn't translate it to an icon easily. It was possible but I'd have to create a giant mapping from every key to the key icons and add a bunch of icons and I don't think that's necessary.

Contributes to issue CURA-5634.
 2018-08-10 11:22:42 +02:00
Ghostkeeper
4a22bb3b69
Code style 2018-08-10 11:22:42 +02:00
Ghostkeeper
e4bdd8096a
Remap shortcut 
This is a bit more logical than 'G', I'd say. E is now available since other shortcuts were remapped as well.

Contributes to issue CURA-5634 and fixes #3969.
 2018-08-10 11:22:42 +02:00
Ian Paschal
db6d18cf2c
Merge pull request #4199 from Ultimaker/fix_gcode_formatter 
Fix the gcode start/end formatter
 2018-08-10 10:37:19 +02:00
Jaime van Kessel
74f8c82c5e Removed commented out code 2018-08-09 16:38:30 +02:00
Jaime van Kessel
86be07b095 Refactored the config models so they they function are more stand alone units. 
The seperation of concern got a bit mixed up, as the printer output model was connecting the signals that the config model needed to function together.
With these changes it's now also possible to use the config model as a part of a printjob, since printjobs can also have a configuration
 2018-08-09 16:22:35 +02:00
Ian Paschal
82e1a7c5fc
Merge pull request #4203 from Ultimaker/CURA-5538-fix-one-at-a-time-order-2 
CURA-5538 Fix print order for one-at-a-time mode
 2018-08-09 16:16:27 +02:00
Aleksei S
033a00ec20 fixed addNodesToCheck function, wrong max index value 
CURA-5570
 2018-08-09 16:06:09 +02:00
Aleksei S
57f04d8940 Load 3mf projects 
CURA-5570
 2018-08-09 15:39:10 +02:00
Ian Paschal
88c4240e3b Remove back-ups traces 
Contributes to CURA-5595
 2018-08-09 15:21:38 +02:00
Ian Paschal
3217085ebe Fix plural 
Contributes to CURA-5595
 2018-08-09 15:20:53 +02:00
Ian Paschal
4912073aed Add API abstraction layer 
Contributes to CURA-5595
 2018-08-09 15:14:55 +02:00
Ian Paschal
1915659393
Merge pull request #4176 from Ultimaker/fix_slider_range 
Fix the sliders that went out of range when using the arrow keys
 2018-08-09 14:12:50 +02:00