Merge BS 1.7.7.89

# Conflicts: # bbl/i18n/ko/BambuStudio_ko.po # localization/i18n/OrcaSlicer.pot # localization/i18n/de/OrcaSlicer_de.po # localization/i18n/en/OrcaSlicer_en.po # localization/i18n/es/OrcaSlicer_es.po # localization/i18n/fr/OrcaSlicer_fr.po # localization/i18n/hu/OrcaSlicer_hu.po # localization/i18n/it/OrcaSlicer_it.po # localization/i18n/ja/OrcaSlicer_ja.po # localization/i18n/nl/OrcaSlicer_nl.po # localization/i18n/sv/OrcaSlicer_sv.po # localization/i18n/zh_cn/OrcaSlicer_zh_CN.po # resources/i18n/de/BambuStudio.mo # resources/i18n/en/BambuStudio.mo # resources/i18n/es/BambuStudio.mo # resources/i18n/fr/BambuStudio.mo # resources/i18n/hu/BambuStudio.mo # resources/i18n/it/BambuStudio.mo # resources/i18n/ja/BambuStudio.mo # resources/i18n/ko/BambuStudio.mo # resources/i18n/nl/BambuStudio.mo # resources/i18n/sv/BambuStudio.mo # resources/i18n/zh_cn/BambuStudio.mo # resources/profiles/Anycubic/machine/Anycubic Kobra Max 0.4 nozzle.json # src/OrcaSlicer.cpp # src/libnest2d/include/libnest2d/selections/firstfit.hpp # src/libslic3r/GCode/GCodeProcessor.cpp # src/libslic3r/Print.cpp # src/libslic3r/Print.hpp # src/libslic3r/PrintConfig.cpp # src/slic3r/GUI/CalibrationWizardPresetPage.cpp # src/slic3r/GUI/GLCanvas3D.cpp # src/slic3r/GUI/PartPlate.cpp # src/slic3r/GUI/PartPlate.hpp # src/slic3r/GUI/ReleaseNote.cpp # src/slic3r/GUI/Tab.cpp # version.inc
SoftFever · Oct 21, 2023 · a7729ca · a7729ca
2 parents 156c35e + 1d07869
commit a7729ca
Show file tree

Hide file tree

Showing 213 changed files with 2,089 additions and 648 deletions.
diff --git a/resources/data/hints.ini b/resources/data/hints.ini
@@ -164,6 +164,10 @@ documentation_link= https://wiki.bambulab.com/en/software/bambu-studio/reduce-wa
 [hint:Improve strength]
 text = Improve strength\nDid you know that you can use more wall loops and higher sparse infill density to improve the strength of the model?
 
+[hint:When need to print with the printer door opened]
+text = When need to print with the printer door opened\nOpening the printer door can reduce the probability of extruder/hotend clogging when printing lower temperature filament with a higher enclosure temperature. More info about this in the Wiki.
+documentation_link= https://wiki.bambulab.com/en/filament-acc/filament/heat-creep
+
 #[hint:]
 #text = 
 #hypertext =

