Commit graph

8923 commits

Author SHA1 Message Date
Konstantinos Karmas
d24d520db0 Change background of Premium plugins and materials
Or else the link "Search materials" in the materials tab was very hard to see.

CURA-8380
2021-08-24 13:32:25 +02:00
fieldOfView
2238234741 Add id & brand and don't send material properties to CuraEngine 2021-08-24 09:57:30 +02:00
Ghostkeeper
6b5ea9086f
Fix spelling in documentation
Saw this and wanted to take it along blindly with whatever next modification I made to Cura. However I need to switch branches now so it's just going to be a rather useless commit I guess.
2021-08-23 14:40:57 +02:00
Ghostkeeper
44913c0d87
Merge branch '4.11' 2021-08-20 17:37:49 +02:00
Konstantinos Karmas
ae3362f716 Fix "Manage printer" button pointing to the print job link
Both the "Manage printer" and the "Manage in browser" button were using the `openPrintJobControlPanel()` function, which was wrong. This is now fixed so that the "Manage printer" will use the `openPrinterControlPanel()` function as it should've in the first place.
2021-08-19 12:33:46 +02:00
Jaime van Kessel
0348293f87 Merge branch '4.11' of github.com:Ultimaker/Cura 2021-08-19 10:01:20 +02:00
Jaime van Kessel
668624e13d Set lifetimes correctly 2021-08-19 10:01:01 +02:00
Ghostkeeper
fcadba944a
Merge branch '4.11' into CURA-8491_sdk_upgrade_770 2021-08-19 09:17:17 +02:00
Konstantinos Karmas
9f31e1421b Make lifetime optional in the getBackwardsCompatibleMessage
This should fix the failing tests
2021-08-18 17:18:21 +02:00
Remco Burema
898abc92a8
Update SDK 7.6 -> 7.7 because of API changes in 4.11
CURA-8491
2021-08-18 16:56:29 +02:00
Ghostkeeper
8650dd9b0f
Merge branch '4.11' 2021-08-18 16:18:43 +02:00
Ghostkeeper
a40c7e7410
Default lifetime for successful upload messages
There is no real reason to keep this visible indefinitely.
2021-08-18 15:36:41 +02:00
Konstantinos Karmas
ef1d1dda5b Fix skipping the 48to49 upgrade in arachne
Currently:
* 48to49 upgrades the machine stacks from 4000016 to 50000**16**
* 49to50 upgrades the machine stacks from 4000016 to 50000**18**
As a result, the versionUpgrader in arachne skips the 48to49 because it sees that the 49to50 also increments the setting version.
This is now fixed by making sure that the 49to50 upgrades from **5**000016 to 5000018.

CURA-8468
2021-08-18 09:47:06 +02:00
Konstantinos Karmas
e5374ada3b Merge branch '4.11' 2021-08-17 15:59:53 +02:00
Jelle Spijker
d87c7a70cb
Switch return order for Repetier pauseAtHeight
While testing I noticed that the movement after the pause will
first move the head down and then move to the position before
the pause. This could result in noticeable artifacts or
accidentally push thin towers from the bed.) See the code below.

```gcode
;TYPE:CUSTOM
;added code by post processing
;script: PauseAtHeight.py
;current z: 5
;current height: 5.0
M83 ; switch to relative E values for any needed retraction
G1 F300 Z6 ; move up a millimeter to get out of the way
G1 F9000 X190 Y190
G1 F300 Z20.0
M84 E0
@pause now change filament and press ; Do the actual pause
G1 F300 Z5
G1 F9000 X30.759 Y30.759
G1 F1800 ; restore extrusion feedrate
```
I have switched the lines in the script such that it will first move to the correct X, Y and then move down
```python
prepend_gcode += self.putValue(G = 1, X = x, Y = y, F = 9000) + "\n"
prepend_gcode += self.putValue(G = 1, Z = current_z, F = 300) + "\n"
```
As shown in the code below
```gcode
;TYPE:CUSTOM
;added code by post processing
;script: PauseAtHeight.py
;current z: 5
;current height: 5.0
M83 ; switch to relative E values for any needed retraction
G1 F300 Z6 ; move up a millimeter to get out of the way
G1 F9000 X190 Y190
G1 F300 Z20.0
M84 E0
@pause now change filament and press ; Do the actual pause
G1 F9000 X30.759 Y30.759
G1 F300 Z5
G1 F1800 ; restore extrusion feedrate
```
2021-08-17 13:38:50 +02:00
fieldOfView
91b2a9b325 Fix typo 2021-08-16 21:07:55 +02:00
fieldOfView
f11869034b Add {material_type} and {material_name} as replacement patterns 2021-08-16 14:28:40 +02:00
fieldOfView
e4a04c186f Merge branch 'master' into feature_pause_at_height_optional_parking
# Conflicts:
#	plugins/PostProcessingPlugin/scripts/PauseAtHeight.py
2021-08-16 12:19:49 +02:00
fieldOfView
6c585deb1e Make parking optional
Not adding parking gcode makes the repetier @pause method suitable for use with OctoPrint.

Contributes to #7842
2021-08-16 12:15:38 +02:00
Jaime van Kessel
a124342127 Fix Pause at height issue
Fixes #8575

