Dimitriovski
75d2a72424
Remove the label(s) from the compatibility dialog if there are no packages
...
CURA-7038
2020-01-07 14:19:31 +01:00
Jaime van Kessel
a1f8c3f281
Merge branch 'CURA-6255_incorrect_usage_of__file__' of github.com:Ultimaker/Cura
2020-01-07 14:10:19 +01:00
Lipu Fei
0a495b3f6f
Remove unused code in Toolbox
...
CURA-6387
2020-01-07 12:44:45 +01:00
Lipu Fei
a84e6c3c92
Fix Toolbox due to network manager refactor
...
CURA-6387
2020-01-07 11:37:37 +01:00
Lipu Fei
4f91389941
Fix QML warnings
2020-01-07 11:37:37 +01:00
Jaime van Kessel
523b4e96a8
Ensure that post processing scripts are correctly reloaded on project loading
...
Previously it would not re load post processing plugins if it was updating an existing machine
Fixes #6881
2020-01-07 10:45:57 +01:00
Johnathan Chu
1f2e079185
Update DisplayFilenameAndLayerOnLCD.py:
...
- Fixed filename appearing in middle of text when scrolling is disabled and displaying max layer.
- Fixed filename appearing twice when scrolling is enabled and displaying max layers.
2020-01-06 21:45:43 -08:00
Jaime van Kessel
2a09404235
Change ModuleNotFoundError to ImportError
...
THat's what you get from developing with Python 3.6 instead of 3.5
2020-01-06 15:53:55 +01:00
Jaime van Kessel
116ea76fbb
Don't register SentryLogger if sentry_sdk is not available
2020-01-06 15:17:20 +01:00
Jaime van Kessel
11d176137f
Remove usage of deprecated function
2020-01-06 15:02:33 +01:00
Jaime van Kessel
0c1c4e4856
Move HttpRquestData to it's own file
...
CURA-6387
2020-01-06 11:34:32 +01:00
Lipu Fei
625b08baf8
Merge master and fix
...
CURA-6387
2020-01-06 11:18:12 +01:00
Lipu Fei
5a689c2389
Merge remote-tracking branch 'origin/master' into CURA-6387_http_request_manager
2020-01-06 11:15:37 +01:00
Jaime van Kessel
043ef2e84f
Fix crash when layer does not exist
2020-01-06 10:47:47 +01:00
novamxd
bcc12030a2
Revamped ChangeAtZ
...
Adjusted coding style to use spaces instead of tabs
2020-01-03 19:01:33 -06:00
Tim Kuipers
9c2fd1c9d4
automatically add shell thickness to stack and set to zero for infill meshes
...
and remove when unmodified and we change to another mesh type
2020-01-03 15:57:20 +01:00
Jaime van Kessel
3ffbdf2888
Ensure that after a reslice the nozzle location of re-slice is still correct
2020-01-03 11:28:29 +01:00
Jaime van Kessel
552ce1fc66
Merge branch 'master' of github.com:Ultimaker/Cura into speed_up_layerview
2020-01-03 11:15:24 +01:00
Lipu Fei
55d31b9846
Move HttpRequestManager to Uranium
...
CURA-6387
2020-01-03 08:59:29 +01:00
Lipu Fei
6fbce74523
Use network manager in SliceInfo
...
CURA-6387
2020-01-03 08:59:29 +01:00
Lipu Fei
77511c2590
Use network manager in Toolbox
...
CURA-6387
2020-01-03 08:59:29 +01:00
Nino van Hooff
8dbd67f5bd
Merge remote-tracking branch 'origin/master' into CURA-6959_collapse_categories
...
# Conflicts:
# resources/qml/Menus/SettingVisibilityPresetsMenu.qml
# resources/qml/Settings/SettingView.qml
2020-01-02 15:32:26 +01:00
Jaime van Kessel
61a605d02b
Chop up the render function to make it a bit more readable
2020-01-02 13:34:57 +01:00
Jaime van Kessel
0d7421140f
Recalculate the start / end elements when the layer is changed instead of on render
...
About with larger models, about 30-40% of the time of the render was spent on this.
2020-01-02 13:28:14 +01:00
Remco Burema
1915100118
Fix: Layersliders work again.
2019-12-31 16:48:50 +01:00
Remco Burema
cb361e9543
Force sim-view to update after view-type change.
2019-12-31 16:14:02 +01:00
Dimitriovski
1ea8145f39
Changed the hardcoded value for leftMargin
...
CURA-7038
2019-12-31 14:35:47 +01:00
Dimitriovski
802c095c9f
Removed unused list
...
CURA-7038
2019-12-31 14:07:40 +01:00
Dimitriovski
42851b0851
Removed unnecessary pass statement from reply.operation
...
CURA-7038
2019-12-31 14:03:56 +01:00
Dimitriovski
dde0dd8ce3
Removed the 'workaround' that I've added earlier. Simplified the flow. The dialog is now showing display_name instead of package_id
...
CURA-7038
2019-12-31 14:02:41 +01:00
Dimitriovski
96311c974b
Fixed failing tests. Hid the sync Message when it's clicked.
...
CURA-7038
2019-12-31 12:07:42 +01:00
Dimitriovski
ea1896fe6b
Merge branch 'master' of github.com:Ultimaker/Cura into CURA-7038
2019-12-30 17:38:31 +01:00
Dimitriovski
93c1c1a86e
deleted unused lines
...
CURA-7038
2019-12-30 17:38:21 +01:00
Dimitriovski
ada2a776d5
Reworked the Compatibility Dialog and how it shows the subscribed packages
...
CURA-7038
2019-12-30 17:36:46 +01:00
Nino van Hooff
5c83ba0129
Rename SettingsDefinitionModel.collapse to -Recursive for consistency
...
CURA-6959
2019-12-30 15:05:52 +01:00
Jaime van Kessel
0eea73d2a9
Fix typing
...
CURA-6255
2019-12-30 12:57:04 +01:00
Nino van Hooff
9aa5c3cd24
Hardcode plugin id for UsbPrinter and XmlMaterialProfile
...
Previous solution was more defensive but also introduced dependencies
and extra files for minor benefit
CURA-6255
2019-12-30 12:04:41 +01:00
novamxd
6c22a5ed06
* Revamped ChangeAtZ
...
Fixed a bug where extruder temps for extruder one and two were being applied universally. Now sets individually as expected.
2019-12-26 00:56:57 -06:00
Nino van Hooff
8ae7459ea7
Use plugin Id instead of __file__ for XmlMaterialProfile
...
CURA-6255
2019-12-24 15:49:18 +01:00
Nino van Hooff
128bfa987e
Use plugin Id instead of __file__ for XmlMaterialProfile
...
CURA-6255
2019-12-24 15:42:01 +01:00
Nino van Hooff
49b93db6df
Use plugin Id instead of __file__ for USBPrinting
...
CURA-6255
2019-12-24 14:51:50 +01:00
Lipu Fei
dcaa10e409
Handle error due to missing quality_changes in 3MF loading
...
CURA-7078
2019-12-24 10:59:09 +01:00
Dimitriovski
4b86400661
Merge branch 'master' of github.com:Ultimaker/Cura into CURA-7038
2019-12-23 17:48:15 +01:00
Dimitriovski
12be21e594
Reworked the flow to show only not installed packages for installing in the Compatibility Dialog
...
CURA-7038
2019-12-23 17:23:26 +01:00
Jaime van Kessel
58a20fc110
Remove themed color from machinesettings action
...
Since it's partially in a system themed style, it shouldn't use color.
If it does use color, it gets messed up if the user uses dark theme (white text on
gray background doesn't work)
CURA-7059
2019-12-23 17:08:48 +01:00
Dimitriovski
4375118a9f
Refactored most of the code into separate functions
...
CURA-7038
2019-12-23 16:58:44 +01:00
Ghostkeeper
8a9b791298
Merge branch '4.4'
...
Conflicts:
cura/Machines/MaterialNode.py -> Due to some automated formatting tool. Please disable those tools, people.
2019-12-23 16:26:25 +01:00
Ghostkeeper
a3c5435a1d
Remove support_tree_wall_thickness
...
This setting will not be automatically translated to support_wall_thickness if it's overwritten, because that would require knowing the line width and we don't know that here. So it's hard to do.
Contributes to issue CURA-7077.
2019-12-23 16:22:17 +01:00
Ghostkeeper
50f64ca696
Merge support_tree_wall_count into support_wall_count
...
So now the two settings are used as one.
Contributes to issue CURA-7077.
2019-12-23 16:22:17 +01:00
Ghostkeeper
dbda415bba
Make merged settings extensible
...
This way it's:
- documented at the top of the file to make it easier to find all the changes, and
- easier to extend the list of merged settings.
Contributes to issue CURA-7077.
2019-12-23 16:22:16 +01:00