diff --git a/localization/i18n/ja/OrcaSlicer_ja.po b/localization/i18n/ja/OrcaSlicer_ja.po index 3055f24fd0..1441c88e87 100644 --- a/localization/i18n/ja/OrcaSlicer_ja.po +++ b/localization/i18n/ja/OrcaSlicer_ja.po @@ -289,7 +289,7 @@ msgid "Dowel" msgstr "Dowel" msgid "Snap" -msgstr "Snap" +msgstr "スナップ" msgid "Prism" msgstr "プリズム" @@ -374,7 +374,7 @@ msgid "Change cut mode" msgstr "カットモード変更" msgid "Tolerance" -msgstr "Tolerance" +msgstr "公差" msgid "Drag" msgstr "Drag" @@ -383,13 +383,13 @@ msgid "Draw cut line" msgstr "" msgid "Left click" -msgstr "Left click" +msgstr "左クリック" msgid "Add connector" msgstr "Add connector" msgid "Right click" -msgstr "Right click" +msgstr "右クリック" msgid "Remove connector" msgstr "Remove connector" @@ -468,13 +468,13 @@ msgid "Reset cutting plane and remove connectors" msgstr "カット面をリセットし、コネクターを削除" msgid "Upper part" -msgstr "Upper part" +msgstr "上部パーツ" msgid "Lower part" -msgstr "Lower part" +msgstr "下部パーツ" msgid "Keep" -msgstr "Keep" +msgstr "残す" msgid "Flip" msgstr "Flip" @@ -1278,7 +1278,7 @@ msgid "Center of edge" msgstr "Center of edge" msgid "Center of circle" -msgstr "Center of circle" +msgstr "円の中心" msgid "ShiftLeft mouse button" msgstr "" @@ -1466,7 +1466,7 @@ msgid "Choose one file (3mf):" msgstr "ファイルを選択 (3mf):" 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):" msgstr "ファイルを選択 (3mf/step/stl/svg/obj/amf)" @@ -1732,10 +1732,10 @@ msgid "Set as individual objects" msgstr "個別オブジェクトとして設定" msgid "Fill bed with copies" -msgstr "Fill bed with copies" +msgstr "コピーでビルドプレートを埋める" 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" msgstr "造形可能" @@ -1744,7 +1744,7 @@ msgid "Fix model" msgstr "モデルを修復" msgid "Export as one STL" -msgstr "Export as one STL" +msgstr "1つのSTLとしてエクスポート" msgid "Export as STLs" msgstr "Export as STLs" @@ -1916,10 +1916,10 @@ msgid "arrange current plate" msgstr "現在のプレートをレイアウト" msgid "Reload All" -msgstr "" +msgstr "全て再読み込み" msgid "reload all from disk" -msgstr "" +msgstr "全てディスクから再読み込み" msgid "Auto Rotate" msgstr "自動回転" @@ -2068,7 +2068,7 @@ msgstr "" "cut information first." msgid "Delete all connectors" -msgstr "Delete all connectors" +msgstr "全てのコネクターを削除" msgid "Deleting the last solid part is not allowed." msgstr "最後のソリッドパーツは削除できません。" @@ -2205,13 +2205,13 @@ msgid "Mouse ear" msgstr "" msgid "Outer brim only" -msgstr "Outer brim only" +msgstr "外側ブリムのみ" msgid "Inner brim only" -msgstr "Inner brim only" +msgstr "内側ブリムのみ" msgid "Outer and inner brim" -msgstr "Outer and inner brim" +msgstr "外側および内側ブリム" msgid "No-brim" msgstr "ブリム無し" @@ -2286,7 +2286,7 @@ msgid "Add Pause" msgstr "一時停止を追加" 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" msgstr "カスタムG-codeを追加" @@ -2298,13 +2298,13 @@ msgid "Add Custom Template" msgstr "カスタムテンプレートを追加" 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 " msgstr "フィラメント" msgid "Change filament at the beginning of this layer." -msgstr "Change filament at the beginning of this layer." +msgstr "このレイヤーの先頭でフィラメントを交換" msgid "Delete Pause" msgstr "Delete Pause" @@ -2337,19 +2337,19 @@ msgid "code" msgstr "code" 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" -msgstr "Please click on the hyperlink above to view the cloud service status" +msgstr "クラウドサービスのステータスを確認するには、上記のハイパーリンクをクリックしてください。" msgid "Failed to connect to the printer" msgstr "プリンターへ接続できませんでした" msgid "Connection to printer failed" -msgstr "Connection to printer failed" +msgstr "プリンターへの接続に失敗しました。" 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..." msgstr "接続中…" @@ -8614,10 +8614,10 @@ msgid "Where to find your printer's IP and Access Code?" msgstr "どこでプリンターのIPアドレスとアクセスコードを確認できますか?" 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" -msgstr "Test" +msgstr "テスト" msgid "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" msgid "file create failed" -msgstr "file create failed" +msgstr "ファイルの作成に失敗しました" msgid "file write failed" -msgstr "file write failed" +msgstr "ファイルの書き込みに失敗しました" msgid "file read failed" -msgstr "file read failed" +msgstr "ファイルの読み込みに失敗しました" msgid "file close failed" msgstr "file close failed" @@ -9028,13 +9028,15 @@ msgid "" "Ooze prevention is only supported with the wipe tower when " "'single_extruder_multi_material' is off." msgstr "" +"オーズ防止は、'single_extruder_multi_material'がオフの場合にのみ、 " +"ワイプタワーと併用してサポートされます。" msgid "" "The prime tower is currently only supported for the Marlin, RepRap/Sprinter, " "RepRapFirmware and Repetier G-code flavors." msgstr "" -"The prime tower is currently only supported for the Marlin, RepRap/Sprinter, " -"RepRapFirmware and Repetier G-code flavors." +"プライムタワーは現在、Marlin、RepRap/Sprinter、RepRapFirmware、" +"およびRepetierのGコード形式のみサポートされています。" msgid "The prime tower is not supported in \"By object\" print." msgstr "オブジェクト順で造形する場合、プライムタワーを利用できません" @@ -15371,10 +15373,10 @@ msgid "Could not connect to Prusa Connect" msgstr "Prusaコネクトに接続できませんでした" msgid "Connection to Repetier works correctly." -msgstr "Connection to Repetier is working correctly." +msgstr "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." 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 " "time." msgstr "" -"Compared with the default profile of a 0.2 mm nozzle, it has a bigger layer " -"height. This results in slightly visible layer lines but shorter print time." +"0.2 mmノズルのデフォルトプロファイルと比較すると、レイヤー高さが大きくなっています。" +"そのため、レイヤーラインがわずかに見えますが、印刷時間は短縮されます。" msgid "" "Compared with the default profile of a 0.2 mm nozzle, it has a smaller layer " diff --git a/localization/i18n/ru/OrcaSlicer_ru.po b/localization/i18n/ru/OrcaSlicer_ru.po index b4a99052f2..f68beeed9b 100644 --- a/localization/i18n/ru/OrcaSlicer_ru.po +++ b/localization/i18n/ru/OrcaSlicer_ru.po @@ -5,18 +5,18 @@ # msgid "" 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" "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" "Language-Team: Andylg \n" "Language: ru_RU\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<12 || n%100>14) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<12 || n%100>14) ? 1 : 2);\n" "X-Generator: Poedit 3.5\n" msgid "Supports Painting" @@ -101,8 +101,9 @@ msgstr "Позволяет рисовать на выбранных гранях msgid "Highlight faces according to overhang angle." msgstr "Выделение граней по углу свеса." +# это в рисование поддержки идет после - Выделение граней по углу свеса. msgid "No auto support" -msgstr "Откл. автоподдержку" +msgstr "Автоподдержка отключена." msgid "Support Generated" msgstr "Поддержка сгенерирована" @@ -361,17 +362,17 @@ msgid "" "Click to flip the cut plane\n" "Drag to move the cut plane" msgstr "" -"Нажмите, чтобы перевернуть секущую плоскость\n" -"Двигайте, чтобы переместить секущую плоскость" +"Нажмите, чтобы перевернуть секущую плоскость.\n" +"Двигайте, чтобы переместить секущую плоскость." msgid "" "Click to flip the cut plane\n" "Drag to move the cut plane\n" "Right-click a part to assign it to the other side" msgstr "" -"Нажмите, чтобы перевернуть секущую плоскость\n" -"Двигайте, чтобы переместить секущую плоскость\n" -"Правая кнопка мыши на части модели для переназначения стороны" +"Нажмите, чтобы перевернуть секущую плоскость.\n" +"Двигайте, чтобы переместить секущую плоскость.\n" +"Для переназначения стороны части модели используйте правую кнопку мыши." msgid "Move cut plane" msgstr "Перемещение секущей плоскости" @@ -507,16 +508,16 @@ msgstr "Обнаружены недопустимые соединения" #, c-format, boost-format msgid "%1$d connector is out of cut contour" msgid_plural "%1$d connectors are out of cut contour" -msgstr[0] "%1$d соединение выходит за контур модели" -msgstr[1] "%1$d соединения выходит за контур модели" -msgstr[2] "%1$d соединений выходит за контур модели" +msgstr[0] "%1$d соединение выходит за контур модели." +msgstr[1] "%1$d соединения выходит за контур модели." +msgstr[2] "%1$d соединений выходит за контур модели." #, c-format, boost-format msgid "%1$d connector is out of object" msgid_plural "%1$d connectors are out of object" -msgstr[0] "%1$d соединение находится за пределами модели" -msgstr[1] "%1$d соединения находится за пределами модели" -msgstr[2] "%1$d соединений находится за пределами модели" +msgstr[0] "%1$d соединение находится за пределами модели." +msgstr[1] "%1$d соединения находится за пределами модели." +msgstr[2] "%1$d соединений находится за пределами модели." msgid "Some connectors are overlapped" msgstr "Имеются пересекающие соединения" @@ -605,7 +606,6 @@ msgstr "Показывать каркас" msgid "%1%" msgstr "%1%" -# ??? msgid "Can't apply when process preview." msgstr "Невозможно применить при предпросмотре нарезки." @@ -1247,10 +1247,10 @@ msgstr "" "Блокировка/разблокировка угла поворота при перетаскивании над поверхностью." msgid "Mirror vertically" -msgstr "Зеркалировать по вертикали" +msgstr "Отзеркалить по вертикали" 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). msgid "Change SVG Type" @@ -2446,11 +2446,11 @@ msgstr "Автодозаправка" msgid "AMS not connected" msgstr "АСПП не подключена" -# ???? кнопка в интерфейсе? Extrude - Выдавить - Load +# ??? кнопка в интерфейсе? Extrude - Выдавить - Load msgid "Load" msgstr "Выдавить" -# ???? кнопка в интерфейсе? retract - Втянуть - Unload (Выгрузить, Вырузка) +# ??? кнопка в интерфейсе? retract - Втянуть - Unload (Выгрузить, Вырузка) msgid "Unload" msgstr "Втянуть" @@ -2483,6 +2483,7 @@ msgstr "Отменить калибровку" msgid "Idling..." msgstr "Простой..." +# При выгрузке/загрузке прутка справа отображается процесс msgid "Heat the nozzle" msgstr "Нагрев сопла" @@ -3877,6 +3878,7 @@ msgstr "Пауза при неисправности температуры ст msgid "Filament unloading" msgstr "Выгрузка прутка" +# ??? msgid "Skip step pause" msgstr "Пропуск команды паузы" @@ -3889,6 +3891,7 @@ msgstr "Калибровка шума двигателя" msgid "Paused due to AMS lost" msgstr "Печать приостановлена из-за потери связи с АСПП" +# ??? Печать приостановлена из-за низкой скорости вентилятора радиатора головы msgid "Paused due to low speed of the heat break fan" msgstr "" "Печать приостановлена из-за низкой скорости вентилятора обдува радиатора " @@ -4610,7 +4613,7 @@ msgstr "Авторизация" msgid "Preview" msgstr "Предпросмотр нарезки" -# ??? Управ. принтерами, Управ. устройствами, менеджер устройств, Диспетчер устройств, Принтеры +# ??? Управ. принтерами, менеджер принтеров, Диспетчер принтеров msgid "Multi-device" msgstr "Принтеры" @@ -5070,7 +5073,7 @@ msgid "File is missing" msgstr "Файл отсутствует" msgid "The project is no longer available." -msgstr "Проект больше не доступен." +msgstr "Проект больше недоступен." msgid "Filament Settings" msgstr "Настройки прутка" @@ -5152,7 +5155,7 @@ msgstr "" msgid "The printer has been logged out and cannot connect." msgstr "Принтер вышел из системы и не может подключиться." -# ??? Трансляция, видеотрансляция остановлена +# ??? видеотрансляция остановлена msgid "Stopped." msgstr "Трансляция с камеры остановлена." @@ -5784,8 +5787,8 @@ msgstr "Безопасное извлечение устройства." msgid "%1$d Object has custom supports." msgid_plural "%1$d Objects have custom supports." msgstr[0] "%1$d модель имеет пользовательскую поддержку." -msgstr[1] "%1$d модели имеют пользовательские поддержки." -msgstr[2] "%1$d моделей имеют пользовательские поддержки." +msgstr[1] "%1$d модели имеют пользовательскую поддержку." +msgstr[2] "%1$d моделей имеют пользовательскую поддержку." #, c-format, boost-format msgid "%1$d Object has color painting." @@ -5958,7 +5961,7 @@ msgid "View all object's settings" msgstr "Просмотр всех настроек модели" msgid "Material settings" -msgstr "Параметры материала" +msgstr "Настройки материала" msgid "Remove current plate (if not last one)" msgstr "Удалить текущую печатную пластину (кроме последней)" @@ -6120,7 +6123,7 @@ msgid "" "nozzle hardness of the printer. Please replace the hardened nozzle or " "filament, otherwise, the nozzle will be attrited or damaged." msgstr "" -"Твердость сопла, установленного по умолчанию, не достаточна для печати " +"Твердость сопла, установленного по умолчанию, недостаточна для печати " "данной пластиковой нитью. Замените сопло на закалённое или смените " "пластиковую нить. В противном случае сопло будет изношено или повреждено." @@ -6510,15 +6513,17 @@ msgid "" "will be kept. You may fix the meshes and try again." msgstr "" "Невозможно выполнить булеву операцию над сетками модели. Будут сохранены " -"только положительные части. Вы можете исправить сетки и попробовать снова." +"только положительные части. Попробуйте починить сетку модели и попробовать " +"снова." #, boost-format msgid "Reason: part \"%1%\" is empty." msgstr "Причина: часть \"%1%\" пустая." +# ??? не формирует объем, не имеет замкнутой геометрии #, boost-format msgid "Reason: part \"%1%\" does not bound a volume." -msgstr "Причина: часть \"%1%\" не ограничивает объём." +msgstr "Причина: часть \"%1%\" не формирует замкнутый объём." #, boost-format msgid "Reason: part \"%1%\" has self intersection." @@ -6532,6 +6537,8 @@ msgid "" "Unable to perform boolean operation on model meshes. Only positive parts " "will be exported." msgstr "" +"Невозможно выполнить булеву операцию над сетками модели. Будут " +"экспортированы только положительные части." msgid "" "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!" msgstr "Выбранный профиль пуст!" -# ?????? В двух местах - в одном месте кнопка в другом Конечный слой +# ?????? В двух местах - в одном месте кнопка в другом Конечный слой. В V2.2.0beta2 пока не исправлено msgid "End" msgstr "End" msgid "Customize" msgstr "Настройка" -# ??? layer? msgid "Other layer filament sequence" msgstr "Последовательность прутков на других слоях" @@ -7801,8 +7807,8 @@ msgstr "" msgid "" "When recording timelapse without toolhead, it is recommended to add a " "\"Timelapse Wipe Tower\" \n" -"by right-click the empty position of build plate and choose \"Add Primitive" -"\"->\"Timelapse Wipe Tower\"." +"by right-click the empty position of build plate and choose \"Add " +"Primitive\"->\"Timelapse Wipe Tower\"." msgstr "" "При записи таймлапса без видимости головы рекомендуется добавить «Черновая " "башня таймлапса». \n" @@ -7956,7 +7962,7 @@ msgid "Flow ratio and Pressure Advance" msgstr "Коэффициент потока и Pressure Advance" msgid "Print chamber temperature" -msgstr "Температура в камере" +msgstr "Температура в термокамере при печати" msgid "Print temperature" msgstr "Температура печати" @@ -8061,7 +8067,7 @@ msgstr "" "расчётное время печати слоя меньше установленного значения." msgid "Auxiliary part cooling fan" -msgstr "Вспомогательный вентилятор для охлаждения моделей" +msgstr "Вспомогательный вентилятор модели" msgid "Exhaust fan" msgstr "Вытяжной вентилятор" @@ -8192,10 +8198,6 @@ msgstr "Диаметр сопла" msgid "Wipe tower" msgstr "Черновая башня" -# ????2 Параметры замены материала в одноэкструдерном ММ принтере -# ???? Параметры экструдера в одноэкструдерном мультиматериальном принтере -# ???? Параметры для экструдера в одноэкструдерном мультиматериальном принтере -# ???? Параметры для одноэкструдерной мультиматериальном печати msgid "Single extruder multi-material parameters" msgstr "Параметры одноэкструдерного мультиматериального принтера" @@ -8772,7 +8774,9 @@ msgid "" "objects, it just orientates the selected ones.Otherwise, it will orientates " "all objects in the current disk." msgstr "" -"Автоориентация моделей (ориентация выбранного, иначе всего на текущем столе)" +"Автоориентация выбранных или всех моделей. Если выбраны отдельные модели, " +"ориентация будет применена только к ним; в противном случае ко всем моделям " +"на текущем столе." msgid "Shift+Tab" msgstr "Shift+Tab" @@ -8940,10 +8944,10 @@ msgid "Select the object/part and press space to change the name" msgstr "Выберите модель/часть и нажмите пробел, чтобы изменить имя" msgid "Mouse click" -msgstr "Щелчок кнопкой мыши" +msgstr "Левая кнопка мыши" msgid "Select the object/part and mouse click to change the name" -msgstr "Выберите модель/часть и нажмите клавишу мыши, чтобы изменить имя" +msgstr "Выберите модель/часть и нажмите левую клавишу мыши, чтобы изменить имя" msgid "Objects List" msgstr "Список моделей" @@ -10133,7 +10137,6 @@ msgstr "" msgid "Cooling overhang threshold" msgstr "Порог включения обдува на нависаниях" -#, fuzzy, c-format msgid "" "Force cooling fan to be specific speed when overhang degree of printed part " "exceeds this value. Expressed as percentage which indicates how much width " @@ -10394,6 +10397,7 @@ msgstr "Порог для реверса" msgid "Overhang reversal threshold" msgstr "Порог разворота на свесах" +# ????? #, no-c-format, no-boost-format msgid "" "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 " "reversal happens on every even layers regardless." msgstr "" +"Величина свеса периметра при которой она считается достаточной для активации " +"функции реверса печати нависаний. Может быть в мм или в % от ширины " +"периметра.\n" +"При нуле разворот будет на каждом чётном слое, независимо от величина " +"свеса.\n" +"Если «Определять нависающие периметры» не включено, этот параметр " +"игнорируется, и разворот происходит на каждом чётном слое без " +"исключений." msgid "Classic mode" msgstr "Классический режим" @@ -10928,7 +10940,7 @@ msgid "" "\n" " " msgstr "" -"Последовательность печати внутреннего/внешнего периметров.\n" +"Последовательность печати внутреннего и внешнего периметров.\n" "\n" "Используйте порядок печати периметров «Внутренний/Внешний» для получения " "наилучших нависаний. Однако этот вариант приводит к небольшому снижению " @@ -11117,7 +11129,6 @@ msgstr "" "Используется только в качестве визуальной помощи в пользовательском " "интерфейсе" -# ??? Смещение экструдера по осям X/Y msgid "Extruder offset" msgstr "Смещение координат экструдера" @@ -11834,8 +11845,8 @@ msgstr "" "две ближайшие линии заполнения с коротким отрезком периметра. Если не " "найдено такого отрезка периметра короче этого параметра, линия заполнения " "соединяется с отрезком периметра только с одной стороны, а длина отрезка " -"периметра ограничена значением «Длина привязок разреженного " -"заполнения» (infill_anchor), но не больше этого параметра.\n" +"периметра ограничена значением «Длина привязок разреженного заполнения» " +"(infill_anchor), но не больше этого параметра.\n" "Если установить 0, то будет использоваться старый алгоритм для соединения " "заполнения, который даёт такой же результат, как и при значениях 1000 и 0." @@ -11900,7 +11911,7 @@ msgstr "Вкл. ограничение ускорения зигзагов" msgid "Klipper's max_accel_to_decel will be adjusted automatically" msgstr "" -"Значение ограничение ускорения зигзагов (max_accel_to_decel) в Klipper будет " +"Значение Klipper-а ограничение ускорения зигзагов (max_accel_to_decel) будет " "скорректировано автоматически.\n" "\n" "Параметр предназначен для ограничения влияния экстремальных переходов от " @@ -11914,8 +11925,8 @@ msgstr "Ограничение ускорение зигзагов" msgid "" "Klipper's max_accel_to_decel will be adjusted to this %% of acceleration" msgstr "" -"Значение ограничение ускорения зигзагов (max_accel_to_decel) в Klipper будет " -"скорректировано на заданный процент ускорения." +"Значение Klipper-а ограничение ускорения зигзагов (max_accel_to_decel) будет " +"скорректировано на данный процент ускорения." msgid "Jerk of outer walls" msgstr "Рывок для внешних периметров." @@ -11990,17 +12001,17 @@ msgstr "Полная скорость вентилятора на слое" msgid "" "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" -"\". \"full_fan_speed_layer\" will be ignored if lower than " -"\"close_fan_the_first_x_layers\", in which case the fan will be running at " -"maximum allowed speed at layer \"close_fan_the_first_x_layers\" + 1." +"\"close_fan_the_first_x_layers\" to maximum at layer " +"\"full_fan_speed_layer\". \"full_fan_speed_layer\" will be ignored if lower " +"than \"close_fan_the_first_x_layers\", in which case the fan will be running " +"at maximum allowed speed at layer \"close_fan_the_first_x_layers\" + 1." msgstr "" "Скорость вентилятора будет нарастать линейно от нуля на слое " -"\"close_fan_the_first_x_layers\" до максимума на слое \"full_fan_speed_layer" -"\". Значение \"full_fan_speed_layer\" будет игнорироваться, если оно меньше " -"значения \"close_fan_the_first_x_layers\", в этом случае вентилятор будет " -"работать на максимально допустимой скорости на слое " -"\"close_fan_the_first_x_layers\" + 1." +"\"close_fan_the_first_x_layers\" до максимума на слое " +"\"full_fan_speed_layer\". Значение \"full_fan_speed_layer\" будет " +"игнорироваться, если оно меньше значения \"close_fan_the_first_x_layers\", в " +"этом случае вентилятор будет работать на максимально допустимой скорости на " +"слое \"close_fan_the_first_x_layers\" + 1." msgid "layer" msgstr "слой" @@ -12088,7 +12099,7 @@ msgid "" "printed more slowly" msgstr "" "Скорость заполнения пробелов. Пробелы обычно имеют неравномерную ширину " -"линии и должен печататься медленнее." +"линии и должны печататься медленнее." msgid "Precise Z height" msgstr "Точная высота по Z" @@ -12311,7 +12322,7 @@ msgstr "Включите, если хотите использовать нес # ?????? Название моделей msgid "Label objects" -msgstr "Помечать объекты" +msgstr "Помечать модели" # ?????? msgid "" @@ -12321,7 +12332,8 @@ msgid "" "setup and Wipe into Object / Wipe into Infill." msgstr "" "Отвечает за присвоение уникальных меток или названий каждой модели или " -"элементу, что позволяет отменять печать любого из них по вашему выбору." +"элементу, что позволяет отменять печать любого из них по вашему выбору.\n" +"\n" "Включите эту опцию, чтобы добавить комментарии в G-код с указанием того, к " "какой модели он принадлежит, что полезно для плагина Octoprint CancelObject. " "Эта настройка не совместима с настройкой «Одноэкструдерный " @@ -12329,11 +12341,11 @@ msgstr "" "модели»." msgid "Exclude objects" -msgstr "Исключить модели" +msgstr "Исключение моделей" msgid "Enable this option to add EXCLUDE OBJECT command in g-code" msgstr "" -"Включите эту опцию, чтобы добавить команду EXCLUDE OBJECT (исключения " +"Включите эту опцию, чтобы добавить команду EXCLUDE OBJECT (исключение " "моделей) в G-код для принтера с прошивкой Klipper." msgid "Verbose G-code" @@ -13151,7 +13163,7 @@ msgstr "Расширение первого слоя" msgid "Expand the first raft or support layer to improve bed plate adhesion" msgstr "" "Расширение первого слоя подложки или поддержки в плоскости XY для улучшения " -"адгезии с материалами склонными к отлипанию и закручиванию." +"адгезии при печати материалами склонными к отлипанию и закручиванию." msgid "Raft layers" msgstr "Слоёв в подложке" @@ -13542,7 +13554,7 @@ msgid "" "scarf." msgstr "" "Длина клиновидного шва. Установка этого параметра на ноль фактически " -"отключает шарф." +"отключает клиновидный шов." msgid "Scarf steps" msgstr "Шагов клиновидного шва" @@ -13816,9 +13828,9 @@ msgid "" "zero value." msgstr "" "Разница температур, которая будет применяться, когда экструдер не активен. " -"Значение не используется, если для параметра «Температура " -"ожидания» ('idle_temperature') в настройках пластиковой нити установлено " -"ненулевое значение." +"Значение не используется, если для параметра «Температура ожидания» " +"('idle_temperature') в настройках пластиковой нити установлено ненулевое " +"значение." msgid "Preheat time" msgstr "Время преднагрева" @@ -14375,8 +14387,8 @@ msgstr "Вкл. контроль температуры" msgid "" "Enable this option for automated chamber temperature control. This option " -"activates the emitting of an M191 command before the \"machine_start_gcode" -"\"\n" +"activates the emitting of an M191 command before the " +"\"machine_start_gcode\"\n" " 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 " "chamber heater, if present. \n" @@ -14832,9 +14844,12 @@ msgid "" msgstr "" "Движок классического генератора периметров создаёт их с постоянной шириной " "экструзии, а для очень тонких участков используется параметр «Заполнять " -"щели». Движок Arachne же создаёт периметры с переменной шириной экструзии, " -"что позволяет печатать без щелей, лучше пропечатывать мелкие элементы (при " -"условии, что у вас правильно откалиброван LA/PA)." +"щели».\n" +"\n" +"Движок Arachne же создаёт периметры с переменной шириной экструзии, что " +"позволяет печатать без щелей, лучше пропечатывать мелкие элементы (при " +"условии, что у вас правильно откалиброван LA/PA). Этот параметр также влияет " +"на концентрическое заполнение." msgid "Classic" msgstr "Классический" @@ -16288,8 +16303,9 @@ msgstr "Пересечение" msgid "Source Volume" msgstr "Исходный объём" +# ??? msgid "Tool Volume" -msgstr "" +msgstr "Объём инструмента" msgid "Subtract from" msgstr "Главный" @@ -16455,8 +16471,8 @@ msgstr "" "Хотите перезаписать его?" msgid "" -"We would rename the presets as \"Vendor Type Serial @printer you selected" -"\". \n" +"We would rename the presets as \"Vendor Type Serial @printer you " +"selected\". \n" "To add preset for more printers, Please go to printer selection" msgstr "" "Мы переименуем профиль в \"Производитель Тип Серия @выбранный принтер\".\n" @@ -17439,7 +17455,7 @@ msgid "" "Auxiliary fan\n" "Did you know that OrcaSlicer supports Auxiliary part cooling fan?" msgstr "" -"Вспомогательный вентилятор для охлаждения моделей\n" +"Вспомогательный вентилятор модели\n" "Знаете ли вы, что OrcaSlicer поддерживает управление вспомогательным " "вентилятором для охлаждения моделей?" diff --git a/resources/profiles/Anycubic/process/0.08mm HighDetail @Anycubic Kobra 3 0.4 nozzle.json b/resources/profiles/Anycubic/process/0.08mm HighDetail @Anycubic Kobra 3 0.4 nozzle.json index 0c28cba87a..76c221347a 100644 --- a/resources/profiles/Anycubic/process/0.08mm HighDetail @Anycubic Kobra 3 0.4 nozzle.json +++ b/resources/profiles/Anycubic/process/0.08mm HighDetail @Anycubic Kobra 3 0.4 nozzle.json @@ -162,7 +162,7 @@ "seam_slope_start_height": "0", "seam_slope_steps": "10", "seam_slope_type": "none", - "single_extruder_multi_material_priming": "1", + "single_extruder_multi_material_priming": "0", "skirt_distance": "2", "skirt_height": "1", "skirt_loops": "0", diff --git a/resources/profiles/Anycubic/process/0.10mm Detail @Anycubic Kobra 3 0.2 nozzle.json b/resources/profiles/Anycubic/process/0.10mm Detail @Anycubic Kobra 3 0.2 nozzle.json index 5f94f3e8fe..13884c2625 100644 --- a/resources/profiles/Anycubic/process/0.10mm Detail @Anycubic Kobra 3 0.2 nozzle.json +++ b/resources/profiles/Anycubic/process/0.10mm Detail @Anycubic Kobra 3 0.2 nozzle.json @@ -162,7 +162,7 @@ "seam_slope_start_height": "0", "seam_slope_steps": "10", "seam_slope_type": "none", - "single_extruder_multi_material_priming": "1", + "single_extruder_multi_material_priming": "0", "skirt_distance": "2", "skirt_height": "1", "skirt_loops": "0", diff --git a/resources/profiles/Anycubic/process/0.12mm Detail @Anycubic Kobra 3 0.4 nozzle.json b/resources/profiles/Anycubic/process/0.12mm Detail @Anycubic Kobra 3 0.4 nozzle.json index 35745292d2..3febe3b3c5 100644 --- a/resources/profiles/Anycubic/process/0.12mm Detail @Anycubic Kobra 3 0.4 nozzle.json +++ b/resources/profiles/Anycubic/process/0.12mm Detail @Anycubic Kobra 3 0.4 nozzle.json @@ -162,7 +162,7 @@ "seam_slope_start_height": "0", "seam_slope_steps": "10", "seam_slope_type": "none", - "single_extruder_multi_material_priming": "1", + "single_extruder_multi_material_priming": "0", "skirt_distance": "2", "skirt_height": "1", "skirt_loops": "0", diff --git a/resources/profiles/Anycubic/process/0.16mm Optimal @Anycubic Kobra 2 Pro 0.4 nozzle.json b/resources/profiles/Anycubic/process/0.16mm Optimal @Anycubic Kobra 2 Pro 0.4 nozzle.json index 48c5d85af3..d59311f740 100644 --- a/resources/profiles/Anycubic/process/0.16mm Optimal @Anycubic Kobra 2 Pro 0.4 nozzle.json +++ b/resources/profiles/Anycubic/process/0.16mm Optimal @Anycubic Kobra 2 Pro 0.4 nozzle.json @@ -162,7 +162,7 @@ "seam_slope_start_height": "0", "seam_slope_steps": "10", "seam_slope_type": "none", - "single_extruder_multi_material_priming": "1", + "single_extruder_multi_material_priming": "0", "skirt_distance": "2", "skirt_height": "1", "skirt_loops": "0", diff --git a/resources/profiles/Anycubic/process/0.16mm Optimal @Anycubic Kobra 3 0.4 nozzle.json b/resources/profiles/Anycubic/process/0.16mm Optimal @Anycubic Kobra 3 0.4 nozzle.json index 9e1873775c..bdd93e6fdc 100644 --- a/resources/profiles/Anycubic/process/0.16mm Optimal @Anycubic Kobra 3 0.4 nozzle.json +++ b/resources/profiles/Anycubic/process/0.16mm Optimal @Anycubic Kobra 3 0.4 nozzle.json @@ -162,7 +162,7 @@ "seam_slope_start_height": "0", "seam_slope_steps": "10", "seam_slope_type": "none", - "single_extruder_multi_material_priming": "1", + "single_extruder_multi_material_priming": "0", "skirt_distance": "2", "skirt_height": "1", "skirt_loops": "0", diff --git a/resources/profiles/Anycubic/process/0.20mm Standard @Anycubic Kobra 2 Max 0.4 nozzle.json b/resources/profiles/Anycubic/process/0.20mm Standard @Anycubic Kobra 2 Max 0.4 nozzle.json index 073a4e6b63..0802e64e3b 100644 --- a/resources/profiles/Anycubic/process/0.20mm Standard @Anycubic Kobra 2 Max 0.4 nozzle.json +++ b/resources/profiles/Anycubic/process/0.20mm Standard @Anycubic Kobra 2 Max 0.4 nozzle.json @@ -162,7 +162,7 @@ "seam_slope_start_height": "0", "seam_slope_steps": "10", "seam_slope_type": "none", - "single_extruder_multi_material_priming": "1", + "single_extruder_multi_material_priming": "0", "skirt_distance": "2", "skirt_height": "1", "skirt_loops": "0", diff --git a/resources/profiles/Anycubic/process/0.20mm Standard @Anycubic Kobra 2 Neo 0.4 nozzle.json b/resources/profiles/Anycubic/process/0.20mm Standard @Anycubic Kobra 2 Neo 0.4 nozzle.json index d6573bf139..ce8d3f9bd9 100644 --- a/resources/profiles/Anycubic/process/0.20mm Standard @Anycubic Kobra 2 Neo 0.4 nozzle.json +++ b/resources/profiles/Anycubic/process/0.20mm Standard @Anycubic Kobra 2 Neo 0.4 nozzle.json @@ -162,7 +162,7 @@ "seam_slope_start_height": "0", "seam_slope_steps": "10", "seam_slope_type": "none", - "single_extruder_multi_material_priming": "1", + "single_extruder_multi_material_priming": "0", "skirt_distance": "2", "skirt_height": "1", "skirt_loops": "0", diff --git a/resources/profiles/Anycubic/process/0.20mm Standard @Anycubic Kobra 2 Plus 0.4 nozzle.json b/resources/profiles/Anycubic/process/0.20mm Standard @Anycubic Kobra 2 Plus 0.4 nozzle.json index f619dd5bc9..557d6bc75d 100644 --- a/resources/profiles/Anycubic/process/0.20mm Standard @Anycubic Kobra 2 Plus 0.4 nozzle.json +++ b/resources/profiles/Anycubic/process/0.20mm Standard @Anycubic Kobra 2 Plus 0.4 nozzle.json @@ -162,7 +162,7 @@ "seam_slope_start_height": "0", "seam_slope_steps": "10", "seam_slope_type": "none", - "single_extruder_multi_material_priming": "1", + "single_extruder_multi_material_priming": "0", "skirt_distance": "2", "skirt_height": "1", "skirt_loops": "0", diff --git a/resources/profiles/Anycubic/process/0.20mm Standard @Anycubic Kobra 2 Pro 0.4 nozzle.json b/resources/profiles/Anycubic/process/0.20mm Standard @Anycubic Kobra 2 Pro 0.4 nozzle.json index dd7c9fc714..b510830392 100644 --- a/resources/profiles/Anycubic/process/0.20mm Standard @Anycubic Kobra 2 Pro 0.4 nozzle.json +++ b/resources/profiles/Anycubic/process/0.20mm Standard @Anycubic Kobra 2 Pro 0.4 nozzle.json @@ -162,7 +162,7 @@ "seam_slope_start_height": "0", "seam_slope_steps": "10", "seam_slope_type": "none", - "single_extruder_multi_material_priming": "1", + "single_extruder_multi_material_priming": "0", "skirt_distance": "2", "skirt_height": "1", "skirt_loops": "0", diff --git a/resources/profiles/Anycubic/process/0.20mm Standard @Anycubic Kobra 3 0.4 nozzle.json b/resources/profiles/Anycubic/process/0.20mm Standard @Anycubic Kobra 3 0.4 nozzle.json index 35a958e81b..3eac0335a9 100644 --- a/resources/profiles/Anycubic/process/0.20mm Standard @Anycubic Kobra 3 0.4 nozzle.json +++ b/resources/profiles/Anycubic/process/0.20mm Standard @Anycubic Kobra 3 0.4 nozzle.json @@ -162,7 +162,7 @@ "seam_slope_start_height": "0", "seam_slope_steps": "10", "seam_slope_type": "none", - "single_extruder_multi_material_priming": "1", + "single_extruder_multi_material_priming": "0", "skirt_distance": "2", "skirt_height": "1", "skirt_loops": "0", diff --git a/resources/profiles/Anycubic/process/0.24mm Draft @Anycubic Kobra 3 0.4 nozzle.json b/resources/profiles/Anycubic/process/0.24mm Draft @Anycubic Kobra 3 0.4 nozzle.json index 49701d0f2e..5ba4c7c387 100644 --- a/resources/profiles/Anycubic/process/0.24mm Draft @Anycubic Kobra 3 0.4 nozzle.json +++ b/resources/profiles/Anycubic/process/0.24mm Draft @Anycubic Kobra 3 0.4 nozzle.json @@ -162,7 +162,7 @@ "seam_slope_start_height": "0", "seam_slope_steps": "10", "seam_slope_type": "none", - "single_extruder_multi_material_priming": "1", + "single_extruder_multi_material_priming": "0", "skirt_distance": "2", "skirt_height": "1", "skirt_loops": "0", diff --git a/resources/profiles/Anycubic/process/0.28mm Draft @Anycubic Kobra 2 Pro 0.4 nozzle.json b/resources/profiles/Anycubic/process/0.28mm Draft @Anycubic Kobra 2 Pro 0.4 nozzle.json index 0808f0b1d0..5493230ccb 100644 --- a/resources/profiles/Anycubic/process/0.28mm Draft @Anycubic Kobra 2 Pro 0.4 nozzle.json +++ b/resources/profiles/Anycubic/process/0.28mm Draft @Anycubic Kobra 2 Pro 0.4 nozzle.json @@ -162,7 +162,7 @@ "seam_slope_start_height": "0", "seam_slope_steps": "10", "seam_slope_type": "none", - "single_extruder_multi_material_priming": "1", + "single_extruder_multi_material_priming": "0", "skirt_distance": "2", "skirt_height": "1", "skirt_loops": "0", diff --git a/resources/profiles/Anycubic/process/0.28mm SuperDraft @Anycubic Kobra 3 0.4 nozzle.json b/resources/profiles/Anycubic/process/0.28mm SuperDraft @Anycubic Kobra 3 0.4 nozzle.json index 83d0a1b842..53059f57d7 100644 --- a/resources/profiles/Anycubic/process/0.28mm SuperDraft @Anycubic Kobra 3 0.4 nozzle.json +++ b/resources/profiles/Anycubic/process/0.28mm SuperDraft @Anycubic Kobra 3 0.4 nozzle.json @@ -162,7 +162,7 @@ "seam_slope_start_height": "0", "seam_slope_steps": "10", "seam_slope_type": "none", - "single_extruder_multi_material_priming": "1", + "single_extruder_multi_material_priming": "0", "skirt_distance": "2", "skirt_height": "1", "skirt_loops": "0", diff --git a/resources/profiles/Anycubic/process/0.30mm Standard @Anycubic Kobra 3 0.6 nozzle.json b/resources/profiles/Anycubic/process/0.30mm Standard @Anycubic Kobra 3 0.6 nozzle.json index 9ce20fd9fa..4190d23daa 100644 --- a/resources/profiles/Anycubic/process/0.30mm Standard @Anycubic Kobra 3 0.6 nozzle.json +++ b/resources/profiles/Anycubic/process/0.30mm Standard @Anycubic Kobra 3 0.6 nozzle.json @@ -162,7 +162,7 @@ "seam_slope_start_height": "0", "seam_slope_steps": "10", "seam_slope_type": "none", - "single_extruder_multi_material_priming": "1", + "single_extruder_multi_material_priming": "0", "skirt_distance": "2", "skirt_height": "1", "skirt_loops": "0", diff --git a/resources/profiles/Anycubic/process/0.40mm Standard @Anycubic Kobra 3 0.8 nozzle.json b/resources/profiles/Anycubic/process/0.40mm Standard @Anycubic Kobra 3 0.8 nozzle.json index dfd05c6d22..913402bcaf 100644 --- a/resources/profiles/Anycubic/process/0.40mm Standard @Anycubic Kobra 3 0.8 nozzle.json +++ b/resources/profiles/Anycubic/process/0.40mm Standard @Anycubic Kobra 3 0.8 nozzle.json @@ -162,7 +162,7 @@ "seam_slope_start_height": "0", "seam_slope_steps": "10", "seam_slope_type": "none", - "single_extruder_multi_material_priming": "1", + "single_extruder_multi_material_priming": "0", "skirt_distance": "2", "skirt_height": "1", "skirt_loops": "0", @@ -289,4 +289,4 @@ ], "xy_contour_compensation": "0", "xy_hole_compensation": "0" -} \ No newline at end of file +} diff --git a/resources/profiles/BBL/machine/Bambu Lab P1P 0.4 nozzle.json b/resources/profiles/BBL/machine/Bambu Lab P1P 0.4 nozzle.json index b947c06289..c92d63d0b6 100644 --- a/resources/profiles/BBL/machine/Bambu Lab P1P 0.4 nozzle.json +++ b/resources/profiles/BBL/machine/Bambu Lab P1P 0.4 nozzle.json @@ -37,7 +37,7 @@ "Bambu Lab X1E 0.4 nozzle", "Bambu Lab A1 0.4 nozzle" ], - "machine_start_gcode": ";===== machine: P1P ========================\n;===== date: 20230707 =====================\n;===== turn on the HB fan =================\nM104 S75 ;set extruder temp to turn on the HB fan and prevent filament oozing from nozzle\n;===== reset machine status =================\nG91\nM17 Z0.4 ; lower the z-motor current\nG380 S2 Z30 F300 ; G380 is same as G38; lower the hotbed , to prevent the nozzle is below the hotbed\nG380 S2 Z-25 F300 ;\nG1 Z5 F300;\nG90\nM17 X1.2 Y1.2 Z0.75 ; reset motor current to default\nM960 S5 P1 ; turn on logo lamp\nG90\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\nM73.2 R1.0 ;Reset left time magnitude\nM1002 set_gcode_claim_speed_level : 5\nM221 X0 Y0 Z0 ; turn off soft endstop to prevent protential logic problem\nG29.1 Z{+0.0} ; clear z-trim value first\nM204 S10000 ; init ACC set to 10m/s^2\n\n;===== heatbed preheat ====================\nM1002 gcode_claim_action : 2\nM140 S[bed_temperature_initial_layer_single] ;set bed temp\nM190 S[bed_temperature_initial_layer_single] ;wait for bed temp\n\n\n\n;=============turn on fans to prevent PLA jamming=================\n{if filament_type[initial_extruder]==\"PLA\"}\n {if (bed_temperature[initial_extruder] >45)||(bed_temperature_initial_layer[initial_extruder] >45)}\n M106 P3 S180\n {endif};Prevent PLA from jamming\n{endif}\nM106 P2 S100 ; turn on big fan ,to cool down toolhead\n\n;===== prepare print temperature and material ==========\nM104 S[nozzle_temperature_initial_layer] ;set extruder temp\nG91\nG0 Z10 F1200\nG90\nG28 X\nM975 S1 ; turn on\nG1 X60 F12000\nG1 Y245\nG1 Y265 F3000\nM620 M\nM620 S[initial_extruder]A ; switch material if AMS exist\n M109 S[nozzle_temperature_initial_layer]\n G1 X120 F12000\n\n G1 X20 Y50 F12000\n G1 Y-3\n T[initial_extruder]\n G1 X54 F12000\n G1 Y265\n M400\nM621 S[initial_extruder]A\nM620.1 E F{filament_max_volumetric_speed[initial_extruder]/2.4053*60} T{nozzle_temperature_range_high[initial_extruder]}\n\n\nM412 S1 ; ===turn on filament runout detection===\n\nM109 S250 ;set nozzle to common flush temp\nM106 P1 S0\nG92 E0\nG1 E50 F200\nM400\nM104 S[nozzle_temperature_initial_layer]\nG92 E0\nG1 E50 F200\nM400\nM106 P1 S255\nG92 E0\nG1 E5 F300\nM109 S{nozzle_temperature_initial_layer[initial_extruder]-20} ; drop nozzle temp, make filament shink a bit\nG92 E0\nG1 E-0.5 F300\n\nG1 X70 F9000\nG1 X76 F15000\nG1 X65 F15000\nG1 X76 F15000\nG1 X65 F15000; shake to put down garbage\nG1 X80 F6000\nG1 X95 F15000\nG1 X80 F15000\nG1 X165 F15000; wipe and shake\nM400\nM106 P1 S0\n;===== prepare print temperature and material end =====\n\n\n;===== wipe nozzle ===============================\nM1002 gcode_claim_action : 14\nM975 S1\nM106 S255\nG1 X65 Y230 F18000\nG1 Y264 F6000\nM109 S{nozzle_temperature_initial_layer[initial_extruder]-20}\nG1 X100 F18000 ; first wipe mouth\n\nG0 X135 Y253 F20000 ; move to exposed steel surface edge\nG28 Z P0 T300; home z with low precision,permit 300deg temperature\nG29.2 S0 ; turn off ABL\nG0 Z5 F20000\n\nG1 X60 Y265\nG92 E0\nG1 E-0.5 F300 ; retrack more\nG1 X100 F5000; second wipe mouth\nG1 X70 F15000\nG1 X100 F5000\nG1 X70 F15000\nG1 X100 F5000\nG1 X70 F15000\nG1 X100 F5000\nG1 X70 F15000\nG1 X90 F5000\nG0 X128 Y261 Z-1.5 F20000 ; move to exposed steel surface and stop the nozzle\nM104 S140 ; set temp down to heatbed acceptable\nM106 S255 ; turn on fan (G28 has turn off fan)\n\nM221 S; push soft endstop status\nM221 Z0 ;turn off Z axis endstop\nG0 Z0.5 F20000\nG0 X125 Y259.5 Z-1.01\nG0 X131 F211\nG0 X124\nG0 Z0.5 F20000\nG0 X125 Y262.5\nG0 Z-1.01\nG0 X131 F211\nG0 X124\nG0 Z0.5 F20000\nG0 X125 Y260.0\nG0 Z-1.01\nG0 X131 F211\nG0 X124\nG0 Z0.5 F20000\nG0 X125 Y262.0\nG0 Z-1.01\nG0 X131 F211\nG0 X124\nG0 Z0.5 F20000\nG0 X125 Y260.5\nG0 Z-1.01\nG0 X131 F211\nG0 X124\nG0 Z0.5 F20000\nG0 X125 Y261.5\nG0 Z-1.01\nG0 X131 F211\nG0 X124\nG0 Z0.5 F20000\nG0 X125 Y261.0\nG0 Z-1.01\nG0 X131 F211\nG0 X124\nG0 X128\nG2 I0.5 J0 F300\nG2 I0.5 J0 F300\nG2 I0.5 J0 F300\nG2 I0.5 J0 F300\n\nM109 S140 ; wait nozzle temp down to heatbed acceptable\nG2 I0.5 J0 F3000\nG2 I0.5 J0 F3000\nG2 I0.5 J0 F3000\nG2 I0.5 J0 F3000\n\nM221 R; pop softend status\nG1 Z10 F1200\nM400\nG1 Z10\nG1 F30000\nG1 X230 Y15\nG29.2 S1 ; turn on ABL\n;G28 ; home again after hard wipe mouth\nM106 S0 ; turn off fan , too noisy\n;===== wipe nozzle end ================================\n\n\n;===== bed leveling ==================================\nM1002 judge_flag g29_before_print_flag\nM622 J1\n\n M1002 gcode_claim_action : 1\n G29 A X{first_layer_print_min[0]} Y{first_layer_print_min[1]} I{first_layer_print_size[0]} J{first_layer_print_size[1]}\n M400\n M500 ; save cali data\n\nM623\n;===== bed leveling end ================================\n\n;===== home after wipe mouth============================\nM1002 judge_flag g29_before_print_flag\nM622 J0\n\n M1002 gcode_claim_action : 13\n G28\n\nM623\n;===== home after wipe mouth end =======================\n\nM975 S1 ; turn on vibration supression\n\n\n;=============turn on fans to prevent PLA jamming=================\n{if filament_type[initial_extruder]==\"PLA\"}\n {if (bed_temperature[initial_extruder] >45)||(bed_temperature_initial_layer[initial_extruder] >45)}\n M106 P3 S180\n {endif};Prevent PLA from jamming\n{endif}\nM106 P2 S100 ; turn on big fan ,to cool down toolhead\n\n\nM104 S{nozzle_temperature_initial_layer[initial_extruder]} ; set extrude temp earlier, to reduce wait time\n\n;===== mech mode fast check============================\nG1 X128 Y128 Z10 F20000\nM400 P200\nM970.3 Q1 A7 B30 C80 H15 K0\nM974 Q1 S2 P0\n\nG1 X128 Y128 Z10 F20000\nM400 P200\nM970.3 Q0 A7 B30 C90 Q0 H15 K0\nM974 Q0 S2 P0\n\nM975 S1\nG1 F30000\nG1 X230 Y15\nG28 X ; re-home XY\n;===== fmech mode fast check============================\n\n\n;===== nozzle load line ===============================\nM975 S1\nG90\nM83\nT1000\nG1 X18.0 Y1.0 Z0.8 F18000;Move to start position\nM109 S{nozzle_temperature_initial_layer[initial_extruder]}\nG1 Z0.2\nG0 E2 F300\nG0 X240 E15 F{outer_wall_volumetric_speed/(0.3*0.5) * 60}\nG0 Y11 E0.700 F{outer_wall_volumetric_speed/(0.3*0.5)/ 4 * 60}\nG0 X239.5\nG0 E0.2\nG0 Y1.5 E0.700\nG0 X18 E15 F{outer_wall_volumetric_speed/(0.3*0.5) * 60}\nM400\n\n;===== for Textured PEI Plate , lower the nozzle as the nozzle was touching topmost of the texture when homing ==\n;curr_bed_type={curr_bed_type}\n{if curr_bed_type==\"Textured PEI Plate\"}\nG29.1 Z{-0.04} ; for Textured PEI Plate\n{endif}\n;========turn off light and wait extrude temperature =============\nM1002 gcode_claim_action : 0\nM106 S0 ; turn off fan\nM106 P2 S0 ; turn off big fan\nM106 P3 S0 ; turn off chamber fan\n\nM975 S1 ; turn on mech mode supression", + "machine_start_gcode": ";===== machine: P1P ========================\n;===== date: 20241115 =====================\n;===== turn on the HB fan & MC board fan =================\nM104 S75 ;set extruder temp to turn on the HB fan and prevent filament oozing from nozzle\nM710 A1 S255 ;turn on MC fan by default(P1S)\n;===== reset machine status =================\nG91\nM17 Z0.4 ; lower the z-motor current\nG380 S2 Z30 F300 ; G380 is same as G38; lower the hotbed , to prevent the nozzle is below the hotbed\nG380 S2 Z-25 F300 ;\nG1 Z5 F300;\nG90\nM17 X1.2 Y1.2 Z0.75 ; reset motor current to default\nM960 S5 P1 ; turn on logo lamp\nG90\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\nM73.2 R1.0 ;Reset left time magnitude\nM1002 set_gcode_claim_speed_level : 5\nM221 X0 Y0 Z0 ; turn off soft endstop to prevent protential logic problem\nG29.1 Z{+0.0} ; clear z-trim value first\nM204 S10000 ; init ACC set to 10m/s^2\n\n;===== heatbed preheat ====================\nM1002 gcode_claim_action : 2\nM140 S[bed_temperature_initial_layer_single] ;set bed temp\nM190 S[bed_temperature_initial_layer_single] ;wait for bed temp\n\n\n\n;=============turn on fans to prevent PLA jamming=================\n{if filament_type[initial_extruder]==\"PLA\"}\n {if (bed_temperature[initial_extruder] >45)||(bed_temperature_initial_layer[initial_extruder] >45)}\n M106 P3 S180\n {endif};Prevent PLA from jamming\n{endif}\nM106 P2 S100 ; turn on big fan ,to cool down toolhead\n\n;===== prepare print temperature and material ==========\nM104 S[nozzle_temperature_initial_layer] ;set extruder temp\nG91\nG0 Z10 F1200\nG90\nG28 X\nM975 S1 ; turn on\nG1 X60 F12000\nG1 Y245\nG1 Y265 F3000\nM620 M\nM620 S[initial_extruder]A ; switch material if AMS exist\n M109 S[nozzle_temperature_initial_layer]\n G1 X120 F12000\n\n G1 X20 Y50 F12000\n G1 Y-3\n T[initial_extruder]\n G1 X54 F12000\n G1 Y265\n M400\nM621 S[initial_extruder]A\nM620.1 E F{filament_max_volumetric_speed[initial_extruder]/2.4053*60} T{nozzle_temperature_range_high[initial_extruder]}\n\n\nM412 S1 ; ===turn on filament runout detection===\n\nM109 S250 ;set nozzle to common flush temp\nM106 P1 S0\nG92 E0\nG1 E50 F200\nM400\nM104 S[nozzle_temperature_initial_layer]\nG92 E0\nG1 E50 F200\nM400\nM106 P1 S255\nG92 E0\nG1 E5 F300\nM109 S{nozzle_temperature_initial_layer[initial_extruder]-20} ; drop nozzle temp, make filament shink a bit\nG92 E0\nG1 E-0.5 F300\n\nG1 X70 F9000\nG1 X76 F15000\nG1 X65 F15000\nG1 X76 F15000\nG1 X65 F15000; shake to put down garbage\nG1 X80 F6000\nG1 X95 F15000\nG1 X80 F15000\nG1 X165 F15000; wipe and shake\nM400\nM106 P1 S0\n;===== prepare print temperature and material end =====\n\n\n;===== wipe nozzle ===============================\nM1002 gcode_claim_action : 14\nM975 S1\nM106 S255\nG1 X65 Y230 F18000\nG1 Y264 F6000\nM109 S{nozzle_temperature_initial_layer[initial_extruder]-20}\nG1 X100 F18000 ; first wipe mouth\n\nG0 X135 Y253 F20000 ; move to exposed steel surface edge\nG28 Z P0 T300; home z with low precision,permit 300deg temperature\nG29.2 S0 ; turn off ABL\nG0 Z5 F20000\n\nG1 X60 Y265\nG92 E0\nG1 E-0.5 F300 ; retrack more\nG1 X100 F5000; second wipe mouth\nG1 X70 F15000\nG1 X100 F5000\nG1 X70 F15000\nG1 X100 F5000\nG1 X70 F15000\nG1 X100 F5000\nG1 X70 F15000\nG1 X90 F5000\nG0 X128 Y261 Z-1.5 F20000 ; move to exposed steel surface and stop the nozzle\nM104 S140 ; set temp down to heatbed acceptable\nM106 S255 ; turn on fan (G28 has turn off fan)\n\nM221 S; push soft endstop status\nM221 Z0 ;turn off Z axis endstop\nG0 Z0.5 F20000\nG0 X125 Y259.5 Z-1.01\nG0 X131 F211\nG0 X124\nG0 Z0.5 F20000\nG0 X125 Y262.5\nG0 Z-1.01\nG0 X131 F211\nG0 X124\nG0 Z0.5 F20000\nG0 X125 Y260.0\nG0 Z-1.01\nG0 X131 F211\nG0 X124\nG0 Z0.5 F20000\nG0 X125 Y262.0\nG0 Z-1.01\nG0 X131 F211\nG0 X124\nG0 Z0.5 F20000\nG0 X125 Y260.5\nG0 Z-1.01\nG0 X131 F211\nG0 X124\nG0 Z0.5 F20000\nG0 X125 Y261.5\nG0 Z-1.01\nG0 X131 F211\nG0 X124\nG0 Z0.5 F20000\nG0 X125 Y261.0\nG0 Z-1.01\nG0 X131 F211\nG0 X124\nG0 X128\nG2 I0.5 J0 F300\nG2 I0.5 J0 F300\nG2 I0.5 J0 F300\nG2 I0.5 J0 F300\n\nM109 S140 ; wait nozzle temp down to heatbed acceptable\nG2 I0.5 J0 F3000\nG2 I0.5 J0 F3000\nG2 I0.5 J0 F3000\nG2 I0.5 J0 F3000\n\nM221 R; pop softend status\nG1 Z10 F1200\nM400\nG1 Z10\nG1 F30000\nG1 X230 Y15\nG29.2 S1 ; turn on ABL\n;G28 ; home again after hard wipe mouth\nM106 S0 ; turn off fan , too noisy\n;===== wipe nozzle end ================================\n\n\n;===== bed leveling ==================================\nM1002 judge_flag g29_before_print_flag\nM622 J1\n\n M1002 gcode_claim_action : 1\n G29 A X{first_layer_print_min[0]} Y{first_layer_print_min[1]} I{first_layer_print_size[0]} J{first_layer_print_size[1]}\n M400\n M500 ; save cali data\n\nM623\n;===== bed leveling end ================================\n\n;===== home after wipe mouth============================\nM1002 judge_flag g29_before_print_flag\nM622 J0\n\n M1002 gcode_claim_action : 13\n G28\n\nM623\n;===== home after wipe mouth end =======================\n\nM975 S1 ; turn on vibration supression\n\n\n;=============turn on fans to prevent PLA jamming=================\n{if filament_type[initial_extruder]==\"PLA\"}\n {if (bed_temperature[initial_extruder] >45)||(bed_temperature_initial_layer[initial_extruder] >45)}\n M106 P3 S180\n {endif};Prevent PLA from jamming\n{endif}\nM106 P2 S100 ; turn on big fan ,to cool down toolhead\n\n\nM104 S{nozzle_temperature_initial_layer[initial_extruder]} ; set extrude temp earlier, to reduce wait time\n\n;===== mech mode fast check============================\nG1 X128 Y128 Z10 F20000\nM400 P200\nM970.3 Q1 A7 B30 C80 H15 K0\nM974 Q1 S2 P0\n\nG1 X128 Y128 Z10 F20000\nM400 P200\nM970.3 Q0 A7 B30 C90 Q0 H15 K0\nM974 Q0 S2 P0\n\nM975 S1\nG1 F30000\nG1 X230 Y15\nG28 X ; re-home XY\n;===== fmech mode fast check============================\n\n\n;===== nozzle load line ===============================\nM975 S1\nG90\nM83\nT1000\nG1 X18.0 Y1.0 Z0.8 F18000;Move to start position\nM109 S{nozzle_temperature_initial_layer[initial_extruder]}\nG1 Z0.2\nG0 E2 F300\nG0 X240 E15 F{outer_wall_volumetric_speed/(0.3*0.5) * 60}\nG0 Y11 E0.700 F{outer_wall_volumetric_speed/(0.3*0.5)/ 4 * 60}\nG0 X239.5\nG0 E0.2\nG0 Y1.5 E0.700\nG0 X18 E15 F{outer_wall_volumetric_speed/(0.3*0.5) * 60}\nM400\n\n;===== for Textured PEI Plate , lower the nozzle as the nozzle was touching topmost of the texture when homing ==\n;curr_bed_type={curr_bed_type}\n{if curr_bed_type==\"Textured PEI Plate\"}\nG29.1 Z{-0.04} ; for Textured PEI Plate\n{endif}\n;========turn off light and wait extrude temperature =============\nM1002 gcode_claim_action : 0\nM106 S0 ; turn off fan\nM106 P2 S0 ; turn off big fan\nM106 P3 S0 ; turn off chamber fan\n\nM975 S1 ; turn on mech mode supression", "machine_end_gcode": ";===== date: 20230428 =====================\nM400 ; wait for buffer to clear\nG92 E0 ; zero the extruder\nG1 E-0.8 F1800 ; retract\nG1 Z{max_layer_z + 0.5} F900 ; lower z a little\nG1 X65 Y245 F12000 ; move to safe pos \nG1 Y265 F3000\n\nG1 X65 Y245 F12000\nG1 Y265 F3000\nM140 S0 ; turn off bed\nM106 S0 ; turn off fan\nM106 P2 S0 ; turn off remote part cooling fan\nM106 P3 S0 ; turn off chamber cooling fan\n\nG1 X100 F12000 ; wipe\n; pull back filament to AMS\nM620 S255\nG1 X20 Y50 F12000\nG1 Y-3\nT255\nG1 X65 F12000\nG1 Y265\nG1 X100 F12000 ; wipe\nM621 S255\nM104 S0 ; turn off hotend\n\nM622.1 S1 ; for prev firware, default turned on\nM1002 judge_flag timelapse_record_flag\nM622 J1\n M400 ; wait all motion done\n M991 S0 P-1 ;end smooth timelapse at safe pos\n M400 S3 ;wait for last picture to be taken\nM623; end of \"timelapse_record_flag\"\n\nM400 ; wait all motion done\nM17 S\nM17 Z0.4 ; lower z motor current to reduce impact if there is something in the bottom\n{if (max_layer_z + 100.0) < 250}\n G1 Z{max_layer_z + 100.0} F600\n G1 Z{max_layer_z +98.0}\n{else}\n G1 Z250 F600\n G1 Z248\n{endif}\nM400 P100\nM17 R ; restore z current\n\nM220 S100 ; Reset feedrate magnitude\nM201.2 K1.0 ; Reset acc magnitude\nM73.2 R1.0 ;Reset left time magnitude\nM1002 set_gcode_claim_speed_level : 0\n\nM17 X0.8 Y0.8 Z0.5 ; lower motor current to 45% power\n", "layer_change_gcode": "; layer num/total_layer_count: {layer_num+1}/[total_layer_count]\nM622.1 S1 ; for prev firware, default turned on\nM1002 judge_flag timelapse_record_flag\nM622 J1\n{if timelapse_type == 0} ; timelapse without wipe tower\nM971 S11 C10 O0\n{elsif timelapse_type == 1} ; timelapse with wipe tower\nG92 E0\nG1 E-[retraction_length] F1800\nG17\nG2 Z{layer_z + 0.4} I0.86 J0.86 P1 F20000 ; spiral lift a little\nG1 X65 Y245 F20000 ; move to safe pos\nG17\nG2 Z{layer_z} I0.86 J0.86 P1 F20000\nG1 Y265 F3000\nM400 P300\nM971 S11 C11 O0\nG92 E0\nG1 E[retraction_length] F300\nG1 X100 F5000\nG1 Y255 F20000\n{endif}\nM623\n; update layer progress\nM73 L{layer_num+1}\nM991 S0 P{layer_num} ;notify layer change", "change_filament_gcode": "M620 S[next_extruder]A\nM204 S9000\n{if toolchange_count > 1 && (z_hop_types[current_extruder] == 0 || z_hop_types[current_extruder] == 3)}\nG17\nG2 Z{z_after_toolchange + 0.4} I0.86 J0.86 P1 F10000 ; spiral lift a little from second lift\n{endif}\nG1 Z{max_layer_z + 3.0} F1200\n\nG1 X70 F21000\nG1 Y245\nG1 Y265 F3000\nM400\nM106 P1 S0\nM106 P2 S0\n{if old_filament_temp > 142 && next_extruder < 255}\nM104 S[old_filament_temp]\n{endif}\n{if long_retractions_when_cut[previous_extruder]}\nM620.11 S1 I[previous_extruder] E-{retraction_distances_when_cut[previous_extruder]} F{old_filament_e_feedrate}\n{else}\nM620.11 S0\n{endif}\nM400\nG1 X90 F3000\nG1 Y255 F4000\nG1 X100 F5000\nG1 X120 F15000\nG1 X20 Y50 F21000\nG1 Y-3\n{if toolchange_count == 2}\n; get travel path for change filament\nM620.1 X[travel_point_1_x] Y[travel_point_1_y] F21000 P0\nM620.1 X[travel_point_2_x] Y[travel_point_2_y] F21000 P1\nM620.1 X[travel_point_3_x] Y[travel_point_3_y] F21000 P2\n{endif}\nM620.1 E F[old_filament_e_feedrate] T{nozzle_temperature_range_high[previous_extruder]}\nT[next_extruder]\nM620.1 E F[new_filament_e_feedrate] T{nozzle_temperature_range_high[next_extruder]}\n\n{if next_extruder < 255}\n{if long_retractions_when_cut[previous_extruder]}\nM620.11 S1 I[previous_extruder] E{retraction_distances_when_cut[previous_extruder]} F{old_filament_e_feedrate}\nM628 S1\nG92 E0\nG1 E{retraction_distances_when_cut[previous_extruder]} F[old_filament_e_feedrate]\nM400\nM629 S1\n{else}\nM620.11 S0\n{endif}\nG92 E0\n{if flush_length_1 > 1}\nM83\n; FLUSH_START\n; always use highest temperature to flush\nM400\n{if filament_type[next_extruder] == \"PETG\"}\nM109 S260\n{elsif filament_type[next_extruder] == \"PVA\"}\nM109 S210\n{else}\nM109 S[nozzle_temperature_range_high]\n{endif}\n{if flush_length_1 > 23.7}\nG1 E23.7 F{old_filament_e_feedrate} ; do not need pulsatile flushing for start part\nG1 E{(flush_length_1 - 23.7) * 0.02} F50\nG1 E{(flush_length_1 - 23.7) * 0.23} F{old_filament_e_feedrate}\nG1 E{(flush_length_1 - 23.7) * 0.02} F50\nG1 E{(flush_length_1 - 23.7) * 0.23} F{new_filament_e_feedrate}\nG1 E{(flush_length_1 - 23.7) * 0.02} F50\nG1 E{(flush_length_1 - 23.7) * 0.23} F{new_filament_e_feedrate}\nG1 E{(flush_length_1 - 23.7) * 0.02} F50\nG1 E{(flush_length_1 - 23.7) * 0.23} F{new_filament_e_feedrate}\n{else}\nG1 E{flush_length_1} F{old_filament_e_feedrate}\n{endif}\n; FLUSH_END\nG1 E-[old_retract_length_toolchange] F1800\nG1 E[old_retract_length_toolchange] F300\n{endif}\n\n{if flush_length_2 > 1}\n\nG91\nG1 X3 F12000; move aside to extrude\nG90\nM83\n\n; FLUSH_START\nG1 E{flush_length_2 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_2 * 0.02} F50\nG1 E{flush_length_2 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_2 * 0.02} F50\nG1 E{flush_length_2 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_2 * 0.02} F50\nG1 E{flush_length_2 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_2 * 0.02} F50\nG1 E{flush_length_2 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_2 * 0.02} F50\n; FLUSH_END\nG1 E-[new_retract_length_toolchange] F1800\nG1 E[new_retract_length_toolchange] F300\n{endif}\n\n{if flush_length_3 > 1}\n\nG91\nG1 X3 F12000; move aside to extrude\nG90\nM83\n\n; FLUSH_START\nG1 E{flush_length_3 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_3 * 0.02} F50\nG1 E{flush_length_3 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_3 * 0.02} F50\nG1 E{flush_length_3 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_3 * 0.02} F50\nG1 E{flush_length_3 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_3 * 0.02} F50\nG1 E{flush_length_3 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_3 * 0.02} F50\n; FLUSH_END\nG1 E-[new_retract_length_toolchange] F1800\nG1 E[new_retract_length_toolchange] F300\n{endif}\n\n{if flush_length_4 > 1}\n\nG91\nG1 X3 F12000; move aside to extrude\nG90\nM83\n\n; FLUSH_START\nG1 E{flush_length_4 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_4 * 0.02} F50\nG1 E{flush_length_4 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_4 * 0.02} F50\nG1 E{flush_length_4 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_4 * 0.02} F50\nG1 E{flush_length_4 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_4 * 0.02} F50\nG1 E{flush_length_4 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_4 * 0.02} F50\n; FLUSH_END\n{endif}\n; FLUSH_START\nM400\nM109 S[new_filament_temp]\nG1 E2 F{new_filament_e_feedrate} ;Compensate for filament spillage during waiting temperature\n; FLUSH_END\nM400\nG92 E0\nG1 E-[new_retract_length_toolchange] F1800\nM106 P1 S255\nM400 S3\n\nG1 X70 F5000\nG1 X90 F3000\nG1 Y255 F4000\nG1 X105 F5000\nG1 Y265 F5000\nG1 X70 F10000\nG1 X100 F5000\nG1 X70 F10000\nG1 X100 F5000\n\nG1 X70 F10000\nG1 X80 F15000\nG1 X60\nG1 X80\nG1 X60\nG1 X80 ; shake to put down garbage\nG1 X100 F5000\nG1 X165 F15000; wipe and shake\nG1 Y256 ; move Y to aside, prevent collision\nM400\nG1 Z{max_layer_z + 3.0} F3000\n{if layer_z <= (initial_layer_print_height + 0.001)}\nM204 S[initial_layer_acceleration]\n{else}\nM204 S[default_acceleration]\n{endif}\n{else}\nG1 X[x_after_toolchange] Y[y_after_toolchange] Z[z_after_toolchange] F12000\n{endif}\nM621 S[next_extruder]A\n" diff --git a/resources/profiles/Creality/machine/Creality CR-10 SE 0.2 nozzle.json b/resources/profiles/Creality/machine/Creality CR-10 SE 0.2 nozzle.json index 1ecafe3f8d..4911adffb7 100644 --- a/resources/profiles/Creality/machine/Creality CR-10 SE 0.2 nozzle.json +++ b/resources/profiles/Creality/machine/Creality CR-10 SE 0.2 nozzle.json @@ -88,10 +88,10 @@ "2" ], "max_layer_height": [ - "0.32" + "0.16" ], "min_layer_height": [ - "0.08" + "0.04" ], "printer_settings_id": "Creality", "retraction_minimum_travel": [ @@ -125,4 +125,4 @@ "96x96", "300x300" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Creality/machine/Creality CR-10 SE 0.6 nozzle.json b/resources/profiles/Creality/machine/Creality CR-10 SE 0.6 nozzle.json index 5f56e1ff87..fbcb5d3921 100644 --- a/resources/profiles/Creality/machine/Creality CR-10 SE 0.6 nozzle.json +++ b/resources/profiles/Creality/machine/Creality CR-10 SE 0.6 nozzle.json @@ -88,10 +88,10 @@ "2" ], "max_layer_height": [ - "0.32" + "0.48" ], "min_layer_height": [ - "0.08" + "0.12" ], "printer_settings_id": "Creality", "retraction_minimum_travel": [ @@ -125,4 +125,4 @@ "96x96", "300x300" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Creality/machine/Creality CR-10 SE 0.8 nozzle.json b/resources/profiles/Creality/machine/Creality CR-10 SE 0.8 nozzle.json index 00d3f3ff44..71fa0f5db4 100644 --- a/resources/profiles/Creality/machine/Creality CR-10 SE 0.8 nozzle.json +++ b/resources/profiles/Creality/machine/Creality CR-10 SE 0.8 nozzle.json @@ -88,10 +88,10 @@ "2" ], "max_layer_height": [ - "0.32" + "0.64" ], "min_layer_height": [ - "0.08" + "0.16" ], "printer_settings_id": "Creality", "retraction_minimum_travel": [ @@ -125,4 +125,4 @@ "96x96", "300x300" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Creality/machine/Creality Ender-3 0.2 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-3 0.2 nozzle.json index 84b0aa585b..020a23436d 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 0.2 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 0.2 nozzle.json @@ -81,10 +81,10 @@ "0.4" ], "max_layer_height": [ - "0.36" + "0.16" ], "min_layer_height": [ - "0.08" + "0.04" ], "printer_settings_id": "Creality", "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_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" -} \ No newline at end of file +} diff --git a/resources/profiles/Creality/machine/Creality Ender-3 0.6 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-3 0.6 nozzle.json index 3cd5410693..3ca555c031 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 0.6 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 0.6 nozzle.json @@ -81,10 +81,10 @@ "0.4" ], "max_layer_height": [ - "0.36" + "0.48" ], "min_layer_height": [ - "0.08" + "0.12" ], "printer_settings_id": "Creality", "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_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" -} \ No newline at end of file +} diff --git a/resources/profiles/Creality/machine/Creality Ender-3 0.8 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-3 0.8 nozzle.json index 5d0f0b674f..1f6e3c34ef 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 0.8 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 0.8 nozzle.json @@ -81,10 +81,10 @@ "0.4" ], "max_layer_height": [ - "0.36" + "0.64" ], "min_layer_height": [ - "0.08" + "0.16" ], "printer_settings_id": "Creality", "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_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" -} \ No newline at end of file +} diff --git a/resources/profiles/Creality/machine/Creality Ender-3 Pro 0.2 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-3 Pro 0.2 nozzle.json index 9cd139b34e..bef8c38f3d 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 Pro 0.2 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 Pro 0.2 nozzle.json @@ -81,10 +81,10 @@ "0.4" ], "max_layer_height": [ - "0.36" + "0.16" ], "min_layer_height": [ - "0.08" + "0.04" ], "printer_settings_id": "Creality", "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_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" -} \ No newline at end of file +} diff --git a/resources/profiles/Creality/machine/Creality Ender-3 Pro 0.6 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-3 Pro 0.6 nozzle.json index 759243c2b7..268a063383 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 Pro 0.6 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 Pro 0.6 nozzle.json @@ -81,10 +81,10 @@ "0.4" ], "max_layer_height": [ - "0.36" + "0.48" ], "min_layer_height": [ - "0.08" + "0.12" ], "printer_settings_id": "Creality", "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_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" -} \ No newline at end of file +} diff --git a/resources/profiles/Creality/machine/Creality Ender-3 Pro 0.8 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-3 Pro 0.8 nozzle.json index e807d8f2f0..b49092d49e 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 Pro 0.8 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 Pro 0.8 nozzle.json @@ -81,10 +81,10 @@ "0.4" ], "max_layer_height": [ - "0.36" + "0.64" ], "min_layer_height": [ - "0.08" + "0.16" ], "printer_settings_id": "Creality", "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_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" -} \ No newline at end of file +} diff --git a/resources/profiles/Creality/machine/Creality Ender-3 S1 Plus 0.2 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-3 S1 Plus 0.2 nozzle.json index 158e30b6e7..b8fc2bc851 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 S1 Plus 0.2 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 S1 Plus 0.2 nozzle.json @@ -78,10 +78,10 @@ "0.4" ], "max_layer_height": [ - "0.36" + "0.16" ], "min_layer_height": [ - "0.08" + "0.04" ], "printer_settings_id": "Creality", "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_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" -} \ No newline at end of file +} diff --git a/resources/profiles/Creality/machine/Creality Ender-3 S1 Plus 0.6 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-3 S1 Plus 0.6 nozzle.json index 445e0b0bc3..f774ae2713 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 S1 Plus 0.6 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 S1 Plus 0.6 nozzle.json @@ -78,10 +78,10 @@ "0.4" ], "max_layer_height": [ - "0.36" + "0.48" ], "min_layer_height": [ - "0.08" + "0.12" ], "printer_settings_id": "Creality", "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_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" -} \ No newline at end of file +} diff --git a/resources/profiles/Creality/machine/Creality Ender-3 S1 Plus 0.8 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-3 S1 Plus 0.8 nozzle.json index f8930b0d96..bd4add3b08 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 S1 Plus 0.8 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 S1 Plus 0.8 nozzle.json @@ -79,10 +79,10 @@ "0.4" ], "max_layer_height": [ - "0.36" + "0.64" ], "min_layer_height": [ - "0.08" + "0.16" ], "printer_settings_id": "Creality", "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_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" -} \ No newline at end of file +} diff --git a/resources/profiles/Creality/machine/Creality Ender-3 V3 SE 0.2 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-3 V3 SE 0.2 nozzle.json index 5c8c2b73b6..b9a5d7fc8b 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 V3 SE 0.2 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 V3 SE 0.2 nozzle.json @@ -84,10 +84,10 @@ "0.4" ], "max_layer_height": [ - "0.32" + "0.16" ], "min_layer_height": [ - "0.08" + "0.04" ], "retraction_minimum_travel": [ "2" diff --git a/resources/profiles/Creality/machine/Creality Ender-3 V3 SE 0.6 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-3 V3 SE 0.6 nozzle.json index ccc53b8c90..ae639af95a 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 V3 SE 0.6 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 V3 SE 0.6 nozzle.json @@ -84,10 +84,10 @@ "0.4" ], "max_layer_height": [ - "0.32" + "0.48" ], "min_layer_height": [ - "0.08" + "0.12" ], "retraction_minimum_travel": [ "2" diff --git a/resources/profiles/Creality/machine/Creality Ender-3 V3 SE 0.8 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-3 V3 SE 0.8 nozzle.json index f5e565f0cd..8833fd9ecd 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 V3 SE 0.8 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 V3 SE 0.8 nozzle.json @@ -84,10 +84,10 @@ "0.4" ], "max_layer_height": [ - "0.32" + "0.64" ], "min_layer_height": [ - "0.08" + "0.16" ], "retraction_minimum_travel": [ "2" diff --git a/resources/profiles/Creality/machine/Creality K1 (0.8 nozzle).json b/resources/profiles/Creality/machine/Creality K1 (0.8 nozzle).json index 2c980a66aa..0a15d1d0d9 100644 --- a/resources/profiles/Creality/machine/Creality K1 (0.8 nozzle).json +++ b/resources/profiles/Creality/machine/Creality K1 (0.8 nozzle).json @@ -86,7 +86,7 @@ "0.5" ], "min_layer_height": [ - "0.08" + "0.16" ], "printer_settings_id": "Creality", "retraction_minimum_travel": [ @@ -130,4 +130,4 @@ "100x100", "320x320" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Creality/machine/Creality K1 Max (0.8 nozzle).json b/resources/profiles/Creality/machine/Creality K1 Max (0.8 nozzle).json index e31c188086..c7520321c5 100644 --- a/resources/profiles/Creality/machine/Creality K1 Max (0.8 nozzle).json +++ b/resources/profiles/Creality/machine/Creality K1 Max (0.8 nozzle).json @@ -87,7 +87,7 @@ "0.5" ], "min_layer_height": [ - "0.08" + "0.16" ], "printer_settings_id": "Creality", "retraction_minimum_travel": [ @@ -131,4 +131,4 @@ "100x100", "320x320" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Creality/machine/Creality K1C 0.8 nozzle.json b/resources/profiles/Creality/machine/Creality K1C 0.8 nozzle.json index 6788e0c5ec..d96df6c6d3 100644 --- a/resources/profiles/Creality/machine/Creality K1C 0.8 nozzle.json +++ b/resources/profiles/Creality/machine/Creality K1C 0.8 nozzle.json @@ -87,7 +87,7 @@ "0.5" ], "min_layer_height": [ - "0.08" + "0.16" ], "printer_settings_id": "Creality", "retraction_minimum_travel": [ @@ -131,4 +131,4 @@ "100x100", "320x320" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Creality/machine/Creality K2 Plus 0.8 nozzle.json b/resources/profiles/Creality/machine/Creality K2 Plus 0.8 nozzle.json index bdd7bb0473..2461c90711 100644 --- a/resources/profiles/Creality/machine/Creality K2 Plus 0.8 nozzle.json +++ b/resources/profiles/Creality/machine/Creality K2 Plus 0.8 nozzle.json @@ -87,7 +87,7 @@ "0.56" ], "min_layer_height": [ - "0.08" + "0.16" ], "printer_settings_id": "Creality", "retraction_minimum_travel": [ diff --git a/resources/profiles/Prusa/filament/Prusa Generic TPU @MK3.5.json b/resources/profiles/Prusa/filament/Prusa Generic TPU @MK3.5.json index dd6e47980a..3daf24d7d5 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic TPU @MK3.5.json +++ b/resources/profiles/Prusa/filament/Prusa Generic TPU @MK3.5.json @@ -7,7 +7,7 @@ "instantiation": "true", "inherits": "fdm_filament_tpu", "filament_max_volumetric_speed": [ - "1.35" + "1.8" ], "filament_flow_ratio": [ "1.15" @@ -28,8 +28,14 @@ "210" ], "filament_retraction_length": [ - "0" + "2" ], + "filament_retraction_speed": [ + "45" + ], + "filament_deretraction_speed": [ + "20" + ], "close_fan_the_first_x_layers": [ "3" ], diff --git a/resources/profiles/Prusa/process/process_detail_MK3.5.json b/resources/profiles/Prusa/process/process_detail_MK3.5.json index 134905069b..3e9e82439c 100644 --- a/resources/profiles/Prusa/process/process_detail_MK3.5.json +++ b/resources/profiles/Prusa/process/process_detail_MK3.5.json @@ -12,7 +12,7 @@ "support_speed": "60", "small_perimeter_speed": "40", "sparse_infill_speed": "100", - "internal_solid_infill_speed": "140", + "internal_solid_infill_speed": "120", "top_surface_speed": "60", "gap_infill_speed": "40", "default_acceleration": "1500", diff --git a/resources/profiles/Voron.json b/resources/profiles/Voron.json index 7bfa7c6615..a821cfc7c0 100644 --- a/resources/profiles/Voron.json +++ b/resources/profiles/Voron.json @@ -58,6 +58,10 @@ "name": "fdm_process_voron_common_0_2_5", "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", "sub_path": "process/fdm_process_voron_common_0_6.json" @@ -205,6 +209,30 @@ { "name": "0.80mm Extra Draft 1.0 nozzle @Voron", "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": [ @@ -310,6 +338,10 @@ "name": "Voron 2.4 250 0.25 nozzle", "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", "sub_path": "machine/Voron 2.4 250 0.6 nozzle.json" @@ -338,6 +370,10 @@ "name": "Voron 2.4 300 0.25 nozzle", "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", "sub_path": "machine/Voron 2.4 300 0.6 nozzle.json" @@ -366,6 +402,10 @@ "name": "Voron 2.4 350 0.25 nozzle", "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", "sub_path": "machine/Voron 2.4 350 0.6 nozzle.json" @@ -394,6 +434,10 @@ "name": "Voron Trident 250 0.25 nozzle", "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", "sub_path": "machine/Voron Trident 250 0.6 nozzle.json" @@ -422,6 +466,10 @@ "name": "Voron Trident 300 0.25 nozzle", "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", "sub_path": "machine/Voron Trident 300 0.6 nozzle.json" @@ -450,6 +498,10 @@ "name": "Voron Trident 350 0.25 nozzle", "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", "sub_path": "machine/Voron Trident 350 0.6 nozzle.json" @@ -478,6 +530,10 @@ "name": "Voron 0.1 0.25 nozzle", "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", "sub_path": "machine/Voron 0.1 0.6 nozzle.json" @@ -506,6 +562,10 @@ "name": "Voron Switchwire 250 0.25 nozzle", "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", "sub_path": "machine/Voron Switchwire 250 0.6 nozzle.json" diff --git a/resources/profiles/Voron/filament/Voron Generic ABS.json b/resources/profiles/Voron/filament/Voron Generic ABS.json index a321511ad0..a93df9012f 100644 --- a/resources/profiles/Voron/filament/Voron Generic ABS.json +++ b/resources/profiles/Voron/filament/Voron Generic ABS.json @@ -17,6 +17,7 @@ "Voron 2.4 250 0.15 nozzle", "Voron 2.4 250 0.2 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.8 nozzle", "Voron 2.4 250 1.0 nozzle", @@ -24,6 +25,7 @@ "Voron 2.4 300 0.15 nozzle", "Voron 2.4 300 0.2 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.8 nozzle", "Voron 2.4 300 1.0 nozzle", @@ -31,6 +33,7 @@ "Voron 2.4 350 0.15 nozzle", "Voron 2.4 350 0.2 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.8 nozzle", "Voron 2.4 350 1.0 nozzle", @@ -38,6 +41,7 @@ "Voron Trident 250 0.15 nozzle", "Voron Trident 250 0.2 nozzle", "Voron Trident 250 0.25 nozzle", + "Voron Trident 250 0.5 nozzle", "Voron Trident 250 0.6 nozzle", "Voron Trident 250 0.8 nozzle", "Voron Trident 250 1.0 nozzle", @@ -45,6 +49,7 @@ "Voron Trident 300 0.15 nozzle", "Voron Trident 300 0.2 nozzle", "Voron Trident 300 0.25 nozzle", + "Voron Trident 300 0.5 nozzle", "Voron Trident 300 0.6 nozzle", "Voron Trident 300 0.8 nozzle", "Voron Trident 300 1.0 nozzle", @@ -52,6 +57,7 @@ "Voron Trident 350 0.15 nozzle", "Voron Trident 350 0.2 nozzle", "Voron Trident 350 0.25 nozzle", + "Voron Trident 350 0.5 nozzle", "Voron Trident 350 0.6 nozzle", "Voron Trident 350 0.8 nozzle", "Voron Trident 350 1.0 nozzle", @@ -59,6 +65,7 @@ "Voron 0.1 0.15 nozzle", "Voron 0.1 0.2 nozzle", "Voron 0.1 0.25 nozzle", + "Voron 0.1 0.5 nozzle", "Voron 0.1 0.6 nozzle", "Voron 0.1 0.8 nozzle", "Voron 0.1 1.0 nozzle", @@ -66,6 +73,7 @@ "Voron Switchwire 250 0.15 nozzle", "Voron Switchwire 250 0.2 nozzle", "Voron Switchwire 250 0.25 nozzle", + "Voron Switchwire 250 0.5 nozzle", "Voron Switchwire 250 0.6 nozzle", "Voron Switchwire 250 0.8 nozzle", "Voron Switchwire 250 1.0 nozzle" diff --git a/resources/profiles/Voron/filament/Voron Generic ASA.json b/resources/profiles/Voron/filament/Voron Generic ASA.json index 2e32235db1..2c323cb525 100644 --- a/resources/profiles/Voron/filament/Voron Generic ASA.json +++ b/resources/profiles/Voron/filament/Voron Generic ASA.json @@ -17,6 +17,7 @@ "Voron 2.4 250 0.15 nozzle", "Voron 2.4 250 0.2 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.8 nozzle", "Voron 2.4 250 1.0 nozzle", @@ -24,6 +25,7 @@ "Voron 2.4 300 0.15 nozzle", "Voron 2.4 300 0.2 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.8 nozzle", "Voron 2.4 300 1.0 nozzle", @@ -31,6 +33,7 @@ "Voron 2.4 350 0.15 nozzle", "Voron 2.4 350 0.2 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.8 nozzle", "Voron 2.4 350 1.0 nozzle", @@ -38,6 +41,7 @@ "Voron Trident 250 0.15 nozzle", "Voron Trident 250 0.2 nozzle", "Voron Trident 250 0.25 nozzle", + "Voron Trident 250 0.5 nozzle", "Voron Trident 250 0.6 nozzle", "Voron Trident 250 0.8 nozzle", "Voron Trident 250 1.0 nozzle", @@ -45,6 +49,7 @@ "Voron Trident 300 0.15 nozzle", "Voron Trident 300 0.2 nozzle", "Voron Trident 300 0.25 nozzle", + "Voron Trident 300 0.5 nozzle", "Voron Trident 300 0.6 nozzle", "Voron Trident 300 0.8 nozzle", "Voron Trident 300 1.0 nozzle", @@ -52,6 +57,7 @@ "Voron Trident 350 0.15 nozzle", "Voron Trident 350 0.2 nozzle", "Voron Trident 350 0.25 nozzle", + "Voron Trident 350 0.5 nozzle", "Voron Trident 350 0.6 nozzle", "Voron Trident 350 0.8 nozzle", "Voron Trident 350 1.0 nozzle", @@ -59,6 +65,7 @@ "Voron 0.1 0.15 nozzle", "Voron 0.1 0.2 nozzle", "Voron 0.1 0.25 nozzle", + "Voron 0.1 0.5 nozzle", "Voron 0.1 0.6 nozzle", "Voron 0.1 0.8 nozzle", "Voron 0.1 1.0 nozzle", @@ -66,6 +73,7 @@ "Voron Switchwire 250 0.15 nozzle", "Voron Switchwire 250 0.2 nozzle", "Voron Switchwire 250 0.25 nozzle", + "Voron Switchwire 250 0.5 nozzle", "Voron Switchwire 250 0.6 nozzle", "Voron Switchwire 250 0.8 nozzle", "Voron Switchwire 250 1.0 nozzle" diff --git a/resources/profiles/Voron/filament/Voron Generic PA-CF.json b/resources/profiles/Voron/filament/Voron Generic PA-CF.json index 868ca5dba6..30e5136fd0 100644 --- a/resources/profiles/Voron/filament/Voron Generic PA-CF.json +++ b/resources/profiles/Voron/filament/Voron Generic PA-CF.json @@ -23,6 +23,7 @@ "Voron 2.4 250 0.15 nozzle", "Voron 2.4 250 0.2 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.8 nozzle", "Voron 2.4 250 1.0 nozzle", @@ -30,6 +31,7 @@ "Voron 2.4 300 0.15 nozzle", "Voron 2.4 300 0.2 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.8 nozzle", "Voron 2.4 300 1.0 nozzle", @@ -37,6 +39,7 @@ "Voron 2.4 350 0.15 nozzle", "Voron 2.4 350 0.2 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.8 nozzle", "Voron 2.4 350 1.0 nozzle", @@ -44,6 +47,7 @@ "Voron Trident 250 0.15 nozzle", "Voron Trident 250 0.2 nozzle", "Voron Trident 250 0.25 nozzle", + "Voron Trident 250 0.5 nozzle", "Voron Trident 250 0.6 nozzle", "Voron Trident 250 0.8 nozzle", "Voron Trident 250 1.0 nozzle", @@ -51,6 +55,7 @@ "Voron Trident 300 0.15 nozzle", "Voron Trident 300 0.2 nozzle", "Voron Trident 300 0.25 nozzle", + "Voron Trident 300 0.5 nozzle", "Voron Trident 300 0.6 nozzle", "Voron Trident 300 0.8 nozzle", "Voron Trident 300 1.0 nozzle", @@ -58,6 +63,7 @@ "Voron Trident 350 0.15 nozzle", "Voron Trident 350 0.2 nozzle", "Voron Trident 350 0.25 nozzle", + "Voron Trident 350 0.5 nozzle", "Voron Trident 350 0.6 nozzle", "Voron Trident 350 0.8 nozzle", "Voron Trident 350 1.0 nozzle", @@ -65,6 +71,7 @@ "Voron 0.1 0.15 nozzle", "Voron 0.1 0.2 nozzle", "Voron 0.1 0.25 nozzle", + "Voron 0.1 0.5 nozzle", "Voron 0.1 0.6 nozzle", "Voron 0.1 0.8 nozzle", "Voron 0.1 1.0 nozzle", @@ -72,6 +79,7 @@ "Voron Switchwire 250 0.15 nozzle", "Voron Switchwire 250 0.2 nozzle", "Voron Switchwire 250 0.25 nozzle", + "Voron Switchwire 250 0.5 nozzle", "Voron Switchwire 250 0.6 nozzle", "Voron Switchwire 250 0.8 nozzle", "Voron Switchwire 250 1.0 nozzle" diff --git a/resources/profiles/Voron/filament/Voron Generic PA.json b/resources/profiles/Voron/filament/Voron Generic PA.json index 391f871744..91790d2f80 100644 --- a/resources/profiles/Voron/filament/Voron Generic PA.json +++ b/resources/profiles/Voron/filament/Voron Generic PA.json @@ -20,6 +20,7 @@ "Voron 2.4 250 0.15 nozzle", "Voron 2.4 250 0.2 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.8 nozzle", "Voron 2.4 250 1.0 nozzle", @@ -27,6 +28,7 @@ "Voron 2.4 300 0.15 nozzle", "Voron 2.4 300 0.2 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.8 nozzle", "Voron 2.4 300 1.0 nozzle", @@ -34,6 +36,7 @@ "Voron 2.4 350 0.15 nozzle", "Voron 2.4 350 0.2 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.8 nozzle", "Voron 2.4 350 1.0 nozzle", @@ -41,6 +44,7 @@ "Voron Trident 250 0.15 nozzle", "Voron Trident 250 0.2 nozzle", "Voron Trident 250 0.25 nozzle", + "Voron Trident 250 0.5 nozzle", "Voron Trident 250 0.6 nozzle", "Voron Trident 250 0.8 nozzle", "Voron Trident 250 1.0 nozzle", @@ -48,6 +52,7 @@ "Voron Trident 300 0.15 nozzle", "Voron Trident 300 0.2 nozzle", "Voron Trident 300 0.25 nozzle", + "Voron Trident 300 0.5 nozzle", "Voron Trident 300 0.6 nozzle", "Voron Trident 300 0.8 nozzle", "Voron Trident 300 1.0 nozzle", @@ -55,6 +60,7 @@ "Voron Trident 350 0.15 nozzle", "Voron Trident 350 0.2 nozzle", "Voron Trident 350 0.25 nozzle", + "Voron Trident 350 0.5 nozzle", "Voron Trident 350 0.6 nozzle", "Voron Trident 350 0.8 nozzle", "Voron Trident 350 1.0 nozzle", @@ -62,6 +68,7 @@ "Voron 0.1 0.15 nozzle", "Voron 0.1 0.2 nozzle", "Voron 0.1 0.25 nozzle", + "Voron 0.1 0.5 nozzle", "Voron 0.1 0.6 nozzle", "Voron 0.1 0.8 nozzle", "Voron 0.1 1.0 nozzle", @@ -69,6 +76,7 @@ "Voron Switchwire 250 0.15 nozzle", "Voron Switchwire 250 0.2 nozzle", "Voron Switchwire 250 0.25 nozzle", + "Voron Switchwire 250 0.5 nozzle", "Voron Switchwire 250 0.6 nozzle", "Voron Switchwire 250 0.8 nozzle", "Voron Switchwire 250 1.0 nozzle" diff --git a/resources/profiles/Voron/filament/Voron Generic PC.json b/resources/profiles/Voron/filament/Voron Generic PC.json index eec0beb6eb..96de811416 100644 --- a/resources/profiles/Voron/filament/Voron Generic PC.json +++ b/resources/profiles/Voron/filament/Voron Generic PC.json @@ -17,6 +17,7 @@ "Voron 2.4 250 0.15 nozzle", "Voron 2.4 250 0.2 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.8 nozzle", "Voron 2.4 250 1.0 nozzle", @@ -24,6 +25,7 @@ "Voron 2.4 300 0.15 nozzle", "Voron 2.4 300 0.2 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.8 nozzle", "Voron 2.4 300 1.0 nozzle", @@ -31,6 +33,7 @@ "Voron 2.4 350 0.15 nozzle", "Voron 2.4 350 0.2 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.8 nozzle", "Voron 2.4 350 1.0 nozzle", @@ -38,6 +41,7 @@ "Voron Trident 250 0.15 nozzle", "Voron Trident 250 0.2 nozzle", "Voron Trident 250 0.25 nozzle", + "Voron Trident 250 0.5 nozzle", "Voron Trident 250 0.6 nozzle", "Voron Trident 250 0.8 nozzle", "Voron Trident 250 1.0 nozzle", @@ -45,6 +49,7 @@ "Voron Trident 300 0.15 nozzle", "Voron Trident 300 0.2 nozzle", "Voron Trident 300 0.25 nozzle", + "Voron Trident 300 0.5 nozzle", "Voron Trident 300 0.6 nozzle", "Voron Trident 300 0.8 nozzle", "Voron Trident 300 1.0 nozzle", @@ -52,6 +57,7 @@ "Voron Trident 350 0.15 nozzle", "Voron Trident 350 0.2 nozzle", "Voron Trident 350 0.25 nozzle", + "Voron Trident 350 0.5 nozzle", "Voron Trident 350 0.6 nozzle", "Voron Trident 350 0.8 nozzle", "Voron Trident 350 1.0 nozzle", @@ -59,6 +65,7 @@ "Voron 0.1 0.15 nozzle", "Voron 0.1 0.2 nozzle", "Voron 0.1 0.25 nozzle", + "Voron 0.1 0.5 nozzle", "Voron 0.1 0.6 nozzle", "Voron 0.1 0.8 nozzle", "Voron 0.1 1.0 nozzle", @@ -66,6 +73,7 @@ "Voron Switchwire 250 0.15 nozzle", "Voron Switchwire 250 0.2 nozzle", "Voron Switchwire 250 0.25 nozzle", + "Voron Switchwire 250 0.5 nozzle", "Voron Switchwire 250 0.6 nozzle", "Voron Switchwire 250 0.8 nozzle", "Voron Switchwire 250 1.0 nozzle" diff --git a/resources/profiles/Voron/filament/Voron Generic PETG.json b/resources/profiles/Voron/filament/Voron Generic PETG.json index ddd396ff4c..6238ed6a3c 100644 --- a/resources/profiles/Voron/filament/Voron Generic PETG.json +++ b/resources/profiles/Voron/filament/Voron Generic PETG.json @@ -47,6 +47,7 @@ "Voron 2.4 250 0.15 nozzle", "Voron 2.4 250 0.2 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.8 nozzle", "Voron 2.4 250 1.0 nozzle", @@ -54,6 +55,7 @@ "Voron 2.4 300 0.15 nozzle", "Voron 2.4 300 0.2 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.8 nozzle", "Voron 2.4 300 1.0 nozzle", @@ -61,6 +63,7 @@ "Voron 2.4 350 0.15 nozzle", "Voron 2.4 350 0.2 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.8 nozzle", "Voron 2.4 350 1.0 nozzle", @@ -68,6 +71,7 @@ "Voron Trident 250 0.15 nozzle", "Voron Trident 250 0.2 nozzle", "Voron Trident 250 0.25 nozzle", + "Voron Trident 250 0.5 nozzle", "Voron Trident 250 0.6 nozzle", "Voron Trident 250 0.8 nozzle", "Voron Trident 250 1.0 nozzle", @@ -75,6 +79,7 @@ "Voron Trident 300 0.15 nozzle", "Voron Trident 300 0.2 nozzle", "Voron Trident 300 0.25 nozzle", + "Voron Trident 300 0.5 nozzle", "Voron Trident 300 0.6 nozzle", "Voron Trident 300 0.8 nozzle", "Voron Trident 300 1.0 nozzle", @@ -82,6 +87,7 @@ "Voron Trident 350 0.15 nozzle", "Voron Trident 350 0.2 nozzle", "Voron Trident 350 0.25 nozzle", + "Voron Trident 350 0.5 nozzle", "Voron Trident 350 0.6 nozzle", "Voron Trident 350 0.8 nozzle", "Voron Trident 350 1.0 nozzle", @@ -89,6 +95,7 @@ "Voron 0.1 0.15 nozzle", "Voron 0.1 0.2 nozzle", "Voron 0.1 0.25 nozzle", + "Voron 0.1 0.5 nozzle", "Voron 0.1 0.6 nozzle", "Voron 0.1 0.8 nozzle", "Voron 0.1 1.0 nozzle", @@ -96,6 +103,7 @@ "Voron Switchwire 250 0.15 nozzle", "Voron Switchwire 250 0.2 nozzle", "Voron Switchwire 250 0.25 nozzle", + "Voron Switchwire 250 0.5 nozzle", "Voron Switchwire 250 0.6 nozzle", "Voron Switchwire 250 0.8 nozzle", "Voron Switchwire 250 1.0 nozzle" diff --git a/resources/profiles/Voron/filament/Voron Generic PLA-CF.json b/resources/profiles/Voron/filament/Voron Generic PLA-CF.json index 9de164685b..904e232753 100644 --- a/resources/profiles/Voron/filament/Voron Generic PLA-CF.json +++ b/resources/profiles/Voron/filament/Voron Generic PLA-CF.json @@ -23,6 +23,7 @@ "Voron 2.4 250 0.15 nozzle", "Voron 2.4 250 0.2 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.8 nozzle", "Voron 2.4 250 1.0 nozzle", @@ -30,6 +31,7 @@ "Voron 2.4 300 0.15 nozzle", "Voron 2.4 300 0.2 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.8 nozzle", "Voron 2.4 300 1.0 nozzle", @@ -37,6 +39,7 @@ "Voron 2.4 350 0.15 nozzle", "Voron 2.4 350 0.2 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.8 nozzle", "Voron 2.4 350 1.0 nozzle", @@ -44,6 +47,7 @@ "Voron Trident 250 0.15 nozzle", "Voron Trident 250 0.2 nozzle", "Voron Trident 250 0.25 nozzle", + "Voron Trident 250 0.5 nozzle", "Voron Trident 250 0.6 nozzle", "Voron Trident 250 0.8 nozzle", "Voron Trident 250 1.0 nozzle", @@ -51,6 +55,7 @@ "Voron Trident 300 0.15 nozzle", "Voron Trident 300 0.2 nozzle", "Voron Trident 300 0.25 nozzle", + "Voron Trident 300 0.5 nozzle", "Voron Trident 300 0.6 nozzle", "Voron Trident 300 0.8 nozzle", "Voron Trident 300 1.0 nozzle", @@ -58,6 +63,7 @@ "Voron Trident 350 0.15 nozzle", "Voron Trident 350 0.2 nozzle", "Voron Trident 350 0.25 nozzle", + "Voron Trident 350 0.5 nozzle", "Voron Trident 350 0.6 nozzle", "Voron Trident 350 0.8 nozzle", "Voron Trident 350 1.0 nozzle", @@ -65,6 +71,7 @@ "Voron 0.1 0.15 nozzle", "Voron 0.1 0.2 nozzle", "Voron 0.1 0.25 nozzle", + "Voron 0.1 0.5 nozzle", "Voron 0.1 0.6 nozzle", "Voron 0.1 0.8 nozzle", "Voron 0.1 1.0 nozzle", @@ -72,6 +79,7 @@ "Voron Switchwire 250 0.15 nozzle", "Voron Switchwire 250 0.2 nozzle", "Voron Switchwire 250 0.25 nozzle", + "Voron Switchwire 250 0.5 nozzle", "Voron Switchwire 250 0.6 nozzle", "Voron Switchwire 250 0.8 nozzle", "Voron Switchwire 250 1.0 nozzle" diff --git a/resources/profiles/Voron/filament/Voron Generic PLA.json b/resources/profiles/Voron/filament/Voron Generic PLA.json index 699970bf68..1147466761 100644 --- a/resources/profiles/Voron/filament/Voron Generic PLA.json +++ b/resources/profiles/Voron/filament/Voron Generic PLA.json @@ -20,6 +20,7 @@ "Voron 2.4 250 0.15 nozzle", "Voron 2.4 250 0.2 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.8 nozzle", "Voron 2.4 250 1.0 nozzle", @@ -27,6 +28,7 @@ "Voron 2.4 300 0.15 nozzle", "Voron 2.4 300 0.2 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.8 nozzle", "Voron 2.4 300 1.0 nozzle", @@ -34,6 +36,7 @@ "Voron 2.4 350 0.15 nozzle", "Voron 2.4 350 0.2 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.8 nozzle", "Voron 2.4 350 1.0 nozzle", @@ -41,6 +44,7 @@ "Voron Trident 250 0.15 nozzle", "Voron Trident 250 0.2 nozzle", "Voron Trident 250 0.25 nozzle", + "Voron Trident 250 0.5 nozzle", "Voron Trident 250 0.6 nozzle", "Voron Trident 250 0.8 nozzle", "Voron Trident 250 1.0 nozzle", @@ -48,6 +52,7 @@ "Voron Trident 300 0.15 nozzle", "Voron Trident 300 0.2 nozzle", "Voron Trident 300 0.25 nozzle", + "Voron Trident 300 0.5 nozzle", "Voron Trident 300 0.6 nozzle", "Voron Trident 300 0.8 nozzle", "Voron Trident 300 1.0 nozzle", @@ -55,6 +60,7 @@ "Voron Trident 350 0.15 nozzle", "Voron Trident 350 0.2 nozzle", "Voron Trident 350 0.25 nozzle", + "Voron Trident 350 0.5 nozzle", "Voron Trident 350 0.6 nozzle", "Voron Trident 350 0.8 nozzle", "Voron Trident 350 1.0 nozzle", @@ -62,6 +68,7 @@ "Voron 0.1 0.15 nozzle", "Voron 0.1 0.2 nozzle", "Voron 0.1 0.25 nozzle", + "Voron 0.1 0.5 nozzle", "Voron 0.1 0.6 nozzle", "Voron 0.1 0.8 nozzle", "Voron 0.1 1.0 nozzle", @@ -69,6 +76,7 @@ "Voron Switchwire 250 0.15 nozzle", "Voron Switchwire 250 0.2 nozzle", "Voron Switchwire 250 0.25 nozzle", + "Voron Switchwire 250 0.5 nozzle", "Voron Switchwire 250 0.6 nozzle", "Voron Switchwire 250 0.8 nozzle", "Voron Switchwire 250 1.0 nozzle" diff --git a/resources/profiles/Voron/filament/Voron Generic PVA.json b/resources/profiles/Voron/filament/Voron Generic PVA.json index 631be1e27a..75cb3f3b22 100644 --- a/resources/profiles/Voron/filament/Voron Generic PVA.json +++ b/resources/profiles/Voron/filament/Voron Generic PVA.json @@ -23,6 +23,7 @@ "Voron 2.4 250 0.15 nozzle", "Voron 2.4 250 0.2 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.8 nozzle", "Voron 2.4 250 1.0 nozzle", @@ -30,6 +31,7 @@ "Voron 2.4 300 0.15 nozzle", "Voron 2.4 300 0.2 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.8 nozzle", "Voron 2.4 300 1.0 nozzle", @@ -37,6 +39,7 @@ "Voron 2.4 350 0.15 nozzle", "Voron 2.4 350 0.2 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.8 nozzle", "Voron 2.4 350 1.0 nozzle", @@ -44,6 +47,7 @@ "Voron Trident 250 0.15 nozzle", "Voron Trident 250 0.2 nozzle", "Voron Trident 250 0.25 nozzle", + "Voron Trident 250 0.5 nozzle", "Voron Trident 250 0.6 nozzle", "Voron Trident 250 0.8 nozzle", "Voron Trident 250 1.0 nozzle", @@ -51,6 +55,7 @@ "Voron Trident 300 0.15 nozzle", "Voron Trident 300 0.2 nozzle", "Voron Trident 300 0.25 nozzle", + "Voron Trident 300 0.5 nozzle", "Voron Trident 300 0.6 nozzle", "Voron Trident 300 0.8 nozzle", "Voron Trident 300 1.0 nozzle", @@ -58,6 +63,7 @@ "Voron Trident 350 0.15 nozzle", "Voron Trident 350 0.2 nozzle", "Voron Trident 350 0.25 nozzle", + "Voron Trident 350 0.5 nozzle", "Voron Trident 350 0.6 nozzle", "Voron Trident 350 0.8 nozzle", "Voron Trident 350 1.0 nozzle", @@ -65,6 +71,7 @@ "Voron 0.1 0.15 nozzle", "Voron 0.1 0.2 nozzle", "Voron 0.1 0.25 nozzle", + "Voron 0.1 0.5 nozzle", "Voron 0.1 0.6 nozzle", "Voron 0.1 0.8 nozzle", "Voron 0.1 1.0 nozzle", @@ -72,6 +79,7 @@ "Voron Switchwire 250 0.15 nozzle", "Voron Switchwire 250 0.2 nozzle", "Voron Switchwire 250 0.25 nozzle", + "Voron Switchwire 250 0.5 nozzle", "Voron Switchwire 250 0.6 nozzle", "Voron Switchwire 250 0.8 nozzle", "Voron Switchwire 250 1.0 nozzle" diff --git a/resources/profiles/Voron/filament/Voron Generic TPU.json b/resources/profiles/Voron/filament/Voron Generic TPU.json index 891156cf1d..00ea690e72 100644 --- a/resources/profiles/Voron/filament/Voron Generic TPU.json +++ b/resources/profiles/Voron/filament/Voron Generic TPU.json @@ -14,6 +14,7 @@ "Voron 2.4 250 0.15 nozzle", "Voron 2.4 250 0.2 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.8 nozzle", "Voron 2.4 250 1.0 nozzle", @@ -21,6 +22,7 @@ "Voron 2.4 300 0.15 nozzle", "Voron 2.4 300 0.2 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.8 nozzle", "Voron 2.4 300 1.0 nozzle", @@ -28,6 +30,7 @@ "Voron 2.4 350 0.15 nozzle", "Voron 2.4 350 0.2 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.8 nozzle", "Voron 2.4 350 1.0 nozzle", @@ -35,6 +38,7 @@ "Voron Trident 250 0.15 nozzle", "Voron Trident 250 0.2 nozzle", "Voron Trident 250 0.25 nozzle", + "Voron Trident 250 0.5 nozzle", "Voron Trident 250 0.6 nozzle", "Voron Trident 250 0.8 nozzle", "Voron Trident 250 1.0 nozzle", @@ -42,6 +46,7 @@ "Voron Trident 300 0.15 nozzle", "Voron Trident 300 0.2 nozzle", "Voron Trident 300 0.25 nozzle", + "Voron Trident 300 0.5 nozzle", "Voron Trident 300 0.6 nozzle", "Voron Trident 300 0.8 nozzle", "Voron Trident 300 1.0 nozzle", @@ -49,6 +54,7 @@ "Voron Trident 350 0.15 nozzle", "Voron Trident 350 0.2 nozzle", "Voron Trident 350 0.25 nozzle", + "Voron Trident 350 0.5 nozzle", "Voron Trident 350 0.6 nozzle", "Voron Trident 350 0.8 nozzle", "Voron Trident 350 1.0 nozzle", @@ -56,6 +62,7 @@ "Voron 0.1 0.15 nozzle", "Voron 0.1 0.2 nozzle", "Voron 0.1 0.25 nozzle", + "Voron 0.1 0.5 nozzle", "Voron 0.1 0.6 nozzle", "Voron 0.1 0.8 nozzle", "Voron 0.1 1.0 nozzle", @@ -63,6 +70,7 @@ "Voron Switchwire 250 0.15 nozzle", "Voron Switchwire 250 0.2 nozzle", "Voron Switchwire 250 0.25 nozzle", + "Voron Switchwire 250 0.5 nozzle", "Voron Switchwire 250 0.6 nozzle", "Voron Switchwire 250 0.8 nozzle", "Voron Switchwire 250 1.0 nozzle" diff --git a/resources/profiles/Voron/machine/Voron 0.1 0.5 nozzle.json b/resources/profiles/Voron/machine/Voron 0.1 0.5 nozzle.json new file mode 100644 index 0000000000..7efe30a3c8 --- /dev/null +++ b/resources/profiles/Voron/machine/Voron 0.1 0.5 nozzle.json @@ -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" +} diff --git a/resources/profiles/Voron/machine/Voron 0.1.json b/resources/profiles/Voron/machine/Voron 0.1.json index d520c09d23..a773f78eda 100644 --- a/resources/profiles/Voron/machine/Voron 0.1.json +++ b/resources/profiles/Voron/machine/Voron 0.1.json @@ -2,7 +2,7 @@ "type": "machine_model", "name": "Voron 0.1", "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", "family": "VoronDesign", "bed_model": "Voron_120_build_plate.stl", diff --git a/resources/profiles/Voron/machine/Voron 2.4 250 0.5 nozzle.json b/resources/profiles/Voron/machine/Voron 2.4 250 0.5 nozzle.json new file mode 100644 index 0000000000..af60cbe29d --- /dev/null +++ b/resources/profiles/Voron/machine/Voron 2.4 250 0.5 nozzle.json @@ -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" +} diff --git a/resources/profiles/Voron/machine/Voron 2.4 250.json b/resources/profiles/Voron/machine/Voron 2.4 250.json index a0936a3a8f..b032e4e779 100644 --- a/resources/profiles/Voron/machine/Voron 2.4 250.json +++ b/resources/profiles/Voron/machine/Voron 2.4 250.json @@ -2,7 +2,7 @@ "type": "machine_model", "name": "Voron 2.4 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", "family": "VoronDesign", "bed_model": "Voron_250_build_plate.stl", diff --git a/resources/profiles/Voron/machine/Voron 2.4 300 0.5 nozzle.json b/resources/profiles/Voron/machine/Voron 2.4 300 0.5 nozzle.json new file mode 100644 index 0000000000..52fb046b56 --- /dev/null +++ b/resources/profiles/Voron/machine/Voron 2.4 300 0.5 nozzle.json @@ -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" +} diff --git a/resources/profiles/Voron/machine/Voron 2.4 300.json b/resources/profiles/Voron/machine/Voron 2.4 300.json index 5291f7a2ff..094357baa4 100644 --- a/resources/profiles/Voron/machine/Voron 2.4 300.json +++ b/resources/profiles/Voron/machine/Voron 2.4 300.json @@ -2,7 +2,7 @@ "type": "machine_model", "name": "Voron 2.4 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", "family": "VoronDesign", "bed_model": "Voron_300_build_plate.stl", diff --git a/resources/profiles/Voron/machine/Voron 2.4 350 0.5 nozzle.json b/resources/profiles/Voron/machine/Voron 2.4 350 0.5 nozzle.json new file mode 100644 index 0000000000..856008d6b2 --- /dev/null +++ b/resources/profiles/Voron/machine/Voron 2.4 350 0.5 nozzle.json @@ -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" +} diff --git a/resources/profiles/Voron/machine/Voron 2.4 350.json b/resources/profiles/Voron/machine/Voron 2.4 350.json index ae772b063d..785831a3a1 100644 --- a/resources/profiles/Voron/machine/Voron 2.4 350.json +++ b/resources/profiles/Voron/machine/Voron 2.4 350.json @@ -2,7 +2,7 @@ "type": "machine_model", "name": "Voron 2.4 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", "family": "VoronDesign", "bed_model": "Voron_350_build_plate.stl", diff --git a/resources/profiles/Voron/machine/Voron Switchwire 250 0.5 nozzle.json b/resources/profiles/Voron/machine/Voron Switchwire 250 0.5 nozzle.json new file mode 100644 index 0000000000..5b8044a8db --- /dev/null +++ b/resources/profiles/Voron/machine/Voron Switchwire 250 0.5 nozzle.json @@ -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" +} diff --git a/resources/profiles/Voron/machine/Voron Switchwire 250.json b/resources/profiles/Voron/machine/Voron Switchwire 250.json index 6a3e3de7cc..9955eaa057 100644 --- a/resources/profiles/Voron/machine/Voron Switchwire 250.json +++ b/resources/profiles/Voron/machine/Voron Switchwire 250.json @@ -2,7 +2,7 @@ "type": "machine_model", "name": "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", "family": "VoronDesign", "bed_model": "", diff --git a/resources/profiles/Voron/machine/Voron Trident 250 0.5 nozzle.json b/resources/profiles/Voron/machine/Voron Trident 250 0.5 nozzle.json new file mode 100644 index 0000000000..f7c94d5454 --- /dev/null +++ b/resources/profiles/Voron/machine/Voron Trident 250 0.5 nozzle.json @@ -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" +} diff --git a/resources/profiles/Voron/machine/Voron Trident 250.json b/resources/profiles/Voron/machine/Voron Trident 250.json index d3fe9e5b23..614aa804e2 100644 --- a/resources/profiles/Voron/machine/Voron Trident 250.json +++ b/resources/profiles/Voron/machine/Voron Trident 250.json @@ -2,7 +2,7 @@ "type": "machine_model", "name": "Voron 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", "family": "VoronDesign", "bed_model": "Voron_250_build_plate.stl", diff --git a/resources/profiles/Voron/machine/Voron Trident 300 0.5 nozzle.json b/resources/profiles/Voron/machine/Voron Trident 300 0.5 nozzle.json new file mode 100644 index 0000000000..b1e47991f0 --- /dev/null +++ b/resources/profiles/Voron/machine/Voron Trident 300 0.5 nozzle.json @@ -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" +} diff --git a/resources/profiles/Voron/machine/Voron Trident 300.json b/resources/profiles/Voron/machine/Voron Trident 300.json index 05bb448a2a..9f5ca659ea 100644 --- a/resources/profiles/Voron/machine/Voron Trident 300.json +++ b/resources/profiles/Voron/machine/Voron Trident 300.json @@ -2,7 +2,7 @@ "type": "machine_model", "name": "Voron 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", "family": "VoronDesign", "bed_model": "Voron_300_build_plate.stl", diff --git a/resources/profiles/Voron/machine/Voron Trident 350 0.5 nozzle.json b/resources/profiles/Voron/machine/Voron Trident 350 0.5 nozzle.json new file mode 100644 index 0000000000..ef3fcbacd6 --- /dev/null +++ b/resources/profiles/Voron/machine/Voron Trident 350 0.5 nozzle.json @@ -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" +} diff --git a/resources/profiles/Voron/machine/Voron Trident 350.json b/resources/profiles/Voron/machine/Voron Trident 350.json index 850c49bb97..7be86f5435 100644 --- a/resources/profiles/Voron/machine/Voron Trident 350.json +++ b/resources/profiles/Voron/machine/Voron Trident 350.json @@ -2,7 +2,7 @@ "type": "machine_model", "name": "Voron 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", "family": "VoronDesign", "bed_model": "Voron_350_build_plate.stl", diff --git a/resources/profiles/Voron/process/0.10mm Extra Fine 0.5 nozzle @Voron.json b/resources/profiles/Voron/process/0.10mm Extra Fine 0.5 nozzle @Voron.json new file mode 100644 index 0000000000..f55a77fbc4 --- /dev/null +++ b/resources/profiles/Voron/process/0.10mm Extra Fine 0.5 nozzle @Voron.json @@ -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" +} diff --git a/resources/profiles/Voron/process/0.15mm Fine 0.5 nozzle @Voron.json b/resources/profiles/Voron/process/0.15mm Fine 0.5 nozzle @Voron.json new file mode 100644 index 0000000000..13c74e2724 --- /dev/null +++ b/resources/profiles/Voron/process/0.15mm Fine 0.5 nozzle @Voron.json @@ -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" +} diff --git a/resources/profiles/Voron/process/0.20mm Optimal 0.5 nozzle @Voron.json b/resources/profiles/Voron/process/0.20mm Optimal 0.5 nozzle @Voron.json new file mode 100644 index 0000000000..dd602f1201 --- /dev/null +++ b/resources/profiles/Voron/process/0.20mm Optimal 0.5 nozzle @Voron.json @@ -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" +} diff --git a/resources/profiles/Voron/process/0.25mm Standard 0.5 nozzle @Voron.json b/resources/profiles/Voron/process/0.25mm Standard 0.5 nozzle @Voron.json new file mode 100644 index 0000000000..9dc9a48ef2 --- /dev/null +++ b/resources/profiles/Voron/process/0.25mm Standard 0.5 nozzle @Voron.json @@ -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" +} diff --git a/resources/profiles/Voron/process/0.30mm Draft 0.5 nozzle @Voron.json b/resources/profiles/Voron/process/0.30mm Draft 0.5 nozzle @Voron.json new file mode 100644 index 0000000000..5e56b9e023 --- /dev/null +++ b/resources/profiles/Voron/process/0.30mm Draft 0.5 nozzle @Voron.json @@ -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" +} diff --git a/resources/profiles/Voron/process/0.35mm Extra Draft 0.5 nozzle @Voron.json b/resources/profiles/Voron/process/0.35mm Extra Draft 0.5 nozzle @Voron.json new file mode 100644 index 0000000000..4e21043a99 --- /dev/null +++ b/resources/profiles/Voron/process/0.35mm Extra Draft 0.5 nozzle @Voron.json @@ -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" +} diff --git a/resources/profiles/Voron/process/fdm_process_voron_common_0_5.json b/resources/profiles/Voron/process/fdm_process_voron_common_0_5.json new file mode 100644 index 0000000000..57f5b7dc86 --- /dev/null +++ b/resources/profiles/Voron/process/fdm_process_voron_common_0_5.json @@ -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" + ] +} diff --git a/resources/web/guide/21/21.js b/resources/web/guide/21/21.js index 131420dbdd..d7a4d640dc 100644 --- a/resources/web/guide/21/21.js +++ b/resources/web/guide/21/21.js @@ -303,12 +303,18 @@ function FilterModelList(keyword) { function SelectPrinterAll( sVendor ) { $("input[vendor='"+sVendor+"']").prop("checked", true); + $("input[vendor='"+sVendor+"']").each(function() { + CheckBoxOnclick(this); + }); } function SelectPrinterNone( sVendor ) { $("input[vendor='"+sVendor+"']").prop("checked", false); + $("input[vendor='"+sVendor+"']").each(function() { + CheckBoxOnclick(this); + }); } diff --git a/resources/web/guide/24/24.js b/resources/web/guide/24/24.js index bc3e33820d..611020f704 100644 --- a/resources/web/guide/24/24.js +++ b/resources/web/guide/24/24.js @@ -303,12 +303,18 @@ function FilterModelList(keyword) { function SelectPrinterAll( sVendor ) { $("input[vendor='"+sVendor+"']").prop("checked", true); + $("input[vendor='"+sVendor+"']").each(function() { + CheckBoxOnclick(this); + }); } function SelectPrinterNone( sVendor ) { $("input[vendor='"+sVendor+"']").prop("checked", false); + $("input[vendor='"+sVendor+"']").each(function() { + CheckBoxOnclick(this); + }); } function OnExitFilter() { diff --git a/src/libslic3r/GCode.cpp b/src/libslic3r/GCode.cpp index c9a2ef2549..f6c11632aa 100644 --- a/src/libslic3r/GCode.cpp +++ b/src/libslic3r/GCode.cpp @@ -1898,36 +1898,42 @@ void GCode::_do_export(Print& print, GCodeOutputStream &file, ThumbnailsGenerato if (!print.config().small_area_infill_flow_compensation_model.empty()) m_small_area_infill_flow_compensator = make_unique(print.config()); - - file.write_format("; HEADER_BLOCK_START\n"); - // Write information on the generator. - 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) - file.write_format(";%s\n", GCodeProcessor::reserved_tag(GCodeProcessor::ETags::Estimated_Printing_Time_Placeholder).c_str()); - //BBS: total layer number - file.write_format(";%s\n", GCodeProcessor::reserved_tag(GCodeProcessor::ETags::Total_Layer_Number_Placeholder).c_str()); - m_enable_exclude_object = config().exclude_object; - //Orca: extra check for bbl printer - if (is_bbl_printers) { - if (print.calib_params().mode == CalibMode::Calib_None) { // Don't support skipping in cali mode - // list all label_object_id with sorted order here - m_enable_exclude_object = true; - m_label_objects_ids.clear(); - m_label_objects_ids.reserve(print.num_object_instances()); - for (const PrintObject *print_object : print.objects()) - for (const PrintInstance &print_instance : print_object->instances()) - m_label_objects_ids.push_back(print_instance.model_instance->get_labeled_id()); - - std::sort(m_label_objects_ids.begin(), m_label_objects_ids.end()); - - 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(); - } + // Orca: Don't output Header block if BTT thumbnail is identified in the list + // Get the thumbnails value as a string + std::string thumbnails_value = print.config().option("thumbnails")->value; + // search string for the BTT_TFT label + bool has_BTT_thumbnail = (thumbnails_value.find("BTT_TFT") != std::string::npos); + + if(!has_BTT_thumbnail){ + file.write_format("; HEADER_BLOCK_START\n"); + // Write information on the generator. + 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) + file.write_format(";%s\n", GCodeProcessor::reserved_tag(GCodeProcessor::ETags::Estimated_Printing_Time_Placeholder).c_str()); + //BBS: total layer number + file.write_format(";%s\n", GCodeProcessor::reserved_tag(GCodeProcessor::ETags::Total_Layer_Number_Placeholder).c_str()); + m_enable_exclude_object = config().exclude_object; + //Orca: extra check for bbl printer + if (is_bbl_printers) { + if (print.calib_params().mode == CalibMode::Calib_None) { // Don't support skipping in cali mode + // list all label_object_id with sorted order here + m_enable_exclude_object = true; + m_label_objects_ids.clear(); + m_label_objects_ids.reserve(print.num_object_instances()); + for (const PrintObject *print_object : print.objects()) + for (const PrintInstance &print_instance : print_object->instances()) + m_label_objects_ids.push_back(print_instance.model_instance->get_labeled_id()); + + std::sort(m_label_objects_ids.begin(), m_label_objects_ids.end()); + + 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"); - + } // BBS: write global config at the beginning of gcode file because printer // need these config information diff --git a/src/libslic3r/PresetBundle.cpp b/src/libslic3r/PresetBundle.cpp index 92a8069e6e..ae18f5f810 100644 --- a/src/libslic3r/PresetBundle.cpp +++ b/src/libslic3r/PresetBundle.cpp @@ -1851,6 +1851,26 @@ void PresetBundle::export_selections(AppConfig &config) } // BBS +void PresetBundle::set_num_filaments(unsigned int n, std::vector 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("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) { int old_filament_count = this->filament_presets.size(); diff --git a/src/libslic3r/PresetBundle.hpp b/src/libslic3r/PresetBundle.hpp index 976e654074..2937937920 100644 --- a/src/libslic3r/PresetBundle.hpp +++ b/src/libslic3r/PresetBundle.hpp @@ -111,6 +111,7 @@ public: void export_selections(AppConfig &config); // BBS + void set_num_filaments(unsigned int n, std::vector new_colors); void set_num_filaments(unsigned int n, std::string new_col = ""); unsigned int sync_ams_list(unsigned int & unknowns); //BBS: check whether this is the only edited filament diff --git a/src/libslic3r/ShortestPath.cpp b/src/libslic3r/ShortestPath.cpp index a2a2680f52..3aa99e2b76 100644 --- a/src/libslic3r/ShortestPath.cpp +++ b/src/libslic3r/ShortestPath.cpp @@ -1910,14 +1910,15 @@ static inline void improve_ordering_by_two_exchanges_with_segment_flipping(Polyl for (const FlipEdge &edge : edges) { Polyline &pl = polylines[edge.source_index]; out.emplace_back(std::move(pl)); - if (edge.p2 == pl.first_point().cast()) { + if (edge.p2 == out.back().first_point().cast()) { // Polyline is flipped. out.back().reverse(); } else { // Polyline is not flipped. - assert(edge.p1 == pl.first_point().cast()); + assert(edge.p1 == out.back().first_point().cast()); } } + polylines = out; #ifndef NDEBUG double cost_final = cost(); diff --git a/src/slic3r/GUI/3DScene.cpp b/src/slic3r/GUI/3DScene.cpp index 89a922c343..9070887052 100644 --- a/src/slic3r/GUI/3DScene.cpp +++ b/src/slic3r/GUI/3DScene.cpp @@ -675,12 +675,13 @@ std::vector GLVolumeCollection::load_object( int obj_idx, const std::vector &instance_idxs, const std::string &color_by, - bool opengl_initialized) + bool opengl_initialized, + bool need_raycaster) { std::vector volumes_idx; for (int volume_idx = 0; volume_idx < int(model_object->volumes.size()); ++volume_idx) 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; } @@ -693,7 +694,8 @@ int GLVolumeCollection::load_object_volume( const std::string &color_by, bool opengl_initialized, 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 int extruder_id = model_volume->extruder_id(); @@ -711,7 +713,7 @@ int GLVolumeCollection::load_object_volume( v.model.init_from(mesh, true); #else v.model.init_from(*mesh); - v.mesh_raycaster = std::make_unique(mesh); + if (need_raycaster) { v.mesh_raycaster = std::make_unique(mesh); } #endif // ENABLE_SMOOTH_NORMALS v.composite_id = GLVolume::CompositeID(obj_idx, volume_idx, instance_idx); diff --git a/src/slic3r/GUI/3DScene.hpp b/src/slic3r/GUI/3DScene.hpp index cd89efa36a..8e39c0febd 100644 --- a/src/slic3r/GUI/3DScene.hpp +++ b/src/slic3r/GUI/3DScene.hpp @@ -439,7 +439,8 @@ public: int obj_idx, const std::vector &instance_idxs, const std::string &color_by, - bool opengl_initialized); + bool opengl_initialized, + bool need_raycaster = true); int load_object_volume( const ModelObject *model_object, @@ -449,7 +450,8 @@ public: const std::string &color_by, bool opengl_initialized, 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). void load_object_auxiliary( const SLAPrintObject *print_object, diff --git a/src/slic3r/GUI/GCodeViewer.cpp b/src/slic3r/GUI/GCodeViewer.cpp index 4fd50ad189..00b9685861 100644 --- a/src/slic3r/GUI/GCodeViewer.cpp +++ b/src/slic3r/GUI/GCodeViewer.cpp @@ -3123,7 +3123,7 @@ void GCodeViewer::load_shells(const Print& print, bool initialized, bool force_p instance_ids.resize(instance_index); 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 const SlicingParameters& slicing_parameters = obj->slicing_parameters(); diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index 4415118af5..72eed3e7c1 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -4280,7 +4280,6 @@ void GUI_App::check_new_version_sf(bool show_tips, int by_user) best_pre = tag_version; best_pre_url = root.get("html_url"); best_pre_content = root.get("body"); - best_pre.set_prerelease("Preview"); } } else { 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_url = json_version.second.get("html_url"); best_pre_content = json_version.second.get("body"); - best_pre.set_prerelease("Preview"); } } else { 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; 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; 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); }; - if (dlg.discard()) + if (dlg.discard() || no_need_change) reset_modifications(); else // save selected changes { diff --git a/src/slic3r/GUI/Mouse3DController.cpp b/src/slic3r/GUI/Mouse3DController.cpp index 9ee6342ae4..2282559369 100644 --- a/src/slic3r/GUI/Mouse3DController.cpp +++ b/src/slic3r/GUI/Mouse3DController.cpp @@ -29,7 +29,7 @@ static const std::vector _3DCONNEXION_VENDORS = 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 _3DCONNEXION_DEVICES = { 0xc603, /* 50691 spacemouse plus XT */ @@ -43,6 +43,7 @@ static const std::vector _3DCONNEXION_DEVICES = 0xc628, /* 50728 space navigator for notebooks*/ 0xc629, /* 50729 space pilot pro*/ 0xc62b, /* 50731 space mouse pro*/ + 0xc640, /* 50752 nulooq */ 0xc62e, /* 50734 spacemouse wireless (USB cable) *TESTED* */ 0xc62f, /* 50735 spacemouse wireless receiver */ 0xc631, /* 50737 spacemouse pro wireless *TESTED* */ @@ -50,7 +51,7 @@ static const std::vector _3DCONNEXION_DEVICES = 0xc633, /* 50739 spacemouse enterprise */ 0xc635, /* 50741 spacemouse compact *TESTED* */ 0xc636, /* 50742 spacemouse module */ - 0xc640, /* 50752 nulooq */ + 0xc63a, /* 60060 spacemouse wireless (Bluetooth) */ 0xc652, /* 50770 3Dconnexion universal receiver *TESTED* */ }; diff --git a/src/slic3r/GUI/ReleaseNote.cpp b/src/slic3r/GUI/ReleaseNote.cpp index 617397f32f..331711a823 100644 --- a/src/slic3r/GUI/ReleaseNote.cpp +++ b/src/slic3r/GUI/ReleaseNote.cpp @@ -502,21 +502,20 @@ std::vector UpdateVersionDialog::splitWithStl(std::string str,std:: void UpdateVersionDialog::update_version_info(wxString release_note, wxString version) { //bbs check whether the web display is used - bool use_web_link = false; - url_line = ""; - auto split_array = splitWithStl(release_note.ToStdString(), "###"); - - if (split_array.size() >= 3) { - for (auto i = 0; i < split_array.size(); i++) { - std::string url = split_array[i]; - if (std::strstr(url.c_str(), "http://") != NULL || std::strstr(url.c_str(), "https://") != NULL) { - use_web_link = true; - url_line = url; - break; - } - } - } - + bool use_web_link = false; + url_line = ""; + // Orca: not used in Orca Slicer + // auto split_array = splitWithStl(release_note.ToStdString(), "###"); + // if (split_array.size() >= 3) { + // for (auto i = 0; i < split_array.size(); i++) { + // std::string url = split_array[i]; + // if (std::strstr(url.c_str(), "http://") != NULL || std::strstr(url.c_str(), "https://") != NULL) { + // use_web_link = true; + // url_line = url; + // break; + // } + // } + // } if (use_web_link) { m_brand->Hide(); diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index 8d5cbf1c7e..05b741bcb5 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -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 if (opt_key == "extruders_count" && !m_config->opt_bool("single_extruder_multi_material")){ auto num_extruder = boost::any_cast(value); - wxGetApp().preset_bundle->set_num_filaments(num_extruder); + int old_filament_size = wxGetApp().preset_bundle->filament_presets.size(); + std::vector 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().get_tab(Preset::TYPE_PRINT)->update(); wxGetApp().preset_bundle->export_selections(*wxGetApp().app_config); diff --git a/src/slic3r/GUI/UnsavedChangesDialog.hpp b/src/slic3r/GUI/UnsavedChangesDialog.hpp index f91fa844f4..c6dbd20505 100644 --- a/src/slic3r/GUI/UnsavedChangesDialog.hpp +++ b/src/slic3r/GUI/UnsavedChangesDialog.hpp @@ -312,6 +312,8 @@ public: { } }; +public: + int getUpdateItemCount() { return m_presetitems.size(); } private: std::vector m_presetitems;