Thanks to @EGOiST1991 for suggesting the fix!
2021-08-16 11:15:30 +02:00
Jelle Spijker
7f79ccdf33
Merge pull request #10261 from Ultimaker/CURA-8468_fix_project_loading
Fix project loading Arachne
2021-08-13 09:27:28 +02:00
Jelle Spijker
4986861727
Merge branch 'master' into libArachne_rebased 2021-08-12 18:50:29 +02:00
Jaime van Kessel
4b324095ec Remove incorrect log
There is absolutely no reason that needed to be logged, since it
happens on *every* boot. It was also not a place where an exception
even happend.
2021-08-12 15:43:11 +02:00
Jaime van Kessel
21a076aea4 Set type of engine crash message to Error 2021-08-12 11:17:38 +02:00
Jaime van Kessel
34905857ee
Merge pull request #10267 from Ultimaker/CURA-8473_backwards_compat_messages_411
Digital Library plugin needs to be backwards compatible.
2021-08-12 11:15:01 +02:00
Remco Burema
3061490675
Fix look for string in enum-type.
CURA-8473
2021-08-12 10:05:16 +02:00
Konstantinos Karmas
f5bf88e546 Fix crashing when clicking the "Manage in browser"
The parenthesis should be placed at the end.
2021-08-12 09:51:27 +02:00
Konstantinos Karmas
71748bff8d Don't crash if the reply cannot be loaded
Fixes Sentry issue CURA-2RQ
2021-08-11 17:05:36 +02:00
Jaime van Kessel
fb18b278bf
Merge pull request #10245 from Ultimaker/CURA-7279_back_pressure_compensation
[CURA-7279] Back-Pressure Compensation
2021-08-11 15:52:32 +02:00
Remco Burema
ecf820f3db
Fix tests.
CURA-8473
2021-08-11 12:35:54 +02:00
Remco Burema
5d7804deae
Digital Library plugin needs to be backwards compatible.
Message-types are a new parameter to Messages, so they can't be used in SDK/API versions smaller than 7.7.0.

CURA-8473
2021-08-11 12:14:02 +02:00
Jaime van Kessel
988de58c4e Fix version upgrader for arachne
CURA-8468
2021-08-09 17:13:40 +02:00
Jaime van Kessel
5ea0344a65 Remove duplicated code from versionupgrader 2021-08-09 16:43:23 +02:00
Jaime van Kessel
8b2904ee3b Merge branch 'CURA-8441_campaign_links' of github.com:Ultimaker/Cura 2021-08-09 14:09:27 +02:00
Remco Burema
e119c46944
Fetch count from simple property instead of recalculation.
Polygons don't change when in layer-view. There's already an analogous elementCount property anyway, so a vertexCount property can't do much harm. Just keep in mind that when the polygons are altered, it should be either done via build, or the lineMeshXXXCount methods should be used instead.
2021-08-09 13:15:44 +02:00
Konstantinos Karmas
e18a840c43 Change troubleshooting link
CURA-8441
2021-08-09 13:00:25 +02:00
Remco Burema
818438a8d6
Merge branch 'graphics_buffer_update' of https://github.com/bremco/Cura into bremco-graphics_buffer_update 2021-08-09 12:09:19 +02:00
Jaime van Kessel
f8df3facc5 Merge branch 'CURA-8444_Digital_Library_does_not_work_on_earlier_Cura_versions' of github.com:Ultimaker/Cura 2021-08-09 11:03:24 +02:00
Jaime van Kessel
176077c910 Merge branch 'CURA-8436_Inform_user_that_the_webcam_is_disabled_for_cloud_printers' of github.com:Ultimaker/Cura 2021-08-09 11:00:58 +02:00
Remco Burema
586198c628
Remove direct flow equalization in favour of line-width based.
CURA-7279
2021-08-06 16:56:56 +02:00
Konstantinos Karmas
97c779cc53 Use the old icon names
So that they can still be found in 4.9 and 4.10 Cura version.

CURA-8444
2021-08-06 09:50:04 +02:00
Konstantinos Karmas
10ec9e2754 Remove the tooltipWidth property
The `tooltipWidth` property is not available in 4.9 and 4.10. This property was added to make sure that the tooltip has a smaller width than the DigitalLibrary window, or else the tooltip doesn't get drawn at all, which is confusing. Since it was not available in 4.9 and 4.10, the tooltip text smaller had to become smaller to make sure that it will fit.

CURA-8444
2021-08-06 09:49:29 +02:00
Konstantinos Karmas
22e407207f Manually add the magnifier icon in the search bar in DL
The `leftIcon` property, which is not available in 4.9 and 4.10, so the DigitalLibrary window wasn't getting drawn. To keep having the icon, I manually added the RecolorImage in the search textfield.

CURA-8444
2021-08-06 09:47:47 +02:00
Jaime van Kessel
57e66a5796 Add campaign links
CURA-8441
2021-08-05 15:42:23 +02:00
Remco Burema
1e5ea055aa
Changed cloud-printer message into proposal from growth group.
CURA-8436
2021-08-04 13:20:43 +02:00
Remco Burema
b72e200e2c
Add wall_min_flow[_retract] to removed settings in upgrade.
Also remove these settings from profiles which included them.

CURA-8442
2021-08-04 11:07:21 +02:00
Konstantinos Karmas
b0702e2312 Remove NativeRendering type in the MonitorInfoBlurb
Since it makes the letters look weird.

CURA-8436
2021-08-03 16:56:05 +02:00
Konstantinos Karmas
de9b1f82b9 Enable the tooltip when the camera button is disabled
CURA-8436
2021-08-03 16:55:11 +02:00
Konstantinos Karmas
7a5787bd18 Merge branch 'master' into CURA-8442_remove_wall_min_flow 2021-08-03 13:07:56 +02:00
Jaime van Kessel
be59e701f2 Add seperate preference for plugin notifications check
CURA-7689
2021-08-03 13:07:11 +02:00