Merge branch 'main' into main

This commit is contained in:
SoftFever
2024-12-02 10:40:47 +08:00
committed by GitHub
87 changed files with 782 additions and 254 deletions

View File

@@ -289,7 +289,7 @@ msgid "Dowel"
msgstr "Dowel" msgstr "Dowel"
msgid "Snap" msgid "Snap"
msgstr "Snap" msgstr "スナップ"
msgid "Prism" msgid "Prism"
msgstr "プリズム" msgstr "プリズム"
@@ -374,7 +374,7 @@ msgid "Change cut mode"
msgstr "カットモード変更" msgstr "カットモード変更"
msgid "Tolerance" msgid "Tolerance"
msgstr "Tolerance" msgstr "公差"
msgid "Drag" msgid "Drag"
msgstr "Drag" msgstr "Drag"
@@ -383,13 +383,13 @@ msgid "Draw cut line"
msgstr "" msgstr ""
msgid "Left click" msgid "Left click"
msgstr "Left click" msgstr "左クリック"
msgid "Add connector" msgid "Add connector"
msgstr "Add connector" msgstr "Add connector"
msgid "Right click" msgid "Right click"
msgstr "Right click" msgstr "右クリック"
msgid "Remove connector" msgid "Remove connector"
msgstr "Remove connector" msgstr "Remove connector"
@@ -468,13 +468,13 @@ msgid "Reset cutting plane and remove connectors"
msgstr "カット面をリセットし、コネクターを削除" msgstr "カット面をリセットし、コネクターを削除"
msgid "Upper part" msgid "Upper part"
msgstr "Upper part" msgstr "上部パーツ"
msgid "Lower part" msgid "Lower part"
msgstr "Lower part" msgstr "下部パーツ"
msgid "Keep" msgid "Keep"
msgstr "Keep" msgstr "残す"
msgid "Flip" msgid "Flip"
msgstr "Flip" msgstr "Flip"
@@ -1278,7 +1278,7 @@ msgid "Center of edge"
msgstr "Center of edge" msgstr "Center of edge"
msgid "Center of circle" msgid "Center of circle"
msgstr "Center of circle" msgstr "円の中心"
msgid "ShiftLeft mouse button" msgid "ShiftLeft mouse button"
msgstr "" msgstr ""
@@ -1466,7 +1466,7 @@ msgid "Choose one file (3mf):"
msgstr "ファイルを選択 (3mf):" msgstr "ファイルを選択 (3mf):"
msgid "Choose one or more files (3mf/step/stl/svg/obj/amf/usd*/abc/ply):" msgid "Choose one or more files (3mf/step/stl/svg/obj/amf/usd*/abc/ply):"
msgstr "Choose one or more files (3mf/step/stl/svg/obj/amf/usd*/abc/ply):" msgstr "1つ以上のファイルを選択してください (3mf/step/stl/svg/obj/amf/usd*/abc/ply):"
msgid "Choose one or more files (3mf/step/stl/svg/obj/amf):" msgid "Choose one or more files (3mf/step/stl/svg/obj/amf):"
msgstr "ファイルを選択 (3mf/step/stl/svg/obj/amf)" msgstr "ファイルを選択 (3mf/step/stl/svg/obj/amf)"
@@ -1732,10 +1732,10 @@ msgid "Set as individual objects"
msgstr "個別オブジェクトとして設定" msgstr "個別オブジェクトとして設定"
msgid "Fill bed with copies" msgid "Fill bed with copies"
msgstr "Fill bed with copies" msgstr "コピーでビルドプレートを埋める"
msgid "Fill the remaining area of bed with copies of the selected object" msgid "Fill the remaining area of bed with copies of the selected object"
msgstr "Fill the remaining area of bed with copies of the selected object" msgstr "選択したオブジェクトのコピーでビルドプレートの残りの領域を埋める"
msgid "Printable" msgid "Printable"
msgstr "造形可能" msgstr "造形可能"
@@ -1744,7 +1744,7 @@ msgid "Fix model"
msgstr "モデルを修復" msgstr "モデルを修復"
msgid "Export as one STL" msgid "Export as one STL"
msgstr "Export as one STL" msgstr "1つのSTLとしてエクスポート"
msgid "Export as STLs" msgid "Export as STLs"
msgstr "Export as STLs" msgstr "Export as STLs"
@@ -1916,10 +1916,10 @@ msgid "arrange current plate"
msgstr "現在のプレートをレイアウト" msgstr "現在のプレートをレイアウト"
msgid "Reload All" msgid "Reload All"
msgstr "" msgstr "全て再読み込み"
msgid "reload all from disk" msgid "reload all from disk"
msgstr "" msgstr "全てディスクから再読み込み"
msgid "Auto Rotate" msgid "Auto Rotate"
msgstr "自動回転" msgstr "自動回転"
@@ -2068,7 +2068,7 @@ msgstr ""
"cut information first." "cut information first."
msgid "Delete all connectors" msgid "Delete all connectors"
msgstr "Delete all connectors" msgstr "全てのコネクターを削除"
msgid "Deleting the last solid part is not allowed." msgid "Deleting the last solid part is not allowed."
msgstr "最後のソリッドパーツは削除できません。" msgstr "最後のソリッドパーツは削除できません。"
@@ -2205,13 +2205,13 @@ msgid "Mouse ear"
msgstr "" msgstr ""
msgid "Outer brim only" msgid "Outer brim only"
msgstr "Outer brim only" msgstr "外側ブリムのみ"
msgid "Inner brim only" msgid "Inner brim only"
msgstr "Inner brim only" msgstr "内側ブリムのみ"
msgid "Outer and inner brim" msgid "Outer and inner brim"
msgstr "Outer and inner brim" msgstr "外側および内側ブリム"
msgid "No-brim" msgid "No-brim"
msgstr "ブリム無し" msgstr "ブリム無し"
@@ -2286,7 +2286,7 @@ msgid "Add Pause"
msgstr "一時停止を追加" msgstr "一時停止を追加"
msgid "Insert a pause command at the beginning of this layer." msgid "Insert a pause command at the beginning of this layer."
msgstr "Insert a pause command at the beginning of this layer." msgstr "このレイヤーの先頭にポーズコマンドを挿入"
msgid "Add Custom G-code" msgid "Add Custom G-code"
msgstr "カスタムG-codeを追加" msgstr "カスタムG-codeを追加"
@@ -2298,13 +2298,13 @@ msgid "Add Custom Template"
msgstr "カスタムテンプレートを追加" msgstr "カスタムテンプレートを追加"
msgid "Insert template custom G-code at the beginning of this layer." msgid "Insert template custom G-code at the beginning of this layer."
msgstr "Insert template custom G-code at the beginning of this layer." msgstr "このレイヤーの先頭にテンプレートカスタムGコードを挿入"
msgid "Filament " msgid "Filament "
msgstr "フィラメント" msgstr "フィラメント"
msgid "Change filament at the beginning of this layer." msgid "Change filament at the beginning of this layer."
msgstr "Change filament at the beginning of this layer." msgstr "このレイヤーの先頭でフィラメントを交換"
msgid "Delete Pause" msgid "Delete Pause"
msgstr "Delete Pause" msgstr "Delete Pause"
@@ -2337,19 +2337,19 @@ msgid "code"
msgstr "code" msgstr "code"
msgid "Failed to connect to cloud service" msgid "Failed to connect to cloud service"
msgstr "Failed to connect to cloud service" msgstr "クラウドサービスへの接続に失敗しました。"
msgid "Please click on the hyperlink above to view the cloud service status" msgid "Please click on the hyperlink above to view the cloud service status"
msgstr "Please click on the hyperlink above to view the cloud service status" msgstr "クラウドサービスのステータスを確認するには、上記のハイパーリンクをクリックしてください。"
msgid "Failed to connect to the printer" msgid "Failed to connect to the printer"
msgstr "プリンターへ接続できませんでした" msgstr "プリンターへ接続できませんでした"
msgid "Connection to printer failed" msgid "Connection to printer failed"
msgstr "Connection to printer failed" msgstr "プリンターへの接続に失敗しました。"
msgid "Please check the network connection of the printer and Orca." msgid "Please check the network connection of the printer and Orca."
msgstr "Please check the network connection of the printer and Orca." msgstr "プリンターとOrcaのネットワーク接続を確認してください。"
msgid "Connecting..." msgid "Connecting..."
msgstr "接続中…" msgstr "接続中…"
@@ -8614,10 +8614,10 @@ msgid "Where to find your printer's IP and Access Code?"
msgstr "どこでプリンターのIPアドレスとアクセスコードを確認できますか" msgstr "どこでプリンターのIPアドレスとアクセスコードを確認できますか"
msgid "Step 3: Ping the IP address to check for packet loss and latency." msgid "Step 3: Ping the IP address to check for packet loss and latency."
msgstr "Step 3: Ping the IP address to check for packet loss and latency." msgstr "ステップ3: パケットロスとレイテンシを確認するために、IPアドレスに対してpingを実行します。"
msgid "Test" msgid "Test"
msgstr "Test" msgstr "テスト"
msgid "IP and Access Code Verified! You may close the window" msgid "IP and Access Code Verified! You may close the window"
msgstr "IP and Access Code Verified! You may close the window" msgstr "IP and Access Code Verified! You may close the window"
@@ -8887,13 +8887,13 @@ msgid "file open failed"
msgstr "file open failed" msgstr "file open failed"
msgid "file create failed" msgid "file create failed"
msgstr "file create failed" msgstr "ファイルの作成に失敗しました"
msgid "file write failed" msgid "file write failed"
msgstr "file write failed" msgstr "ファイルの書き込みに失敗しました"
msgid "file read failed" msgid "file read failed"
msgstr "file read failed" msgstr "ファイルの読み込みに失敗しました"
msgid "file close failed" msgid "file close failed"
msgstr "file close failed" msgstr "file close failed"
@@ -9028,13 +9028,15 @@ msgid ""
"Ooze prevention is only supported with the wipe tower when " "Ooze prevention is only supported with the wipe tower when "
"'single_extruder_multi_material' is off." "'single_extruder_multi_material' is off."
msgstr "" msgstr ""
"オーズ防止は、'single_extruder_multi_material'がオフの場合にのみ、 "
"ワイプタワーと併用してサポートされます。"
msgid "" msgid ""
"The prime tower is currently only supported for the Marlin, RepRap/Sprinter, " "The prime tower is currently only supported for the Marlin, RepRap/Sprinter, "
"RepRapFirmware and Repetier G-code flavors." "RepRapFirmware and Repetier G-code flavors."
msgstr "" msgstr ""
"The prime tower is currently only supported for the Marlin, RepRap/Sprinter, " "プライムタワーは現在、MarlinRepRap/Sprinter、RepRapFirmware、"
"RepRapFirmware and Repetier G-code flavors." "およびRepetierのGコード形式のみサポートされています。"
msgid "The prime tower is not supported in \"By object\" print." msgid "The prime tower is not supported in \"By object\" print."
msgstr "オブジェクト順で造形する場合、プライムタワーを利用できません" msgstr "オブジェクト順で造形する場合、プライムタワーを利用できません"
@@ -15371,10 +15373,10 @@ msgid "Could not connect to Prusa Connect"
msgstr "Prusaコネクトに接続できませんでした" msgstr "Prusaコネクトに接続できませんでした"
msgid "Connection to Repetier works correctly." msgid "Connection to Repetier works correctly."
msgstr "Connection to Repetier is working correctly." msgstr "Repetierへの接続は正常に動作しています"
msgid "Could not connect to Repetier" msgid "Could not connect to Repetier"
msgstr "Could not connect to Repetier" msgstr "Repetierに接続できませんでした。"
msgid "Note: Repetier version at least 0.90.0 is required." msgid "Note: Repetier version at least 0.90.0 is required."
msgstr "Note: Repetier version 0.90.0 or higher is required." msgstr "Note: Repetier version 0.90.0 or higher is required."
@@ -15437,8 +15439,8 @@ msgid ""
"height, and results in slightly visible layer lines, but shorter printing " "height, and results in slightly visible layer lines, but shorter printing "
"time." "time."
msgstr "" msgstr ""
"Compared with the default profile of a 0.2 mm nozzle, it has a bigger layer " "0.2 mmズルのデフォルトプロファイルと比較すると、レイヤー高さが大きくなっています。"
"height. This results in slightly visible layer lines but shorter print time." "そのため、レイヤーラインがわずかに見えますが、印刷時間は短縮されます。"
msgid "" msgid ""
"Compared with the default profile of a 0.2 mm nozzle, it has a smaller layer " "Compared with the default profile of a 0.2 mm nozzle, it has a smaller layer "

View File

