Ghostkeeper
|
7aec564848
|
Attempt at fixing saving of load location on Linux
Hope this also works on the Qt version used by our build system...
|
2019-07-19 12:38:07 +02:00 |
|
Ghostkeeper
|
4b8274d7cb
|
Add ID to stage selection buttons
Necessary to switch stages in the Squish tests.
Contributes to issue CURA-6276.
|
2019-07-19 12:38:07 +02:00 |
|
Jaime van Kessel
|
e6512e748c
|
Merge branch '4.2' of github.com:Ultimaker/Cura
|
2019-07-19 10:58:45 +02:00 |
|
Jaime van Kessel
|
ee05dc7b47
|
Minor codestyle fixes
|
2019-07-19 10:55:22 +02:00 |
|
Jaime van Kessel
|
b8d27b9ce3
|
Fix definition_changes not being updated properly
CURA-6667
|
2019-07-19 10:53:11 +02:00 |
|
Brecht Nuyttens
|
949d62feef
|
Added Vertex Nano K8600 profile (#5998)
* Added Vertex Nano Profile
|
2019-07-19 10:42:01 +02:00 |
|
Jaime van Kessel
|
a7ddab3c60
|
Merge branch '4.2' of github.com:Ultimaker/Cura
|
2019-07-19 10:38:39 +02:00 |
|
Jaime van Kessel
|
c67f2cfcf5
|
Merge pull request #6004 from Ultimaker/add_camera_view_stats
Add camera_view as stats
|
2019-07-19 10:38:25 +02:00 |
|
Jaime van Kessel
|
2e3a390757
|
Merge branch 'update_imade3d_jellybox_support' of https://github.com/IMADE3D/Cura
|
2019-07-19 09:33:15 +02:00 |
|
Jaime van Kessel
|
272ef40669
|
Merge branch '4.2' of github.com:Ultimaker/Cura
|
2019-07-19 09:31:51 +02:00 |
|
Jaime van Kessel
|
a82dcb6f52
|
Fix crash when attempting to set build plate for selection
|
2019-07-19 09:23:42 +02:00 |
|
Jeff Rogers
|
5ee31a1983
|
Preserve extruder-only moves in post stretch script
|
2019-07-18 16:52:59 -07:00 |
|
Lipu Fei
|
a6790e7bb2
|
Merge pull request #6011 from Ultimaker/CURA-6651_add_peripheral_data_slot
Add data slot for peripherals
|
2019-07-18 12:39:56 +02:00 |
|
Lipu Fei
|
6a843866a0
|
Fix code style
CURA-6651
|
2019-07-18 11:57:07 +02:00 |
|
Ghostkeeper
|
cc9609738c
|
Show a message when trying to print via USB while already printing
Otherwise the button does nothing and gives no feedback of why it does nothing.
Fixes #6026.
|
2019-07-18 11:55:26 +02:00 |
|
Ghostkeeper
|
f334fa8578
|
Spelling of log entries and code style
|
2019-07-18 11:49:18 +02:00 |
|
Lipu Fei
|
d4a683966d
|
Merge remote-tracking branch 'origin/master' into CURA-6651_add_peripheral_data_slot
|
2019-07-18 10:42:59 +02:00 |
|
Jaime van Kessel
|
49074e51ae
|
Merge branch '4.2' of github.com:Ultimaker/Cura
|
2019-07-17 12:53:03 +02:00 |
|
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 f08fc10672b230fb2e587bf889ec0498e531f96d)
|
2019-07-17 01:49:08 +02:00 |
|
Filip Goc
|
1f18551688
|
Update JellyBOX start gcodes
(cherry picked from commit f7da0fd30160184196c88b5c1c67fed9cfb684fe)
|
2019-07-17 01:48:58 +02:00 |
|
Filip Goc
|
5b7dd6af2b
|
Update the JellyBOX variants
(cherry picked from commit ffaa09e906ab9d8d6914ad3454b1e03f0860bb35)
|
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 73177f7497d1ece53b520912e98cc7bd47d4fd7f)
|
2019-07-17 01:42:58 +02:00 |
|
Filip Goc
|
2633ae14b8
|
Add JellyBOX 2 Extruder
(cherry picked from commit 920b7662ccd60e137685f7586ca087d84edd1e31)
|
2019-07-17 01:42:45 +02:00 |
|
Filip Goc
|
6c80ebe86a
|
Update the JellyBOX definitions
(cherry picked from commit 9ad6c16c58238aafa5d8ca07531325d8dcf55cad)
|
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.
4.2-beta
|
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 |
|