3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-20 21:27:50 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
21225 commits 307 branches 270 tags 779 MiB
Commit graph

21225 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jaime van Kessel
ea5c34868e Merge branch 'revert_correct_depriming_settings' of github.com:Ultimaker/Cura into 4.2 2019-07-17 12:51:56 +02:00
Filip Goc
44420d5244 Lower the priming line from 0.6 to 0.3mm 2019-07-17 02:27:21 +02:00
Filip Goc
13df255477 Merge branch 'master-2019-12-17' into update_imade3d_jellybox_support 
# Conflicts (resolved):
#	resources/quality/imade3d_jellybox/PETG/jbo_generic_petg_0.4_coarse.inst.cfg
#	resources/quality/imade3d_jellybox/PLA/jbo_generic_pla_0.4_coarse.inst.cfg
#	resources/quality/imade3d_jellybox/imade3d_jellybox_coarse.inst.cfg
 2019-07-17 02:19:45 +02:00
Filip Goc
3c8e0f8ff1 Update setting_version to 8 (7 → 8) 
(cherry picked from commit f08fc10672)
 2019-07-17 01:49:08 +02:00
Filip Goc
1f18551688 Update JellyBOX start gcodes 
(cherry picked from commit f7da0fd301)
 2019-07-17 01:48:58 +02:00
Filip Goc
5b7dd6af2b Update the JellyBOX variants 
(cherry picked from commit ffaa09e906)
 2019-07-17 01:48:40 +02:00
Filip Goc
1b5fb36a4b Update JellyBOX quality profiles 2019-07-17 01:48:04 +02:00
Filip Goc
1023e043fb Add JellyBOX 2 platform 
(cherry picked from commit 73177f7497)
 2019-07-17 01:42:58 +02:00
Filip Goc
2633ae14b8 Add JellyBOX 2 Extruder 
(cherry picked from commit 920b7662cc)
 2019-07-17 01:42:45 +02:00
Filip Goc
6c80ebe86a Update the JellyBOX definitions 
(cherry picked from commit 9ad6c16c58)
 2019-07-17 01:42:35 +02:00
Filip Goc
f08fc10672 Update setting_version to 8 (7 → 8) 2019-07-17 00:58:44 +02:00
Lipu Fei
154d6a2182 Merge remote-tracking branch 'origin/4.2' 2019-07-16 15:03:32 +02:00
Diego Prado Gesto
b6fba1b196 Change the warnings sign 
Because those settings should be negative.

Contributes to CURA-6662.
 2019-07-16 15:01:54 +02:00
Lipu Fei
0dfa7f1f84 Fix typing 2019-07-16 14:56:30 +02:00
Ghostkeeper
8c11b67fa8
Update translation templates per language for Cura 4.2 
These files will get sent out to the translators.

Contributes to issue CURA-6663.
 2019-07-16 14:50:50 +02:00
Ghostkeeper
de1c588ec6
Update translation templates for Cura 4.2 
These are the new strings that were added.

Contributes to issue CURA-6663.
 2019-07-16 14:50:50 +02:00
Jaime van Kessel
e21de3edf9 Merge branch '4.2' of github.com:Ultimaker/Cura 2019-07-16 14:33:57 +02:00
Jaime van Kessel
e8350547b7
Merge pull request #5999 from Ultimaker/CURA-6659_fix_import_quality 
CURA-6659 Use VersionUpgradeManager to update the imported quality
 2019-07-16 14:33:26 +02:00
Jaime van Kessel
2ca39c8e7f Don't reparse entire file when checking for already extracted version 
CURA-6659
 2019-07-16 14:31:38 +02:00
Diego Prado Gesto
0eec9138c1 Merge branch 'DragonJe-master' 2019-07-16 12:09:22 +02:00
Diego Prado Gesto
3460ce5b8b Remove deprecated setting from the quality profiles 
The setting should not exist anymore in the new setting_version 8.

Contributes to CURA-6642.
 2019-07-16 12:07:37 +02:00
Ghostkeeper
569765adfc
Merge branch '4.2' 2019-07-16 11:51:39 +02:00
Diego Prado Gesto
0e9379e658 Merge branch 'master' of https://github.com/DragonJe/Cura into DragonJe-master 2019-07-16 11:47:00 +02:00
Lipu Fei
1e7c682382 Use default variant if empty in project loading 
CURA-6654
 2019-07-16 11:24:19 +02:00
Jaime van Kessel
f402235406 Fix shadowed use of builtin type 
CURA-6651
 2019-07-16 10:27:50 +02:00