diff --git a/resources/info/filament_info.json b/resources/info/filament_info.json
@@ -0,0 +1,27 @@
+{
+    "version": "1.0.0.1",
+    "high_temp_filament": [
+        "ABS",
+        "ASA",
+        "PC",
+        "PA",
+        "PA-CF",
+        "PA6-CF",
+        "PET-CF",
+        "PPS",
+        "PPS-CF",
+        "PPA-CF",
+        "PPA-GF"
+    ],
+    "low_temp_filament": [
+        "PLA",
+        "TPU",
+        "PLA-CF",
+        "PLA-AERO",
+        "PVA"
+    ],
+    "high_low_compatible_filament":[
+        "HIPS",
+        "PETG"
+    ]
+}
diff --git a/resources/info/nozzle_info.json b/resources/info/nozzle_info.json
@@ -0,0 +1,9 @@
+{
+    "version": "1.0.0.1",
+    "nozzle_hrc": {
+        "hardened_steel": 55,
+        "stainless_steel": 20,
+        "brass": 2,
+        "undefine": 0
+    }
+}
diff --git a/resources/profiles/BBL.json b/resources/profiles/BBL.json
@@ -1,7 +1,7 @@
 {
     "name": "Bambulab",
     "url": "http://www.bambulab.com/Parameters/vendor/BBL.json",
-    "version": "01.07.00.25",
+    "version": "01.07.00.29",
     "force_update": "0",
     "description": "the initial version of BBL configurations",
     "machine_model_list": [
@@ -24,6 +24,10 @@
         {
             "name": "Bambu Lab A1 mini",
             "sub_path": "machine/Bambu Lab A1 mini.json"
+        },
+        {
+            "name": "Bambu Lab X1E",
+            "sub_path": "machine/Bambu Lab X1E.json"
         }
     ],
     "process_list": [
@@ -1317,6 +1321,10 @@
             "name": "Bambu PA-CF @BBL P1P",
             "sub_path": "filament/P1P/Bambu PA-CF @BBL P1P.json"
         },
+        {
+            "name": "Generic PA-CF @BBL X1E",
+            "sub_path": "filament/Generic PA-CF @BBL X1E.json"
+        },
         {
             "name": "Bambu PAHT-CF @BBL X1C",
             "sub_path": "filament/Bambu PAHT-CF @BBL X1C.json"
@@ -1337,6 +1345,10 @@
             "name": "Bambu PA6-CF @BBL X1C",
             "sub_path": "filament/Bambu PA6-CF @BBL X1C.json"
         },
+        {
+            "name": "Bambu PA6-CF @BBL X1E",
+            "sub_path": "filament/Bambu PA6-CF @BBL X1E.json"
+        },
         {
             "name": "Generic HIPS @BBL X1C",
             "sub_path": "filament/Generic HIPS @BBL X1C.json"
@@ -1353,6 +1365,18 @@
             "name": "Generic HIPS @BBL A1M 0.2 nozzle",
             "sub_path": "filament/Generic HIPS @BBL A1M 0.2 nozzle.json"
         },
+        {
+            "name": "Generic PPS-CF @BBL X1E",
+            "sub_path": "filament/Generic PPS-CF @BBL X1E.json"
+        },
+        {
+            "name": "Generic PPS @BBL X1E",
+            "sub_path": "filament/Generic PPS @BBL X1E.json"
+        },
+        {
+            "name": "Generic PPA-CF @BBL X1E",
+            "sub_path": "filament/Generic PPA-CF @BBL X1E.json"
+        },
         {
             "name": "Generic PPA-CF @BBL X1C",
             "sub_path": "filament/Generic PPA-CF @BBL X1C.json"
@@ -1361,6 +1385,10 @@
             "name": "Generic PPA-GF @BBL X1C",
             "sub_path": "filament/Generic PPA-GF @BBL X1C.json"
         },
+        {
+            "name": "Generic PPA-GF @BBL X1E",
+            "sub_path": "filament/Generic PPA-GF @BBL X1E.json"
+        },
         {
             "name": "PolyTerra PLA @BBL X1C 0.2 nozzle",
             "sub_path": "filament/PolyTerra PLA @BBL X1C 0.2 nozzle.json"
@@ -1433,6 +1461,10 @@
             "name": "Bambu PETG-CF @BBL A1M 0.4 nozzle",
             "sub_path": "filament/Bambu PETG-CF @BBL A1M 0.4 nozzle.json"
         },
+        {
+            "name": "Bambu PET-CF @BBL X1E",
+            "sub_path": "filament/Bambu PET-CF @BBL X1E.json"
+        },
         {
             "name": "PolyLite PETG @BBL X1C 0.2 nozzle",
             "sub_path": "filament/PolyLite PETG @BBL X1C 0.2 nozzle.json"
@@ -1445,6 +1477,30 @@
             "name": "PolyLite PETG @BBL A1M 0.2 nozzle",
             "sub_path": "filament/PolyLite PETG @BBL A1M 0.2 nozzle.json"
         },
+        {
+            "name": "Bambu ABS @BBL X1E",
+            "sub_path": "filament/Bambu ABS @BBL X1E.json"
+        },
+        {
+            "name": "Bambu ABS @BBL X1E 0.2 nozzle",
+            "sub_path": "filament/Bambu ABS @BBL X1E 0.2 nozzle.json"
+        },
+        {
+            "name": "Bambu ABS @BBL X1E 0.8 nozzle",
+            "sub_path": "filament/Bambu ABS @BBL X1E 0.8 nozzle.json"
+        },
+        {
+            "name": "Generic ABS @BBL X1E",
+            "sub_path": "filament/Generic ABS @BBL X1E.json"
+        },
+        {
+            "name": "Generic ABS @BBL X1E 0.2 nozzle",
+            "sub_path": "filament/Generic ABS @BBL X1E 0.2 nozzle.json"
+        },
+        {
+            "name": "PolyLite ABS @BBL X1E",
+            "sub_path": "filament/PolyLite ABS @BBL X1E.json"
+        },
         {
             "name": "PolyLite ABS @BBL X1C 0.2 nozzle",
             "sub_path": "filament/PolyLite ABS @BBL X1C 0.2 nozzle.json"
@@ -1457,33 +1513,97 @@
             "name": "Bambu PC @BBL P1S",
             "sub_path": "filament/Bambu PC @BBL P1S.json"
         },
+        {
+            "name": "Bambu PC @BBL X1E",
+            "sub_path": "filament/Bambu PC @BBL X1E.json"
+        },
         {
             "name": "Bambu PC @BBL P1S 0.2 nozzle",
             "sub_path": "filament/Bambu PC @BBL P1S 0.2 nozzle.json"
         },
+        {
+            "name": "Bambu PC @BBL X1E 0.2 nozzle",
+            "sub_path": "filament/Bambu PC @BBL X1E 0.2 nozzle.json"
+        },
         {
             "name": "Bambu PC @BBL P1S 0.8 nozzle",
             "sub_path": "filament/Bambu PC @BBL P1S 0.8 nozzle.json"
         },
+        {
+            "name": "Bambu PC @BBL X1E 0.8 nozzle",
+            "sub_path": "filament/Bambu PC @BBL X1E 0.8 nozzle.json"
+        },
         {
             "name": "Bambu PC @BBL P1S 0.6 nozzle",
             "sub_path": "filament/Bambu PC @BBL P1S 0.6 nozzle.json"
         },
+        {
+            "name": "Bambu PC @BBL X1E 0.6 nozzle",
+            "sub_path": "filament/Bambu PC @BBL X1E 0.6 nozzle.json"
+        },
         {
             "name": "Generic PC @BBL P1S 0.2 nozzle",
             "sub_path": "filament/Generic PC @BBL P1S 0.2 nozzle.json"
         },
+        {
+            "name": "Generic PC @BBL X1E 0.2 nozzle",
+            "sub_path": "filament/Generic PC @BBL X1E 0.2 nozzle.json"
+        },
         {
             "name": "Generic PC @BBL P1S",
             "sub_path": "filament/Generic PC @BBL P1S.json"
         },
+        {
+            "name": "Generic PC @BBL X1E",
+            "sub_path": "filament/Generic PC @BBL X1E.json"
+        },
+        {
+            "name": "Generic ASA @BBL X1E 0.2 nozzle",
+            "sub_path": "filament/Generic ASA @BBL X1E 0.2 nozzle.json"
+        },
+        {
+            "name": "Generic ASA @BBL X1E",
+            "sub_path": "filament/Generic ASA @BBL X1E.json"
+        },
+        {
+            "name": "Bambu ASA @BBL X1E",
+            "sub_path": "filament/Bambu ASA @BBL X1E.json"
+        },
+        {
+            "name": "Bambu ASA @BBL X1E 0.2 nozzle",
+            "sub_path": "filament/Bambu ASA @BBL X1E 0.2 nozzle.json"
+        },
+        {
+            "name": "Bambu ASA @BBL X1E 0.4 nozzle",
+            "sub_path": "filament/Bambu ASA @BBL X1E 0.4 nozzle.json"
+        },
         {
             "name": "PolyLite ASA @BBL X1C 0.2 nozzle",
             "sub_path": "filament/PolyLite ASA @BBL X1C 0.2 nozzle.json"
         },
+        {
+            "name": "PolyLite ASA @BBL X1E",
+            "sub_path": "filament/PolyLite ASA @BBL X1E.json"
+        },
         {
             "name": "PolyLite ASA @BBL P1P 0.2 nozzle",
             "sub_path": "filament/PolyLite ASA @BBL P1P 0.2 nozzle.json"
+        },
+        {
+            "name": "Bambu Support G @BBL X1E",
+            "sub_path": "filament/Bambu Support G @BBL X1E.json"
+        },
+        {
+            "name": "Bambu PA-CF @BBL X1E",
+            "sub_path": "filament/Bambu PA-CF @BBL X1E.json"
+        },
+        {
+            "name": "PolyLite ABS @BBL X1E 0.2 nozzle",
+            "sub_path": "filament/PolyLite ABS @BBL X1E 0.2 nozzle.json"
+        },
+        {
+            "name": "PolyLite ASA @BBL X1E 0.2 nozzle",
+            "sub_path": "filament/PolyLite ASA @BBL X1E 0.2 nozzle.json"
         }
     ],
     "machine_list": [
@@ -1515,6 +1635,10 @@
             "name": "Bambu Lab A1 mini 0.4 nozzle",
             "sub_path": "machine/Bambu Lab A1 mini 0.4 nozzle.json"
         },
