GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-13 04:29:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '5.1'

Browse Source
This commit is contained in:
Jelle Spijker 2022-07-15 10:14:17 +02:00
commit c37285f9c0
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
conandata.yml
View File

@ -1,3 +1,15 @@
---
# Usage: defaults to None
# If you're on a release branch create an entry for that **version** e.q.: `5.1.0` update the requirements (use pinned versions, not latest)
# also create a beta entry for that **version** e.q.: `5.1.0-beta`, update the requirements (use the <dep_name>/(latest)@ultimaker/stable)
#
# If you're working on a feature/bugfix branch from a release branch, create an entry for that **channel**, update the requirements (use
# the <dep_name>/(latest)@ultimaker/stable)
#
# If you're working on a feature/bugfix branch from a main branch, it is optional to create an entry for that **channel**, update the
# requirements (use the <dep_name>/(latest)@ultimaker/testing)
#
# Subject to change in the future!
"None":
requirements:
- "arcus/(latest)@ultimaker/testing"

4
resources/qml/Preferences/Materials/MaterialsSyncDialog.qml
View File

@ -8,9 +8,9 @@ import QtQuick.Layouts 1.15
import QtQuick.Window 2.1
import Cura 1.1 as Cura
import UM 1.5 as UM
import UM 1.6 as UM
Window
UM.Window
{
id: materialsSyncDialog
property variant catalog: UM.I18nCatalog { name: "cura" }