Diego Prado Gesto
9590262f18 Change the name of the original depriming settings 
Change to align with the name in the XML material files.

Contributes to CURA-6662.
 2019-07-16 09:55:50 +02:00
DragonJe
4216c2bfc4
Rename resources/quality/nwa3d_a31_normal.inst.cfg to resources/quality/nwa3d_a31/nwa3d_a31_normal.inst.cfg 2019-07-15 15:02:19 -05:00
DragonJe
12bdcacefc
Rename resources/quality/nwa3d_a31_fast.inst.cfg to resources/quality/nwa3d_a31/nwa3d_a31_fast.inst.cfg 2019-07-15 15:00:58 -05:00
DragonJe
b53794ca74
Rename resources/quality/nwa3d_a31_e.inst.cfg to resources/quality/nwa3d_a31/nwa3d_a31_e.inst.cfg 2019-07-15 15:00:35 -05:00
DragonJe
85c7386990
Rename resources/quality/nwa3d_a31_nwa3d_a31_best.inst.cfg to resources/quality/nwa3d_a31/nwa3d_a31_best.inst.cfg 2019-07-15 15:00:01 -05:00
DragonJe
c690f52878
Rename nwa3d_a31_best.inst.cfg to nwa3d_a31_nwa3d_a31_best.inst.cfg 2019-07-15 14:59:43 -05:00
Ghostkeeper
fed275024a
Add slot to store peripherals 
You can get the list of names of peripherals this way.

Contributes to issue CURA-6651.
 2019-07-15 17:29:30 +02:00
Ghostkeeper
7927169da1
Add peripheral class 
It has a non-human-readable type for the plug-ins to use and a human-readable name which can be requested with the peripherals() property.

Contributes to issue CURA-6651.
 2019-07-15 17:27:23 +02:00
Lipu Fei
9da6044a72 Simplify camera_view data collection 2019-07-15 17:00:56 +02:00
Ghostkeeper
bf34550488
Merge branch 'eMotion-Tech-master' 2019-07-15 15:01:02 +02:00
Ghostkeeper
505742e63f
Merge branch 'master' of https://github.com/eMotion-Tech/Cura into eMotion-Tech-master 2019-07-15 14:49:36 +02:00
Jaime van Kessel
9fd7ceeae1 Fix trailing , 2019-07-15 14:01:26 +02:00
Ghostkeeper
20c55c09cd
Add description for smart hiding to Corner Seam Pref description 2019-07-15 11:34:04 +02:00
Jaime van Kessel
8ca68ebb15 Move Skin overlap to shell category from the infill category 2019-07-15 10:45:56 +02:00
Lipu Fei
64b23758c5 Add camera_view as stats 2019-07-12 14:35:06 +02:00
Ian Paschal
b166853256
Merge pull request #6002 from Ultimaker/CS-191_fix_resume_local_network 
Send the correct action name when using local network
 2019-07-12 12:03:06 +02:00
ChrisTerBeke
25130b63e2 Fix logic 2019-07-12 09:19:30 +02:00
ChrisTerBeke
6210135b92 Send the correct action name when using local network 2019-07-12 08:14:28 +02:00
Lipu Fei
6bb3e33c9e Use VersionUpgradeManager to update the imported quality 
CURA-6659
 2019-07-11 14:27:49 +02:00
Ghostkeeper
17c0797818
Merge branch '4.2' 2019-07-11 09:59:02 +02:00
Ghostkeeper
483e343b38
Specify both Ultimaker B.V. and Custom as preferred categories 
This requires commit 91c6abfc56162aedc887098744533dfcd8f1cdd5 on Ultimaker/Cura.

Contributes to issue CURA-6640.
 2019-07-11 09:58:40 +02:00
Ghostkeeper
79f948a826
Merge branch '4.2' 2019-07-10 15:59:17 +02:00
Ghostkeeper
40169809bc
Set the default build plate temperature to 0 
All third-party materials that didn't fill in a value for this build volume temperature will then default to 0 which causes the printer to go into a safe mode that doesn't melt the plastic or anything.

Contributes to issue CURA-6652.
 2019-07-10 15:59:05 +02:00
Ghostkeeper
037f1967c8
Remove override for version number in CuraContainerStack 
Otherwise plug-ins can't register ContainerStacks any more.

As discussed in the CCB.
 2019-07-10 14:57:26 +02:00
Ghostkeeper
8cdafc5c1a
Merge branch '4.2' 2019-07-10 14:42:48 +02:00