+        {
+            "name": "Bambu Lab X1E 0.4 nozzle",
+            "sub_path": "machine/Bambu Lab X1E 0.4 nozzle.json"
+        },
         {
             "name": "Bambu Lab X1 Carbon 0.2 nozzle",
             "sub_path": "machine/Bambu Lab X1 Carbon 0.2 nozzle.json"
@@ -1574,6 +1698,18 @@
         {
             "name": "Bambu Lab A1 mini 0.8 nozzle",
             "sub_path": "machine/Bambu Lab A1 mini 0.8 nozzle.json"
+        },
+        {
+            "name": "Bambu Lab X1E 0.2 nozzle",
+            "sub_path": "machine/Bambu Lab X1E 0.2 nozzle.json"
+        },
+        {
+            "name": "Bambu Lab X1E 0.6 nozzle",
+            "sub_path": "machine/Bambu Lab X1E 0.6 nozzle.json"
+        },
+        {
+            "name": "Bambu Lab X1E 0.8 nozzle",
+            "sub_path": "machine/Bambu Lab X1E 0.8 nozzle.json"
         }
     ]
-}
+}
diff --git a/resources/profiles/BBL/Bambu Lab X1E_cover.png b/resources/profiles/BBL/Bambu Lab X1E_cover.png
diff --git a/resources/profiles/BBL/filament/Bambu ABS @BBL X1E 0.2 nozzle.json b/resources/profiles/BBL/filament/Bambu ABS @BBL X1E 0.2 nozzle.json
@@ -0,0 +1,11 @@
+{
+    "type": "filament",
+    "name": "Bambu ABS @BBL X1E 0.2 nozzle",
+    "inherits": "Bambu ABS @BBL X1C 0.2 nozzle",
+    "from": "system",
+    "setting_id": "GFSB00_05",
+    "instantiation": "true",
+    "compatible_printers": [
+        "Bambu Lab X1E 0.2 nozzle"
+    ]
+}
diff --git a/resources/profiles/BBL/filament/Bambu ABS @BBL X1E 0.8 nozzle.json b/resources/profiles/BBL/filament/Bambu ABS @BBL X1E 0.8 nozzle.json
@@ -0,0 +1,11 @@
+{
+    "type": "filament",
+    "name": "Bambu ABS @BBL X1E 0.8 nozzle",
+    "inherits": "Bambu ABS @BBL X1C 0.8 nozzle",
+    "from": "system",
+    "setting_id": "GFSB00_06",
+    "instantiation": "true",
+    "compatible_printers": [
+        "Bambu Lab X1E 0.8 nozzle"
+    ]
+}
diff --git a/resources/profiles/BBL/filament/Bambu ABS @BBL X1E.json b/resources/profiles/BBL/filament/Bambu ABS @BBL X1E.json
@@ -0,0 +1,12 @@
+{
+    "type": "filament",
+    "name": "Bambu ABS @BBL X1E",
+    "inherits": "Bambu ABS @BBL X1C",
+    "from": "system",
+    "setting_id": "GFSB00_04",
+    "instantiation": "true",
+    "compatible_printers": [
+        "Bambu Lab X1E 0.4 nozzle",
+        "Bambu Lab X1E 0.6 nozzle"
+    ]
+}
diff --git a/resources/profiles/BBL/filament/Bambu ASA @BBL X1E 0.2 nozzle.json b/resources/profiles/BBL/filament/Bambu ASA @BBL X1E 0.2 nozzle.json
@@ -0,0 +1,11 @@
+{
+    "type": "filament",
+    "name": "Bambu ASA @BBL X1E 0.2 nozzle",
+    "inherits": "Bambu ASA @BBL X1C 0.2 nozzle",
+    "from": "system",
+    "setting_id": "GFSB01_06",
+    "instantiation": "true",
+    "compatible_printers": [
+        "Bambu Lab X1E 0.2 nozzle"
+    ]
+}
diff --git a/resources/profiles/BBL/filament/Bambu ASA @BBL X1E 0.4 nozzle.json b/resources/profiles/BBL/filament/Bambu ASA @BBL X1E 0.4 nozzle.json
@@ -0,0 +1,14 @@
+{
+    "type": "filament",
+    "name": "Bambu ASA @BBL X1E 0.4 nozzle",
+    "inherits": "Bambu ASA @BBL X1C 0.4 nozzle",
+    "from": "system",
+    "setting_id": "GFSB01_07",
+    "instantiation": "true",
+    "chamber_temperatures": [
+        "0"
+    ],
+    "compatible_printers": [
+        "Bambu Lab X1E 0.4 nozzle"
+    ]
+}
diff --git a/resources/profiles/BBL/filament/Bambu ASA @BBL X1E.json b/resources/profiles/BBL/filament/Bambu ASA @BBL X1E.json
@@ -0,0 +1,12 @@
+{
+    "type": "filament",
+    "name": "Bambu ASA @BBL X1E",
+    "inherits": "Bambu ASA @BBL X1C",
+    "from": "system",
+    "setting_id": "GFSB01_05",
+    "instantiation": "true",
+    "compatible_printers": [
+        "Bambu Lab X1E 0.6 nozzle",
+        "Bambu Lab X1E 0.8 nozzle"
+    ]
+}
diff --git a/resources/profiles/BBL/filament/Bambu PA-CF @BBL X1E.json b/resources/profiles/BBL/filament/Bambu PA-CF @BBL X1E.json
@@ -0,0 +1,16 @@
+{
+    "type": "filament",
+    "name": "Bambu PA-CF @BBL X1E",
+    "inherits": "Bambu PA-CF @BBL X1C",
+    "from": "system",
+    "setting_id": "GFSN03_00",
+    "instantiation": "true",
+    "chamber_temperatures": [
+        "60"
+    ],
+    "compatible_printers": [
+        "Bambu Lab X1E 0.4 nozzle",
+        "Bambu Lab X1E 0.6 nozzle",
+        "Bambu Lab X1E 0.8 nozzle"
+    ]
+}