3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-24 23:23:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 9
18595 commits 307 branches 272 tags 787 MiB
Commit graph

18595 commits

This branch
This branch
All branches
Author SHA1 Message Date
Diego Prado Gesto
3b763e5552
Update plugins/PostProcessingPlugin/scripts/ColorMix.py 
OKay

Co-Authored-By: Hrybmo <john.hryb.4@gmail.com>
 2019-03-09 20:46:34 -05:00
Diego Prado Gesto
0875498a12
Update plugins/PostProcessingPlugin/scripts/ColorMix.py 
Sure

Co-Authored-By: Hrybmo <john.hryb.4@gmail.com>
 2019-03-09 20:46:20 -05:00
Diego Prado Gesto
d19f1f497a
Update plugins/PostProcessingPlugin/scripts/ColorMix.py 
Okay

Co-Authored-By: Hrybmo <john.hryb.4@gmail.com>
 2019-03-09 20:46:00 -05:00
Diego Prado Gesto
fadc8bb624
Update plugins/PostProcessingPlugin/scripts/ColorMix.py 
Sure

Co-Authored-By: Hrybmo <john.hryb.4@gmail.com>
 2019-03-09 20:45:49 -05:00
Diego Prado Gesto
186e715d16
Update plugins/PostProcessingPlugin/scripts/ColorMix.py 
Okay

Co-Authored-By: Hrybmo <john.hryb.4@gmail.com>
 2019-03-09 20:45:34 -05:00
Diego Prado Gesto
151d40664f
Update plugins/PostProcessingPlugin/scripts/ColorMix.py 
It's not functional, just a spot to put info if needed.

Co-Authored-By: Hrybmo <john.hryb.4@gmail.com>
 2019-03-09 20:45:18 -05:00
Diego Prado Gesto
87154238a1
Update plugins/PostProcessingPlugin/scripts/ColorMix.py 
Okay

Co-Authored-By: Hrybmo <john.hryb.4@gmail.com>
 2019-03-09 20:42:40 -05:00
Diego Prado Gesto
8086adf9ba
Update plugins/PostProcessingPlugin/scripts/ColorMix.py 
Okay

Co-Authored-By: Hrybmo <john.hryb.4@gmail.com>
 2019-03-09 20:41:54 -05:00
Diego Prado Gesto
ad820ad1e9
Update plugins/PostProcessingPlugin/scripts/ColorMix.py 
Okay

Co-Authored-By: Hrybmo <john.hryb.4@gmail.com>
 2019-03-09 20:41:35 -05:00
Diego Prado Gesto
986f9aa248
Update plugins/PostProcessingPlugin/scripts/ColorMix.py 
Sure

Co-Authored-By: Hrybmo <john.hryb.4@gmail.com>
 2019-03-09 20:41:00 -05:00
Diego Prado Gesto
7921b89f3e
Update plugins/PostProcessingPlugin/scripts/ColorMix.py 
Sure

Co-Authored-By: Hrybmo <john.hryb.4@gmail.com>
 2019-03-09 20:40:36 -05:00
Diego Prado Gesto
9fae1f29b1
Update plugins/PostProcessingPlugin/scripts/ColorMix.py 
Sure

Co-Authored-By: Hrybmo <john.hryb.4@gmail.com>
 2019-03-09 20:40:11 -05:00
John Hryb IV
3a979903aa
PostProcessingPlugin Script for 2-1 Dual Extruders - ColorMix 2-1 
Marlin Commands:
M163 - Set Mix Factor
M164 - Save Mix
Ability to set a mix ratio or blend at a defined layer or distance.
Based on Geeetech's Color mixing software.
 2019-02-19 23:40:36 -05:00
Simon Edwards
ebc3537537
Merge pull request #5325 from Ultimaker/CL-1222_improve_cloud_flow_toggle 
Improve "don't ask me again" checkbox
 2019-02-19 15:31:38 +01:00
Ghostkeeper
fe9d106332
Remove debug prints 2019-02-19 11:48:10 +01:00
Ian Paschal
05b5dfa05f Improve "don't ask me again" checkbox 
Contributes to CL-1222
 2019-02-19 10:13:05 +01:00
Ghostkeeper
275989d193
Merge branch 'fix_prime_tower_brim_for_raft' 2019-02-18 15:17:48 +01:00
Lipu Fei
64150cc7cf Merge remote-tracking branch 'origin/4.0' 2019-02-18 13:52:27 +01:00
Ian Paschal
0cfc258b8d
Merge pull request #5316 from Ultimaker/fix-cloud-printer-properties 
CL-1255 Manually create printer properties for cloud output device
 2019-02-18 13:33:44 +01:00
