3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-03 07:41:18 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 8
24237 commits 343 branches 300 tags 757 MiB
Commit graph

10493 commits

Author SHA1 Message Date
Nino van Hooff
74253e420a
Merge pull request #7441 from Ultimaker/xray_in_solid_sidequest 
CURA-7262 X-Ray in solid-view (colors instead)
 2020-04-08 15:45:00 +02:00
Ghostkeeper
a2a77804cb
Correct Spanish translation 
It's not the temperature of the print layer. It's the temperature of the build plate.

Fixes #7422.
 2020-04-08 15:28:51 +02:00
Ghostkeeper
69b1c1fe74
Upgrade Deltacomb profiles to setting version 13 
This would halve the maximum resolution setting, but they don't override that setting so there is no actual change to these profiles.
 2020-04-07 23:55:31 +02:00
Ghostkeeper
309d3fc56f
Merge branch 'master' of https://github.com/kaleidoscopeit/Cura into kaleidoscopeit-master 
Conflicts:
	resources/quality/deltacomb/deltacomb_abs_Draft_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_abs_Fast_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_abs_High_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_abs_Normal_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_abs_Verydraft_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_global_Draft_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_global_Fast_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_global_High_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_global_Normal_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_global_Verydraft_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_petg_Draft_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_petg_Fast_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_petg_High_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_petg_Normal_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_petg_Verydraft_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_pla_Verydraft_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_tpu_High_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_tpu_Verydraft_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/variants/deltacomb/deltacomb_dc20_fbe025.inst.cfg: Modified by Ultimaker to update version number, and author added by Kaleidoscopeit.
	resources/variants/deltacomb/deltacomb_dc20_fbe040.inst.cfg: Modified by Ultimaker to update version number, and author added by Kaleidoscopeit.
	resources/variants/deltacomb/deltacomb_dc20_fbe060.inst.cfg: Modified by Ultimaker to update version number, and author added by Kaleidoscopeit.
 2020-04-07 23:40:10 +02:00
Ghostkeeper
be8f8a308e
Merge branch 'master' of https://github.com/PurpleHullPeas/Cura into PurpleHullPeas-master 2020-04-07 18:07:39 +02:00
Remco Burema
b7e6b2888a
Actually remove xray error image (because colors). 
part of CURA-7262
 2020-04-07 12:57:07 +02:00
Remco Burema
5494a09eef
Make sure warning works for greyscale colors. 
part of CURA-7262
 2020-04-07 12:46:32 +02:00
Remco Burema
b59d38e6c9
Replace warning image with triadic colors. 
part of CURA-7262
 2020-04-07 12:06:13 +02:00
Ghostkeeper
fc8cc3187d
Merge branch '4.6' 2020-04-06 17:20:34 +02:00
Ghostkeeper
95b5a176b8
Update translation file headers for Cura 4.6 
Contributes to issue CURA-7344.
 2020-04-06 17:19:59 +02:00
Ghostkeeper
e676308241
Update translation files with new strings in Cura 4.6 
Contributes to issue CURA-7344.
 2020-04-06 16:52:06 +02:00
Ghostkeeper
859adbf347
Update translation templates for Cura 4.6 
These are the new translations for the next release of Cura. I generated them from my computer at home now, so all of the paths have changed... But they are just indications anyway.
 2020-04-06 16:48:13 +02:00
Jaime van Kessel
02202328d8
Add Versionupgrader to bundled plugin list 2020-04-06 11:20:44 +02:00
Jaime van Kessel
82fa1823cc
Merge branch '4.6' of github.com:Ultimaker/Cura 2020-04-06 11:11:43 +02:00
Jaime van Kessel
ddc826af44
Add VersionUpgrade45 package to bundled list 2020-04-06 11:06:26 +02:00
Ghostkeeper
01ec607d40
Merge branch '4.6' 
Conflicts:
	resources/texts/change_log.txt: Both modified but had different wording for the pause-at-height bugfix with motor timeout. I used the wording in 4.6 since it was more extensive.
 2020-04-06 09:20:18 +02:00
Ghostkeeper
7be6412ef3
Correct heating up nozzle instead of build plate 
Otherwise this print won't work at all. It'll just keep waiting forever until the build plate has reached a temperature that is way out of spec.

Applied at request of MaximeGL in #7280.
 2020-04-06 09:19:08 +02:00
Evg33
d3da609746 UNI3D Extruders 2020-04-05 19:00:51 +03:00
Evg33
293be8fdb9 UNI 3D Series printers 2020-04-05 18:44:34 +03:00
PurpleHullPeas
3cc6b0cb9a
Simplifying mp_mini_delta.def.json 
Removing minimum/maximum nozzle size, minimum layer_height, and minimum layer_height_0.
 2020-04-04 23:22:17 -05:00