@@ -5,18 +5,18 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: OrcaSlicer V2.2.0-beta2\n" "Project-Id-Version: OrcaSlicer V2.2.0 Official Release\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-10-27 23:05+0800\n" "POT-Creation-Date: 2024-10-27 23:05+0800\n"
"PO-Revision-Date: 2024-09-25 22:36+0700\n" "PO-Revision-Date: 2024-11-30 20:56+0700\n"
"Last-Translator: \n" "Last-Translator: \n"
"Language-Team: Andylg <andylg@yandex.ru>\n" "Language-Team: Andylg <andylg@yandex.ru>\n"
"Language: ru_RU\n" "Language: ru_RU\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
"%10<=4 && (n%100<12 || n%100>14) ? 1 : 2);\n" "n%10<=4 && (n%100<12 || n%100>14) ? 1 : 2);\n"
"X-Generator: Poedit 3.5\n" "X-Generator: Poedit 3.5\n"
msgid "Supports Painting" msgid "Supports Painting"
@@ -101,8 +101,9 @@ msgstr "Позволяет рисовать на выбранных гранях
msgid "Highlight faces according to overhang angle." msgid "Highlight faces according to overhang angle."
msgstr "Выделение граней по углу свеса." msgstr "Выделение граней по углу свеса."
# это в рисование поддержки идет после - Выделение граней по углу свеса.
msgid "No auto support" msgid "No auto support"
msgstr "Откл. автоподдержку" msgstr "Автоподдержка отключена."
msgid "Support Generated" msgid "Support Generated"
msgstr "Поддержка сгенерирована" msgstr "Поддержка сгенерирована"
@@ -361,17 +362,17 @@ msgid ""
"Click to flip the cut plane\n" "Click to flip the cut plane\n"
"Drag to move the cut plane" "Drag to move the cut plane"
msgstr "" msgstr ""
"Нажмите, чтобы перевернуть секущую плоскость\n" "Нажмите, чтобы перевернуть секущую плоскость.\n"
"Двигайте, чтобы переместить секущую плоскость" "Двигайте, чтобы переместить секущую плоскость."
msgid "" msgid ""
"Click to flip the cut plane\n" "Click to flip the cut plane\n"
"Drag to move the cut plane\n" "Drag to move the cut plane\n"
"Right-click a part to assign it to the other side" "Right-click a part to assign it to the other side"
msgstr "" msgstr ""
"Нажмите, чтобы перевернуть секущую плоскость\n" "Нажмите, чтобы перевернуть секущую плоскость.\n"
"Двигайте, чтобы переместить секущую плоскость\n" "Двигайте, чтобы переместить секущую плоскость.\n"
"Правая кнопка мыши на части модели для переназначения стороны" "Для переназначения стороны части модели используйте правую кнопку мыши."
msgid "Move cut plane" msgid "Move cut plane"
msgstr "Перемещение секущей плоскости" msgstr "Перемещение секущей плоскости"
@@ -507,16 +508,16 @@ msgstr "Обнаружены недопустимые соединения"
#, c-format, boost-format #, c-format, boost-format
msgid "%1$d connector is out of cut contour" msgid "%1$d connector is out of cut contour"
msgid_plural "%1$d connectors are out of cut contour" msgid_plural "%1$d connectors are out of cut contour"
msgstr[0] "%1$d соединение выходит за контур модели" msgstr[0] "%1$d соединение выходит за контур модели."
msgstr[1] "%1$d соединения выходит за контур модели" msgstr[1] "%1$d соединения выходит за контур модели."
msgstr[2] "%1$d соединений выходит за контур модели" msgstr[2] "%1$d соединений выходит за контур модели."
#, c-format, boost-format #, c-format, boost-format
msgid "%1$d connector is out of object" msgid "%1$d connector is out of object"
msgid_plural "%1$d connectors are out of object" msgid_plural "%1$d connectors are out of object"
msgstr[0] "%1$d соединение находится за пределами модели" msgstr[0] "%1$d соединение находится за пределами модели."
msgstr[1] "%1$d соединения находится за пределами модели" msgstr[1] "%1$d соединения находится за пределами модели."
msgstr[2] "%1$d соединений находится за пределами модели" msgstr[2] "%1$d соединений находится за пределами модели."
msgid "Some connectors are overlapped" msgid "Some connectors are overlapped"
msgstr "Имеются пересекающие соединения" msgstr "Имеются пересекающие соединения"
@@ -605,7 +606,6 @@ msgstr "Показывать каркас"
msgid "%1%" msgid "%1%"
msgstr "%1%" msgstr "%1%"
# ???
msgid "Can't apply when process preview." msgid "Can't apply when process preview."
msgstr "Невозможно применить при предпросмотре нарезки." msgstr "Невозможно применить при предпросмотре нарезки."
@@ -1247,10 +1247,10 @@ msgstr ""
"Блокировка/разблокировка угла поворота при перетаскивании над поверхностью." "Блокировка/разблокировка угла поворота при перетаскивании над поверхностью."
msgid "Mirror vertically" msgid "Mirror vertically"
msgstr "Зеркалировать по вертикали" msgstr "Отзеркалить по вертикали"
msgid "Mirror horizontally" msgid "Mirror horizontally"
msgstr "Зеркалировать по горизонтали" msgstr "Отзеркалить по горизонтали"
#. TRN: This is the name of the action that shows in undo/redo stack (changing part type from SVG to something else). #. TRN: This is the name of the action that shows in undo/redo stack (changing part type from SVG to something else).
msgid "Change SVG Type" msgid "Change SVG Type"
@@ -2446,11 +2446,11 @@ msgstr "Автодозаправка"
msgid "AMS not connected" msgid "AMS not connected"
msgstr "АСПП не подключена" msgstr "АСПП не подключена"
# ???? кнопка в интерфейсе? Extrude - Выдавить - Load # ??? кнопка в интерфейсе? Extrude - Выдавить - Load
msgid "Load" msgid "Load"
msgstr "Выдавить" msgstr "Выдавить"
# ???? кнопка в интерфейсе? retract - Втянуть - Unload (Выгрузить, Вырузка) # ??? кнопка в интерфейсе? retract - Втянуть - Unload (Выгрузить, Вырузка)
msgid "Unload" msgid "Unload"
msgstr "Втянуть" msgstr "Втянуть"
@@ -2483,6 +2483,7 @@ msgstr "Отменить калибровку"
msgid "Idling..." msgid "Idling..."
msgstr "Простой..." msgstr "Простой..."
# При выгрузке/загрузке прутка справа отображается процесс
msgid "Heat the nozzle" msgid "Heat the nozzle"
msgstr "Нагрев сопла" msgstr "Нагрев сопла"
@@ -3877,6 +3878,7 @@ msgstr "Пауза при неисправности температуры ст
msgid "Filament unloading" msgid "Filament unloading"
msgstr "Выгрузка прутка" msgstr "Выгрузка прутка"
# ???
msgid "Skip step pause" msgid "Skip step pause"
msgstr "Пропуск команды паузы" msgstr "Пропуск команды паузы"
@@ -3889,6 +3891,7 @@ msgstr "Калибровка шума двигателя"
msgid "Paused due to AMS lost" msgid "Paused due to AMS lost"
msgstr "Печать приостановлена из-за потери связи с АСПП" msgstr "Печать приостановлена из-за потери связи с АСПП"
# ??? Печать приостановлена из-за низкой скорости вентилятора радиатора головы
msgid "Paused due to low speed of the heat break fan" msgid "Paused due to low speed of the heat break fan"
msgstr "" msgstr ""
"Печать приостановлена из-за низкой скорости вентилятора обдува радиатора " "Печать приостановлена из-за низкой скорости вентилятора обдува радиатора "
@@ -4610,7 +4613,7 @@ msgstr "Авторизация"
msgid "Preview" msgid "Preview"
msgstr "Предпросмотр нарезки" msgstr "Предпросмотр нарезки"
# ??? Управ. принтерами, Управ. устройствами, менеджер устройств, Диспетчер устройств, Принтеры # ??? Управ. принтерами, менеджер принтеров, Диспетчер принтеров
msgid "Multi-device" msgid "Multi-device"
msgstr "Принтеры" msgstr "Принтеры"
@@ -5070,7 +5073,7 @@ msgid "File is missing"
msgstr "Файл отсутствует" msgstr "Файл отсутствует"
msgid "The project is no longer available." msgid "The project is no longer available."
msgstr "Проект больше не доступен." msgstr "Проект больше недоступен."
msgid "Filament Settings" msgid "Filament Settings"
msgstr "Настройки прутка" msgstr "Настройки прутка"
@@ -5152,7 +5155,7 @@ msgstr ""
msgid "The printer has been logged out and cannot connect." msgid "The printer has been logged out and cannot connect."
msgstr "Принтер вышел из системы и не может подключиться." msgstr "Принтер вышел из системы и не может подключиться."
# ??? Трансляция, видеотрансляция остановлена # ??? видеотрансляция остановлена
msgid "Stopped." msgid "Stopped."
msgstr "Трансляция с камеры остановлена." msgstr "Трансляция с камеры остановлена."
@@ -5784,8 +5787,8 @@ msgstr "Безопасное извлечение устройства."
msgid "%1$d Object has custom supports." msgid "%1$d Object has custom supports."
msgid_plural "%1$d Objects have custom supports." msgid_plural "%1$d Objects have custom supports."
msgstr[0] "%1$d модель имеет пользовательскую поддержку." msgstr[0] "%1$d модель имеет пользовательскую поддержку."
msgstr[1] "%1$d модели имеют пользовательские поддержки." msgstr[1] "%1$d модели имеют пользовательскую поддержку."
msgstr[2] "%1$d моделей имеют пользовательские поддержки." msgstr[2] "%1$d моделей имеют пользовательскую поддержку."
#, c-format, boost-format #, c-format, boost-format
msgid "%1$d Object has color painting." msgid "%1$d Object has color painting."
@@ -5958,7 +5961,7 @@ msgid "View all object's settings"
msgstr "Просмотр всех настроек модели" msgstr "Просмотр всех настроек модели"
msgid "Material settings" msgid "Material settings"
msgstr "Параметры материала" msgstr "Настройки материала"
msgid "Remove current plate (if not last one)" msgid "Remove current plate (if not last one)"
msgstr "Удалить текущую печатную пластину (кроме последней)" msgstr "Удалить текущую печатную пластину (кроме последней)"
@@ -6120,7 +6123,7 @@ msgid ""
"nozzle hardness of the printer. Please replace the hardened nozzle or " "nozzle hardness of the printer. Please replace the hardened nozzle or "
"filament, otherwise, the nozzle will be attrited or damaged." "filament, otherwise, the nozzle will be attrited or damaged."
msgstr "" msgstr ""
"Твердость сопла, установленного по умолчанию, не достаточна для печати " "Твердость сопла, установленного по умолчанию, недостаточна для печати "
"данной пластиковой нитью. Замените сопло на закалённое или смените " "данной пластиковой нитью. Замените сопло на закалённое или смените "
"пластиковую нить. В противном случае сопло будет изношено или повреждено." "пластиковую нить. В противном случае сопло будет изношено или повреждено."
@@ -6510,15 +6513,17 @@ msgid ""
"will be kept. You may fix the meshes and try again." "will be kept. You may fix the meshes and try again."
msgstr "" msgstr ""
"Невозможно выполнить булеву операцию над сетками модели. Будут сохранены " "Невозможно выполнить булеву операцию над сетками модели. Будут сохранены "
"только положительные части. Вы можете исправить сетки и попробовать снова." "только положительные части. Попробуйте починить сетку модели и попробовать "
"снова."
#, boost-format #, boost-format
msgid "Reason: part \"%1%\" is empty." msgid "Reason: part \"%1%\" is empty."
msgstr "Причина: часть \"%1%\" пустая." msgstr "Причина: часть \"%1%\" пустая."
# ??? не формирует объем, не имеет замкнутой геометрии
#, boost-format #, boost-format
msgid "Reason: part \"%1%\" does not bound a volume." msgid "Reason: part \"%1%\" does not bound a volume."
msgstr "Причина: часть \"%1%\" не ограничивает объём." msgstr "Причина: часть \"%1%\" не формирует замкнутый объём."
#, boost-format #, boost-format
msgid "Reason: part \"%1%\" has self intersection." msgid "Reason: part \"%1%\" has self intersection."
@@ -6532,6 +6537,8 @@ msgid ""
"Unable to perform boolean operation on model meshes. Only positive parts " "Unable to perform boolean operation on model meshes. Only positive parts "
"will be exported." "will be exported."
msgstr "" msgstr ""
"Невозможно выполнить булеву операцию над сетками модели. Будут "
"экспортированы только положительные части."
msgid "" msgid ""
"Are you sure you want to store original SVGs with their local paths into the " "Are you sure you want to store original SVGs with their local paths into the "
@@ -7091,14 +7098,13 @@ msgstr "Создать принтер"
msgid "The selected preset is null!" msgid "The selected preset is null!"
msgstr "Выбранный профиль пуст!" msgstr "Выбранный профиль пуст!"
# ?????? В двух местах - в одном месте кнопка в другом Конечный слой # ?????? В двух местах - в одном месте кнопка в другом Конечный слой. В V2.2.0beta2 пока не исправлено
msgid "End" msgid "End"
msgstr "End" msgstr "End"
msgid "Customize" msgid "Customize"
msgstr "Настройка" msgstr "Настройка"
# ??? layer?
msgid "Other layer filament sequence" msgid "Other layer filament sequence"
msgstr "Последовательность прутков на других слоях" msgstr "Последовательность прутков на других слоях"
@@ -7801,8 +7807,8 @@ msgstr ""
msgid "" msgid ""
"When recording timelapse without toolhead, it is recommended to add a " "When recording timelapse without toolhead, it is recommended to add a "
"\"Timelapse Wipe Tower\" \n" "\"Timelapse Wipe Tower\" \n"
"by right-click the empty position of build plate and choose \"Add Primitive" "by right-click the empty position of build plate and choose \"Add "
"\"->\"Timelapse Wipe Tower\"." "Primitive\"->\"Timelapse Wipe Tower\"."
msgstr "" msgstr ""
"При записи таймлапса без видимости головы рекомендуется добавить «Черновая " "При записи таймлапса без видимости головы рекомендуется добавить «Черновая "
"башня таймлапса». \n" "башня таймлапса». \n"
@@ -7956,7 +7962,7 @@ msgid "Flow ratio and Pressure Advance"
msgstr "Коэффициент потока и Pressure Advance" msgstr "Коэффициент потока и Pressure Advance"
msgid "Print chamber temperature" msgid "Print chamber temperature"
msgstr "Температура в камере" msgstr "Температура в термокамере при печати"
msgid "Print temperature" msgid "Print temperature"
msgstr "Температура печати" msgstr "Температура печати"
@@ -8061,7 +8067,7 @@ msgstr ""
"расчётное время печати слоя меньше установленного значения." "расчётное время печати слоя меньше установленного значения."
msgid "Auxiliary part cooling fan" msgid "Auxiliary part cooling fan"
msgstr "Вспомогательный вентилятор для охлаждения моделей" msgstr "Вспомогательный вентилятор модели"
msgid "Exhaust fan" msgid "Exhaust fan"
msgstr "Вытяжной вентилятор" msgstr "Вытяжной вентилятор"
@@ -8192,10 +8198,6 @@ msgstr "Диаметр сопла"
msgid "Wipe tower" msgid "Wipe tower"
msgstr "Черновая башня" msgstr "Черновая башня"
# ????2 Параметры замены материала в одноэкструдерном ММ принтере
# ???? Параметры экструдера в одноэкструдерном мультиматериальном принтере
# ???? Параметры для экструдера в одноэкструдерном мультиматериальном принтере
# ???? Параметры для одноэкструдерной мультиматериальном печати
msgid "Single extruder multi-material parameters" msgid "Single extruder multi-material parameters"
msgstr "Параметры одноэкструдерного мультиматериального принтера" msgstr "Параметры одноэкструдерного мультиматериального принтера"
@@ -8772,7 +8774,9 @@ msgid ""
"objects, it just orientates the selected ones.Otherwise, it will orientates " "objects, it just orientates the selected ones.Otherwise, it will orientates "
"all objects in the current disk." "all objects in the current disk."
msgstr "" msgstr ""
"Автоориентация моделей (ориентация выбранного, иначе всего на текущем столе)" "Автоориентация выбранных или всех моделей. Если выбраны отдельные модели, "
"ориентация будет применена только к ним; в противном случае ко всем моделям "
"на текущем столе."
msgid "Shift+Tab" msgid "Shift+Tab"
msgstr "Shift+Tab" msgstr "Shift+Tab"
@@ -8940,10 +8944,10 @@ msgid "Select the object/part and press space to change the name"
msgstr "Выберите модель/часть и нажмите пробел, чтобы изменить имя" msgstr "Выберите модель/часть и нажмите пробел, чтобы изменить имя"
msgid "Mouse click" msgid "Mouse click"
msgstr "Щелчок кнопкой мыши" msgstr "Левая кнопка мыши"
msgid "Select the object/part and mouse click to change the name" msgid "Select the object/part and mouse click to change the name"
msgstr "Выберите модель/часть и нажмите клавишу мыши, чтобы изменить имя" msgstr "Выберите модель/часть и нажмите левую клавишу мыши, чтобы изменить имя"
msgid "Objects List" msgid "Objects List"
msgstr "Список моделей" msgstr "Список моделей"
@@ -10133,7 +10137,6 @@ msgstr ""
msgid "Cooling overhang threshold" msgid "Cooling overhang threshold"
msgstr "Порог включения обдува на нависаниях" msgstr "Порог включения обдува на нависаниях"
#, fuzzy, c-format
msgid "" msgid ""
"Force cooling fan to be specific speed when overhang degree of printed part " "Force cooling fan to be specific speed when overhang degree of printed part "
"exceeds this value. Expressed as percentage which indicates how much width " "exceeds this value. Expressed as percentage which indicates how much width "
@@ -10394,6 +10397,7 @@ msgstr "Порог для реверса"
msgid "Overhang reversal threshold" msgid "Overhang reversal threshold"
msgstr "Порог разворота на свесах" msgstr "Порог разворота на свесах"
# ?????
#, no-c-format, no-boost-format #, no-c-format, no-boost-format
msgid "" msgid ""
"Number of mm the overhang need to be for the reversal to be considered " "Number of mm the overhang need to be for the reversal to be considered "
@@ -10402,6 +10406,14 @@ msgid ""
"When Detect overhang wall is not enabled, this option is ignored and " "When Detect overhang wall is not enabled, this option is ignored and "
"reversal happens on every even layers regardless." "reversal happens on every even layers regardless."
msgstr "" msgstr ""
"Величина свеса периметра при которой она считается достаточной для активации "
"функции реверса печати нависаний. Может быть в мм или в % от ширины "
"периметра.\n"
"При нуле разворот будет на каждом чётном слое, независимо от величина "
"свеса.\n"
"Если «Определять нависающие периметры» не включено, этот параметр "
"игнорируется, и разворот происходит на каждом чётном слое без "
"исключений."
msgid "Classic mode" msgid "Classic mode"
msgstr "Классический режим" msgstr "Классический режим"
@@ -10928,7 +10940,7 @@ msgid ""
"\n" "\n"
" " " "
msgstr "" msgstr ""
"Последовательность печати внутреннего/внешнего периметров.\n" "Последовательность печати внутреннего и внешнего периметров.\n"
"\n" "\n"
"Используйте порядок печати периметров «Внутренний/Внешний» для получения " "Используйте порядок печати периметров «Внутренний/Внешний» для получения "
"наилучших нависаний. Однако этот вариант приводит к небольшому снижению " "наилучших нависаний. Однако этот вариант приводит к небольшому снижению "
@@ -11117,7 +11129,6 @@ msgstr ""
"Используется только в качестве визуальной помощи в пользовательском " "Используется только в качестве визуальной помощи в пользовательском "
"интерфейсе" "интерфейсе"
# ??? Смещение экструдера по осям X/Y
msgid "Extruder offset" msgid "Extruder offset"
msgstr "Смещение координат экструдера" msgstr "Смещение координат экструдера"
@@ -11834,8 +11845,8 @@ msgstr ""
"две ближайшие линии заполнения с коротким отрезком периметра. Если не " "две ближайшие линии заполнения с коротким отрезком периметра. Если не "
"найдено такого отрезка периметра короче этого параметра, линия заполнения " "найдено такого отрезка периметра короче этого параметра, линия заполнения "
"соединяется с отрезком периметра только с одной стороны, а длина отрезка " "соединяется с отрезком периметра только с одной стороны, а длина отрезка "
"периметра ограничена значением «Длина привязок разреженного " "периметра ограничена значением «Длина привязок разреженного заполнения» "
"заполнения» (infill_anchor), но не больше этого параметра.\n" "(infill_anchor), но не больше этого параметра.\n"
"Если установить 0, то будет использоваться старый алгоритм для соединения " "Если установить 0, то будет использоваться старый алгоритм для соединения "
"заполнения, который даёт такой же результат, как и при значениях 1000 и 0." "заполнения, который даёт такой же результат, как и при значениях 1000 и 0."
@@ -11900,7 +11911,7 @@ msgstr "Вкл. ограничение ускорения зигзагов"
msgid "Klipper's max_accel_to_decel will be adjusted automatically" msgid "Klipper's max_accel_to_decel will be adjusted automatically"
msgstr "" msgstr ""
"Значение ограничение ускорения зигзагов (max_accel_to_decel) в Klipper будет " "Значение Klipper-а ограничение ускорения зигзагов (max_accel_to_decel) будет "
"скорректировано автоматически.\n" "скорректировано автоматически.\n"
"\n" "\n"
"Параметр предназначен для ограничения влияния экстремальных переходов от " "Параметр предназначен для ограничения влияния экстремальных переходов от "
@@ -11914,8 +11925,8 @@ msgstr "Ограничение ускорение зигзагов"
msgid "" msgid ""
"Klipper's max_accel_to_decel will be adjusted to this %% of acceleration" "Klipper's max_accel_to_decel will be adjusted to this %% of acceleration"
msgstr "" msgstr ""
"Значение ограничение ускорения зигзагов (max_accel_to_decel) в Klipper будет " "Значение Klipper-а ограничение ускорения зигзагов (max_accel_to_decel) будет "
"скорректировано на заданный процент ускорения." "скорректировано на данный процент ускорения."
msgid "Jerk of outer walls" msgid "Jerk of outer walls"
msgstr "Рывок для внешних периметров." msgstr "Рывок для внешних периметров."
@@ -11990,17 +12001,17 @@ msgstr "Полная скорость вентилятора на слое"
msgid "" msgid ""
"Fan speed will be ramped up linearly from zero at layer " "Fan speed will be ramped up linearly from zero at layer "
"\"close_fan_the_first_x_layers\" to maximum at layer \"full_fan_speed_layer" "\"close_fan_the_first_x_layers\" to maximum at layer "
"\". \"full_fan_speed_layer\" will be ignored if lower than " "\"full_fan_speed_layer\". \"full_fan_speed_layer\" will be ignored if lower "
"\"close_fan_the_first_x_layers\", in which case the fan will be running at " "than \"close_fan_the_first_x_layers\", in which case the fan will be running "
"maximum allowed speed at layer \"close_fan_the_first_x_layers\" + 1." "at maximum allowed speed at layer \"close_fan_the_first_x_layers\" + 1."
msgstr "" msgstr ""
"Скорость вентилятора будет нарастать линейно от нуля на слое " "Скорость вентилятора будет нарастать линейно от нуля на слое "
"\"close_fan_the_first_x_layers\" до максимума на слое \"full_fan_speed_layer" "\"close_fan_the_first_x_layers\" до максимума на слое "
"\". Значение \"full_fan_speed_layer\" будет игнорироваться, если оно меньше " "\"full_fan_speed_layer\". Значение \"full_fan_speed_layer\" будет "
"значения \"close_fan_the_first_x_layers\", в этом случае вентилятор будет " "игнорироваться, если оно меньше значения \"close_fan_the_first_x_layers\", в "
"работать на максимально допустимой скорости на слое " "этом случае вентилятор будет работать на максимально допустимой скорости на "
"\"close_fan_the_first_x_layers\" + 1." "слое \"close_fan_the_first_x_layers\" + 1."
msgid "layer" msgid "layer"
msgstr "слой" msgstr "слой"
@@ -12088,7 +12099,7 @@ msgid ""
"printed more slowly" "printed more slowly"
msgstr "" msgstr ""
"Скорость заполнения пробелов. Пробелы обычно имеют неравномерную ширину " "Скорость заполнения пробелов. Пробелы обычно имеют неравномерную ширину "
"линии и должен печататься медленнее." "линии и должны печататься медленнее."
msgid "Precise Z height" msgid "Precise Z height"
msgstr "Точная высота по Z" msgstr "Точная высота по Z"
@@ -12311,7 +12322,7 @@ msgstr "Включите, если хотите использовать нес
# ?????? Название моделей # ?????? Название моделей
msgid "Label objects" msgid "Label objects"
msgstr "Помечать объекты" msgstr "Помечать модели"
# ?????? # ??????
msgid "" msgid ""
@@ -12321,7 +12332,8 @@ msgid ""
"setup and Wipe into Object / Wipe into Infill." "setup and Wipe into Object / Wipe into Infill."
msgstr "" msgstr ""
"Отвечает за присвоение уникальных меток или названий каждой модели или " "Отвечает за присвоение уникальных меток или названий каждой модели или "
"элементу, что позволяет отменять печать любого из них по вашему выбору." "элементу, что позволяет отменять печать любого из них по вашему выбору.\n"
"\n"
"Включите эту опцию, чтобы добавить комментарии в G-код с указанием того, к " "Включите эту опцию, чтобы добавить комментарии в G-код с указанием того, к "
"какой модели он принадлежит, что полезно для плагина Octoprint CancelObject. " "какой модели он принадлежит, что полезно для плагина Octoprint CancelObject. "
"Эта настройка не совместима с настройкой «Одноэкструдерный " "Эта настройка не совместима с настройкой «Одноэкструдерный "
@@ -12329,11 +12341,11 @@ msgstr ""
"модели»." "модели»."
msgid "Exclude objects" msgid "Exclude objects"
msgstr "Исключить модели" msgstr "Исключение моделей"
msgid "Enable this option to add EXCLUDE OBJECT command in g-code" msgid "Enable this option to add EXCLUDE OBJECT command in g-code"
msgstr "" msgstr ""
"Включите эту опцию, чтобы добавить команду EXCLUDE OBJECT (исключения " "Включите эту опцию, чтобы добавить команду EXCLUDE OBJECT (исключение "
"моделей) в G-код для принтера с прошивкой Klipper." "моделей) в G-код для принтера с прошивкой Klipper."
msgid "Verbose G-code" msgid "Verbose G-code"
@@ -13151,7 +13163,7 @@ msgstr "Расширение первого слоя"
msgid "Expand the first raft or support layer to improve bed plate adhesion" msgid "Expand the first raft or support layer to improve bed plate adhesion"
msgstr "" msgstr ""
"Расширение первого слоя подложки или поддержки в плоскости XY для улучшения " "Расширение первого слоя подложки или поддержки в плоскости XY для улучшения "
"адгезии с материалами склонными к отлипанию и закручиванию." "адгезии при печати материалами склонными к отлипанию и закручиванию."
msgid "Raft layers" msgid "Raft layers"
msgstr "Слоёв в подложке" msgstr "Слоёв в подложке"
@@ -13542,7 +13554,7 @@ msgid ""
"scarf." "scarf."
msgstr "" msgstr ""
"Длина клиновидного шва. Установка этого параметра на ноль фактически " "Длина клиновидного шва. Установка этого параметра на ноль фактически "
"отключает шарф." "отключает клиновидный шов."
msgid "Scarf steps" msgid "Scarf steps"
msgstr "Шагов клиновидного шва" msgstr "Шагов клиновидного шва"
@@ -13816,9 +13828,9 @@ msgid ""
"zero value." "zero value."
msgstr "" msgstr ""
"Разница температур, которая будет применяться, когда экструдер не активен. " "Разница температур, которая будет применяться, когда экструдер не активен. "
"Значение не используется, если для параметра «Температура " "Значение не используется, если для параметра «Температура ожидания» "
"ожидания» ('idle_temperature') в настройках пластиковой нити установлено " "('idle_temperature') в настройках пластиковой нити установлено ненулевое "
"ненулевое значение." "значение."
msgid "Preheat time" msgid "Preheat time"
msgstr "Время преднагрева" msgstr "Время преднагрева"
@@ -14375,8 +14387,8 @@ msgstr "Вкл. контроль температуры"
msgid "" msgid ""
"Enable this option for automated chamber temperature control. This option " "Enable this option for automated chamber temperature control. This option "
"activates the emitting of an M191 command before the \"machine_start_gcode" "activates the emitting of an M191 command before the "
"\"\n" "\"machine_start_gcode\"\n"
" which sets the chamber temperature and waits until it is reached. In " " which sets the chamber temperature and waits until it is reached. In "
"addition, it emits an M141 command at the end of the print to turn off the " "addition, it emits an M141 command at the end of the print to turn off the "
"chamber heater, if present. \n" "chamber heater, if present. \n"
@@ -14832,9 +14844,12 @@ msgid ""
msgstr "" msgstr ""
"Движок классического генератора периметров создаёт их с постоянной шириной " "Движок классического генератора периметров создаёт их с постоянной шириной "
"экструзии, а для очень тонких участков используется параметр «Заполнять " "экструзии, а для очень тонких участков используется параметр «Заполнять "
"щели». Движок Arachne же создаёт периметры с переменной шириной экструзии, " "щели».\n"
"что позволяет печатать без щелей, лучше пропечатывать мелкие элементы (при " "\n"
"условии, что у вас правильно откалиброван LA/PA)." "Движок Arachne же создаёт периметры с переменной шириной экструзии, что "
"позволяет печатать без щелей, лучше пропечатывать мелкие элементы (при "
"условии, что у вас правильно откалиброван LA/PA). Этот параметр также влияет "
"на концентрическое заполнение."
msgid "Classic" msgid "Classic"
msgstr "Классический" msgstr "Классический"
@@ -16288,8 +16303,9 @@ msgstr "Пересечение"
msgid "Source Volume" msgid "Source Volume"
msgstr "Исходный объём" msgstr "Исходный объём"
# ???
msgid "Tool Volume" msgid "Tool Volume"
msgstr "" msgstr "Объём инструмента"
msgid "Subtract from" msgid "Subtract from"
msgstr "Главный" msgstr "Главный"
@@ -16455,8 +16471,8 @@ msgstr ""
"Хотите перезаписать его?" "Хотите перезаписать его?"
msgid "" msgid ""
"We would rename the presets as \"Vendor Type Serial @printer you selected" "We would rename the presets as \"Vendor Type Serial @printer you "
"\". \n" "selected\". \n"
"To add preset for more printers, Please go to printer selection" "To add preset for more printers, Please go to printer selection"
msgstr "" msgstr ""
"Мы переименуем профиль в \"Производитель Тип Серия @выбранный принтер\".\n" "Мы переименуем профиль в \"Производитель Тип Серия @выбранный принтер\".\n"
@@ -17439,7 +17455,7 @@ msgid ""
"Auxiliary fan\n" "Auxiliary fan\n"
"Did you know that OrcaSlicer supports Auxiliary part cooling fan?" "Did you know that OrcaSlicer supports Auxiliary part cooling fan?"
msgstr "" msgstr ""
"Вспомогательный вентилятор для охлаждения моделей\n" "Вспомогательный вентилятор модели\n"
"Знаете ли вы, что OrcaSlicer поддерживает управление вспомогательным " "Знаете ли вы, что OrcaSlicer поддерживает управление вспомогательным "
"вентилятором для охлаждения моделей?" "вентилятором для охлаждения моделей?"