Ghostkeeper
8d263e11b1
Merge branch 'mb-enable-gyroid-support' of https://github.com/smartavionics/Cura into smartavionics-mb-enable-gyroid-support 2019-02-18 11:30:49 +01:00
Jaime van Kessel
222f8e6cdb Prevent crash for backup plugin if there is no internet connection 2019-02-18 10:38:39 +01:00
Jaime van Kessel
efeba48ffb Move initializeSettingDefinitions and setting functions to their own function 
This means we don't have to instantiate CuraApplication in the tests anymore
 2019-02-18 09:45:30 +01:00
ChrisTerBeke
f25fefdbcb Add expected mesh back to test 2019-02-15 17:24:03 +01:00
ChrisTerBeke
11cf409d71 Fix codestyle 2019-02-15 17:07:45 +01:00
ChrisTerBeke
3f11cb911d Add filesize back to expected result 2019-02-15 17:06:32 +01:00
ChrisTerBeke
897c932e80 Fix test for cloud output device ufp uploading 2019-02-15 17:03:38 +01:00
ChrisTerBeke
119c868650 Add a test for the device properties 2019-02-15 16:52:11 +01:00
ChrisTerBeke
e80eccaea3 Manually create printer properties for cloud output device 2019-02-15 16:46:47 +01:00
Jaime van Kessel
75b185d462 Add test for duration messages for printInformation 2019-02-15 16:43:08 +01:00
Jaime van Kessel
f4a0b742cb Added some tests for printerOutputDevice 2019-02-15 15:39:18 +01:00
Jaime van Kessel
4acc480544 Also add tests for configurationModel 2019-02-15 15:27:57 +01:00
Jaime van Kessel
369c64e1b6 Add tests for PrintJobOutputModel & PrinterOutputModel 2019-02-15 15:19:19 +01:00
Lipu Fei
3e819f56fc Remove debug code 
CURA-6225
 2019-02-15 15:14:12 +01:00
Lipu Fei
f521fae152 Fix call_on_qt_thread decorator 
CURA-6225

Do thread check in the wrapper function, not outside.
 2019-02-15 15:11:11 +01:00
Jaime van Kessel
338f9c0052 Add check for platform mesh & texture 
It simply checks if the file exists
 2019-02-15 14:42:50 +01:00
Diego Prado Gesto
ace638ec81 Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2019-02-15 14:37:56 +01:00
Diego Prado Gesto
ef73453874 Fix height in the about dialog to show the logo correctly 2019-02-15 14:36:58 +01:00
Jaime van Kessel
c3b447cd89 Also check if the variants are correct 2019-02-15 14:20:13 +01:00
Jaime van Kessel
2820bc2e8f Merge branch 'master' of github.com:Ultimaker/Cura 2019-02-15 14:08:22 +01:00
Jaime van Kessel
48b4f0ae2b Removed last few incorrect values from nwa3d profiles 2019-02-15 14:07:57 +01:00
Jaime van Kessel
b7bbe8e321 Merge branch 'master' of https://github.com/DragonJe/Cura 2019-02-15 14:07:09 +01:00
Jaime van Kessel
c0d75b38b7 Added test to check if a key in the profile is defined in the definition 2019-02-15 14:06:46 +01:00
Ghostkeeper
d42ba9dda0
Merge branch '4.0' 
Conflicts:
	resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg -> Weights being changed while a whole slew of fixes were being done on 4.0
	resources/quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg -> Ditto
 2019-02-15 13:58:47 +01:00
Ghostkeeper
f3cab17e20
Revert "Check if on main thread for call_on_qt_thread" 
This reverts commit 21099e30cb.
It was causing a segfault when saving UFP files.
 2019-02-15 13:45:23 +01:00
Diego Prado Gesto
21bc8d7990 Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2019-02-15 13:40:08 +01:00
Diego Prado Gesto
2d1d0c2d37 Remove unused image 2019-02-15 13:39:40 +01:00
Jaime van Kessel
aefacde7d5 Merge branch 'master' of github.com:Ultimaker/Cura 2019-02-15 13:19:48 +01:00
Jaime van Kessel
1e280c2869 Check if every quality is matched to an existing definition 2019-02-15 13:18:18 +01:00
Jaime van Kessel
98704e72a2 Added validation test for all qualities shipped with Cura 
This checks if the qualities are atleast formatted righ.
 2019-02-15 13:09:42 +01:00
Lipu Fei
21099e30cb Check if on main thread for call_on_qt_thread 
CURA-6225
 2019-02-15 12:51:42 +01:00