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

8033 commits

This branch
This branch
All branches
Author SHA1 Message Date
fieldOfView
57f936e5ff Remove definition_changes containers when a stack is removed 2017-04-24 13:56:37 +02:00
fieldOfView
8b5ac81404 Fix extruder_stack global values are moved to 
ExtruderManager.getMachineExtruders() result is not sorted, the result of getActiveExtruderStacks() is
 2017-04-24 13:20:20 +02:00
fieldOfView
3e9fdb5db1 Prevent the DiscardOrKeepProfileChangesDialog from popping up (twice) if there are user changes 2017-04-24 13:11:10 +02:00
fieldOfView
fab0fa1dde Move setting values that are settable per extruder from/to global stack when setting extruder count 2017-04-24 12:58:20 +02:00
fieldOfView
d2d36b8c98 Lower extruder_nr settings when they exceed the number of extruders 2017-04-22 12:17:16 +02:00
fieldOfView
2ca24ba7e6 Restore both material and variant to match 1st extruder when switching to single extrusion 2017-04-22 11:20:55 +02:00
fieldOfView
8d42f9c187 Move some convoluted logic from QML into Python 2017-04-22 10:13:58 +02:00
fieldOfView
933ee408e4 Code style 2017-04-22 09:47:00 +02:00
fieldOfView
0966ef5338 Fix QML warnings when switching to an extruder tab 2017-04-21 21:48:20 +02:00
fieldOfView
656e7a8046 Change the scope of the head polygon functions to be inside the main tab 2017-04-21 21:27:15 +02:00
fieldOfView
ba229444b7 Pause autoslicing while the MachineSettingsAction is open 
Each setting-change would cause a reslice, which is unnecessary.
 2017-04-21 21:05:28 +02:00
fieldOfView
4d12ab1296 Merge branch 'master' into feature_multiextruder_machinesettings 2017-04-21 19:31:44 +02:00
Ghostkeeper
2fda85a6aa
Hide estimated time left if print is aborted or completed 
In fact, only show it if a time estimate is meaningful. We keep showing the estimate while a print is paused though.

Contributes to issue TRI-1550.
 2017-04-21 14:29:40 +02:00
Ghostkeeper
fb674ec135 Merge remote-tracking branch 'origin/master' 2017-04-21 14:28:22 +02:00
Lipu Fei
71706a5df5 Merge pull request #1702 from daid/master 
Only update the target bed temperature, without submitting it to the printer. To prevent race conditions.
 2017-04-20 09:40:38 +02:00
daid
50acaaf91f Some minor changes on review. 2017-04-20 09:35:48 +02:00
Ghostkeeper
16bc9db06d
Simplify gradual infill steps maximum formula 
The case where it reaches '20' is incorrect, it should never give an error, so it should've been 999999 or something. This case is also overly complex.
Say that P is 'infill_line_distance > 0' and Q is 'spaghetti_enabled'...
Then it would be the logarithmic if (P and not Q)...
Then it would be 0 or 20 if (not (P and not Q)), which is ((not P) or Q)...
Then it would be 20 if (((not P) or Q) and not Q), which is (not P)...
And it would be 0 if (((not P) or Q) and Q), which is Q.

So therefore it can be simplified to: 20 if (not P) else 0 if Q else logarithmic. But 20 became 999999, hence the above formula.

Contributes to issue CURA-3700.
 2017-04-19 16:24:39 +02:00
fieldOfView
62f2fe062b Enable settings when machine_extruder_count is set to 1 but multiple extruders are defined 2017-04-19 16:20:01 +02:00
daid
26a2fb80dc Only update the target bed temperature, without submitting it to the printer. To prevent race conditions. 2017-04-19 15:01:47 +02:00
Tim Kuipers
50a99eb2b1 fix: dont err on gradual infill when printing hollow (CURA-3700) 2017-04-19 13:50:06 +02:00
Jaime van Kessel
0e381f389a Merge branch 'master' of github.com:Ultimaker/Cura 2017-04-19 13:34:07 +02:00
jack
2cd3565d4b Merge pull request #1672 from Ultimaker/feature_CURA-3529_upgrade_cura_dir 
CURA-3529: Set dir names in config to allow UM detect old cura dir
 2017-04-19 13:28:49 +02:00
