3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-18 20:28:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5
18595 commits 306 branches 270 tags 779 MiB
Commit graph

5823 commits

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
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
Jaime van Kessel
222f8e6cdb Prevent crash for backup plugin if there is no internet connection 2019-02-18 10:38:39 +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
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
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
Ian Paschal
0a945b8ba5 Code style 
Contributes to CL-1250
 2019-02-15 10:18:47 +01:00
Ian Paschal
f7d86667ed Simplify code a bit 
Contributes to CL-1250
 2019-02-15 10:14:14 +01:00
Ian Paschal
4feb53fdf4 Revert "Expect to always have a build plate" 
This reverts commit 0be6c9e6d3.
 2019-02-15 10:12:19 +01:00
Ian Paschal
0be6c9e6d3 Expect to always have a build plate 
Contributes to CL-1250
 2019-02-15 10:10:39 +01:00
Ian Paschal
5d294a7ff5 Handle self.build_plate = None 
Contributes to CL-1250
 2019-02-15 10:04:39 +01:00
Ian Paschal
72ce40deba Update buildplate with other props 
Contributes to CL-1250
 2019-02-15 09:36:38 +01:00
Lipu Fei
bfb02f68d9
Merge pull request #5300 from Ultimaker/CURA-6148-Add_where_to_buy_link 
Add a where to buy link underneath the install button for material
 2019-02-14 14:54:26 +01:00
Ghostkeeper
8c3f7a065d
Remove unused import 
Discovered during work on CURA-5787.
 2019-02-14 13:54:03 +01:00
Ghostkeeper
e2a7a68883
Give a warning when you can't update metadata because it's read-only 
This bit me in the bum today.
 2019-02-14 13:26:20 +01:00
Ian Paschal
af565aff55 Clarify if using key or human-readable name 
This is refering to "glass", not "Glass". According to @lipufei, "name" should denote a human readable/capitalized name.

Contributes to CL-1250
 2019-02-14 11:49:43 +01:00
Ian Paschal
0275de7f77 Make sure to set the build plate so it's not empty 
Contributes to CL-1250
 2019-02-14 11:46:41 +01:00
Jaime van Kessel
a8f66a558c Merge branch '4.0' of github.com:Ultimaker/Cura 2019-02-14 10:53:01 +01:00
Ian Paschal
e39e09a692 Fix incorrect method name 
Contributes to CL-1165
 2019-02-13 15:21:09 +01:00
Simon Edwards
8f37421c11
Merge pull request #5291 from Ultimaker/CL-1222_cloud_flow_pop_up 
CL-1222 Ensure pop-up is not shown if cloud connection is already configured
 2019-02-13 14:30:40 +01:00
Simon Edwards
dc9d3ba2a3
Merge pull request #5293 from Ultimaker/CL-1165_missing_cloud_info 
CL-1165 Improve cloud connection or not checking
 2019-02-13 14:23:05 +01:00
Ian Paschal
25cfd4f496 Avoid double negatives in cloud flow metadata 
Contributes to CL-1222
 2019-02-13 14:21:23 +01:00
Jaime van Kessel
f35ad5cf83 Merge branch 'CURA-5977_test_definition_container' of github.com:Ultimaker/Cura 2019-02-13 14:02:09 +01:00
Jaime van Kessel
df3485aaec Add a where to buy link underneath the install button for material 
CURA-6148
 2019-02-13 13:37:10 +01:00
Simon Edwards
d08b8d813d Generate the correct path for the svg on Windows. 
CL-1222
 2019-02-13 12:24:59 +01:00
Ian Paschal
cf4bcf81e7 Make pop up permanent 
Contributes to CL-1222
 2019-02-13 11:49:53 +01:00
Ian Paschal
d74f4f36bd Improve cloud flow checks 
Contributes to CL-1222
 2019-02-13 11:30:31 +01:00
Ian Paschal
8fecf7fb39 Don't crash when clicking don't show again 
Contributes to CL-1222
 2019-02-13 11:04:51 +01:00