Remco Burema
60bd676b44
Shader: More use builtin rather than adhoc mix. 
part of CURA-7262
 2020-04-03 21:24:35 +02:00
Matt Jani
20e58d7d54
Updated "What's New?"change log for 4.6 
CURA-7299
 2020-04-03 16:02:00 +02:00
Remco Burema
e23b9a94fa
Shader: Use builtin rather than mix ourselves. 
part of CURA-7262
 2020-04-03 15:07:28 +02:00
Jaime van Kessel
ecd24cb446
Merge branch 'simplify_test_v2' of github.com:Ultimaker/Cura 2020-04-03 13:25:01 +02:00
maht
58d7eea7bb
Update change_log.txt 2020-04-03 12:45:09 +02:00
maht
48849a3ccd
Update change_log.txt 2020-04-03 12:41:09 +02:00
Remco Burema
9d19f4f2db
Merge pull request #7398 from Ultimaker/matt-staging 
Updated "What's New?"change log for 4.6
 2020-04-03 11:07:44 +02:00
Matt Jani
fd9bd3c123 Updated "What's New?"change log for 4.6 
CURA-7299
 2020-04-03 10:58:57 +02:00
Ghostkeeper
4f50f42796
Merge branch '4.6' 2020-04-02 17:21:03 +02:00
Ghostkeeper
f5669a5a27
Merge branch 'CURA-7340_fix_simulation_slider_layout' into 4.6 2020-04-02 17:20:45 +02:00
Ghostkeeper
b86b6a9449
Merge branch 'fix_jogging_layout' of https://github.com/fieldOfView/Cura into fieldOfView-fix_jogging_layout 2020-04-02 17:07:42 +02:00
Nino van Hooff
9d9753cb45 Fix: Using onCompleted would break the binding. So Use a Binding instead 2020-04-02 16:31:29 +02:00
Nino van Hooff
6d56b52913 Revert "Fix binding loop in action panel widget" 
Fix improper player slider layout which was introduced in 5cfe71e5
 2020-04-02 15:15:05 +02:00
Tom Hofman
f3927115d6
Infill wipe distance reduced 
Since it was protruding the shell
 2020-04-02 09:45:11 +02:00
Remco Burema
175121e86c
Fix add printer scrollview overlaps buttons. 
CURA-7336
 2020-04-01 17:31:23 +02:00
Ghostkeeper
565ce0f4b9
Forgot to increment setting version in definitions 
Contributes to issue CURA-7282.
 2020-04-01 15:51:14 +02:00
Ghostkeeper
8c74429ffc
Halve the defaults in Cura's built-in profile for maximum deviation too 
Apply the version upgrade to these profiles too, essentially.

Contributes to issue CURA-7282.
 2020-04-01 15:30:04 +02:00
Ghostkeeper
e2e69f6646
Increment setting version to 13 
Contributes to issue CURA-7282.
 2020-04-01 15:14:01 +02:00
konskarm
cbccb08103
Merge pull request #7370 from Ultimaker/CURA-7328_remove_unused_machine_settings 
Remove unused machine settings
 2020-03-31 14:41:41 +02:00
fieldOfView
1b3c51d98a Remove extraneous preference 2020-03-31 11:57:45 +02:00
fieldOfView
ccc0589495 Remove the checkbox option to set the preference to hide the messagebox 2020-03-31 11:50:16 +02:00
fieldOfView
b7898b5a97 Change preference to only hide the xray message, not the visualization 2020-03-31 11:39:05 +02:00
fieldOfView
4638e2b72b Fix resetting show xray warning 2020-03-31 11:27:25 +02:00
fieldOfView
b2fc155c3b Fix legacy glsl shaders 
By @smartavionics
 2020-03-31 11:26:21 +02:00
konskarm
95cefbe895
Merge pull request #7368 from maukcc/master 
HMS434 update
 2020-03-30 15:53:09 +02:00
Ghostkeeper
6063307a31
Remove overrides of unused machine setting 
Contributes to issue CURA-7328.
 2020-03-30 12:10:35 +02:00
Ghostkeeper
40fc064e98
Don't remove Nozzle Length 
Turns out this one was used: As default for the wire printing height.

Contributes to issue CURA-7328.
 2020-03-30 12:10:01 +02:00
Ghostkeeper
b5dfcdd482
Remove Nozzle Length and Filament Park Distance from the settings list 
Implements CURA-7328.
 2020-03-30 12:00:59 +02:00
Ghostkeeper
8422172000
Increment setting version to 12 
This is necessary for the version upgrade to run.

Contributes to issue CURA-7328.
 2020-03-30 11:54:18 +02:00
maukcc
b92d0a83ac HMS434 update 2020-03-29 14:21:57 +02:00