Jaime van Kessel
0cb83d2c92
Merge branch 'master' of github.com:Ultimaker/Cura into feature_intent
2019-07-02 13:51:52 +02:00
Lipu Fei
43baca1545
Hardcode Cura SDK version with each release
2019-07-02 13:33:18 +02:00
Ghostkeeper
a4093aa6fd
Merge branch 'type_fix_build_volume'
2019-07-02 10:37:22 +02:00
Remco Burema
f5b0cae554
Prime-brim calculation needs adhesion extruder, not just any.
2019-07-02 07:46:21 +02:00
Jaime van Kessel
bc05587220
Merge branch 'master' of github.com:Ultimaker/Cura
2019-07-01 17:29:51 +02:00
Jaime van Kessel
20357dabb3
Merge branch 'feat_line_spacings' of https://github.com/BagelOrb/Cura
2019-07-01 17:19:26 +02:00
Ghostkeeper
ea93490c45
Fix crash when loading multi-extrusion print
...
Because getProperty needs a property to get.
2019-07-01 14:56:03 +02:00
Jaime van Kessel
a7d419f497
Fix deprecation decorator breaking the getExtruder function
2019-07-01 11:18:54 +02:00
Jaime van Kessel
d48b173118
Merge branch 'master' of github.com:Ultimaker/Cura
2019-07-01 11:15:53 +02:00
Jaime van Kessel
6544c123a4
Add camera view selector to the view application menu
2019-07-01 11:15:26 +02:00
Ghostkeeper
17e86a28b7
Guard against broken import
2019-07-01 10:58:08 +02:00
Ghostkeeper
f86cf06b88
Add typing
2019-07-01 10:57:08 +02:00
Jaime van Kessel
db3d6aae83
Add boundingbox test for buildvolume
2019-07-01 09:55:04 +02:00
Jaime van Kessel
6136f5a2f2
Further simplify the build volume code
2019-06-28 15:22:58 +02:00
Jaime van Kessel
691d106719
Remove old unused code
2019-06-28 15:09:08 +02:00
Jaime van Kessel
f329d7aed9
Made typing hint a bit more specific
2019-06-28 15:08:46 +02:00
Jaime van Kessel
2133fc78e0
Remove unused code
2019-06-28 15:01:09 +02:00
Jaime van Kessel
47cc87ec47
Add tests for calculating the bed adhesion size
2019-06-28 14:17:18 +02:00
Jaime van Kessel
b240ede21c
Add test for computing the static disallowed areas
2019-06-28 13:45:05 +02:00
Jaime van Kessel
efc6ef2905
Add missing typing
2019-06-28 13:44:47 +02:00
Lipu Fei
67f10d8bc3
Merge pull request #5885 from Ultimaker/CURA-6329_add_crystallinity_setting
...
Add deprime settings
2019-06-27 16:09:36 +02:00
Ghostkeeper
fe0fcc6eec
Change human-readable names of renamed settings too
...
Forgot about those.
Contributes to issue CURA-6329.
2019-06-26 16:43:11 +02:00
Ghostkeeper
faf256b2f0
Rename deprime settings with the new name
...
These have been renamed for greater clarity. We also have to rename them on this side now.
Contributes to issue CURA-6329.
2019-06-26 16:41:51 +02:00
pkuiper-ultimaker
67191c4040
Merge pull request #5863 from Ultimaker/CURA-6414_no_blob_for_one_at_a_time
...
Don't prime-blob when print-sequence is one-at-a-time. [CURA-6414]
2019-06-25 17:44:51 +02:00
Ian Paschal
48a69afbcf
Merge pull request #5912 from Ultimaker/cloud-print-job-actions
...
CS-134: Print job actions via cloud
2019-06-25 15:52:10 +02:00
Lipu Fei
934248e218
Merge pull request #5578 from curso007/master
...
Adding Geeetech A30 & FLSUN QQ-S machine definitons
2019-06-24 13:27:03 +02:00
Lipu Fei
92d029d18f
Update flsun_qq_s.def.json
2019-06-24 13:22:18 +02:00
Lipu Fei
7bd297bef5
Fix setting_version
2019-06-24 13:21:04 +02:00
Jaime van Kessel
d9358d56cc
Update issue templates
...
Added a bit more clarification to the issue template.
2019-06-24 13:20:05 +02:00
Lipu Fei
544e7a1614
Rename Geeetech_A30.def.json to geeetech_a30.def.json
2019-06-24 13:20:04 +02:00
Lipu Fei
6a7da56057
geeetech_a30.def.json
...
Fix geeetech_a30.def.json
2019-06-24 13:19:24 +02:00
ChrisTerBeke
1d09cb5b9c
Fix typing for optional data argument
...
Co-Authored-By: Jaime van Kessel <nallath@gmail.com>
2019-06-24 13:18:27 +02:00
Jaime van Kessel
9e4f2a441b
Revert "Also upgrade profiles if only the setting version is incorrect"
...
This reverts commit 77d396b9bd
2019-06-24 11:59:13 +02:00
Jaime van Kessel
0a0b4821ef
Added logging for cases where the upgrade of the profile failed
...
CURA-6592
2019-06-24 11:32:43 +02:00
Ghostkeeper
6273d34eae
Merge branch 'master' of https://github.com/Robokinetics/Cura into Robokinetics-master
2019-06-21 11:33:07 +02:00
Робокинетика
f5d94b9646
Fixed the value of "retraction_amount"
2019-06-21 11:53:06 +03:00
Diego Prado Gesto
efa42ccbd1
Merge branch 'master' into CURA-6329_add_crystallinity_setting
2019-06-20 14:06:18 +02:00
ChrisTerBeke
1ab109ade0
Fix 'resume' action
2019-06-20 13:46:20 +02:00
ChrisTerBeke
baf9dc041c
Fix typing of Any
2019-06-20 12:56:45 +02:00
ChrisTerBeke
0513322f86
Fix expected controller options in test
2019-06-20 12:36:56 +02:00
ChrisTerBeke
93351ec9b9
Show context menu on printers with firmware 5.3 or later
2019-06-20 12:36:15 +02:00
Remco Burema
9845178d26
Remove superfluous bracket (causing 'EOF'). [CURA-6460]
2019-06-20 09:44:19 +02:00
Ghostkeeper
15997685df
Merge branch 'master' of https://github.com/maukcc/Cura into maukcc-master
2019-06-20 09:18:16 +02:00
ChrisTerBeke
6cbe89f832
Remove weird file
2019-06-19 13:58:26 +02:00
ChrisTerBeke
eb8d353e11
Add basic support for print job actions via Cloud output device
2019-06-19 13:58:11 +02:00
Ghostkeeper
aea5e50401
Stacks are upgraded to a higher version number
...
So indicate to the plug-in metadata that they are.
2019-06-19 13:14:02 +02:00
Ghostkeeper
91767cf81f
Fix merge conflict
2019-06-19 13:12:42 +02:00
Ghostkeeper
5ab1881a21
Merge branch 'master' into feature_intent
...
Conflicts:
plugins/VersionUpgrade/VersionUpgrade41to42/VersionUpgrade41to42.py -> There is a new version upgrade in master, so the old one is sort of obsolete. We may have to move this part to a new version upgrade for 4.3.
plugins/VersionUpgrade/VersionUpgrade41to42/__init__.py
2019-06-19 13:10:36 +02:00
Ghostkeeper
23abcd6fd6
Merge branch 'master' into CURA-6329_add_crystallinity_setting
2019-06-19 10:49:20 +02:00
Remco Burema
c65fefce67
Merge pull request #5909 from Ultimaker/CURA-6590_fix_value_update_material
...
CURA-6590 Fix value update in material profile
2019-06-18 16:56:45 +02:00
