3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-06 13:34:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10
20150 commits 313 branches 275 tags 718 MiB
Commit graph

20150 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Lipu Fei
154d6a2182 Merge remote-tracking branch 'origin/4.2' 2019-07-16 15:03:32 +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
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
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
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
8cdafc5c1a
Merge branch '4.2' 2019-07-10 14:42:48 +02:00
Ghostkeeper
bb49acbb7f
Use correct font for material estimates 
Otherwise it uses the system defaults.
 2019-07-10 14:42:26 +02:00
Ian Paschal
5ac167d61a
Merge pull request #5997 from Ultimaker/CS-134_fix_ordering_and_move_to_top 
CS-134: fix ordering and move to top
 2019-07-10 14:05:36 +02:00
Ghostkeeper
99fbb3e5f1
Merge branch '4.2' 2019-07-10 13:02:26 +02:00
Ghostkeeper
83a24ed0cc
Rename machines with too long names 
The names of these two printers were so long that the file names would be too long by default for some file systems. Cura was preventing the user from adding the printers then unless they changed their names.
 2019-07-10 13:02:14 +02:00
Ghostkeeper
446f87ec59
Merge branch '4.2' 2019-07-10 12:58:52 +02:00
Ghostkeeper
be86576ff9
Improve wording and name of 'Ignore Small Z Gaps' 
Hopefully it'll be a bit more clear what this setting does, now.
 2019-07-10 12:58:35 +02:00
ChrisTerBeke
99e2939801 Add defense for when active printer is None 2019-07-10 12:55:12 +02:00
ChrisTerBeke
f1df7b93c4 Fix printer and print job ordering, add back 'move to top' 2019-07-10 12:42:01 +02:00
Simon Edwards
146f78e658
Merge pull request #5992 from Ultimaker/CS-134_hide_move_to_top 
Hide 'move to top' option from actions
 2019-07-09 13:03:42 +02:00
Ghostkeeper
b87a0a7e82
Merge branch 'CURA-6590_continue_fix_diameter_reset' 2019-07-09 09:11:31 +02:00
ChrisTerBeke
9ad89017d0 Add text about cloud connection when no printer can be reached on monitor 2019-07-09 09:09:08 +02:00
ChrisTerBeke
b6a00b9f7f Hide 'move to top' opion from actions 2019-07-09 08:26:44 +02:00