View File

@@ -162,7 +162,7 @@
"seam_slope_start_height": "0", "seam_slope_start_height": "0",
"seam_slope_steps": "10", "seam_slope_steps": "10",
"seam_slope_type": "none", "seam_slope_type": "none",
"single_extruder_multi_material_priming": "1", "single_extruder_multi_material_priming": "0",
"skirt_distance": "2", "skirt_distance": "2",
"skirt_height": "1", "skirt_height": "1",
"skirt_loops": "0", "skirt_loops": "0",

View File

@@ -162,7 +162,7 @@
"seam_slope_start_height": "0", "seam_slope_start_height": "0",
"seam_slope_steps": "10", "seam_slope_steps": "10",
"seam_slope_type": "none", "seam_slope_type": "none",
"single_extruder_multi_material_priming": "1", "single_extruder_multi_material_priming": "0",
"skirt_distance": "2", "skirt_distance": "2",
"skirt_height": "1", "skirt_height": "1",
"skirt_loops": "0", "skirt_loops": "0",

View File

@@ -162,7 +162,7 @@
"seam_slope_start_height": "0", "seam_slope_start_height": "0",
"seam_slope_steps": "10", "seam_slope_steps": "10",
"seam_slope_type": "none", "seam_slope_type": "none",
"single_extruder_multi_material_priming": "1", "single_extruder_multi_material_priming": "0",
"skirt_distance": "2", "skirt_distance": "2",
"skirt_height": "1", "skirt_height": "1",
"skirt_loops": "0", "skirt_loops": "0",

View File

@@ -162,7 +162,7 @@
"seam_slope_start_height": "0", "seam_slope_start_height": "0",
"seam_slope_steps": "10", "seam_slope_steps": "10",
"seam_slope_type": "none", "seam_slope_type": "none",
"single_extruder_multi_material_priming": "1", "single_extruder_multi_material_priming": "0",
"skirt_distance": "2", "skirt_distance": "2",
"skirt_height": "1", "skirt_height": "1",
"skirt_loops": "0", "skirt_loops": "0",

View File

@@ -162,7 +162,7 @@
"seam_slope_start_height": "0", "seam_slope_start_height": "0",
"seam_slope_steps": "10", "seam_slope_steps": "10",
"seam_slope_type": "none", "seam_slope_type": "none",
"single_extruder_multi_material_priming": "1", "single_extruder_multi_material_priming": "0",
"skirt_distance": "2", "skirt_distance": "2",
"skirt_height": "1", "skirt_height": "1",
"skirt_loops": "0", "skirt_loops": "0",

View File

@@ -162,7 +162,7 @@
"seam_slope_start_height": "0", "seam_slope_start_height": "0",
"seam_slope_steps": "10", "seam_slope_steps": "10",
"seam_slope_type": "none", "seam_slope_type": "none",
"single_extruder_multi_material_priming": "1", "single_extruder_multi_material_priming": "0",
"skirt_distance": "2", "skirt_distance": "2",
"skirt_height": "1", "skirt_height": "1",
"skirt_loops": "0", "skirt_loops": "0",

View File

@@ -162,7 +162,7 @@
"seam_slope_start_height": "0", "seam_slope_start_height": "0",
"seam_slope_steps": "10", "seam_slope_steps": "10",
"seam_slope_type": "none", "seam_slope_type": "none",
"single_extruder_multi_material_priming": "1", "single_extruder_multi_material_priming": "0",
"skirt_distance": "2", "skirt_distance": "2",
"skirt_height": "1", "skirt_height": "1",
"skirt_loops": "0", "skirt_loops": "0",

View File

@@ -162,7 +162,7 @@
"seam_slope_start_height": "0", "seam_slope_start_height": "0",
"seam_slope_steps": "10", "seam_slope_steps": "10",
"seam_slope_type": "none", "seam_slope_type": "none",
"single_extruder_multi_material_priming": "1", "single_extruder_multi_material_priming": "0",
"skirt_distance": "2", "skirt_distance": "2",
"skirt_height": "1", "skirt_height": "1",
"skirt_loops": "0", "skirt_loops": "0",

View File

@@ -162,7 +162,7 @@
"seam_slope_start_height": "0", "seam_slope_start_height": "0",
"seam_slope_steps": "10", "seam_slope_steps": "10",
"seam_slope_type": "none", "seam_slope_type": "none",
"single_extruder_multi_material_priming": "1", "single_extruder_multi_material_priming": "0",
"skirt_distance": "2", "skirt_distance": "2",
"skirt_height": "1", "skirt_height": "1",
"skirt_loops": "0", "skirt_loops": "0",

View File

@@ -162,7 +162,7 @@
"seam_slope_start_height": "0", "seam_slope_start_height": "0",
"seam_slope_steps": "10", "seam_slope_steps": "10",
"seam_slope_type": "none", "seam_slope_type": "none",
"single_extruder_multi_material_priming": "1", "single_extruder_multi_material_priming": "0",
"skirt_distance": "2", "skirt_distance": "2",
"skirt_height": "1", "skirt_height": "1",
"skirt_loops": "0", "skirt_loops": "0",

View File

@@ -162,7 +162,7 @@
"seam_slope_start_height": "0", "seam_slope_start_height": "0",
"seam_slope_steps": "10", "seam_slope_steps": "10",
"seam_slope_type": "none", "seam_slope_type": "none",
"single_extruder_multi_material_priming": "1", "single_extruder_multi_material_priming": "0",
"skirt_distance": "2", "skirt_distance": "2",
"skirt_height": "1", "skirt_height": "1",
"skirt_loops": "0", "skirt_loops": "0",

View File

@@ -162,7 +162,7 @@
"seam_slope_start_height": "0", "seam_slope_start_height": "0",
"seam_slope_steps": "10", "seam_slope_steps": "10",
"seam_slope_type": "none", "seam_slope_type": "none",
"single_extruder_multi_material_priming": "1", "single_extruder_multi_material_priming": "0",
"skirt_distance": "2", "skirt_distance": "2",
"skirt_height": "1", "skirt_height": "1",
"skirt_loops": "0", "skirt_loops": "0",

View File

@@ -162,7 +162,7 @@
"seam_slope_start_height": "0", "seam_slope_start_height": "0",
"seam_slope_steps": "10", "seam_slope_steps": "10",
"seam_slope_type": "none", "seam_slope_type": "none",
"single_extruder_multi_material_priming": "1", "single_extruder_multi_material_priming": "0",
"skirt_distance": "2", "skirt_distance": "2",
"skirt_height": "1", "skirt_height": "1",
"skirt_loops": "0", "skirt_loops": "0",

View File

@@ -162,7 +162,7 @@
"seam_slope_start_height": "0", "seam_slope_start_height": "0",
"seam_slope_steps": "10", "seam_slope_steps": "10",
"seam_slope_type": "none", "seam_slope_type": "none",
"single_extruder_multi_material_priming": "1", "single_extruder_multi_material_priming": "0",
"skirt_distance": "2", "skirt_distance": "2",
"skirt_height": "1", "skirt_height": "1",
"skirt_loops": "0", "skirt_loops": "0",

View File

@@ -162,7 +162,7 @@
"seam_slope_start_height": "0", "seam_slope_start_height": "0",
"seam_slope_steps": "10", "seam_slope_steps": "10",
"seam_slope_type": "none", "seam_slope_type": "none",
"single_extruder_multi_material_priming": "1", "single_extruder_multi_material_priming": "0",
"skirt_distance": "2", "skirt_distance": "2",
"skirt_height": "1", "skirt_height": "1",
"skirt_loops": "0", "skirt_loops": "0",
@@ -289,4 +289,4 @@
], ],
"xy_contour_compensation": "0", "xy_contour_compensation": "0",
"xy_hole_compensation": "0" "xy_hole_compensation": "0"
} }

File diff suppressed because one or more lines are too long

View File

@@ -88,10 +88,10 @@
"2" "2"
], ],
"max_layer_height": [ "max_layer_height": [
"0.32" "0.16"
], ],
"min_layer_height": [ "min_layer_height": [
"0.08" "0.04"
], ],
"printer_settings_id": "Creality", "printer_settings_id": "Creality",
"retraction_minimum_travel": [ "retraction_minimum_travel": [
@@ -125,4 +125,4 @@
"96x96", "96x96",
"300x300" "300x300"
] ]
} }

View File

@@ -88,10 +88,10 @@
"2" "2"
], ],
"max_layer_height": [ "max_layer_height": [
"0.32" "0.48"
], ],
"min_layer_height": [ "min_layer_height": [
"0.08" "0.12"
], ],
"printer_settings_id": "Creality", "printer_settings_id": "Creality",
"retraction_minimum_travel": [ "retraction_minimum_travel": [
@@ -125,4 +125,4 @@
"96x96", "96x96",
"300x300" "300x300"
] ]
} }

View File

@@ -88,10 +88,10 @@
"2" "2"
], ],
"max_layer_height": [ "max_layer_height": [
"0.32" "0.64"
], ],
"min_layer_height": [ "min_layer_height": [
"0.08" "0.16"
], ],
"printer_settings_id": "Creality", "printer_settings_id": "Creality",
"retraction_minimum_travel": [ "retraction_minimum_travel": [
@@ -125,4 +125,4 @@
"96x96", "96x96",
"300x300" "300x300"
] ]
} }

View File

@@ -81,10 +81,10 @@
"0.4" "0.4"
], ],
"max_layer_height": [ "max_layer_height": [
"0.36" "0.16"
], ],
"min_layer_height": [ "min_layer_height": [
"0.08" "0.04"
], ],
"printer_settings_id": "Creality", "printer_settings_id": "Creality",
"retraction_minimum_travel": [ "retraction_minimum_travel": [
@@ -111,4 +111,4 @@
"machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nM104 S150 ; set temporary nozzle temp to prevent oozing during homing\nG4 S10 ; allow partial nozzle warmup\nG28 ; home all axis\nG1 Z50 F240\nG1 X2 Y10 F3000\nM104 S[nozzle_temperature_initial_layer] ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 F5000\nG92 E0\nG1 Y10 E10 F1200 ; prime the nozzle\nG92 E0", "machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nM104 S150 ; set temporary nozzle temp to prevent oozing during homing\nG4 S10 ; allow partial nozzle warmup\nG28 ; home all axis\nG1 Z50 F240\nG1 X2 Y10 F3000\nM104 S[nozzle_temperature_initial_layer] ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 F5000\nG92 E0\nG1 Y10 E10 F1200 ; prime the nozzle\nG92 E0",
"machine_end_gcode": "{if max_layer_z < printable_height}G1 Z{z_offset+min(max_layer_z+2, printable_height)} F600 ; Move print head up{endif}\nG1 X5 Y{print_bed_max[1]*0.8} F{travel_speed*60} ; present print\n{if max_layer_z < printable_height-10}G1 Z{z_offset+min(max_layer_z+70, printable_height-10)} F600 ; Move print head further up{endif}\n{if max_layer_z < max_print_height*0.6}G1 Z{printable_height*0.6} F600 ; Move print head further up{endif}\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors", "machine_end_gcode": "{if max_layer_z < printable_height}G1 Z{z_offset+min(max_layer_z+2, printable_height)} F600 ; Move print head up{endif}\nG1 X5 Y{print_bed_max[1]*0.8} F{travel_speed*60} ; present print\n{if max_layer_z < printable_height-10}G1 Z{z_offset+min(max_layer_z+70, printable_height-10)} F600 ; Move print head further up{endif}\n{if max_layer_z < max_print_height*0.6}G1 Z{printable_height*0.6} F600 ; Move print head further up{endif}\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors",
"scan_first_layer": "0" "scan_first_layer": "0"
} }

View File

@@ -81,10 +81,10 @@
"0.4" "0.4"
], ],
"max_layer_height": [ "max_layer_height": [
"0.36" "0.48"
], ],
"min_layer_height": [ "min_layer_height": [
"0.08" "0.12"
], ],
"printer_settings_id": "Creality", "printer_settings_id": "Creality",
"retraction_minimum_travel": [ "retraction_minimum_travel": [
@@ -111,4 +111,4 @@
"machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nM104 S150 ; set temporary nozzle temp to prevent oozing during homing\nG4 S10 ; allow partial nozzle warmup\nG28 ; home all axis\nG1 Z50 F240\nG1 X2 Y10 F3000\nM104 S[nozzle_temperature_initial_layer] ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 F5000\nG92 E0\nG1 Y10 E10 F1200 ; prime the nozzle\nG92 E0", "machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nM104 S150 ; set temporary nozzle temp to prevent oozing during homing\nG4 S10 ; allow partial nozzle warmup\nG28 ; home all axis\nG1 Z50 F240\nG1 X2 Y10 F3000\nM104 S[nozzle_temperature_initial_layer] ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 F5000\nG92 E0\nG1 Y10 E10 F1200 ; prime the nozzle\nG92 E0",
"machine_end_gcode": "{if max_layer_z < printable_height}G1 Z{z_offset+min(max_layer_z+2, printable_height)} F600 ; Move print head up{endif}\nG1 X5 Y{print_bed_max[1]*0.8} F{travel_speed*60} ; present print\n{if max_layer_z < printable_height-10}G1 Z{z_offset+min(max_layer_z+70, printable_height-10)} F600 ; Move print head further up{endif}\n{if max_layer_z < max_print_height*0.6}G1 Z{printable_height*0.6} F600 ; Move print head further up{endif}\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors", "machine_end_gcode": "{if max_layer_z < printable_height}G1 Z{z_offset+min(max_layer_z+2, printable_height)} F600 ; Move print head up{endif}\nG1 X5 Y{print_bed_max[1]*0.8} F{travel_speed*60} ; present print\n{if max_layer_z < printable_height-10}G1 Z{z_offset+min(max_layer_z+70, printable_height-10)} F600 ; Move print head further up{endif}\n{if max_layer_z < max_print_height*0.6}G1 Z{printable_height*0.6} F600 ; Move print head further up{endif}\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors",
"scan_first_layer": "0" "scan_first_layer": "0"
} }

View File

@@ -81,10 +81,10 @@
"0.4" "0.4"
], ],
"max_layer_height": [ "max_layer_height": [
"0.36" "0.64"
], ],
"min_layer_height": [ "min_layer_height": [
"0.08" "0.16"
], ],
"printer_settings_id": "Creality", "printer_settings_id": "Creality",
"retraction_minimum_travel": [ "retraction_minimum_travel": [
@@ -111,4 +111,4 @@
"machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nM104 S150 ; set temporary nozzle temp to prevent oozing during homing\nG4 S10 ; allow partial nozzle warmup\nG28 ; home all axis\nG1 Z50 F240\nG1 X2 Y10 F3000\nM104 S[nozzle_temperature_initial_layer] ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 F5000\nG92 E0\nG1 Y10 E10 F1200 ; prime the nozzle\nG92 E0", "machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nM104 S150 ; set temporary nozzle temp to prevent oozing during homing\nG4 S10 ; allow partial nozzle warmup\nG28 ; home all axis\nG1 Z50 F240\nG1 X2 Y10 F3000\nM104 S[nozzle_temperature_initial_layer] ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 F5000\nG92 E0\nG1 Y10 E10 F1200 ; prime the nozzle\nG92 E0",
"machine_end_gcode": "{if max_layer_z < printable_height}G1 Z{z_offset+min(max_layer_z+2, printable_height)} F600 ; Move print head up{endif}\nG1 X5 Y{print_bed_max[1]*0.8} F{travel_speed*60} ; present print\n{if max_layer_z < printable_height-10}G1 Z{z_offset+min(max_layer_z+70, printable_height-10)} F600 ; Move print head further up{endif}\n{if max_layer_z < max_print_height*0.6}G1 Z{printable_height*0.6} F600 ; Move print head further up{endif}\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors", "machine_end_gcode": "{if max_layer_z < printable_height}G1 Z{z_offset+min(max_layer_z+2, printable_height)} F600 ; Move print head up{endif}\nG1 X5 Y{print_bed_max[1]*0.8} F{travel_speed*60} ; present print\n{if max_layer_z < printable_height-10}G1 Z{z_offset+min(max_layer_z+70, printable_height-10)} F600 ; Move print head further up{endif}\n{if max_layer_z < max_print_height*0.6}G1 Z{printable_height*0.6} F600 ; Move print head further up{endif}\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors",
"scan_first_layer": "0" "scan_first_layer": "0"
} }

View File

@@ -81,10 +81,10 @@
"0.4" "0.4"
], ],
"max_layer_height": [ "max_layer_height": [
"0.36" "0.16"
], ],
"min_layer_height": [ "min_layer_height": [
"0.08" "0.04"
], ],
"printer_settings_id": "Creality", "printer_settings_id": "Creality",
"retraction_minimum_travel": [ "retraction_minimum_travel": [
@@ -111,4 +111,4 @@
"machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nM104 S150 ; set temporary nozzle temp to prevent oozing during homing\nG4 S10 ; allow partial nozzle warmup\nG28 ; home all axis\nG1 Z50 F240\nG1 X2 Y10 F3000\nM104 S[nozzle_temperature_initial_layer] ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 F5000\nG92 E0\nG1 Y10 E10 F1200 ; prime the nozzle\nG92 E0", "machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nM104 S150 ; set temporary nozzle temp to prevent oozing during homing\nG4 S10 ; allow partial nozzle warmup\nG28 ; home all axis\nG1 Z50 F240\nG1 X2 Y10 F3000\nM104 S[nozzle_temperature_initial_layer] ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 F5000\nG92 E0\nG1 Y10 E10 F1200 ; prime the nozzle\nG92 E0",
"machine_end_gcode": "{if max_layer_z < printable_height}G1 Z{z_offset+min(max_layer_z+2, printable_height)} F600 ; Move print head up{endif}\nG1 X5 Y{print_bed_max[1]*0.8} F{travel_speed*60} ; present print\n{if max_layer_z < printable_height-10}G1 Z{z_offset+min(max_layer_z+70, printable_height-10)} F600 ; Move print head further up{endif}\n{if max_layer_z < max_print_height*0.6}G1 Z{printable_height*0.6} F600 ; Move print head further up{endif}\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors", "machine_end_gcode": "{if max_layer_z < printable_height}G1 Z{z_offset+min(max_layer_z+2, printable_height)} F600 ; Move print head up{endif}\nG1 X5 Y{print_bed_max[1]*0.8} F{travel_speed*60} ; present print\n{if max_layer_z < printable_height-10}G1 Z{z_offset+min(max_layer_z+70, printable_height-10)} F600 ; Move print head further up{endif}\n{if max_layer_z < max_print_height*0.6}G1 Z{printable_height*0.6} F600 ; Move print head further up{endif}\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors",
"scan_first_layer": "0" "scan_first_layer": "0"
} }

View File

@@ -81,10 +81,10 @@
"0.4" "0.4"
], ],
"max_layer_height": [ "max_layer_height": [
"0.36" "0.48"
], ],
"min_layer_height": [ "min_layer_height": [
"0.08" "0.12"
], ],
"printer_settings_id": "Creality", "printer_settings_id": "Creality",
"retraction_minimum_travel": [ "retraction_minimum_travel": [
@@ -111,4 +111,4 @@
"machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nM104 S150 ; set temporary nozzle temp to prevent oozing during homing\nG4 S10 ; allow partial nozzle warmup\nG28 ; home all axis\nG1 Z50 F240\nG1 X2 Y10 F3000\nM104 S[nozzle_temperature_initial_layer] ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 F5000\nG92 E0\nG1 Y10 E10 F1200 ; prime the nozzle\nG92 E0", "machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nM104 S150 ; set temporary nozzle temp to prevent oozing during homing\nG4 S10 ; allow partial nozzle warmup\nG28 ; home all axis\nG1 Z50 F240\nG1 X2 Y10 F3000\nM104 S[nozzle_temperature_initial_layer] ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 F5000\nG92 E0\nG1 Y10 E10 F1200 ; prime the nozzle\nG92 E0",
"machine_end_gcode": "{if max_layer_z < printable_height}G1 Z{z_offset+min(max_layer_z+2, printable_height)} F600 ; Move print head up{endif}\nG1 X5 Y{print_bed_max[1]*0.8} F{travel_speed*60} ; present print\n{if max_layer_z < printable_height-10}G1 Z{z_offset+min(max_layer_z+70, printable_height-10)} F600 ; Move print head further up{endif}\n{if max_layer_z < max_print_height*0.6}G1 Z{printable_height*0.6} F600 ; Move print head further up{endif}\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors", "machine_end_gcode": "{if max_layer_z < printable_height}G1 Z{z_offset+min(max_layer_z+2, printable_height)} F600 ; Move print head up{endif}\nG1 X5 Y{print_bed_max[1]*0.8} F{travel_speed*60} ; present print\n{if max_layer_z < printable_height-10}G1 Z{z_offset+min(max_layer_z+70, printable_height-10)} F600 ; Move print head further up{endif}\n{if max_layer_z < max_print_height*0.6}G1 Z{printable_height*0.6} F600 ; Move print head further up{endif}\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors",
"scan_first_layer": "0" "scan_first_layer": "0"
} }

