Merge branch '5.8' into PP-495-Better-default-settings-for-seams

conandata.yml

@@ -1,17 +1,17 @@
-version: "5.8.0-alpha.0"
+version: "5.8.0-beta.1"
 requirements:
- - "cura_resources/(latest)@ultimaker/testing"
- - "uranium/(latest)@ultimaker/testing"
- - "curaengine/(latest)@ultimaker/testing"
- - "cura_binary_data/(latest)@ultimaker/testing"
- - "fdm_materials/(latest)@ultimaker/testing"
+ - "cura_resources/5.8.0-beta.1"
+ - "uranium/5.8.0-beta.1"
+ - "curaengine/5.8.0-beta.1"
+ - "cura_binary_data/5.8.0-beta.1"
+ - "fdm_materials/5.8.0-beta.1"
  - "curaengine_plugin_gradual_flow/0.1.1-beta.3"
  - "dulcificum/latest@ultimaker/testing"
  - "pysavitar/5.3.0"
  - "pynest2d/5.3.0"
  - "native_cad_plugin/2.0.0"
 requirements_internal:
- - "fdm_materials/(latest)@internal/testing"
+ - "fdm_materials/5.8.0-beta.1"
  - "cura_private_data/(latest)@internal/testing"
 urls:
  default:

cura/ApplicationMetadata.py

@@ -14,7 +14,7 @@
 # Each release has a fixed SDK version coupled with it. It doesn't make sense to make it configurable because, for
 # example Cura 3.2 with SDK version 6.1 will not work. So the SDK version is hard-coded here and left out of the
 # CuraVersion.py.in template.
-CuraSDKVersion = "8.7.0"
+CuraSDKVersion = "8.8.0"
 
 try:
  from cura.CuraVersion import CuraLatestURL

cura/PrinterOutput/Models/MaterialOutputModel.py

@@ -32,8 +32,8 @@ def getMaterialFromDefinition(guid, type, brand, name):
  "nylon" :{"name" :"Nylon" ,"guid": "283d439a-3490-4481-920c-c51d8cdecf9c"},
  "pc" :{"name" :"PC" ,"guid": "62414577-94d1-490d-b1e4-7ef3ec40db02"},
  "petg" :{"name" :"PETG" ,"guid": "69386c85-5b6c-421a-bec5-aeb1fb33f060"},
- "pla" :{"name" :"PLA" ,"guid": "0ff92885-617b-4144-a03c-9989872454bc"},
- "pva" :{"name" :"PVA" ,"guid": "a4255da2-cb2a-4042-be49-4a83957a2f9a"},
+ "pla" :{"name" :"PLA" ,"guid": "abb9c58e-1f56-48d1-bd8f-055fde3a5b56"},
+ "pva" :{"name" :"PVA" ,"guid": "add51ef2-86eb-4c39-afd5-5586564f0715"},
  "wss1" :{"name" :"RapidRinse" ,"guid": "a140ef8f-4f26-4e73-abe0-cfc29d6d1024"},
  "sr30" :{"name" :"SR-30" ,"guid": "77873465-83a9-4283-bc44-4e542b8eb3eb"},
  "bvoh" :{"name" :"BVOH" ,"guid": "923e604c-8432-4b09-96aa-9bbbd42207f4"},

resources/conandata.yml

@@ -1 +1 @@
-version: "5.8.0-alpha.0"
+version: "5.8.0-beta.1"

resources/i18n/cs_CZ/cura.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Cura 5.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-03-13 09:02+0100\n"
+"POT-Creation-Date: 2024-07-08 09:05+0200\n"
 "PO-Revision-Date: 2023-09-03 18:15+0200\n"
 "Last-Translator: Miroslav Šustek <sustmidown@centrum.cz>\n"
 "Language-Team: DenyCZ <www.github.com/DenyCZ>\n"
@@ -870,6 +870,10 @@ msgctxt "@label"
 msgid "Color scheme"
 msgstr "Barevné schéma"
 
+msgctxt "@label"
+msgid "Combination not recommended. Load BB core to slot 1 (left) for better reliability."
+msgstr ""
+
 msgctxt "@info"
 msgid "Compare and save."
 msgstr "Porovnat a uložit."
@@ -2431,6 +2435,10 @@ msgctxt "name"
 msgid "Makerbot Printfile Writer"
 msgstr ""
 
+msgctxt "@item:inlistbox"
+msgid "Makerbot Sketch Printfile"
+msgstr ""
+
 msgctxt "@error"
 msgid "MakerbotWriter could not save to the designated path."
 msgstr ""
@@ -3877,6 +3885,10 @@ msgctxt "@placeholder"
 msgid "Search"
 msgstr "Hledat"
 
+msgctxt "@label:textbox"
+msgid "Search Printer"
+msgstr ""
+
 msgctxt "@info"
 msgid "Search in the browser"
 msgstr "Hledat v prohlížeči"
@@ -4756,7 +4768,7 @@ msgid "This configuration is not available because %1 is not recognized. Please
 msgstr "Tato konfigurace není k dispozici, protože %1 nebyl rozpoznán. Navštivte prosím %2 a stáhněte si správný materiálový profil."
 
 msgctxt "@text:window"
-msgid "This is a Cura Universal project file. Would you like to open it as a Cura project or Cura Universal Project or import the models from it?"
+msgid "This is a Cura Universal project file. Would you like to open it as a Cura Universal Project or import the models from it?"
 msgstr ""
 
 msgctxt "@text:window"