Lipu Fei
7db0f0ebb7 Make toggle button labels clickable 2017-04-19 12:46:25 +02:00
Ghostkeeper
f0d4ea43c2
Merge branch 'master' of github.com:Ultimaker/Cura 2017-04-19 10:39:05 +02:00
Ghostkeeper
eed9ea1b3b
Merge branch 'IMADE3D-revise_jellybox_support' 2017-04-19 10:37:56 +02:00
Ghostkeeper
cc23c72124
Merge branch 'revise_jellybox_support' of github.com:IMADE3D/Cura into IMADE3D-revise_jellybox_support 2017-04-19 10:36:20 +02:00
jack
74726e305e Merge pull request #1698 from Ultimaker/feature_CURA-3574_toggle_button 
CURA-3574: Use a toggle button mode switching
 2017-04-19 10:28:54 +02:00
Jack Ha
232f975092 Removed unused code, added ';' to end of lines. CURA-3574 2017-04-19 10:28:16 +02:00
Ghostkeeper
f91037fb7c
Merge branch 'Rigid3D-master' 2017-04-19 09:30:09 +02:00
Ghostkeeper
58bf3e7ab3 Merge branch 'master' of github.com:Rigid3D/Cura into Rigid3D-master 2017-04-19 09:27:54 +02:00
Lipu Fei
61c4631270 Put sizes and numbers for toggle button into theme 
CURA-3574
 2017-04-19 08:56:11 +02:00
Mehmet Sutas
0637719622 Resized Rigid3D Zero2 Platform STL 
Resized Rigid3D Zero2 Platform STL
 2017-04-18 22:49:50 +03:00
Filip Goc
3c85159b05 swap M109 for M104 in the start gcode 
It’s necessary to preheat the nozzle before the auto bed leveling
procedure to loosen up leftover filament that may had hardened on the
nozzle.
 2017-04-18 20:44:55 +02:00
Lipu Fei
6bf0965632 Adjust toggle button size 
CURA-3574
 2017-04-18 16:52:17 +02:00
Lipu Fei
c75887be80 Use a toggle button for mode switching 
CURA-3574
 2017-04-18 16:40:59 +02:00
Jaime van Kessel
c20542b7b8 Merge branch 'feature_CURA-3540_upgrade_for_project' of github.com:Ultimaker/Cura 2017-04-18 15:33:53 +02:00
Ghostkeeper
f1ac1bd876
Add JellyBox to XML material printer name translations 
Because the automatic translation removes the underscore, and then the definition can't be found any more.

Contributes to issue CURA-3695.
 2017-04-18 15:11:24 +02:00
fieldOfView
4d96e6931d Store definition changes containers in a folder named definition_changes 2017-04-18 15:08:46 +02:00
Mark
2d14052f4e Change Label to Text to fix ugly fonts 
CURA-3389
 2017-04-18 13:35:39 +02:00
Mark
8c9eccd1f4 Change Label to Text because of ugle font rendering 
CURA-3389
 2017-04-18 12:11:02 +02:00
Ghostkeeper
7dbb08735a
Merge branch 'master' of github.com:Ultimaker/Cura 2017-04-18 10:30:15 +02:00
Ghostkeeper
e33d4693f0
Merge branch '2.5' 2017-04-18 10:30:01 +02:00
Ghostkeeper
9ad85ce235
Move prime tower 1mm down 
The combination PC-0.4 and PVA-0.8 wouldn't print because the raft was getting so big that it intersected with the prime tower. Moving the prime tower 1mm down allows us to print again.

Contributes to issue CURA-3650.
 2017-04-18 10:29:41 +02:00
Lipu Fei
865ab7135a Merge pull request #1686 from fieldOfView/fix_material_nan 
Fix NaN values on material print settings tab
 2017-04-18 09:52:38 +02:00
Mehmet Sutas
9b0dbdf47c Rigid3D Zero2 Platform 2017-04-16 01:01:16 +03:00
Mehmet Sutas
b908e3a201 Rigid3D Zero2 Machine Definition 2017-04-16 01:00:27 +03:00
fieldOfView
94545ec4ee Restore active extruder after forcing an update of the global extruder stack 2017-04-15 20:09:20 +02:00
fieldOfView
6e0221636d Save definition_changes in their own folder 2017-04-15 20:03:09 +02:00
fieldOfView
813ee65849 Update printer (& disallowed areas) when setting nozzle offsets 2017-04-15 18:58:25 +02:00
fieldOfView
12079fc9da Add documentation 2017-04-15 18:55:59 +02:00