View File

@@ -81,10 +81,10 @@
"0.4" "0.4"
], ],
"max_layer_height": [ "max_layer_height": [
"0.36" "0.64"
], ],
"min_layer_height": [ "min_layer_height": [
"0.08" "0.16"
], ],
"printer_settings_id": "Creality", "printer_settings_id": "Creality",
"retraction_minimum_travel": [ "retraction_minimum_travel": [
@@ -111,4 +111,4 @@
"machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nM104 S150 ; set temporary nozzle temp to prevent oozing during homing\nG4 S10 ; allow partial nozzle warmup\nG28 ; home all axis\nG1 Z50 F240\nG1 X2 Y10 F3000\nM104 S[nozzle_temperature_initial_layer] ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 F5000\nG92 E0\nG1 Y10 E10 F1200 ; prime the nozzle\nG92 E0", "machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nM104 S150 ; set temporary nozzle temp to prevent oozing during homing\nG4 S10 ; allow partial nozzle warmup\nG28 ; home all axis\nG1 Z50 F240\nG1 X2 Y10 F3000\nM104 S[nozzle_temperature_initial_layer] ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 F5000\nG92 E0\nG1 Y10 E10 F1200 ; prime the nozzle\nG92 E0",
"machine_end_gcode": "{if max_layer_z < printable_height}G1 Z{z_offset+min(max_layer_z+2, printable_height)} F600 ; Move print head up{endif}\nG1 X5 Y{print_bed_max[1]*0.8} F{travel_speed*60} ; present print\n{if max_layer_z < printable_height-10}G1 Z{z_offset+min(max_layer_z+70, printable_height-10)} F600 ; Move print head further up{endif}\n{if max_layer_z < max_print_height*0.6}G1 Z{printable_height*0.6} F600 ; Move print head further up{endif}\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors", "machine_end_gcode": "{if max_layer_z < printable_height}G1 Z{z_offset+min(max_layer_z+2, printable_height)} F600 ; Move print head up{endif}\nG1 X5 Y{print_bed_max[1]*0.8} F{travel_speed*60} ; present print\n{if max_layer_z < printable_height-10}G1 Z{z_offset+min(max_layer_z+70, printable_height-10)} F600 ; Move print head further up{endif}\n{if max_layer_z < max_print_height*0.6}G1 Z{printable_height*0.6} F600 ; Move print head further up{endif}\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors",
"scan_first_layer": "0" "scan_first_layer": "0"
} }

View File

@@ -78,10 +78,10 @@
"0.4" "0.4"
], ],
"max_layer_height": [ "max_layer_height": [
"0.36" "0.16"
], ],
"min_layer_height": [ "min_layer_height": [
"0.08" "0.04"
], ],
"printer_settings_id": "Creality", "printer_settings_id": "Creality",
"retraction_minimum_travel": [ "retraction_minimum_travel": [
@@ -111,4 +111,4 @@
"machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S150 ; set temporary nozzle temp to prevent oozing during homing\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nG4 S30 ; allow partial nozzle warmup\nG28 ; home all axis and restore leveling \nM420 S1; Enable mesh leveling\nG1 Z50 F240\nG1 X2.0 Y10 F3000\nM104 S[nozzle_temperature_initial_layer] ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 X2.0 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 Y140 F5000\nG92 E0\nG1 X2.3 Y10 E10 F1200 ; prime the nozzle\nG92 E0", "machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S150 ; set temporary nozzle temp to prevent oozing during homing\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nG4 S30 ; allow partial nozzle warmup\nG28 ; home all axis and restore leveling \nM420 S1; Enable mesh leveling\nG1 Z50 F240\nG1 X2.0 Y10 F3000\nM104 S[nozzle_temperature_initial_layer] ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 X2.0 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 Y140 F5000\nG92 E0\nG1 X2.3 Y10 E10 F1200 ; prime the nozzle\nG92 E0",
"machine_end_gcode": "{if max_layer_z < printable_height}G1 Z{z_offset+min(max_layer_z+2, printable_height)} F600 ; Move print head up{endif}\nG1 X5 Y{print_bed_max[1]*0.8} F{travel_speed*60} ; present print\n{if max_layer_z < printable_height-10}G1 Z{z_offset+min(max_layer_z+70, printable_height-10)} F600 ; Move print head further up{endif}\n{if max_layer_z < max_print_height*0.6}G1 Z{printable_height*0.6} F600 ; Move print head further up{endif}\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors", "machine_end_gcode": "{if max_layer_z < printable_height}G1 Z{z_offset+min(max_layer_z+2, printable_height)} F600 ; Move print head up{endif}\nG1 X5 Y{print_bed_max[1]*0.8} F{travel_speed*60} ; present print\n{if max_layer_z < printable_height-10}G1 Z{z_offset+min(max_layer_z+70, printable_height-10)} F600 ; Move print head further up{endif}\n{if max_layer_z < max_print_height*0.6}G1 Z{printable_height*0.6} F600 ; Move print head further up{endif}\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors",
"scan_first_layer": "0" "scan_first_layer": "0"
} }

View File

@@ -78,10 +78,10 @@
"0.4" "0.4"
], ],
"max_layer_height": [ "max_layer_height": [
"0.36" "0.48"
], ],
"min_layer_height": [ "min_layer_height": [
"0.08" "0.12"
], ],
"printer_settings_id": "Creality", "printer_settings_id": "Creality",
"retraction_minimum_travel": [ "retraction_minimum_travel": [
@@ -111,4 +111,4 @@
"machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S150 ; set temporary nozzle temp to prevent oozing during homing\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nG4 S30 ; allow partial nozzle warmup\nG28 ; home all axis and restore leveling\nM420 S1; Enable mesh leveling\nG1 Z50 F240\nG1 X2.0 Y10 F3000\nM104 S[nozzle_temperature_initial_layer] ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 X2.0 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 Y140 F5000\nG92 E0\nG1 X2.3 Y10 E10 F1200 ; prime the nozzle\nG92 E0", "machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S150 ; set temporary nozzle temp to prevent oozing during homing\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nG4 S30 ; allow partial nozzle warmup\nG28 ; home all axis and restore leveling\nM420 S1; Enable mesh leveling\nG1 Z50 F240\nG1 X2.0 Y10 F3000\nM104 S[nozzle_temperature_initial_layer] ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 X2.0 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 Y140 F5000\nG92 E0\nG1 X2.3 Y10 E10 F1200 ; prime the nozzle\nG92 E0",
"machine_end_gcode": "{if max_layer_z < printable_height}G1 Z{z_offset+min(max_layer_z+2, printable_height)} F600 ; Move print head up{endif}\nG1 X5 Y{print_bed_max[1]*0.8} F{travel_speed*60} ; present print\n{if max_layer_z < printable_height-10}G1 Z{z_offset+min(max_layer_z+70, printable_height-10)} F600 ; Move print head further up{endif}\n{if max_layer_z < max_print_height*0.6}G1 Z{printable_height*0.6} F600 ; Move print head further up{endif}\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors", "machine_end_gcode": "{if max_layer_z < printable_height}G1 Z{z_offset+min(max_layer_z+2, printable_height)} F600 ; Move print head up{endif}\nG1 X5 Y{print_bed_max[1]*0.8} F{travel_speed*60} ; present print\n{if max_layer_z < printable_height-10}G1 Z{z_offset+min(max_layer_z+70, printable_height-10)} F600 ; Move print head further up{endif}\n{if max_layer_z < max_print_height*0.6}G1 Z{printable_height*0.6} F600 ; Move print head further up{endif}\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors",
"scan_first_layer": "0" "scan_first_layer": "0"
} }

View File

@@ -79,10 +79,10 @@
"0.4" "0.4"
], ],
"max_layer_height": [ "max_layer_height": [
"0.36" "0.64"
], ],
"min_layer_height": [ "min_layer_height": [
"0.08" "0.16"
], ],
"printer_settings_id": "Creality", "printer_settings_id": "Creality",
"retraction_minimum_travel": [ "retraction_minimum_travel": [
@@ -112,4 +112,4 @@
"machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S150 ; set temporary nozzle temp to prevent oozing during homing\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nG4 S30 ; allow partial nozzle warmup\nG28 ; home all axis and restore leveling\nM420 S1; Enable mesh leveling\nG1 Z50 F240\nG1 X2.0 Y10 F3000\nM104 S[nozzle_temperature_initial_layer] ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 X2.0 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 Y140 F5000\nG92 E0\nG1 X2.3 Y10 E10 F1200 ; prime the nozzle\nG92 E0", "machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S150 ; set temporary nozzle temp to prevent oozing during homing\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nG4 S30 ; allow partial nozzle warmup\nG28 ; home all axis and restore leveling\nM420 S1; Enable mesh leveling\nG1 Z50 F240\nG1 X2.0 Y10 F3000\nM104 S[nozzle_temperature_initial_layer] ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 X2.0 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 Y140 F5000\nG92 E0\nG1 X2.3 Y10 E10 F1200 ; prime the nozzle\nG92 E0",
"machine_end_gcode": "{if max_layer_z < printable_height}G1 Z{z_offset+min(max_layer_z+2, printable_height)} F600 ; Move print head up{endif}\nG1 X5 Y{print_bed_max[1]*0.8} F{travel_speed*60} ; present print\n{if max_layer_z < printable_height-10}G1 Z{z_offset+min(max_layer_z+70, printable_height-10)} F600 ; Move print head further up{endif}\n{if max_layer_z < max_print_height*0.6}G1 Z{printable_height*0.6} F600 ; Move print head further up{endif}\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors", "machine_end_gcode": "{if max_layer_z < printable_height}G1 Z{z_offset+min(max_layer_z+2, printable_height)} F600 ; Move print head up{endif}\nG1 X5 Y{print_bed_max[1]*0.8} F{travel_speed*60} ; present print\n{if max_layer_z < printable_height-10}G1 Z{z_offset+min(max_layer_z+70, printable_height-10)} F600 ; Move print head further up{endif}\n{if max_layer_z < max_print_height*0.6}G1 Z{printable_height*0.6} F600 ; Move print head further up{endif}\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors",
"scan_first_layer": "0" "scan_first_layer": "0"
} }

View File

@@ -84,10 +84,10 @@
"0.4" "0.4"
], ],
"max_layer_height": [ "max_layer_height": [
"0.32" "0.16"
], ],
"min_layer_height": [ "min_layer_height": [
"0.08" "0.04"
], ],
"retraction_minimum_travel": [ "retraction_minimum_travel": [
"2" "2"

View File

@@ -84,10 +84,10 @@
"0.4" "0.4"
], ],
"max_layer_height": [ "max_layer_height": [
"0.32" "0.48"
], ],
"min_layer_height": [ "min_layer_height": [
"0.08" "0.12"
], ],
"retraction_minimum_travel": [ "retraction_minimum_travel": [
"2" "2"

View File

@@ -84,10 +84,10 @@
"0.4" "0.4"
], ],
"max_layer_height": [ "max_layer_height": [
"0.32" "0.64"
], ],
"min_layer_height": [ "min_layer_height": [
"0.08" "0.16"
], ],
"retraction_minimum_travel": [ "retraction_minimum_travel": [
"2" "2"

View File

@@ -86,7 +86,7 @@
"0.5" "0.5"
], ],
"min_layer_height": [ "min_layer_height": [
"0.08" "0.16"
], ],
"printer_settings_id": "Creality", "printer_settings_id": "Creality",
"retraction_minimum_travel": [ "retraction_minimum_travel": [
@@ -130,4 +130,4 @@
"100x100", "100x100",
"320x320" "320x320"
] ]
} }

View File

@@ -87,7 +87,7 @@
"0.5" "0.5"
], ],
"min_layer_height": [ "min_layer_height": [
"0.08" "0.16"
], ],
"printer_settings_id": "Creality", "printer_settings_id": "Creality",
"retraction_minimum_travel": [ "retraction_minimum_travel": [
@@ -131,4 +131,4 @@
"100x100", "100x100",
"320x320" "320x320"
] ]
} }

View File

@@ -87,7 +87,7 @@
"0.5" "0.5"
], ],
"min_layer_height": [ "min_layer_height": [
"0.08" "0.16"
], ],
"printer_settings_id": "Creality", "printer_settings_id": "Creality",
"retraction_minimum_travel": [ "retraction_minimum_travel": [
@@ -131,4 +131,4 @@
"100x100", "100x100",
"320x320" "320x320"
] ]
} }

View File

