Commit graph

9756 commits

Author SHA1 Message Date
mobilityapplab
f59c9383da Update fdmprinter.def.json
Add Smoothie Firmware Flavor option.
2020-02-04 14:00:23 -05:00
Ghostkeeper
66e2ca6aa5
Merge branch 'CURA-7099_sync_sideloaded_plugins' 2020-02-03 16:12:56 +01:00
Ghostkeeper
3a616c78bc
Merge branch 'rf100_config' of https://github.com/dok-net/Cura into dok-net-rf100_config 2020-02-03 11:47:50 +01:00
Jaime van Kessel
f03b6cc7dc
Add some max values for FDMPrinter temperatures
Marlin breaks on anything above it, so these seem like sensible defaults
A-6.1 (WhiteHats)
2020-01-31 16:21:59 +01:00
Ghostkeeper
32d94f76f1
Merge branch 'mb-fuzzy-outside-only' of https://github.com/smartavionics/Cura into smartavionics-mb-fuzzy-outside-only 2020-01-31 13:10:45 +01:00
Ghostkeeper
1d34f1ecb4
Merge branch 'master' of ssh://github.com/Ultimaker/Cura 2020-01-30 15:47:46 +01:00
Ghostkeeper
c00004b1c0
Correct capitalisation of Geeetech printer names
Contributes to issue CURA-7132.
2020-01-30 15:47:18 +01:00
amitlobo
004ddb3e2c
Add Geeetech printer and extruder definitions 2020-01-30 15:46:08 +01:00
Nino van Hooff
8ea3004c73 Fix some dark theme styling (MoreInfoWindow, ToolboxLicenseDialog
CURA-7152
2020-01-30 12:51:13 +01:00
Nino van Hooff
82e24c1ac3 Register the 44 to 45 version upgrade as a bundled plugin 2020-01-28 15:44:14 +01:00
Nino van Hooff
d4eb463f2d Always subscribe to packages after installing them
Now that we subscribe for all situations where a package is installed,
it makes sense to watch package installs and create a 1:1 relation that
way. Prevents code duplication.

CURA-7099
2020-01-28 13:08:57 +01:00
Dirk O. Kaar
58d737a9a9 Retraction hop enable has default value, the height value is fine by default, too. 2020-01-28 11:00:11 +01:00
Jaime van Kessel
9a9e715e2f
Merge branch 'CURA-6914_Reset_print_sequence_when_reactivating_2nd_extruder' of github.com:Ultimaker/Cura 2020-01-28 09:36:29 +01:00
Jaime van Kessel
a706b42782
Disable create & import on materialpage if machine does not support materials 2020-01-27 16:12:26 +01:00
Kostas Karmas
bcec433f53 Update description of the Print Sequence setting
Update description to clearly state that Print Sequence is not
possible if more than one extruders are enabled.

CURA-6914
2020-01-24 17:30:46 +01:00
Ghostkeeper
db41a83aa6
Fix mix of whitespace styles: Use spaces instead of tabs
Contributes to issue CURA-7140.
2020-01-24 16:13:15 +01:00
Ghostkeeper
61d5ace952
Merge branch 'rf100_config' of https://github.com/dok-net/Cura into dok-net-rf100_config 2020-01-24 16:09:09 +01:00
Ghostkeeper
d31240ad70
Merge branch 'CURA-6627_Store_extra_data_project_files' 2020-01-24 14:53:33 +01:00
Jaime van Kessel
bd18a539e2
Only update position of label when it's visible
This prevents unneeded re-rendering
2020-01-24 14:04:27 +01:00
Kostas Karmas
037e4d5b5f Merge branch 'PurpleHullPeas-add_mp_mini_delta' 2020-01-21 16:59:24 +01:00
Kostas Karmas
c0052ad492 Merge branch 'add_mp_mini_delta' of https://github.com/PurpleHullPeas/Cura into PurpleHullPeas-add_mp_mini_delta 2020-01-21 16:29:53 +01:00
Ghostkeeper
a3825c1f14
Merge branch 'master' into CURA-6627_Store_extra_data_project_files 2020-01-21 15:14:45 +01:00
konskarm
d8abd24bfe
Merge pull request #6992 from Ultimaker/CURA-6984_decline_sync
CURA-6984_decline_sync
2020-01-21 10:47:22 +01:00
Ghostkeeper
5d21872e50
Take nozzle offsets into account when placing prime tower
extruderValues('machine_nozzle_offset_x') := [0, 20, -18]
map(abs(extruderValues('machine_nozzle_offset_x') := [0, 20, 18]
max(map(abs(extruderValues('machine_nozzle_offset_x') := 20

So we take the highest offset of all extruders to get the area that can be reached by all extruders. And we take the abs() of all extruder values because positive or negative only means that the other extruders get offset in the same direction.

Fixes #6997.
2020-01-21 10:31:47 +01:00
MakeIt3D
39780636a9 Add MAKEiT Pro-MX Profile (#6983)
CURA-7125
2020-01-20 14:53:48 +01:00
Ghostkeeper
92926cfc21
Revert "Limit retraction_combing_max_distance to be no lower than retraction_min_travel"
This reverts commit 3b1e88e49c.
It was changing the default behaviour for these printers.

Contributes to issue CURA-6860.
2020-01-20 10:47:46 +01:00
Ghostkeeper
8f6fb5e007
Revert "Properly override retraction_combing_max_distance"
This reverts commit 5ddee1e70f. It was changing the default behaviour for this printer.

Contributes to issue CURA-6860.
2020-01-20 10:46:55 +01:00
Ghostkeeper
5ddee1e70f
Properly override retraction_combing_max_distance
Since by default it now defines a value for this one rather than default_value, this override had broken. Thank you, tests.

Contributes to issue CURA-6860.
2020-01-20 09:51:30 +01:00
Ghostkeeper
3b1e88e49c
Limit retraction_combing_max_distance to be no lower than retraction_min_travel
Retraction_min_travel overrides retraction_combing_max_distance in CuraEngine, so it has no effect to make it any lower.

Contributes to issue CURA-6860.
2020-01-20 09:41:48 +01:00
Nino van Hooff
9dd50c8804 Replace buttons by PrimaryButtons for cloud sync dialogs
CURA-6984
2020-01-17 13:54:39 +01:00
ninovanhooff
8bf7666493
Merge pull request #6986 from Ultimaker/CURA-7027_Add_more_materials_from_Marketplace_button
Cura 7027 add more materials from marketplace button
2020-01-16 16:26:38 +01:00
ninovanhooff
4b60da6802
Update resources/qml/Actions.qml
Remove redundant icon from marketplaceMaterialsAction
2020-01-16 16:26:15 +01:00
MaukCC
1814b67b67 HMS434 update (#6826)
Material exclusion update
2020-01-16 16:13:27 +01:00
Jaime van Kessel
fc25a07666
Update platform offset for 3dtech 2020-01-16 16:11:04 +01:00
David Souza
d6392c117d Add 3D Tech Printer (#6948)
* Add a new Machine Profile for 3DTech
2020-01-16 16:10:24 +01:00
Kostas Karmas
18e5d76990 Fix button to open in-Cura Marketplace materials
The button was opening the online Marketplace, which was wrong.
This fix changes the behavior to open the in-Cura Marketplace at
the materials tab.

In order to achieve that, the button calls an action called
materialsMarketplace, which in turn is connected through a
Connection in the ApplicationMenu. When the action is triggered,
it first launched the Toolbox and then it sets its category to
the materials tab.

Since the callExtensionMethod does not allow us to provide input
arguments to the called method, a new method had to be created in
the toolbox that changes the view to the materials tab, instead
of immediately calling the setViewCategory("material").

CURA-7027
2020-01-16 15:11:34 +01:00
Nino van Hooff
182bab6467 Merge remote-tracking branch 'origin/master' into CURA-6983_sync_packages
# Conflicts:
#	plugins/Toolbox/src/CloudSync/SubscribedPackagesModel.py
#	plugins/Toolbox/src/Toolbox.py
2020-01-15 15:40:03 +01:00
Kostas Karmas
dbab3c6e8b Add more materials from Marketplace menu button
This commit adds a button "Add more materials from Marketplace" in the
menu that pops up in the material list while configuring the materials
into custom ones. The button redirects the user to the Marketplace
materials page (https://marketplace.ultimaker.com/app/cura/materials)

CURA-7027
2020-01-15 11:50:59 +01:00
Remco Burema
3872e8ffa3
Move 'Toolbar' lower: Toolpanels could be obscured by objects-info. 2020-01-14 12:45:11 +01:00
Jaime van Kessel
414b696b32
Use the resetWorkspace for new project
This makes it a bit cleaner as we don't have to copy functionality

CURA-6627
2020-01-14 11:04:42 +01:00
Ghostkeeper
122b6318fe
Remove dash if print job name is empty
Otherwise it shows ' - Ultimaker Cura' here which looks a bit weird.
2020-01-13 12:32:46 +01:00
Nino van Hooff
028aece644 Fix extensions not being unique in ExtensionModel
CURA-6983
2020-01-10 11:42:48 +01:00
Kostas Karmas
3ce52423fa Change description of nozzle wipes settings
CURA-6968
2020-01-09 15:06:58 +01:00
Remco Burema
1f722d4de0
Minimum support area was always supposed to be small. 2020-01-08 16:28:28 +01:00
PurpleHullPeas
b2424a4f2c
Removing id from MPMD extruder def. 2020-01-07 22:27:03 -06:00
PurpleHullPeas
1c54f4c592
Removing id field. 2020-01-07 22:17:54 -06:00
PurpleHullPeas
fa89841f52
Removed gantry_height 2020-01-07 22:03:30 -06:00
PurpleHullPeas
473ff88009
Adding Monoprice Mini Delta platform image. 2020-01-07 18:31:10 -06:00
PurpleHullPeas
8e50f7ab95
Adding Monoprice Mini Delta Extruder File 2020-01-07 18:29:52 -06:00
PurpleHullPeas
317c4aa559
Adding Monoprice Mini Delta definition file. 2020-01-07 18:28:32 -06:00