@@ -87,7 +87,7 @@
"0.56" "0.56"
], ],
"min_layer_height": [ "min_layer_height": [
"0.08" "0.16"
], ],
"printer_settings_id": "Creality", "printer_settings_id": "Creality",
"retraction_minimum_travel": [ "retraction_minimum_travel": [

View File

@@ -7,7 +7,7 @@
"instantiation": "true", "instantiation": "true",
"inherits": "fdm_filament_tpu", "inherits": "fdm_filament_tpu",
"filament_max_volumetric_speed": [ "filament_max_volumetric_speed": [
"1.35" "1.8"
], ],
"filament_flow_ratio": [ "filament_flow_ratio": [
"1.15" "1.15"
@@ -28,8 +28,14 @@
"210" "210"
], ],
"filament_retraction_length": [ "filament_retraction_length": [
"0" "2"
], ],
"filament_retraction_speed": [
"45"
],
"filament_deretraction_speed": [
"20"
],
"close_fan_the_first_x_layers": [ "close_fan_the_first_x_layers": [
"3" "3"
], ],

View File

@@ -12,7 +12,7 @@
"support_speed": "60", "support_speed": "60",
"small_perimeter_speed": "40", "small_perimeter_speed": "40",
"sparse_infill_speed": "100", "sparse_infill_speed": "100",
"internal_solid_infill_speed": "140", "internal_solid_infill_speed": "120",
"top_surface_speed": "60", "top_surface_speed": "60",
"gap_infill_speed": "40", "gap_infill_speed": "40",
"default_acceleration": "1500", "default_acceleration": "1500",

View File

@@ -58,6 +58,10 @@
"name": "fdm_process_voron_common_0_2_5", "name": "fdm_process_voron_common_0_2_5",
"sub_path": "process/fdm_process_voron_common_0_2_5.json" "sub_path": "process/fdm_process_voron_common_0_2_5.json"
}, },
{
"name": "fdm_process_voron_common_0_5",
"sub_path": "process/fdm_process_voron_common_0_5.json"
},
{ {
"name": "fdm_process_voron_common_0_6", "name": "fdm_process_voron_common_0_6",
"sub_path": "process/fdm_process_voron_common_0_6.json" "sub_path": "process/fdm_process_voron_common_0_6.json"
@@ -205,6 +209,30 @@
{ {
"name": "0.80mm Extra Draft 1.0 nozzle @Voron", "name": "0.80mm Extra Draft 1.0 nozzle @Voron",
"sub_path": "process/0.80mm Extra Draft 1.0 nozzle @Voron.json" "sub_path": "process/0.80mm Extra Draft 1.0 nozzle @Voron.json"
},
{
"name": "0.10mm Extra Fine 0.5 nozzle @Voron",
"sub_path": "process/0.10mm Extra Fine 0.5 nozzle @Voron.json"
},
{
"name": "0.15mm Fine 0.5 nozzle @Voron",
"sub_path": "process/0.15mm Fine 0.5 nozzle @Voron.json"
},
{
"name": "0.20mm Optimal 0.5 nozzle @Voron",
"sub_path": "process/0.20mm Optimal 0.5 nozzle @Voron.json"
},
{
"name": "0.25mm Standard 0.5 nozzle @Voron",
"sub_path": "process/0.25mm Standard 0.5 nozzle @Voron.json"
},
{
"name": "0.30mm Draft 0.5 nozzle @Voron",
"sub_path": "process/0.30mm Draft 0.5 nozzle @Voron.json"
},
{
"name": "0.35mm Extra Draft 0.5 nozzle @Voron",
"sub_path": "process/0.35mm Extra Draft 0.5 nozzle @Voron.json"
} }
], ],
"filament_list": [ "filament_list": [
@@ -310,6 +338,10 @@
"name": "Voron 2.4 250 0.25 nozzle", "name": "Voron 2.4 250 0.25 nozzle",
"sub_path": "machine/Voron 2.4 250 0.25 nozzle.json" "sub_path": "machine/Voron 2.4 250 0.25 nozzle.json"
}, },
{
"name": "Voron 2.4 250 0.5 nozzle",
"sub_path": "machine/Voron 2.4 250 0.5 nozzle.json"
},
{ {
"name": "Voron 2.4 250 0.6 nozzle", "name": "Voron 2.4 250 0.6 nozzle",
"sub_path": "machine/Voron 2.4 250 0.6 nozzle.json" "sub_path": "machine/Voron 2.4 250 0.6 nozzle.json"
@@ -338,6 +370,10 @@
"name": "Voron 2.4 300 0.25 nozzle", "name": "Voron 2.4 300 0.25 nozzle",
"sub_path": "machine/Voron 2.4 300 0.25 nozzle.json" "sub_path": "machine/Voron 2.4 300 0.25 nozzle.json"
}, },
{
"name": "Voron 2.4 300 0.5 nozzle",
"sub_path": "machine/Voron 2.4 300 0.5 nozzle.json"
},
{ {
"name": "Voron 2.4 300 0.6 nozzle", "name": "Voron 2.4 300 0.6 nozzle",
"sub_path": "machine/Voron 2.4 300 0.6 nozzle.json" "sub_path": "machine/Voron 2.4 300 0.6 nozzle.json"
@@ -366,6 +402,10 @@
"name": "Voron 2.4 350 0.25 nozzle", "name": "Voron 2.4 350 0.25 nozzle",
"sub_path": "machine/Voron 2.4 350 0.25 nozzle.json" "sub_path": "machine/Voron 2.4 350 0.25 nozzle.json"
}, },
{
"name": "Voron 2.4 350 0.5 nozzle",
"sub_path": "machine/Voron 2.4 350 0.5 nozzle.json"
},
{ {
"name": "Voron 2.4 350 0.6 nozzle", "name": "Voron 2.4 350 0.6 nozzle",
"sub_path": "machine/Voron 2.4 350 0.6 nozzle.json" "sub_path": "machine/Voron 2.4 350 0.6 nozzle.json"
@@ -394,6 +434,10 @@
"name": "Voron Trident 250 0.25 nozzle", "name": "Voron Trident 250 0.25 nozzle",
"sub_path": "machine/Voron Trident 250 0.25 nozzle.json" "sub_path": "machine/Voron Trident 250 0.25 nozzle.json"
}, },
{
"name": "Voron Trident 250 0.5 nozzle",
"sub_path": "machine/Voron Trident 250 0.5 nozzle.json"
},
{ {
"name": "Voron Trident 250 0.6 nozzle", "name": "Voron Trident 250 0.6 nozzle",
"sub_path": "machine/Voron Trident 250 0.6 nozzle.json" "sub_path": "machine/Voron Trident 250 0.6 nozzle.json"
@@ -422,6 +466,10 @@
"name": "Voron Trident 300 0.25 nozzle", "name": "Voron Trident 300 0.25 nozzle",
"sub_path": "machine/Voron Trident 300 0.25 nozzle.json" "sub_path": "machine/Voron Trident 300 0.25 nozzle.json"
}, },
{
"name": "Voron Trident 300 0.5 nozzle",
"sub_path": "machine/Voron Trident 300 0.5 nozzle.json"
},
{ {
"name": "Voron Trident 300 0.6 nozzle", "name": "Voron Trident 300 0.6 nozzle",
"sub_path": "machine/Voron Trident 300 0.6 nozzle.json" "sub_path": "machine/Voron Trident 300 0.6 nozzle.json"
@@ -450,6 +498,10 @@
"name": "Voron Trident 350 0.25 nozzle", "name": "Voron Trident 350 0.25 nozzle",
"sub_path": "machine/Voron Trident 350 0.25 nozzle.json" "sub_path": "machine/Voron Trident 350 0.25 nozzle.json"
}, },
{
"name": "Voron Trident 350 0.5 nozzle",
"sub_path": "machine/Voron Trident 350 0.5 nozzle.json"
},
{ {
"name": "Voron Trident 350 0.6 nozzle", "name": "Voron Trident 350 0.6 nozzle",
"sub_path": "machine/Voron Trident 350 0.6 nozzle.json" "sub_path": "machine/Voron Trident 350 0.6 nozzle.json"
@@ -478,6 +530,10 @@
"name": "Voron 0.1 0.25 nozzle", "name": "Voron 0.1 0.25 nozzle",
"sub_path": "machine/Voron 0.1 0.25 nozzle.json" "sub_path": "machine/Voron 0.1 0.25 nozzle.json"
}, },
{
"name": "Voron 0.1 0.5 nozzle",
"sub_path": "machine/Voron 0.1 0.5 nozzle.json"
},
{ {
"name": "Voron 0.1 0.6 nozzle", "name": "Voron 0.1 0.6 nozzle",
"sub_path": "machine/Voron 0.1 0.6 nozzle.json" "sub_path": "machine/Voron 0.1 0.6 nozzle.json"
@@ -506,6 +562,10 @@
"name": "Voron Switchwire 250 0.25 nozzle", "name": "Voron Switchwire 250 0.25 nozzle",
"sub_path": "machine/Voron Switchwire 250 0.25 nozzle.json" "sub_path": "machine/Voron Switchwire 250 0.25 nozzle.json"
}, },
{
"name": "Voron Switchwire 250 0.5 nozzle",
"sub_path": "machine/Voron Switchwire 250 0.5 nozzle.json"
},
{ {
"name": "Voron Switchwire 250 0.6 nozzle", "name": "Voron Switchwire 250 0.6 nozzle",
"sub_path": "machine/Voron Switchwire 250 0.6 nozzle.json" "sub_path": "machine/Voron Switchwire 250 0.6 nozzle.json"

View File

@@ -17,6 +17,7 @@
"Voron 2.4 250 0.15 nozzle", "Voron 2.4 250 0.15 nozzle",
"Voron 2.4 250 0.2 nozzle", "Voron 2.4 250 0.2 nozzle",
"Voron 2.4 250 0.25 nozzle", "Voron 2.4 250 0.25 nozzle",
"Voron 2.4 250 0.5 nozzle",
"Voron 2.4 250 0.6 nozzle", "Voron 2.4 250 0.6 nozzle",
"Voron 2.4 250 0.8 nozzle", "Voron 2.4 250 0.8 nozzle",
"Voron 2.4 250 1.0 nozzle", "Voron 2.4 250 1.0 nozzle",
@@ -24,6 +25,7 @@
"Voron 2.4 300 0.15 nozzle", "Voron 2.4 300 0.15 nozzle",
"Voron 2.4 300 0.2 nozzle", "Voron 2.4 300 0.2 nozzle",
"Voron 2.4 300 0.25 nozzle", "Voron 2.4 300 0.25 nozzle",
"Voron 2.4 300 0.5 nozzle",
"Voron 2.4 300 0.6 nozzle", "Voron 2.4 300 0.6 nozzle",
"Voron 2.4 300 0.8 nozzle", "Voron 2.4 300 0.8 nozzle",
"Voron 2.4 300 1.0 nozzle", "Voron 2.4 300 1.0 nozzle",
@@ -31,6 +33,7 @@
"Voron 2.4 350 0.15 nozzle", "Voron 2.4 350 0.15 nozzle",
"Voron 2.4 350 0.2 nozzle", "Voron 2.4 350 0.2 nozzle",
"Voron 2.4 350 0.25 nozzle", "Voron 2.4 350 0.25 nozzle",
"Voron 2.4 350 0.5 nozzle",
"Voron 2.4 350 0.6 nozzle", "Voron 2.4 350 0.6 nozzle",
"Voron 2.4 350 0.8 nozzle", "Voron 2.4 350 0.8 nozzle",
"Voron 2.4 350 1.0 nozzle", "Voron 2.4 350 1.0 nozzle",
@@ -38,6 +41,7 @@
"Voron Trident 250 0.15 nozzle", "Voron Trident 250 0.15 nozzle",
"Voron Trident 250 0.2 nozzle", "Voron Trident 250 0.2 nozzle",
"Voron Trident 250 0.25 nozzle", "Voron Trident 250 0.25 nozzle",
"Voron Trident 250 0.5 nozzle",
"Voron Trident 250 0.6 nozzle", "Voron Trident 250 0.6 nozzle",
"Voron Trident 250 0.8 nozzle", "Voron Trident 250 0.8 nozzle",
"Voron Trident 250 1.0 nozzle", "Voron Trident 250 1.0 nozzle",
@@ -45,6 +49,7 @@
"Voron Trident 300 0.15 nozzle", "Voron Trident 300 0.15 nozzle",
"Voron Trident 300 0.2 nozzle", "Voron Trident 300 0.2 nozzle",
"Voron Trident 300 0.25 nozzle", "Voron Trident 300 0.25 nozzle",
"Voron Trident 300 0.5 nozzle",
"Voron Trident 300 0.6 nozzle", "Voron Trident 300 0.6 nozzle",
"Voron Trident 300 0.8 nozzle", "Voron Trident 300 0.8 nozzle",
"Voron Trident 300 1.0 nozzle", "Voron Trident 300 1.0 nozzle",
@@ -52,6 +57,7 @@
"Voron Trident 350 0.15 nozzle", "Voron Trident 350 0.15 nozzle",
"Voron Trident 350 0.2 nozzle", "Voron Trident 350 0.2 nozzle",
"Voron Trident 350 0.25 nozzle", "Voron Trident 350 0.25 nozzle",
"Voron Trident 350 0.5 nozzle",
"Voron Trident 350 0.6 nozzle", "Voron Trident 350 0.6 nozzle",
"Voron Trident 350 0.8 nozzle", "Voron Trident 350 0.8 nozzle",
"Voron Trident 350 1.0 nozzle", "Voron Trident 350 1.0 nozzle",
@@ -59,6 +65,7 @@
"Voron 0.1 0.15 nozzle", "Voron 0.1 0.15 nozzle",
"Voron 0.1 0.2 nozzle", "Voron 0.1 0.2 nozzle",
"Voron 0.1 0.25 nozzle", "Voron 0.1 0.25 nozzle",
"Voron 0.1 0.5 nozzle",
"Voron 0.1 0.6 nozzle", "Voron 0.1 0.6 nozzle",
"Voron 0.1 0.8 nozzle", "Voron 0.1 0.8 nozzle",
"Voron 0.1 1.0 nozzle", "Voron 0.1 1.0 nozzle",
@@ -66,6 +73,7 @@
"Voron Switchwire 250 0.15 nozzle", "Voron Switchwire 250 0.15 nozzle",
"Voron Switchwire 250 0.2 nozzle", "Voron Switchwire 250 0.2 nozzle",
"Voron Switchwire 250 0.25 nozzle", "Voron Switchwire 250 0.25 nozzle",
"Voron Switchwire 250 0.5 nozzle",
"Voron Switchwire 250 0.6 nozzle", "Voron Switchwire 250 0.6 nozzle",
"Voron Switchwire 250 0.8 nozzle", "Voron Switchwire 250 0.8 nozzle",
"Voron Switchwire 250 1.0 nozzle" "Voron Switchwire 250 1.0 nozzle"

View File

@@ -17,6 +17,7 @@
"Voron 2.4 250 0.15 nozzle", "Voron 2.4 250 0.15 nozzle",
"Voron 2.4 250 0.2 nozzle", "Voron 2.4 250 0.2 nozzle",
"Voron 2.4 250 0.25 nozzle", "Voron 2.4 250 0.25 nozzle",
"Voron 2.4 250 0.5 nozzle",
"Voron 2.4 250 0.6 nozzle", "Voron 2.4 250 0.6 nozzle",
"Voron 2.4 250 0.8 nozzle", "Voron 2.4 250 0.8 nozzle",
"Voron 2.4 250 1.0 nozzle", "Voron 2.4 250 1.0 nozzle",
@@ -24,6 +25,7 @@
"Voron 2.4 300 0.15 nozzle", "Voron 2.4 300 0.15 nozzle",
"Voron 2.4 300 0.2 nozzle", "Voron 2.4 300 0.2 nozzle",
"Voron 2.4 300 0.25 nozzle", "Voron 2.4 300 0.25 nozzle",
"Voron 2.4 300 0.5 nozzle",
"Voron 2.4 300 0.6 nozzle", "Voron 2.4 300 0.6 nozzle",
"Voron 2.4 300 0.8 nozzle", "Voron 2.4 300 0.8 nozzle",
"Voron 2.4 300 1.0 nozzle", "Voron 2.4 300 1.0 nozzle",
@@ -31,6 +33,7 @@
"Voron 2.4 350 0.15 nozzle", "Voron 2.4 350 0.15 nozzle",
"Voron 2.4 350 0.2 nozzle", "Voron 2.4 350 0.2 nozzle",
"Voron 2.4 350 0.25 nozzle", "Voron 2.4 350 0.25 nozzle",
"Voron 2.4 350 0.5 nozzle",
"Voron 2.4 350 0.6 nozzle", "Voron 2.4 350 0.6 nozzle",
"Voron 2.4 350 0.8 nozzle", "Voron 2.4 350 0.8 nozzle",
"Voron 2.4 350 1.0 nozzle", "Voron 2.4 350 1.0 nozzle",
@@ -38,6 +41,7 @@
"Voron Trident 250 0.15 nozzle", "Voron Trident 250 0.15 nozzle",
"Voron Trident 250 0.2 nozzle", "Voron Trident 250 0.2 nozzle",
"Voron Trident 250 0.25 nozzle", "Voron Trident 250 0.25 nozzle",
"Voron Trident 250 0.5 nozzle",
"Voron Trident 250 0.6 nozzle", "Voron Trident 250 0.6 nozzle",
"Voron Trident 250 0.8 nozzle", "Voron Trident 250 0.8 nozzle",
"Voron Trident 250 1.0 nozzle", "Voron Trident 250 1.0 nozzle",
@@ -45,6 +49,7 @@
"Voron Trident 300 0.15 nozzle", "Voron Trident 300 0.15 nozzle",
"Voron Trident 300 0.2 nozzle", "Voron Trident 300 0.2 nozzle",
"Voron Trident 300 0.25 nozzle", "Voron Trident 300 0.25 nozzle",
"Voron Trident 300 0.5 nozzle",
"Voron Trident 300 0.6 nozzle", "Voron Trident 300 0.6 nozzle",
"Voron Trident 300 0.8 nozzle", "Voron Trident 300 0.8 nozzle",
"Voron Trident 300 1.0 nozzle", "Voron Trident 300 1.0 nozzle",
@@ -52,6 +57,7 @@
"Voron Trident 350 0.15 nozzle", "Voron Trident 350 0.15 nozzle",
"Voron Trident 350 0.2 nozzle", "Voron Trident 350 0.2 nozzle",
"Voron Trident 350 0.25 nozzle", "Voron Trident 350 0.25 nozzle",
"Voron Trident 350 0.5 nozzle",
"Voron Trident 350 0.6 nozzle", "Voron Trident 350 0.6 nozzle",
"Voron Trident 350 0.8 nozzle", "Voron Trident 350 0.8 nozzle",
"Voron Trident 350 1.0 nozzle", "Voron Trident 350 1.0 nozzle",
@@ -59,6 +65,7 @@
"Voron 0.1 0.15 nozzle", "Voron 0.1 0.15 nozzle",
"Voron 0.1 0.2 nozzle", "Voron 0.1 0.2 nozzle",
"Voron 0.1 0.25 nozzle", "Voron 0.1 0.25 nozzle",
"Voron 0.1 0.5 nozzle",
"Voron 0.1 0.6 nozzle", "Voron 0.1 0.6 nozzle",
"Voron 0.1 0.8 nozzle", "Voron 0.1 0.8 nozzle",
"Voron 0.1 1.0 nozzle", "Voron 0.1 1.0 nozzle",
@@ -66,6 +73,7 @@
"Voron Switchwire 250 0.15 nozzle", "Voron Switchwire 250 0.15 nozzle",
"Voron Switchwire 250 0.2 nozzle", "Voron Switchwire 250 0.2 nozzle",
"Voron Switchwire 250 0.25 nozzle", "Voron Switchwire 250 0.25 nozzle",
"Voron Switchwire 250 0.5 nozzle",
"Voron Switchwire 250 0.6 nozzle", "Voron Switchwire 250 0.6 nozzle",
"Voron Switchwire 250 0.8 nozzle", "Voron Switchwire 250 0.8 nozzle",
"Voron Switchwire 250 1.0 nozzle" "Voron Switchwire 250 1.0 nozzle"

View File

@@ -23,6 +23,7 @@
"Voron 2.4 250 0.15 nozzle", "Voron 2.4 250 0.15 nozzle",
"Voron 2.4 250 0.2 nozzle", "Voron 2.4 250 0.2 nozzle",
"Voron 2.4 250 0.25 nozzle", "Voron 2.4 250 0.25 nozzle",
"Voron 2.4 250 0.5 nozzle",
"Voron 2.4 250 0.6 nozzle", "Voron 2.4 250 0.6 nozzle",
"Voron 2.4 250 0.8 nozzle", "Voron 2.4 250 0.8 nozzle",
"Voron 2.4 250 1.0 nozzle", "Voron 2.4 250 1.0 nozzle",
@@ -30,6 +31,7 @@
"Voron 2.4 300 0.15 nozzle", "Voron 2.4 300 0.15 nozzle",
"Voron 2.4 300 0.2 nozzle", "Voron 2.4 300 0.2 nozzle",
"Voron 2.4 300 0.25 nozzle", "Voron 2.4 300 0.25 nozzle",
"Voron 2.4 300 0.5 nozzle",
"Voron 2.4 300 0.6 nozzle", "Voron 2.4 300 0.6 nozzle",
"Voron 2.4 300 0.8 nozzle", "Voron 2.4 300 0.8 nozzle",
"Voron 2.4 300 1.0 nozzle", "Voron 2.4 300 1.0 nozzle",
@@ -37,6 +39,7 @@
"Voron 2.4 350 0.15 nozzle", "Voron 2.4 350 0.15 nozzle",
"Voron 2.4 350 0.2 nozzle", "Voron 2.4 350 0.2 nozzle",
"Voron 2.4 350 0.25 nozzle", "Voron 2.4 350 0.25 nozzle",
"Voron 2.4 350 0.5 nozzle",
"Voron 2.4 350 0.6 nozzle", "Voron 2.4 350 0.6 nozzle",
"Voron 2.4 350 0.8 nozzle", "Voron 2.4 350 0.8 nozzle",
"Voron 2.4 350 1.0 nozzle", "Voron 2.4 350 1.0 nozzle",
@@ -44,6 +47,7 @@
"Voron Trident 250 0.15 nozzle", "Voron Trident 250 0.15 nozzle",
"Voron Trident 250 0.2 nozzle", "Voron Trident 250 0.2 nozzle",
"Voron Trident 250 0.25 nozzle", "Voron Trident 250 0.25 nozzle",
"Voron Trident 250 0.5 nozzle",
"Voron Trident 250 0.6 nozzle", "Voron Trident 250 0.6 nozzle",
"Voron Trident 250 0.8 nozzle", "Voron Trident 250 0.8 nozzle",
"Voron Trident 250 1.0 nozzle", "Voron Trident 250 1.0 nozzle",
@@ -51,6 +55,7 @@
"Voron Trident 300 0.15 nozzle", "Voron Trident 300 0.15 nozzle",
"Voron Trident 300 0.2 nozzle", "Voron Trident 300 0.2 nozzle",
"Voron Trident 300 0.25 nozzle", "Voron Trident 300 0.25 nozzle",
"Voron Trident 300 0.5 nozzle",
"Voron Trident 300 0.6 nozzle", "Voron Trident 300 0.6 nozzle",
"Voron Trident 300 0.8 nozzle", "Voron Trident 300 0.8 nozzle",
"Voron Trident 300 1.0 nozzle", "Voron Trident 300 1.0 nozzle",
@@ -58,6 +63,7 @@
"Voron Trident 350 0.15 nozzle", "Voron Trident 350 0.15 nozzle",
"Voron Trident 350 0.2 nozzle", "Voron Trident 350 0.2 nozzle",
"Voron Trident 350 0.25 nozzle", "Voron Trident 350 0.25 nozzle",
"Voron Trident 350 0.5 nozzle",
"Voron Trident 350 0.6 nozzle", "Voron Trident 350 0.6 nozzle",
"Voron Trident 350 0.8 nozzle", "Voron Trident 350 0.8 nozzle",
"Voron Trident 350 1.0 nozzle", "Voron Trident 350 1.0 nozzle",
@@ -65,6 +71,7 @@
"Voron 0.1 0.15 nozzle", "Voron 0.1 0.15 nozzle",
"Voron 0.1 0.2 nozzle", "Voron 0.1 0.2 nozzle",
"Voron 0.1 0.25 nozzle", "Voron 0.1 0.25 nozzle",
"Voron 0.1 0.5 nozzle",
"Voron 0.1 0.6 nozzle", "Voron 0.1 0.6 nozzle",
"Voron 0.1 0.8 nozzle", "Voron 0.1 0.8 nozzle",
"Voron 0.1 1.0 nozzle", "Voron 0.1 1.0 nozzle",
@@ -72,6 +79,7 @@
"Voron Switchwire 250 0.15 nozzle", "Voron Switchwire 250 0.15 nozzle",
"Voron Switchwire 250 0.2 nozzle", "Voron Switchwire 250 0.2 nozzle",
"Voron Switchwire 250 0.25 nozzle", "Voron Switchwire 250 0.25 nozzle",
"Voron Switchwire 250 0.5 nozzle",
"Voron Switchwire 250 0.6 nozzle", "Voron Switchwire 250 0.6 nozzle",
"Voron Switchwire 250 0.8 nozzle", "Voron Switchwire 250 0.8 nozzle",
"Voron Switchwire 250 1.0 nozzle" "Voron Switchwire 250 1.0 nozzle"

View File

@@ -20,6 +20,7 @@
"Voron 2.4 250 0.15 nozzle", "Voron 2.4 250 0.15 nozzle",
"Voron 2.4 250 0.2 nozzle", "Voron 2.4 250 0.2 nozzle",
"Voron 2.4 250 0.25 nozzle", "Voron 2.4 250 0.25 nozzle",
"Voron 2.4 250 0.5 nozzle",
"Voron 2.4 250 0.6 nozzle", "Voron 2.4 250 0.6 nozzle",
"Voron 2.4 250 0.8 nozzle", "Voron 2.4 250 0.8 nozzle",
"Voron 2.4 250 1.0 nozzle", "Voron 2.4 250 1.0 nozzle",
@@ -27,6 +28,7 @@
"Voron 2.4 300 0.15 nozzle", "Voron 2.4 300 0.15 nozzle",
"Voron 2.4 300 0.2 nozzle", "Voron 2.4 300 0.2 nozzle",
"Voron 2.4 300 0.25 nozzle", "Voron 2.4 300 0.25 nozzle",
"Voron 2.4 300 0.5 nozzle",
"Voron 2.4 300 0.6 nozzle", "Voron 2.4 300 0.6 nozzle",
"Voron 2.4 300 0.8 nozzle", "Voron 2.4 300 0.8 nozzle",
"Voron 2.4 300 1.0 nozzle", "Voron 2.4 300 1.0 nozzle",
@@ -34,6 +36,7 @@
"Voron 2.4 350 0.15 nozzle", "Voron 2.4 350 0.15 nozzle",
"Voron 2.4 350 0.2 nozzle", "Voron 2.4 350 0.2 nozzle",
"Voron 2.4 350 0.25 nozzle", "Voron 2.4 350 0.25 nozzle",
"Voron 2.4 350 0.5 nozzle",
"Voron 2.4 350 0.6 nozzle", "Voron 2.4 350 0.6 nozzle",
"Voron 2.4 350 0.8 nozzle", "Voron 2.4 350 0.8 nozzle",
"Voron 2.4 350 1.0 nozzle", "Voron 2.4 350 1.0 nozzle",
@@ -41,6 +44,7 @@
"Voron Trident 250 0.15 nozzle", "Voron Trident 250 0.15 nozzle",
"Voron Trident 250 0.2 nozzle", "Voron Trident 250 0.2 nozzle",
"Voron Trident 250 0.25 nozzle", "Voron Trident 250 0.25 nozzle",
"Voron Trident 250 0.5 nozzle",
"Voron Trident 250 0.6 nozzle", "Voron Trident 250 0.6 nozzle",
"Voron Trident 250 0.8 nozzle", "Voron Trident 250 0.8 nozzle",
"Voron Trident 250 1.0 nozzle", "Voron Trident 250 1.0 nozzle",
@@ -48,6 +52,7 @@
"Voron Trident 300 0.15 nozzle", "Voron Trident 300 0.15 nozzle",
"Voron Trident 300 0.2 nozzle", "Voron Trident 300 0.2 nozzle",
"Voron Trident 300 0.25 nozzle", "Voron Trident 300 0.25 nozzle",
"Voron Trident 300 0.5 nozzle",
"Voron Trident 300 0.6 nozzle", "Voron Trident 300 0.6 nozzle",
"Voron Trident 300 0.8 nozzle", "Voron Trident 300 0.8 nozzle",
"Voron Trident 300 1.0 nozzle", "Voron Trident 300 1.0 nozzle",
@@ -55,6 +60,7 @@
"Voron Trident 350 0.15 nozzle", "Voron Trident 350 0.15 nozzle",
"Voron Trident 350 0.2 nozzle", "Voron Trident 350 0.2 nozzle",
"Voron Trident 350 0.25 nozzle", "Voron Trident 350 0.25 nozzle",
"Voron Trident 350 0.5 nozzle",
"Voron Trident 350 0.6 nozzle", "Voron Trident 350 0.6 nozzle",
"Voron Trident 350 0.8 nozzle", "Voron Trident 350 0.8 nozzle",
"Voron Trident 350 1.0 nozzle", "Voron Trident 350 1.0 nozzle",
@@ -62,6 +68,7 @@
"Voron 0.1 0.15 nozzle", "Voron 0.1 0.15 nozzle",
"Voron 0.1 0.2 nozzle", "Voron 0.1 0.2 nozzle",
"Voron 0.1 0.25 nozzle", "Voron 0.1 0.25 nozzle",
"Voron 0.1 0.5 nozzle",
"Voron 0.1 0.6 nozzle", "Voron 0.1 0.6 nozzle",
"Voron 0.1 0.8 nozzle", "Voron 0.1 0.8 nozzle",
"Voron 0.1 1.0 nozzle", "Voron 0.1 1.0 nozzle",
@@ -69,6 +76,7 @@
"Voron Switchwire 250 0.15 nozzle", "Voron Switchwire 250 0.15 nozzle",
"Voron Switchwire 250 0.2 nozzle", "Voron Switchwire 250 0.2 nozzle",
"Voron Switchwire 250 0.25 nozzle", "Voron Switchwire 250 0.25 nozzle",
"Voron Switchwire 250 0.5 nozzle",
"Voron Switchwire 250 0.6 nozzle", "Voron Switchwire 250 0.6 nozzle",
"Voron Switchwire 250 0.8 nozzle", "Voron Switchwire 250 0.8 nozzle",
"Voron Switchwire 250 1.0 nozzle" "Voron Switchwire 250 1.0 nozzle"

View File

@@ -17,6 +17,7 @@
"Voron 2.4 250 0.15 nozzle", "Voron 2.4 250 0.15 nozzle",
"Voron 2.4 250 0.2 nozzle", "Voron 2.4 250 0.2 nozzle",
"Voron 2.4 250 0.25 nozzle", "Voron 2.4 250 0.25 nozzle",
"Voron 2.4 250 0.5 nozzle",
"Voron 2.4 250 0.6 nozzle", "Voron 2.4 250 0.6 nozzle",
"Voron 2.4 250 0.8 nozzle", "Voron 2.4 250 0.8 nozzle",
"Voron 2.4 250 1.0 nozzle", "Voron 2.4 250 1.0 nozzle",
@@ -24,6 +25,7 @@
"Voron 2.4 300 0.15 nozzle", "Voron 2.4 300 0.15 nozzle",
"Voron 2.4 300 0.2 nozzle", "Voron 2.4 300 0.2 nozzle",
"Voron 2.4 300 0.25 nozzle", "Voron 2.4 300 0.25 nozzle",
"Voron 2.4 300 0.5 nozzle",
"Voron 2.4 300 0.6 nozzle", "Voron 2.4 300 0.6 nozzle",
"Voron 2.4 300 0.8 nozzle", "Voron 2.4 300 0.8 nozzle",
"Voron 2.4 300 1.0 nozzle", "Voron 2.4 300 1.0 nozzle",
@@ -31,6 +33,7 @@
"Voron 2.4 350 0.15 nozzle", "Voron 2.4 350 0.15 nozzle",
"Voron 2.4 350 0.2 nozzle", "Voron 2.4 350 0.2 nozzle",
"Voron 2.4 350 0.25 nozzle", "Voron 2.4 350 0.25 nozzle",
"Voron 2.4 350 0.5 nozzle",
"Voron 2.4 350 0.6 nozzle", "Voron 2.4 350 0.6 nozzle",
"Voron 2.4 350 0.8 nozzle", "Voron 2.4 350 0.8 nozzle",
"Voron 2.4 350 1.0 nozzle", "Voron 2.4 350 1.0 nozzle",
@@ -38,6 +41,7 @@
"Voron Trident 250 0.15 nozzle", "Voron Trident 250 0.15 nozzle",
"Voron Trident 250 0.2 nozzle", "Voron Trident 250 0.2 nozzle",
"Voron Trident 250 0.25 nozzle", "Voron Trident 250 0.25 nozzle",
"Voron Trident 250 0.5 nozzle",
"Voron Trident 250 0.6 nozzle", "Voron Trident 250 0.6 nozzle",
"Voron Trident 250 0.8 nozzle", "Voron Trident 250 0.8 nozzle",
"Voron Trident 250 1.0 nozzle", "Voron Trident 250 1.0 nozzle",
@@ -45,6 +49,7 @@
"Voron Trident 300 0.15 nozzle", "Voron Trident 300 0.15 nozzle",
"Voron Trident 300 0.2 nozzle", "Voron Trident 300 0.2 nozzle",
"Voron Trident 300 0.25 nozzle", "Voron Trident 300 0.25 nozzle",
"Voron Trident 300 0.5 nozzle",
"Voron Trident 300 0.6 nozzle", "Voron Trident 300 0.6 nozzle",
"Voron Trident 300 0.8 nozzle", "Voron Trident 300 0.8 nozzle",
"Voron Trident 300 1.0 nozzle", "Voron Trident 300 1.0 nozzle",
@@ -52,6 +57,7 @@
"Voron Trident 350 0.15 nozzle", "Voron Trident 350 0.15 nozzle",
"Voron Trident 350 0.2 nozzle", "Voron Trident 350 0.2 nozzle",
"Voron Trident 350 0.25 nozzle", "Voron Trident 350 0.25 nozzle",
"Voron Trident 350 0.5 nozzle",
"Voron Trident 350 0.6 nozzle", "Voron Trident 350 0.6 nozzle",
"Voron Trident 350 0.8 nozzle", "Voron Trident 350 0.8 nozzle",
"Voron Trident 350 1.0 nozzle", "Voron Trident 350 1.0 nozzle",
@@ -59,6 +65,7 @@
"Voron 0.1 0.15 nozzle", "Voron 0.1 0.15 nozzle",
"Voron 0.1 0.2 nozzle", "Voron 0.1 0.2 nozzle",
"Voron 0.1 0.25 nozzle", "Voron 0.1 0.25 nozzle",
"Voron 0.1 0.5 nozzle",
"Voron 0.1 0.6 nozzle", "Voron 0.1 0.6 nozzle",
"Voron 0.1 0.8 nozzle", "Voron 0.1 0.8 nozzle",
"Voron 0.1 1.0 nozzle", "Voron 0.1 1.0 nozzle",
@@ -66,6 +73,7 @@
"Voron Switchwire 250 0.15 nozzle", "Voron Switchwire 250 0.15 nozzle",
"Voron Switchwire 250 0.2 nozzle", "Voron Switchwire 250 0.2 nozzle",
"Voron Switchwire 250 0.25 nozzle", "Voron Switchwire 250 0.25 nozzle",
"Voron Switchwire 250 0.5 nozzle",
"Voron Switchwire 250 0.6 nozzle", "Voron Switchwire 250 0.6 nozzle",
"Voron Switchwire 250 0.8 nozzle", "Voron Switchwire 250 0.8 nozzle",
"Voron Switchwire 250 1.0 nozzle" "Voron Switchwire 250 1.0 nozzle"

View File

@@ -47,6 +47,7 @@
"Voron 2.4 250 0.15 nozzle", "Voron 2.4 250 0.15 nozzle",
"Voron 2.4 250 0.2 nozzle", "Voron 2.4 250 0.2 nozzle",
"Voron 2.4 250 0.25 nozzle", "Voron 2.4 250 0.25 nozzle",
"Voron 2.4 250 0.5 nozzle",
"Voron 2.4 250 0.6 nozzle", "Voron 2.4 250 0.6 nozzle",
"Voron 2.4 250 0.8 nozzle", "Voron 2.4 250 0.8 nozzle",
"Voron 2.4 250 1.0 nozzle", "Voron 2.4 250 1.0 nozzle",
@@ -54,6 +55,7 @@
"Voron 2.4 300 0.15 nozzle", "Voron 2.4 300 0.15 nozzle",
"Voron 2.4 300 0.2 nozzle", "Voron 2.4 300 0.2 nozzle",
"Voron 2.4 300 0.25 nozzle", "Voron 2.4 300 0.25 nozzle",
"Voron 2.4 300 0.5 nozzle",
"Voron 2.4 300 0.6 nozzle", "Voron 2.4 300 0.6 nozzle",
"Voron 2.4 300 0.8 nozzle", "Voron 2.4 300 0.8 nozzle",
"Voron 2.4 300 1.0 nozzle", "Voron 2.4 300 1.0 nozzle",
@@ -61,6 +63,7 @@
"Voron 2.4 350 0.15 nozzle", "Voron 2.4 350 0.15 nozzle",
"Voron 2.4 350 0.2 nozzle", "Voron 2.4 350 0.2 nozzle",
"Voron 2.4 350 0.25 nozzle", "Voron 2.4 350 0.25 nozzle",
"Voron 2.4 350 0.5 nozzle",
"Voron 2.4 350 0.6 nozzle", "Voron 2.4 350 0.6 nozzle",
"Voron 2.4 350 0.8 nozzle", "Voron 2.4 350 0.8 nozzle",
"Voron 2.4 350 1.0 nozzle", "Voron 2.4 350 1.0 nozzle",
@@ -68,6 +71,7 @@
"Voron Trident 250 0.15 nozzle", "Voron Trident 250 0.15 nozzle",
"Voron Trident 250 0.2 nozzle", "Voron Trident 250 0.2 nozzle",
"Voron Trident 250 0.25 nozzle", "Voron Trident 250 0.25 nozzle",
"Voron Trident 250 0.5 nozzle",
"Voron Trident 250 0.6 nozzle", "Voron Trident 250 0.6 nozzle",
"Voron Trident 250 0.8 nozzle", "Voron Trident 250 0.8 nozzle",
"Voron Trident 250 1.0 nozzle", "Voron Trident 250 1.0 nozzle",
@@ -75,6 +79,7 @@
"Voron Trident 300 0.15 nozzle", "Voron Trident 300 0.15 nozzle",
"Voron Trident 300 0.2 nozzle", "Voron Trident 300 0.2 nozzle",
"Voron Trident 300 0.25 nozzle", "Voron Trident 300 0.25 nozzle",
"Voron Trident 300 0.5 nozzle",
"Voron Trident 300 0.6 nozzle", "Voron Trident 300 0.6 nozzle",
"Voron Trident 300 0.8 nozzle", "Voron Trident 300 0.8 nozzle",
"Voron Trident 300 1.0 nozzle", "Voron Trident 300 1.0 nozzle",
@@ -82,6 +87,7 @@
"Voron Trident 350 0.15 nozzle", "Voron Trident 350 0.15 nozzle",
"Voron Trident 350 0.2 nozzle", "Voron Trident 350 0.2 nozzle",
"Voron Trident 350 0.25 nozzle", "Voron Trident 350 0.25 nozzle",
"Voron Trident 350 0.5 nozzle",
"Voron Trident 350 0.6 nozzle", "Voron Trident 350 0.6 nozzle",
"Voron Trident 350 0.8 nozzle", "Voron Trident 350 0.8 nozzle",
"Voron Trident 350 1.0 nozzle", "Voron Trident 350 1.0 nozzle",
@@ -89,6 +95,7 @@
"Voron 0.1 0.15 nozzle", "Voron 0.1 0.15 nozzle",
"Voron 0.1 0.2 nozzle", "Voron 0.1 0.2 nozzle",
"Voron 0.1 0.25 nozzle", "Voron 0.1 0.25 nozzle",
"Voron 0.1 0.5 nozzle",
"Voron 0.1 0.6 nozzle", "Voron 0.1 0.6 nozzle",
"Voron 0.1 0.8 nozzle", "Voron 0.1 0.8 nozzle",
"Voron 0.1 1.0 nozzle", "Voron 0.1 1.0 nozzle",
@@ -96,6 +103,7 @@
"Voron Switchwire 250 0.15 nozzle", "Voron Switchwire 250 0.15 nozzle",
"Voron Switchwire 250 0.2 nozzle", "Voron Switchwire 250 0.2 nozzle",
"Voron Switchwire 250 0.25 nozzle", "Voron Switchwire 250 0.25 nozzle",
"Voron Switchwire 250 0.5 nozzle",
"Voron Switchwire 250 0.6 nozzle", "Voron Switchwire 250 0.6 nozzle",
"Voron Switchwire 250 0.8 nozzle", "Voron Switchwire 250 0.8 nozzle",
"Voron Switchwire 250 1.0 nozzle" "Voron Switchwire 250 1.0 nozzle"

View File

@@ -23,6 +23,7 @@
"Voron 2.4 250 0.15 nozzle", "Voron 2.4 250 0.15 nozzle",
"Voron 2.4 250 0.2 nozzle", "Voron 2.4 250 0.2 nozzle",
"Voron 2.4 250 0.25 nozzle", "Voron 2.4 250 0.25 nozzle",
"Voron 2.4 250 0.5 nozzle",
"Voron 2.4 250 0.6 nozzle", "Voron 2.4 250 0.6 nozzle",
"Voron 2.4 250 0.8 nozzle", "Voron 2.4 250 0.8 nozzle",
"Voron 2.4 250 1.0 nozzle", "Voron 2.4 250 1.0 nozzle",
@@ -30,6 +31,7 @@
"Voron 2.4 300 0.15 nozzle", "Voron 2.4 300 0.15 nozzle",
"Voron 2.4 300 0.2 nozzle", "Voron 2.4 300 0.2 nozzle",
"Voron 2.4 300 0.25 nozzle", "Voron 2.4 300 0.25 nozzle",
"Voron 2.4 300 0.5 nozzle",
"Voron 2.4 300 0.6 nozzle", "Voron 2.4 300 0.6 nozzle",
"Voron 2.4 300 0.8 nozzle", "Voron 2.4 300 0.8 nozzle",
"Voron 2.4 300 1.0 nozzle", "Voron 2.4 300 1.0 nozzle",
@@ -37,6 +39,7 @@
"Voron 2.4 350 0.15 nozzle", "Voron 2.4 350 0.15 nozzle",
"Voron 2.4 350 0.2 nozzle", "Voron 2.4 350 0.2 nozzle",
"Voron 2.4 350 0.25 nozzle", "Voron 2.4 350 0.25 nozzle",
"Voron 2.4 350 0.5 nozzle",
"Voron 2.4 350 0.6 nozzle", "Voron 2.4 350 0.6 nozzle",
"Voron 2.4 350 0.8 nozzle", "Voron 2.4 350 0.8 nozzle",
"Voron 2.4 350 1.0 nozzle", "Voron 2.4 350 1.0 nozzle",
@@ -44,6 +47,7 @@
"Voron Trident 250 0.15 nozzle", "Voron Trident 250 0.15 nozzle",
"Voron Trident 250 0.2 nozzle", "Voron Trident 250 0.2 nozzle",
"Voron Trident 250 0.25 nozzle", "Voron Trident 250 0.25 nozzle",
"Voron Trident 250 0.5 nozzle",
"Voron Trident 250 0.6 nozzle", "Voron Trident 250 0.6 nozzle",
"Voron Trident 250 0.8 nozzle", "Voron Trident 250 0.8 nozzle",
"Voron Trident 250 1.0 nozzle", "Voron Trident 250 1.0 nozzle",
@@ -51,6 +55,7 @@
"Voron Trident 300 0.15 nozzle", "Voron Trident 300 0.15 nozzle",
"Voron Trident 300 0.2 nozzle", "Voron Trident 300 0.2 nozzle",
"Voron Trident 300 0.25 nozzle", "Voron Trident 300 0.25 nozzle",
"Voron Trident 300 0.5 nozzle",
"Voron Trident 300 0.6 nozzle", "Voron Trident 300 0.6 nozzle",
"Voron Trident 300 0.8 nozzle", "Voron Trident 300 0.8 nozzle",
"Voron Trident 300 1.0 nozzle", "Voron Trident 300 1.0 nozzle",
@@ -58,6 +63,7 @@
"Voron Trident 350 0.15 nozzle", "Voron Trident 350 0.15 nozzle",
"Voron Trident 350 0.2 nozzle", "Voron Trident 350 0.2 nozzle",
"Voron Trident 350 0.25 nozzle", "Voron Trident 350 0.25 nozzle",
"Voron Trident 350 0.5 nozzle",
"Voron Trident 350 0.6 nozzle", "Voron Trident 350 0.6 nozzle",
"Voron Trident 350 0.8 nozzle", "Voron Trident 350 0.8 nozzle",
"Voron Trident 350 1.0 nozzle", "Voron Trident 350 1.0 nozzle",
@@ -65,6 +71,7 @@
"Voron 0.1 0.15 nozzle", "Voron 0.1 0.15 nozzle",
"Voron 0.1 0.2 nozzle", "Voron 0.1 0.2 nozzle",
"Voron 0.1 0.25 nozzle", "Voron 0.1 0.25 nozzle",
"Voron 0.1 0.5 nozzle",
"Voron 0.1 0.6 nozzle", "Voron 0.1 0.6 nozzle",
"Voron 0.1 0.8 nozzle", "Voron 0.1 0.8 nozzle",
"Voron 0.1 1.0 nozzle", "Voron 0.1 1.0 nozzle",
@@ -72,6 +79,7 @@
"Voron Switchwire 250 0.15 nozzle", "Voron Switchwire 250 0.15 nozzle",
"Voron Switchwire 250 0.2 nozzle", "Voron Switchwire 250 0.2 nozzle",
"Voron Switchwire 250 0.25 nozzle", "Voron Switchwire 250 0.25 nozzle",
"Voron Switchwire 250 0.5 nozzle",
"Voron Switchwire 250 0.6 nozzle", "Voron Switchwire 250 0.6 nozzle",
"Voron Switchwire 250 0.8 nozzle", "Voron Switchwire 250 0.8 nozzle",
"Voron Switchwire 250 1.0 nozzle" "Voron Switchwire 250 1.0 nozzle"

View File

@@ -20,6 +20,7 @@
"Voron 2.4 250 0.15 nozzle", "Voron 2.4 250 0.15 nozzle",
"Voron 2.4 250 0.2 nozzle", "Voron 2.4 250 0.2 nozzle",
"Voron 2.4 250 0.25 nozzle", "Voron 2.4 250 0.25 nozzle",
"Voron 2.4 250 0.5 nozzle",
"Voron 2.4 250 0.6 nozzle", "Voron 2.4 250 0.6 nozzle",
"Voron 2.4 250 0.8 nozzle", "Voron 2.4 250 0.8 nozzle",
"Voron 2.4 250 1.0 nozzle", "Voron 2.4 250 1.0 nozzle",
@@ -27,6 +28,7 @@
"Voron 2.4 300 0.15 nozzle", "Voron 2.4 300 0.15 nozzle",
"Voron 2.4 300 0.2 nozzle", "Voron 2.4 300 0.2 nozzle",
"Voron 2.4 300 0.25 nozzle", "Voron 2.4 300 0.25 nozzle",
"Voron 2.4 300 0.5 nozzle",
"Voron 2.4 300 0.6 nozzle", "Voron 2.4 300 0.6 nozzle",
"Voron 2.4 300 0.8 nozzle", "Voron 2.4 300 0.8 nozzle",
"Voron 2.4 300 1.0 nozzle", "Voron 2.4 300 1.0 nozzle",
@@ -34,6 +36,7 @@
"Voron 2.4 350 0.15 nozzle", "Voron 2.4 350 0.15 nozzle",
"Voron 2.4 350 0.2 nozzle", "Voron 2.4 350 0.2 nozzle",
"Voron 2.4 350 0.25 nozzle", "Voron 2.4 350 0.25 nozzle",
"Voron 2.4 350 0.5 nozzle",
"Voron 2.4 350 0.6 nozzle", "Voron 2.4 350 0.6 nozzle",
"Voron 2.4 350 0.8 nozzle", "Voron 2.4 350 0.8 nozzle",
"Voron 2.4 350 1.0 nozzle", "Voron 2.4 350 1.0 nozzle",
@@ -41,6 +44,7 @@
"Voron Trident 250 0.15 nozzle", "Voron Trident 250 0.15 nozzle",
"Voron Trident 250 0.2 nozzle", "Voron Trident 250 0.2 nozzle",
"Voron Trident 250 0.25 nozzle", "Voron Trident 250 0.25 nozzle",
"Voron Trident 250 0.5 nozzle",
"Voron Trident 250 0.6 nozzle", "Voron Trident 250 0.6 nozzle",
"Voron Trident 250 0.8 nozzle", "Voron Trident 250 0.8 nozzle",
"Voron Trident 250 1.0 nozzle", "Voron Trident 250 1.0 nozzle",
@@ -48,6 +52,7 @@
"Voron Trident 300 0.15 nozzle", "Voron Trident 300 0.15 nozzle",
"Voron Trident 300 0.2 nozzle", "Voron Trident 300 0.2 nozzle",
"Voron Trident 300 0.25 nozzle", "Voron Trident 300 0.25 nozzle",
"Voron Trident 300 0.5 nozzle",
"Voron Trident 300 0.6 nozzle", "Voron Trident 300 0.6 nozzle",
"Voron Trident 300 0.8 nozzle", "Voron Trident 300 0.8 nozzle",
"Voron Trident 300 1.0 nozzle", "Voron Trident 300 1.0 nozzle",
@@ -55,6 +60,7 @@
"Voron Trident 350 0.15 nozzle", "Voron Trident 350 0.15 nozzle",
"Voron Trident 350 0.2 nozzle", "Voron Trident 350 0.2 nozzle",
"Voron Trident 350 0.25 nozzle", "Voron Trident 350 0.25 nozzle",
"Voron Trident 350 0.5 nozzle",
"Voron Trident 350 0.6 nozzle", "Voron Trident 350 0.6 nozzle",
"Voron Trident 350 0.8 nozzle", "Voron Trident 350 0.8 nozzle",
"Voron Trident 350 1.0 nozzle", "Voron Trident 350 1.0 nozzle",
@@ -62,6 +68,7 @@
"Voron 0.1 0.15 nozzle", "Voron 0.1 0.15 nozzle",
"Voron 0.1 0.2 nozzle", "Voron 0.1 0.2 nozzle",
"Voron 0.1 0.25 nozzle", "Voron 0.1 0.25 nozzle",
"Voron 0.1 0.5 nozzle",
"Voron 0.1 0.6 nozzle", "Voron 0.1 0.6 nozzle",
"Voron 0.1 0.8 nozzle", "Voron 0.1 0.8 nozzle",
"Voron 0.1 1.0 nozzle", "Voron 0.1 1.0 nozzle",
@@ -69,6 +76,7 @@
"Voron Switchwire 250 0.15 nozzle", "Voron Switchwire 250 0.15 nozzle",
"Voron Switchwire 250 0.2 nozzle", "Voron Switchwire 250 0.2 nozzle",
"Voron Switchwire 250 0.25 nozzle", "Voron Switchwire 250 0.25 nozzle",
"Voron Switchwire 250 0.5 nozzle",
"Voron Switchwire 250 0.6 nozzle", "Voron Switchwire 250 0.6 nozzle",
"Voron Switchwire 250 0.8 nozzle", "Voron Switchwire 250 0.8 nozzle",
"Voron Switchwire 250 1.0 nozzle" "Voron Switchwire 250 1.0 nozzle"

View File

@@ -23,6 +23,7 @@
"Voron 2.4 250 0.15 nozzle", "Voron 2.4 250 0.15 nozzle",
"Voron 2.4 250 0.2 nozzle", "Voron 2.4 250 0.2 nozzle",
"Voron 2.4 250 0.25 nozzle", "Voron 2.4 250 0.25 nozzle",
"Voron 2.4 250 0.5 nozzle",
"Voron 2.4 250 0.6 nozzle", "Voron 2.4 250 0.6 nozzle",
"Voron 2.4 250 0.8 nozzle", "Voron 2.4 250 0.8 nozzle",
"Voron 2.4 250 1.0 nozzle", "Voron 2.4 250 1.0 nozzle",
@@ -30,6 +31,7 @@
"Voron 2.4 300 0.15 nozzle", "Voron 2.4 300 0.15 nozzle",
"Voron 2.4 300 0.2 nozzle", "Voron 2.4 300 0.2 nozzle",
"Voron 2.4 300 0.25 nozzle", "Voron 2.4 300 0.25 nozzle",
"Voron 2.4 300 0.5 nozzle",
"Voron 2.4 300 0.6 nozzle", "Voron 2.4 300 0.6 nozzle",
"Voron 2.4 300 0.8 nozzle", "Voron 2.4 300 0.8 nozzle",
"Voron 2.4 300 1.0 nozzle", "Voron 2.4 300 1.0 nozzle",
@@ -37,6 +39,7 @@
"Voron 2.4 350 0.15 nozzle", "Voron 2.4 350 0.15 nozzle",
"Voron 2.4 350 0.2 nozzle", "Voron 2.4 350 0.2 nozzle",
"Voron 2.4 350 0.25 nozzle", "Voron 2.4 350 0.25 nozzle",
"Voron 2.4 350 0.5 nozzle",
"Voron 2.4 350 0.6 nozzle", "Voron 2.4 350 0.6 nozzle",
"Voron 2.4 350 0.8 nozzle", "Voron 2.4 350 0.8 nozzle",
"Voron 2.4 350 1.0 nozzle", "Voron 2.4 350 1.0 nozzle",
@@ -44,6 +47,7 @@
"Voron Trident 250 0.15 nozzle", "Voron Trident 250 0.15 nozzle",
"Voron Trident 250 0.2 nozzle", "Voron Trident 250 0.2 nozzle",
"Voron Trident 250 0.25 nozzle", "Voron Trident 250 0.25 nozzle",
"Voron Trident 250 0.5 nozzle",
"Voron Trident 250 0.6 nozzle", "Voron Trident 250 0.6 nozzle",
"Voron Trident 250 0.8 nozzle", "Voron Trident 250 0.8 nozzle",
"Voron Trident 250 1.0 nozzle", "Voron Trident 250 1.0 nozzle",
@@ -51,6 +55,7 @@
"Voron Trident 300 0.15 nozzle", "Voron Trident 300 0.15 nozzle",
"Voron Trident 300 0.2 nozzle", "Voron Trident 300 0.2 nozzle",
"Voron Trident 300 0.25 nozzle", "Voron Trident 300 0.25 nozzle",
"Voron Trident 300 0.5 nozzle",
"Voron Trident 300 0.6 nozzle", "Voron Trident 300 0.6 nozzle",
"Voron Trident 300 0.8 nozzle", "Voron Trident 300 0.8 nozzle",
"Voron Trident 300 1.0 nozzle", "Voron Trident 300 1.0 nozzle",
@@ -58,6 +63,7 @@
"Voron Trident 350 0.15 nozzle", "Voron Trident 350 0.15 nozzle",
"Voron Trident 350 0.2 nozzle", "Voron Trident 350 0.2 nozzle",
"Voron Trident 350 0.25 nozzle", "Voron Trident 350 0.25 nozzle",
"Voron Trident 350 0.5 nozzle",
"Voron Trident 350 0.6 nozzle", "Voron Trident 350 0.6 nozzle",
"Voron Trident 350 0.8 nozzle", "Voron Trident 350 0.8 nozzle",
"Voron Trident 350 1.0 nozzle", "Voron Trident 350 1.0 nozzle",
@@ -65,6 +71,7 @@
"Voron 0.1 0.15 nozzle", "Voron 0.1 0.15 nozzle",
"Voron 0.1 0.2 nozzle", "Voron 0.1 0.2 nozzle",
"Voron 0.1 0.25 nozzle", "Voron 0.1 0.25 nozzle",
"Voron 0.1 0.5 nozzle",
"Voron 0.1 0.6 nozzle", "Voron 0.1 0.6 nozzle",
"Voron 0.1 0.8 nozzle", "Voron 0.1 0.8 nozzle",
"Voron 0.1 1.0 nozzle", "Voron 0.1 1.0 nozzle",
@@ -72,6 +79,7 @@
"Voron Switchwire 250 0.15 nozzle", "Voron Switchwire 250 0.15 nozzle",
"Voron Switchwire 250 0.2 nozzle", "Voron Switchwire 250 0.2 nozzle",
"Voron Switchwire 250 0.25 nozzle", "Voron Switchwire 250 0.25 nozzle",
"Voron Switchwire 250 0.5 nozzle",
"Voron Switchwire 250 0.6 nozzle", "Voron Switchwire 250 0.6 nozzle",
"Voron Switchwire 250 0.8 nozzle", "Voron Switchwire 250 0.8 nozzle",
"Voron Switchwire 250 1.0 nozzle" "Voron Switchwire 250 1.0 nozzle"

View File

@@ -14,6 +14,7 @@
"Voron 2.4 250 0.15 nozzle", "Voron 2.4 250 0.15 nozzle",
"Voron 2.4 250 0.2 nozzle", "Voron 2.4 250 0.2 nozzle",
"Voron 2.4 250 0.25 nozzle", "Voron 2.4 250 0.25 nozzle",
"Voron 2.4 250 0.5 nozzle",
"Voron 2.4 250 0.6 nozzle", "Voron 2.4 250 0.6 nozzle",
"Voron 2.4 250 0.8 nozzle", "Voron 2.4 250 0.8 nozzle",
"Voron 2.4 250 1.0 nozzle", "Voron 2.4 250 1.0 nozzle",
@@ -21,6 +22,7 @@
"Voron 2.4 300 0.15 nozzle", "Voron 2.4 300 0.15 nozzle",
"Voron 2.4 300 0.2 nozzle", "Voron 2.4 300 0.2 nozzle",
"Voron 2.4 300 0.25 nozzle", "Voron 2.4 300 0.25 nozzle",
"Voron 2.4 300 0.5 nozzle",
"Voron 2.4 300 0.6 nozzle", "Voron 2.4 300 0.6 nozzle",
"Voron 2.4 300 0.8 nozzle", "Voron 2.4 300 0.8 nozzle",
"Voron 2.4 300 1.0 nozzle", "Voron 2.4 300 1.0 nozzle",
@@ -28,6 +30,7 @@
"Voron 2.4 350 0.15 nozzle", "Voron 2.4 350 0.15 nozzle",
"Voron 2.4 350 0.2 nozzle", "Voron 2.4 350 0.2 nozzle",
"Voron 2.4 350 0.25 nozzle", "Voron 2.4 350 0.25 nozzle",
"Voron 2.4 350 0.5 nozzle",
"Voron 2.4 350 0.6 nozzle", "Voron 2.4 350 0.6 nozzle",
"Voron 2.4 350 0.8 nozzle", "Voron 2.4 350 0.8 nozzle",
"Voron 2.4 350 1.0 nozzle", "Voron 2.4 350 1.0 nozzle",
@@ -35,6 +38,7 @@
"Voron Trident 250 0.15 nozzle", "Voron Trident 250 0.15 nozzle",
"Voron Trident 250 0.2 nozzle", "Voron Trident 250 0.2 nozzle",
"Voron Trident 250 0.25 nozzle", "Voron Trident 250 0.25 nozzle",
"Voron Trident 250 0.5 nozzle",
"Voron Trident 250 0.6 nozzle", "Voron Trident 250 0.6 nozzle",
"Voron Trident 250 0.8 nozzle", "Voron Trident 250 0.8 nozzle",
"Voron Trident 250 1.0 nozzle", "Voron Trident 250 1.0 nozzle",
@@ -42,6 +46,7 @@
"Voron Trident 300 0.15 nozzle", "Voron Trident 300 0.15 nozzle",
"Voron Trident 300 0.2 nozzle", "Voron Trident 300 0.2 nozzle",
"Voron Trident 300 0.25 nozzle", "Voron Trident 300 0.25 nozzle",
"Voron Trident 300 0.5 nozzle",
"Voron Trident 300 0.6 nozzle", "Voron Trident 300 0.6 nozzle",
"Voron Trident 300 0.8 nozzle", "Voron Trident 300 0.8 nozzle",
"Voron Trident 300 1.0 nozzle", "Voron Trident 300 1.0 nozzle",
@@ -49,6 +54,7 @@
"Voron Trident 350 0.15 nozzle", "Voron Trident 350 0.15 nozzle",
"Voron Trident 350 0.2 nozzle", "Voron Trident 350 0.2 nozzle",
"Voron Trident 350 0.25 nozzle", "Voron Trident 350 0.25 nozzle",
"Voron Trident 350 0.5 nozzle",
"Voron Trident 350 0.6 nozzle", "Voron Trident 350 0.6 nozzle",
"Voron Trident 350 0.8 nozzle", "Voron Trident 350 0.8 nozzle",
"Voron Trident 350 1.0 nozzle", "Voron Trident 350 1.0 nozzle",
@@ -56,6 +62,7 @@
"Voron 0.1 0.15 nozzle", "Voron 0.1 0.15 nozzle",
"Voron 0.1 0.2 nozzle", "Voron 0.1 0.2 nozzle",
"Voron 0.1 0.25 nozzle", "Voron 0.1 0.25 nozzle",
"Voron 0.1 0.5 nozzle",
"Voron 0.1 0.6 nozzle", "Voron 0.1 0.6 nozzle",
"Voron 0.1 0.8 nozzle", "Voron 0.1 0.8 nozzle",
"Voron 0.1 1.0 nozzle", "Voron 0.1 1.0 nozzle",
@@ -63,6 +70,7 @@
"Voron Switchwire 250 0.15 nozzle", "Voron Switchwire 250 0.15 nozzle",
"Voron Switchwire 250 0.2 nozzle", "Voron Switchwire 250 0.2 nozzle",
"Voron Switchwire 250 0.25 nozzle", "Voron Switchwire 250 0.25 nozzle",
"Voron Switchwire 250 0.5 nozzle",
"Voron Switchwire 250 0.6 nozzle", "Voron Switchwire 250 0.6 nozzle",
"Voron Switchwire 250 0.8 nozzle", "Voron Switchwire 250 0.8 nozzle",
"Voron Switchwire 250 1.0 nozzle" "Voron Switchwire 250 1.0 nozzle"

View File

@@ -0,0 +1,29 @@
{
"type": "machine",
"setting_id": "GM003",
"name": "Voron 0.1 0.5 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "fdm_klipper_common",
"printer_model": "Voron 0.1",
"default_print_profile": "0.25mm Standard 0.5 nozzle @Voron",
"max_layer_height": [
"0.4"
],
"min_layer_height": [
"0.1"
],
"nozzle_diameter": [
"0.5"
],
"printable_area": [
"0x0",
"120x0",
"120x120",
"0x120"
],
"printable_height": "120",
"nozzle_type": "undefine",
"auxiliary_fan": "0",
"printer_variant": "0.5"
}

View File

@@ -2,7 +2,7 @@
"type": "machine_model", "type": "machine_model",
"name": "Voron 0.1", "name": "Voron 0.1",
"model_id": "Voron0", "model_id": "Voron0",
"nozzle_diameter": "0.4;0.15;0.2;0.25;0.6;0.8;1.0", "nozzle_diameter": "0.4;0.15;0.2;0.25;0.5;0.6;0.8;1.0",
"machine_tech": "FFF", "machine_tech": "FFF",
"family": "VoronDesign", "family": "VoronDesign",
"bed_model": "Voron_120_build_plate.stl", "bed_model": "Voron_120_build_plate.stl",

View File

@@ -0,0 +1,27 @@
{
"type": "machine",
"setting_id": "GM003",
"name": "Voron 2.4 250 0.5 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "fdm_klipper_common",
"printer_model": "Voron 2.4 250",
"default_print_profile": "0.25mm Standard 0.5 nozzle @Voron",
"max_layer_height": [
"0.4"
],
"min_layer_height": [
"0.1"
],
"nozzle_diameter": [
"0.5"
],
"printable_area": [
"0x0",
"250x0",
"250x250",
"0x250"
],
"printable_height": "225",
"printer_variant": "0.5"
}

View File

@@ -2,7 +2,7 @@
"type": "machine_model", "type": "machine_model",
"name": "Voron 2.4 250", "name": "Voron 2.4 250",
"model_id": "Voron2_250", "model_id": "Voron2_250",
"nozzle_diameter": "0.4;0.15;0.2;0.25;0.6;0.8;1.0", "nozzle_diameter": "0.4;0.15;0.2;0.25;0.5;0.6;0.8;1.0",
"machine_tech": "FFF", "machine_tech": "FFF",
"family": "VoronDesign", "family": "VoronDesign",
"bed_model": "Voron_250_build_plate.stl", "bed_model": "Voron_250_build_plate.stl",

View File

@@ -0,0 +1,27 @@
{
"type": "machine",
"setting_id": "GM003",
"name": "Voron 2.4 300 0.5 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "fdm_klipper_common",
"printer_model": "Voron 2.4 300",
"default_print_profile": "0.25mm Standard 0.5 nozzle @Voron",
"max_layer_height": [
"0.4"
],
"min_layer_height": [
"0.1"
],
"nozzle_diameter": [
"0.5"
],
"printable_area": [
"0x0",
"300x0",
"300x300",
"0x300"
],
"printable_height": "275",
"printer_variant": "0.5"
}

View File

@@ -2,7 +2,7 @@
"type": "machine_model", "type": "machine_model",
"name": "Voron 2.4 300", "name": "Voron 2.4 300",
"model_id": "Voron2_300", "model_id": "Voron2_300",
"nozzle_diameter": "0.4;0.15;0.2;0.25;0.6;0.8;1.0", "nozzle_diameter": "0.4;0.15;0.2;0.25;0.5;0.6;0.8;1.0",
"machine_tech": "FFF", "machine_tech": "FFF",
"family": "VoronDesign", "family": "VoronDesign",
"bed_model": "Voron_300_build_plate.stl", "bed_model": "Voron_300_build_plate.stl",

View File

@@ -0,0 +1,27 @@
{
"type": "machine",
"setting_id": "GM003",
"name": "Voron 2.4 350 0.5 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "fdm_klipper_common",
"printer_model": "Voron 2.4 350",
"default_print_profile": "0.25mm Standard 0.5 nozzle @Voron",
"max_layer_height": [
"0.4"
],
"min_layer_height": [
"0.1"
],
"nozzle_diameter": [
"0.5"
],
"printable_area": [
"0x0",
"350x0",
"350x350",
"0x350"
],
"printable_height": "325",
"printer_variant": "0.5"
}

View File

@@ -2,7 +2,7 @@
"type": "machine_model", "type": "machine_model",
"name": "Voron 2.4 350", "name": "Voron 2.4 350",
"model_id": "Voron2_350", "model_id": "Voron2_350",
"nozzle_diameter": "0.4;0.15;0.2;0.25;0.6;0.8;1.0", "nozzle_diameter": "0.4;0.15;0.2;0.25;0.5;0.6;0.8;1.0",
"machine_tech": "FFF", "machine_tech": "FFF",
"family": "VoronDesign", "family": "VoronDesign",
"bed_model": "Voron_350_build_plate.stl", "bed_model": "Voron_350_build_plate.stl",

View File

@@ -0,0 +1,27 @@
{
"type": "machine",
"setting_id": "GM003",
"name": "Voron Switchwire 250 0.5 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "fdm_klipper_common",
"printer_model": "Voron Switchwire 250",
"default_print_profile": "0.25mm Standard 0.5 nozzle @Voron",
"max_layer_height": [
"0.4"
],
"min_layer_height": [
"0.1"
],
"nozzle_diameter": [
"0.5"
],
"printable_area": [
"0x0",
"250x0",
"250x210",
"0x210"
],
"printable_height": "240",
"printer_variant": "0.5"
}

View File

@@ -2,7 +2,7 @@
"type": "machine_model", "type": "machine_model",
"name": "Voron Switchwire 250", "name": "Voron Switchwire 250",
"model_id": "Voron_Switchwire_250", "model_id": "Voron_Switchwire_250",
"nozzle_diameter": "0.4;0.15;0.2;0.25;0.6;0.8;1.0", "nozzle_diameter": "0.4;0.15;0.2;0.25;0.5;0.6;0.8;1.0",
"machine_tech": "FFF", "machine_tech": "FFF",
"family": "VoronDesign", "family": "VoronDesign",
"bed_model": "", "bed_model": "",

View File

@@ -0,0 +1,27 @@
{
"type": "machine",
"setting_id": "GM003",
"name": "Voron Trident 250 0.5 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "fdm_klipper_common",
"printer_model": "Voron Trident 250",
"default_print_profile": "0.25mm Standard 0.5 nozzle @Voron",
"max_layer_height": [
"0.4"
],
"min_layer_height": [
"0.1"
],
"nozzle_diameter": [
"0.5"
],
"printable_area": [
"0x0",
"250x0",
"250x250",
"0x250"
],
"printable_height": "250",
"printer_variant": "0.5"
}

View File

@@ -2,7 +2,7 @@
"type": "machine_model", "type": "machine_model",
"name": "Voron Trident 250", "name": "Voron Trident 250",
"model_id": "Voron2_Trident_250", "model_id": "Voron2_Trident_250",
"nozzle_diameter": "0.4;0.15;0.2;0.25;0.6;0.8;1.0", "nozzle_diameter": "0.4;0.15;0.2;0.25;0.5;0.6;0.8;1.0",
"machine_tech": "FFF", "machine_tech": "FFF",
"family": "VoronDesign", "family": "VoronDesign",
"bed_model": "Voron_250_build_plate.stl", "bed_model": "Voron_250_build_plate.stl",

View File

@@ -0,0 +1,27 @@
{
"type": "machine",
"setting_id": "GM003",
"name": "Voron Trident 300 0.5 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "fdm_klipper_common",
"printer_model": "Voron Trident 300",
"default_print_profile": "0.25mm Standard 0.5 nozzle @Voron",
"max_layer_height": [
"0.4"
],
"min_layer_height": [
"0.1"
],
"nozzle_diameter": [
"0.5"
],
"printable_area": [
"0x0",
"300x0",
"300x300",
"0x300"
],
"printable_height": "250",
"printer_variant": "0.5"
}

View File

@@ -2,7 +2,7 @@
"type": "machine_model", "type": "machine_model",
"name": "Voron Trident 300", "name": "Voron Trident 300",
"model_id": "Voron2_Trident_300", "model_id": "Voron2_Trident_300",
"nozzle_diameter": "0.4;0.15;0.2;0.25;0.6;0.8;1.0", "nozzle_diameter": "0.4;0.15;0.2;0.25;0.5;0.6;0.8;1.0",
"machine_tech": "FFF", "machine_tech": "FFF",
"family": "VoronDesign", "family": "VoronDesign",
"bed_model": "Voron_300_build_plate.stl", "bed_model": "Voron_300_build_plate.stl",

View File

@@ -0,0 +1,27 @@
{
"type": "machine",
"setting_id": "GM003",
"name": "Voron Trident 350 0.5 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "fdm_klipper_common",
"printer_model": "Voron Trident 350",
"default_print_profile": "0.30mm Standard 0.5 nozzle @Voron",
"max_layer_height": [
"0.4"
],
"min_layer_height": [
"0.1"
],
"nozzle_diameter": [
"0.5"
],
"printable_area": [
"0x0",
"350x0",
"350x350",
"0x350"
],
"printable_height": "250",
"printer_variant": "0.5"
}

View File

@@ -2,7 +2,7 @@
"type": "machine_model", "type": "machine_model",
"name": "Voron Trident 350", "name": "Voron Trident 350",
"model_id": "Voron2_Trident_350", "model_id": "Voron2_Trident_350",
"nozzle_diameter": "0.4;0.15;0.2;0.25;0.6;0.8;1.0", "nozzle_diameter": "0.4;0.15;0.2;0.25;0.5;0.6;0.8;1.0",
"machine_tech": "FFF", "machine_tech": "FFF",
"family": "VoronDesign", "family": "VoronDesign",
"bed_model": "Voron_350_build_plate.stl", "bed_model": "Voron_350_build_plate.stl",

View File

@@ -0,0 +1,11 @@
{
"type": "process",
"setting_id": "GP004",
"name": "0.10mm Extra Fine 0.5 nozzle @Voron",
"from": "system",
"instantiation": "true",
"inherits": "fdm_process_voron_common_0_5",
"layer_height": "0.10",
"bottom_shell_layers": "6",
"top_shell_layers": "8"
}

View File

@@ -0,0 +1,11 @@
{
"type": "process",
"setting_id": "GP004",
"name": "0.15mm Fine 0.5 nozzle @Voron",
"from": "system",
"instantiation": "true",
"inherits": "fdm_process_voron_common_0_5",
"layer_height": "0.15",
"bottom_shell_layers": "4",
"top_shell_layers": "6"
}

View File

@@ -0,0 +1,11 @@
{
"type": "process",
"setting_id": "GP004",
"name": "0.20mm Optimal 0.5 nozzle @Voron",
"from": "system",
"instantiation": "true",
"inherits": "fdm_process_voron_common_0_5",
"layer_height": "0.20",
"bottom_shell_layers": "3",
"top_shell_layers": "4"
}

View File

@@ -0,0 +1,11 @@
{
"type": "process",
"setting_id": "GP004",
"name": "0.25mm Standard 0.5 nozzle @Voron",
"from": "system",
"instantiation": "true",
"inherits": "fdm_process_voron_common_0_5",
"layer_height": "0.25",
"bottom_shell_layers": "3",
"top_shell_layers": "4"
}

View File

@@ -0,0 +1,12 @@
{
"type": "process",
"setting_id": "GP004",
"name": "0.30mm Draft 0.5 nozzle @Voron",
"from": "system",
"instantiation": "true",
"inherits": "fdm_process_voron_common_0_5",
"layer_height": "0.30",
"top_surface_line_width": "0.55",
"bottom_shell_layers": "3",
"top_shell_layers": "4"
}

View File

@@ -0,0 +1,12 @@
{
"type": "process",
"setting_id": "GP004",
"name": "0.35mm Extra Draft 0.5 nozzle @Voron",
"from": "system",
"instantiation": "true",
"inherits": "fdm_process_voron_common_0_5",
"layer_height": "0.35",
"top_surface_line_width": "0.55",
"bottom_shell_layers": "3",
"top_shell_layers": "4"
}

View File

@@ -0,0 +1,26 @@
{
"type": "process",
"name": "fdm_process_voron_common_0_5",
"from": "system",
"instantiation": "false",
"inherits": "fdm_process_voron_common",
"initial_layer_line_width": "0.52",
"initial_layer_print_height": "0.25",
"outer_wall_line_width": "0.52",
"line_width": "0.52",
"sparse_infill_line_width": "0.52",
"inner_wall_line_width": "0.52",
"internal_solid_infill_line_width": "0.52",
"support_line_width": "0.52",
"top_surface_line_width": "0.52",
"compatible_printers": [
"Voron 0.1 0.5 nozzle",
"Voron 2.4 250 0.5 nozzle",
"Voron 2.4 300 0.5 nozzle",
"Voron 2.4 350 0.5 nozzle",
"Voron Trident 250 0.5 nozzle",
"Voron Trident 300 0.5 nozzle",
"Voron Trident 350 0.5 nozzle",
"Voron Switchwire 250 0.5 nozzle"
]
}

View File

@@ -303,12 +303,18 @@ function FilterModelList(keyword) {
function SelectPrinterAll( sVendor ) function SelectPrinterAll( sVendor )
{ {
$("input[vendor='"+sVendor+"']").prop("checked", true); $("input[vendor='"+sVendor+"']").prop("checked", true);
$("input[vendor='"+sVendor+"']").each(function() {
CheckBoxOnclick(this);
});
} }
function SelectPrinterNone( sVendor ) function SelectPrinterNone( sVendor )
{ {
$("input[vendor='"+sVendor+"']").prop("checked", false); $("input[vendor='"+sVendor+"']").prop("checked", false);
$("input[vendor='"+sVendor+"']").each(function() {
CheckBoxOnclick(this);
});
} }

View File

@@ -303,12 +303,18 @@ function FilterModelList(keyword) {
function SelectPrinterAll( sVendor ) function SelectPrinterAll( sVendor )
{ {
$("input[vendor='"+sVendor+"']").prop("checked", true); $("input[vendor='"+sVendor+"']").prop("checked", true);
$("input[vendor='"+sVendor+"']").each(function() {
CheckBoxOnclick(this);
});
} }
function SelectPrinterNone( sVendor ) function SelectPrinterNone( sVendor )
{ {
$("input[vendor='"+sVendor+"']").prop("checked", false); $("input[vendor='"+sVendor+"']").prop("checked", false);
$("input[vendor='"+sVendor+"']").each(function() {
CheckBoxOnclick(this);
});
} }
function OnExitFilter() { function OnExitFilter() {

View File

@@ -1898,36 +1898,42 @@ void GCode::_do_export(Print& print, GCodeOutputStream &file, ThumbnailsGenerato
if (!print.config().small_area_infill_flow_compensation_model.empty()) if (!print.config().small_area_infill_flow_compensation_model.empty())
m_small_area_infill_flow_compensator = make_unique<SmallAreaInfillFlowCompensator>(print.config()); m_small_area_infill_flow_compensator = make_unique<SmallAreaInfillFlowCompensator>(print.config());
// Orca: Don't output Header block if BTT thumbnail is identified in the list
file.write_format("; HEADER_BLOCK_START\n"); // Get the thumbnails value as a string
// Write information on the generator. std::string thumbnails_value = print.config().option<ConfigOptionString>("thumbnails")->value;
file.write_format("; generated by %s on %s\n", Slic3r::header_slic3r_generated().c_str(), Slic3r::Utils::local_timestamp().c_str()); // search string for the BTT_TFT label
if (is_bbl_printers) bool has_BTT_thumbnail = (thumbnails_value.find("BTT_TFT") != std::string::npos);
file.write_format(";%s\n", GCodeProcessor::reserved_tag(GCodeProcessor::ETags::Estimated_Printing_Time_Placeholder).c_str());
//BBS: total layer number if(!has_BTT_thumbnail){
file.write_format(";%s\n", GCodeProcessor::reserved_tag(GCodeProcessor::ETags::Total_Layer_Number_Placeholder).c_str()); file.write_format("; HEADER_BLOCK_START\n");
m_enable_exclude_object = config().exclude_object; // Write information on the generator.
//Orca: extra check for bbl printer file.write_format("; generated by %s on %s\n", Slic3r::header_slic3r_generated().c_str(), Slic3r::Utils::local_timestamp().c_str());
if (is_bbl_printers) { if (is_bbl_printers)
if (print.calib_params().mode == CalibMode::Calib_None) { // Don't support skipping in cali mode file.write_format(";%s\n", GCodeProcessor::reserved_tag(GCodeProcessor::ETags::Estimated_Printing_Time_Placeholder).c_str());
// list all label_object_id with sorted order here //BBS: total layer number
m_enable_exclude_object = true; file.write_format(";%s\n", GCodeProcessor::reserved_tag(GCodeProcessor::ETags::Total_Layer_Number_Placeholder).c_str());
m_label_objects_ids.clear(); m_enable_exclude_object = config().exclude_object;
m_label_objects_ids.reserve(print.num_object_instances()); //Orca: extra check for bbl printer
for (const PrintObject *print_object : print.objects()) if (is_bbl_printers) {
for (const PrintInstance &print_instance : print_object->instances()) if (print.calib_params().mode == CalibMode::Calib_None) { // Don't support skipping in cali mode
m_label_objects_ids.push_back(print_instance.model_instance->get_labeled_id()); // list all label_object_id with sorted order here
m_enable_exclude_object = true;
std::sort(m_label_objects_ids.begin(), m_label_objects_ids.end()); m_label_objects_ids.clear();
m_label_objects_ids.reserve(print.num_object_instances());
std::string objects_id_list = "; model label id: "; for (const PrintObject *print_object : print.objects())
for (auto it = m_label_objects_ids.begin(); it != m_label_objects_ids.end(); it++) for (const PrintInstance &print_instance : print_object->instances())
objects_id_list += (std::to_string(*it) + (it != m_label_objects_ids.end() - 1 ? "," : "\n")); m_label_objects_ids.push_back(print_instance.model_instance->get_labeled_id());
file.writeln(objects_id_list);
} else { std::sort(m_label_objects_ids.begin(), m_label_objects_ids.end());
m_enable_exclude_object = false;
m_label_objects_ids.clear(); std::string objects_id_list = "; model label id: ";
} for (auto it = m_label_objects_ids.begin(); it != m_label_objects_ids.end(); it++)
objects_id_list += (std::to_string(*it) + (it != m_label_objects_ids.end() - 1 ? "," : "\n"));
file.writeln(objects_id_list);
} else {
m_enable_exclude_object = false;
m_label_objects_ids.clear();
}
} }
{ {
@@ -1949,7 +1955,7 @@ void GCode::_do_export(Print& print, GCodeOutputStream &file, ThumbnailsGenerato
} }
file.write_format("; HEADER_BLOCK_END\n\n"); file.write_format("; HEADER_BLOCK_END\n\n");
}
// BBS: write global config at the beginning of gcode file because printer // BBS: write global config at the beginning of gcode file because printer
// need these config information // need these config information

View File

@@ -1851,6 +1851,26 @@ void PresetBundle::export_selections(AppConfig &config)
} }
// BBS // BBS
void PresetBundle::set_num_filaments(unsigned int n, std::vector<std::string> new_colors) {
int old_filament_count = this->filament_presets.size();
if (n > old_filament_count && old_filament_count != 0)
filament_presets.resize(n, filament_presets.back());
else {
filament_presets.resize(n);
}
ConfigOptionStrings* filament_color = project_config.option<ConfigOptionStrings>("filament_colour");
filament_color->resize(n);
ams_multi_color_filment.resize(n);
// BBS set new filament color to new_color
if (old_filament_count < n) {
if (!new_colors.empty()) {
for (int i = old_filament_count; i < n; i++) {
filament_color->values[i] = new_colors[i - old_filament_count];
}
}
}
update_multi_material_filament_presets();
}
void PresetBundle::set_num_filaments(unsigned int n, std::string new_color) void PresetBundle::set_num_filaments(unsigned int n, std::string new_color)
{ {
int old_filament_count = this->filament_presets.size(); int old_filament_count = this->filament_presets.size();

View File

@@ -111,6 +111,7 @@ public:
void export_selections(AppConfig &config); void export_selections(AppConfig &config);
// BBS // BBS
void set_num_filaments(unsigned int n, std::vector<std::string> new_colors);
void set_num_filaments(unsigned int n, std::string new_col = ""); void set_num_filaments(unsigned int n, std::string new_col = "");
unsigned int sync_ams_list(unsigned int & unknowns); unsigned int sync_ams_list(unsigned int & unknowns);
//BBS: check whether this is the only edited filament //BBS: check whether this is the only edited filament

View File

@@ -1910,14 +1910,15 @@ static inline void improve_ordering_by_two_exchanges_with_segment_flipping(Polyl
for (const FlipEdge &edge : edges) { for (const FlipEdge &edge : edges) {
Polyline &pl = polylines[edge.source_index]; Polyline &pl = polylines[edge.source_index];
out.emplace_back(std::move(pl)); out.emplace_back(std::move(pl));
if (edge.p2 == pl.first_point().cast<double>()) { if (edge.p2 == out.back().first_point().cast<double>()) {
// Polyline is flipped. // Polyline is flipped.
out.back().reverse(); out.back().reverse();
} else { } else {
// Polyline is not flipped. // Polyline is not flipped.
assert(edge.p1 == pl.first_point().cast<double>()); assert(edge.p1 == out.back().first_point().cast<double>());
} }
} }
polylines = out;
#ifndef NDEBUG #ifndef NDEBUG
double cost_final = cost(); double cost_final = cost();

View File

@@ -675,12 +675,13 @@ std::vector<int> GLVolumeCollection::load_object(
int obj_idx, int obj_idx,
const std::vector<int> &instance_idxs, const std::vector<int> &instance_idxs,
const std::string &color_by, const std::string &color_by,
bool opengl_initialized) bool opengl_initialized,
bool need_raycaster)
{ {
std::vector<int> volumes_idx; std::vector<int> volumes_idx;
for (int volume_idx = 0; volume_idx < int(model_object->volumes.size()); ++volume_idx) for (int volume_idx = 0; volume_idx < int(model_object->volumes.size()); ++volume_idx)
for (int instance_idx : instance_idxs) for (int instance_idx : instance_idxs)
volumes_idx.emplace_back(this->GLVolumeCollection::load_object_volume(model_object, obj_idx, volume_idx, instance_idx, color_by, opengl_initialized)); volumes_idx.emplace_back(this->GLVolumeCollection::load_object_volume(model_object, obj_idx, volume_idx, instance_idx, color_by, opengl_initialized, false, false, need_raycaster));
return volumes_idx; return volumes_idx;
} }
@@ -693,7 +694,8 @@ int GLVolumeCollection::load_object_volume(
const std::string &color_by, const std::string &color_by,
bool opengl_initialized, bool opengl_initialized,
bool in_assemble_view, bool in_assemble_view,
bool use_loaded_id) bool use_loaded_id,
bool need_raycaster)
{ {
const ModelVolume *model_volume = model_object->volumes[volume_idx]; const ModelVolume *model_volume = model_object->volumes[volume_idx];
const int extruder_id = model_volume->extruder_id(); const int extruder_id = model_volume->extruder_id();
@@ -711,7 +713,7 @@ int GLVolumeCollection::load_object_volume(
v.model.init_from(mesh, true); v.model.init_from(mesh, true);
#else #else
v.model.init_from(*mesh); v.model.init_from(*mesh);
v.mesh_raycaster = std::make_unique<GUI::MeshRaycaster>(mesh); if (need_raycaster) { v.mesh_raycaster = std::make_unique<GUI::MeshRaycaster>(mesh); }
#endif // ENABLE_SMOOTH_NORMALS #endif // ENABLE_SMOOTH_NORMALS
v.composite_id = GLVolume::CompositeID(obj_idx, volume_idx, instance_idx); v.composite_id = GLVolume::CompositeID(obj_idx, volume_idx, instance_idx);

View File

@@ -439,7 +439,8 @@ public:
int obj_idx, int obj_idx,
const std::vector<int> &instance_idxs, const std::vector<int> &instance_idxs,
const std::string &color_by, const std::string &color_by,
bool opengl_initialized); bool opengl_initialized,
bool need_raycaster = true);
int load_object_volume( int load_object_volume(
const ModelObject *model_object, const ModelObject *model_object,
@@ -449,7 +450,8 @@ public:
const std::string &color_by, const std::string &color_by,
bool opengl_initialized, bool opengl_initialized,
bool in_assemble_view = false, bool in_assemble_view = false,
bool use_loaded_id = false); bool use_loaded_id = false,
bool need_raycaster = true);
// Load SLA auxiliary GLVolumes (for support trees or pad). // Load SLA auxiliary GLVolumes (for support trees or pad).
void load_object_auxiliary( void load_object_auxiliary(
const SLAPrintObject *print_object, const SLAPrintObject *print_object,

View File

@@ -3123,7 +3123,7 @@ void GCodeViewer::load_shells(const Print& print, bool initialized, bool force_p
instance_ids.resize(instance_index); instance_ids.resize(instance_index);
size_t current_volumes_count = m_shells.volumes.volumes.size(); size_t current_volumes_count = m_shells.volumes.volumes.size();
m_shells.volumes.load_object(model_obj, object_idx, instance_ids, "object", initialized); m_shells.volumes.load_object(model_obj, object_idx, instance_ids, "object", initialized, false);
// adjust shells' z if raft is present // adjust shells' z if raft is present
const SlicingParameters& slicing_parameters = obj->slicing_parameters(); const SlicingParameters& slicing_parameters = obj->slicing_parameters();

View File

@@ -4280,7 +4280,6 @@ void GUI_App::check_new_version_sf(bool show_tips, int by_user)
best_pre = tag_version; best_pre = tag_version;
best_pre_url = root.get<std::string>("html_url"); best_pre_url = root.get<std::string>("html_url");
best_pre_content = root.get<std::string>("body"); best_pre_content = root.get<std::string>("body");
best_pre.set_prerelease("Preview");
} }
} else { } else {
if (best_release < tag_version) { if (best_release < tag_version) {
@@ -4302,7 +4301,6 @@ void GUI_App::check_new_version_sf(bool show_tips, int by_user)
best_pre = tag_version; best_pre = tag_version;
best_pre_url = json_version.second.get<std::string>("html_url"); best_pre_url = json_version.second.get<std::string>("html_url");
best_pre_content = json_version.second.get<std::string>("body"); best_pre_content = json_version.second.get<std::string>("body");
best_pre.set_prerelease("Preview");
} }
} else { } else {
if (best_release < tag_version) { if (best_release < tag_version) {
@@ -5647,7 +5645,8 @@ bool GUI_App::check_and_keep_current_preset_changes(const wxString& caption, con
bool is_called_from_configwizard = postponed_apply_of_keeped_changes != nullptr; bool is_called_from_configwizard = postponed_apply_of_keeped_changes != nullptr;
UnsavedChangesDialog dlg(caption, header, "", action_buttons); UnsavedChangesDialog dlg(caption, header, "", action_buttons);
if (dlg.ShowModal() == wxID_CANCEL) bool no_need_change = dlg.getUpdateItemCount() == 0 ? true : false;
if (!no_need_change && dlg.ShowModal() == wxID_CANCEL)
return false; return false;
auto reset_modifications = [this, is_called_from_configwizard]() { auto reset_modifications = [this, is_called_from_configwizard]() {
@@ -5662,7 +5661,7 @@ bool GUI_App::check_and_keep_current_preset_changes(const wxString& caption, con
load_current_presets(false); load_current_presets(false);
}; };
if (dlg.discard()) if (dlg.discard() || no_need_change)
reset_modifications(); reset_modifications();
else // save selected changes else // save selected changes
{ {

View File

@@ -29,7 +29,7 @@ static const std::vector<int> _3DCONNEXION_VENDORS =
0x256F // 3DCONNECTION = 9583 // 3Dconnexion 0x256F // 3DCONNECTION = 9583 // 3Dconnexion
}; };
// See: https://github.com/FreeSpacenav/spacenavd/blob/a9eccf34e7cac969ee399f625aef827f4f4aaec6/src/dev.c#L202 // See: https://github.com/FreeSpacenav/spacenavd/blob/39856625a6de1e8c4b57c5938e1bf29d13cf1a9f/src/dev.c#L63
static const std::vector<int> _3DCONNEXION_DEVICES = static const std::vector<int> _3DCONNEXION_DEVICES =
{ {
0xc603, /* 50691 spacemouse plus XT */ 0xc603, /* 50691 spacemouse plus XT */
@@ -43,6 +43,7 @@ static const std::vector<int> _3DCONNEXION_DEVICES =
0xc628, /* 50728 space navigator for notebooks*/ 0xc628, /* 50728 space navigator for notebooks*/
0xc629, /* 50729 space pilot pro*/ 0xc629, /* 50729 space pilot pro*/
0xc62b, /* 50731 space mouse pro*/ 0xc62b, /* 50731 space mouse pro*/
0xc640, /* 50752 nulooq */
0xc62e, /* 50734 spacemouse wireless (USB cable) *TESTED* */ 0xc62e, /* 50734 spacemouse wireless (USB cable) *TESTED* */
0xc62f, /* 50735 spacemouse wireless receiver */ 0xc62f, /* 50735 spacemouse wireless receiver */
0xc631, /* 50737 spacemouse pro wireless *TESTED* */ 0xc631, /* 50737 spacemouse pro wireless *TESTED* */
@@ -50,7 +51,7 @@ static const std::vector<int> _3DCONNEXION_DEVICES =
0xc633, /* 50739 spacemouse enterprise */ 0xc633, /* 50739 spacemouse enterprise */
0xc635, /* 50741 spacemouse compact *TESTED* */ 0xc635, /* 50741 spacemouse compact *TESTED* */
0xc636, /* 50742 spacemouse module */ 0xc636, /* 50742 spacemouse module */
0xc640, /* 50752 nulooq */ 0xc63a, /* 60060 spacemouse wireless (Bluetooth) */
0xc652, /* 50770 3Dconnexion universal receiver *TESTED* */ 0xc652, /* 50770 3Dconnexion universal receiver *TESTED* */
}; };

View File

@@ -502,21 +502,20 @@ std::vector<std::string> UpdateVersionDialog::splitWithStl(std::string str,std::
void UpdateVersionDialog::update_version_info(wxString release_note, wxString version) void UpdateVersionDialog::update_version_info(wxString release_note, wxString version)
{ {
//bbs check whether the web display is used //bbs check whether the web display is used
bool use_web_link = false; bool use_web_link = false;
url_line = ""; url_line = "";
auto split_array = splitWithStl(release_note.ToStdString(), "###"); // Orca: not used in Orca Slicer
// auto split_array = splitWithStl(release_note.ToStdString(), "###");
if (split_array.size() >= 3) { // if (split_array.size() >= 3) {
for (auto i = 0; i < split_array.size(); i++) { // for (auto i = 0; i < split_array.size(); i++) {
std::string url = split_array[i]; // std::string url = split_array[i];
if (std::strstr(url.c_str(), "http://") != NULL || std::strstr(url.c_str(), "https://") != NULL) { // if (std::strstr(url.c_str(), "http://") != NULL || std::strstr(url.c_str(), "https://") != NULL) {
use_web_link = true; // use_web_link = true;
url_line = url; // url_line = url;
break; // break;
} // }
} // }
} // }
if (use_web_link) { if (use_web_link) {
m_brand->Hide(); m_brand->Hide();

View File

@@ -1649,7 +1649,14 @@ void Tab::on_value_change(const std::string& opt_key, const boost::any& value)
//Orca: sync filament num if it's a multi tool printer //Orca: sync filament num if it's a multi tool printer
if (opt_key == "extruders_count" && !m_config->opt_bool("single_extruder_multi_material")){ if (opt_key == "extruders_count" && !m_config->opt_bool("single_extruder_multi_material")){
auto num_extruder = boost::any_cast<size_t>(value); auto num_extruder = boost::any_cast<size_t>(value);
wxGetApp().preset_bundle->set_num_filaments(num_extruder); int old_filament_size = wxGetApp().preset_bundle->filament_presets.size();
std::vector<std::string> new_colors;
for (int i = old_filament_size; i < num_extruder; ++i) {
wxColour new_col = Plater::get_next_color_for_filament();
std::string new_color = new_col.GetAsString(wxC2S_HTML_SYNTAX).ToStdString();
new_colors.push_back(new_color);
}
wxGetApp().preset_bundle->set_num_filaments(num_extruder, new_colors);
wxGetApp().plater()->on_filaments_change(num_extruder); wxGetApp().plater()->on_filaments_change(num_extruder);
wxGetApp().get_tab(Preset::TYPE_PRINT)->update(); wxGetApp().get_tab(Preset::TYPE_PRINT)->update();
wxGetApp().preset_bundle->export_selections(*wxGetApp().app_config); wxGetApp().preset_bundle->export_selections(*wxGetApp().app_config);

View File

@@ -312,6 +312,8 @@ public:
{ {
} }
}; };
public:
int getUpdateItemCount() { return m_presetitems.size(); }
private: private:
std::vector<PresetItem> m_presetitems; std::vector<PresetItem> m_presetitems;