diff --git a/.github/workflows/build_all.yml b/.github/workflows/build_all.yml index 96027da392..ea72150189 100644 --- a/.github/workflows/build_all.yml +++ b/.github/workflows/build_all.yml @@ -30,6 +30,9 @@ on: - 'build_release_macos.sh' - 'scripts/flatpak/**' + schedule: + - cron: '35 7 * * *' # run once a day near midnight US Pacific time + workflow_dispatch: # allows for manual dispatch inputs: build-deps-only: @@ -60,6 +63,7 @@ jobs: os: ${{ matrix.os }} arch: ${{ matrix.arch }} build-deps-only: ${{ inputs.build-deps-only || false }} + force-build: ${{ github.event_name == 'schedule' }} secrets: inherit flatpak: name: "Flatpak" diff --git a/.github/workflows/build_check_cache.yml b/.github/workflows/build_check_cache.yml index 9bdcd43877..c262eeeadb 100644 --- a/.github/workflows/build_check_cache.yml +++ b/.github/workflows/build_check_cache.yml @@ -12,6 +12,9 @@ on: build-deps-only: required: false type: boolean + force-build: + required: false + type: boolean jobs: check_cache: # determines if there is a cache and outputs variables used in caching process @@ -56,4 +59,5 @@ jobs: os: ${{ inputs.os }} arch: ${{ inputs.arch }} build-deps-only: ${{ inputs.build-deps-only }} + force-build: ${{ inputs.force-build }} secrets: inherit diff --git a/.github/workflows/build_deps.yml b/.github/workflows/build_deps.yml index 5e430bc85f..629fdde2e7 100644 --- a/.github/workflows/build_deps.yml +++ b/.github/workflows/build_deps.yml @@ -19,11 +19,14 @@ on: build-deps-only: required: false type: boolean + force-build: + required: false + type: boolean jobs: build_deps: name: Build Deps - if: inputs.build-deps-only || inputs.valid-cache != true + if: inputs.build-deps-only || inputs.force-build || inputs.valid-cache != true runs-on: ${{ inputs.os }} env: date: @@ -139,7 +142,7 @@ jobs: build_orca: name: Build OrcaSlicer needs: [build_deps] - if: ${{ !cancelled() && !inputs.build-deps-only && (inputs.valid-cache == true && needs.build_deps.result == 'skipped') || (inputs.valid-cache != true && success()) }} + if: ${{ !cancelled() && !inputs.build-deps-only && inputs.force-build || (inputs.valid-cache == true && needs.build_deps.result == 'skipped') || (inputs.valid-cache != true && success()) }} uses: ./.github/workflows/build_orca.yml with: cache-key: ${{ inputs.cache-key }} diff --git a/doc/developer-reference/How-to-create-profiles.md b/doc/developer-reference/How-to-create-profiles.md index 7eeacc76af..cc368bdeba 100644 --- a/doc/developer-reference/How-to-create-profiles.md +++ b/doc/developer-reference/How-to-create-profiles.md @@ -133,6 +133,18 @@ The following sample JSON file shows how to create a new generic filament profil > [!NOTE] > If the filament is compatible with AMS, ensure that the `filament_id` value **does not exceed 8 characters** to maintain AMS compatibility. +> [!TIP] +> **Testing Profile Changes** +> +> When developing profiles, you may notice that changes aren't reflected in OrcaSlicer after editing profile files. This happens because OrcaSlicer caches profiles in the system folder. +> To force OrcaSlicer to load your updated profiles: +> 1. **Access the configuration folder**: Go to **Help** → **Show Configuration Folder** +> ![Help menu](https://github.com/SoftFever/OrcaSlicer/blob/main/doc/images/develop/go-to-configuration-folder.jpeg?raw=true) +> 2. **Clear the cache**: Delete the `system` folder to remove cached profiles +> ![Delete system folder](https://github.com/SoftFever/OrcaSlicer/blob/main/doc/images/develop/profile-delete-system-folder.jpeg?raw=true) +> 3. **Restart OrcaSlicer**: Launch the application to load your updated profiles +> This process forces OrcaSlicer to update its profile cache from the source files in the `resources/profiles/` directory. + ### Adding Filament Profiles to Printer Vendor Library In this section, we will discuss how to add a new filament profile for a certain vendor. diff --git a/doc/images/develop/go-to-configuration-folder.jpeg b/doc/images/develop/go-to-configuration-folder.jpeg new file mode 100644 index 0000000000..2fb48ca919 Binary files /dev/null and b/doc/images/develop/go-to-configuration-folder.jpeg differ diff --git a/doc/images/develop/profile-delete-system-folder.jpeg b/doc/images/develop/profile-delete-system-folder.jpeg new file mode 100644 index 0000000000..fc9a2a24d4 Binary files /dev/null and b/doc/images/develop/profile-delete-system-folder.jpeg differ diff --git a/localization/i18n/pt_BR/OrcaSlicer_pt_BR.po b/localization/i18n/pt_BR/OrcaSlicer_pt_BR.po index 2420723415..9fea5db9cc 100644 --- a/localization/i18n/pt_BR/OrcaSlicer_pt_BR.po +++ b/localization/i18n/pt_BR/OrcaSlicer_pt_BR.po @@ -53,7 +53,7 @@ msgid "Ctrl+" msgstr "Ctrl+" msgid "Alt+" -msgstr "" +msgstr "Alt+" msgid "Shift+" msgstr "Shift+" @@ -189,7 +189,7 @@ msgid "Height range" msgstr "Intervalo de altura" msgid "Enter" -msgstr "" +msgstr "Enter" msgid "Toggle Wireframe" msgstr "Alternar malha" @@ -727,7 +727,7 @@ msgid "Horizontal text" msgstr "Texto horizontal" msgid "Mouse move up or down" -msgstr "" +msgstr "Mover mouse para cima ou para baixo" msgid "Rotate text" msgstr "Rotacionar texto" @@ -1521,7 +1521,7 @@ msgstr "" "foram reconhecidos." msgid "Based on PrusaSlicer and BambuStudio" -msgstr "Baseado no PrusaSlicer e BambuStudio" +msgstr "Baseado no PrusaSlicer e Bambu Studio" msgid "" "OrcaSlicer will terminate because of running out of memory. It may be a bug. " @@ -1568,7 +1568,7 @@ msgid "" "features.\n" "Click Yes to install it now." msgstr "" -"Orca Slicer requer o tempo de execução Microsoft WebView2 para operar " +"O OrcaSlicer requer o Microsoft WebView2 Runtime para operar " "determinados recursos.\n" "Clique em Sim para instalá-lo agora." @@ -1598,7 +1598,7 @@ msgid "Click to download new version in default browser: %s" msgstr "Clique para baixar a nova versão no navegador padrão: %s" msgid "The Orca Slicer needs an upgrade" -msgstr "O Orca Slicer precisa ser atualizado" +msgstr "O OrcaSlicer precisa de uma atualização" msgid "This is the newest version." msgstr "Esta é a versão mais recente." @@ -1667,7 +1667,7 @@ msgid "" "The version of Orca Slicer is too low and needs to be updated to the latest " "version before it can be used normally." msgstr "" -"A versão do Orca Slicer é muito antiga e precisa ser atualizada para a " +"Esta versão do OrcaSlicer é muito antiga e precisa ser atualizada para a " "versão mais recente antes de poder ser usada normalmente." msgid "Privacy Policy Update" @@ -1734,7 +1734,7 @@ msgid "Rename" msgstr "Renomear" msgid "Orca Slicer GUI initialization failed" -msgstr "Falha na inicialização da interface do Orca Slicer" +msgstr "Falha na inicialização da interface do OrcaSlicer" #, boost-format msgid "Fatal error, exception caught: %1%" @@ -1840,13 +1840,13 @@ msgid "Show" msgstr "Mostrar" msgid "Del" -msgstr "Apagar" +msgstr "Del" msgid "Delete the selected object" msgstr "Apagar o objeto selecionado" msgid "Backspace" -msgstr "" +msgstr "Backspace" msgid "Load..." msgstr "Carregar…" @@ -2183,7 +2183,7 @@ msgstr[0] "%1$d aresta não-manifold" msgstr[1] "%1$d arestas não-manifold" msgid "Click the icon to repair model object" -msgstr "" +msgstr "Clique no ícone para consertar o objeto modelo" msgid "Right button click the icon to drop the object settings" msgstr "" @@ -2235,7 +2235,7 @@ msgstr "" "objetos selecionados." msgid "Remove paint-on fuzzy skin" -msgstr "" +msgstr "Remover textura difusa pintada" msgid "Delete connector from object which is a part of cut" msgstr "Excluir conector do objeto que é parte do corte" @@ -2353,13 +2353,13 @@ msgstr "Renomeando" msgid "Following model object has been repaired" msgid_plural "Following model objects have been repaired" -msgstr[0] "O seguinte objeto do modelo foi reparado" -msgstr[1] "Os seguintes objetos do modelo foram reparados" +msgstr[0] "O seguinte objeto modelo foi reparado" +msgstr[1] "Os seguintes objetos modelo foram reparados" msgid "Failed to repair following model object" msgid_plural "Failed to repair following model objects" -msgstr[0] "Falha ao reparar o seguinte objeto do modelo" -msgstr[1] "Falha ao reparar os seguintes objetos do modelo" +msgstr[0] "Falha ao reparar o seguinte objeto modelo" +msgstr[1] "Falha ao reparar os seguintes objetos modelo" msgid "Repairing was canceled" msgstr "A reparação foi cancelada" @@ -2904,13 +2904,13 @@ msgid "License" msgstr "Licença" msgid "Orca Slicer is licensed under " -msgstr "O Orca Slicer é licenciado sob " +msgstr "O OrcaSlicer é licenciado sob " msgid "GNU Affero General Public License, version 3" msgstr "Licença Pública Geral Affero GNU, versão 3" msgid "Orca Slicer is based on PrusaSlicer and BambuStudio" -msgstr "Orca Slicer é baseado no PrusaSlicer e BambuStudio" +msgstr "O OrcaSlicer é baseado no PrusaSlicer e Bambu Studio" msgid "Libraries" msgstr "Bibliotecas" @@ -2927,10 +2927,11 @@ msgid "About %s" msgstr "Sobre %s" msgid "OrcaSlicer is based on BambuStudio, PrusaSlicer, and SuperSlicer." -msgstr "OrcaSlicer é baseado no BambuStudio, PrusaSlicer e SuperSlicer." +msgstr "OrcaSlicer é baseado no Bambu Studio, PrusaSlicer e SuperSlicer." msgid "BambuStudio is originally based on PrusaSlicer by PrusaResearch." -msgstr "BambuStudio é originalmente baseado no PrusaSlicer pela PrusaResearch." +msgstr "" +"Bambu Studio é originalmente baseado no PrusaSlicer pela PrusaResearch." msgid "PrusaSlicer is originally based on Slic3r by Alessandro Ranellucci." msgstr "" @@ -3034,7 +3035,7 @@ msgid "Nozzle Diameter" msgstr "Diâmetro do bico" msgid "Bed Type" -msgstr "Tipo de Mesa" +msgstr "Tipo de Placa" msgid "Nozzle temperature" msgstr "Temperatura do bico" @@ -3846,10 +3847,10 @@ msgid "" "YES - Keep Prime Tower\n" "NO - Keep Adaptive Layer Height and Independent Support Layer Height" msgstr "" -"A torre de preparação não funciona quando a Altura de Camada Adaptativa ou a " +"A torre de preparo não funciona quando a Altura de Camada Adaptativa ou a " "Altura de Camada de Suporte Independente está ativada.\n" "Qual você deseja manter?\n" -"SIM — Manter a Torre de Preparação\n" +"SIM — Manter a Torre de Preparo\n" "NÃO — Manter a Altura de Camada Adaptativa e a Altura de Camada de Suporte " "Independente" @@ -3859,10 +3860,10 @@ msgid "" "YES - Keep Prime Tower\n" "NO - Keep Adaptive Layer Height" msgstr "" -"A torre de preparação não funciona quando a Altura de Camada Adaptativa está " +"A torre de preparo não funciona quando a Altura de Camada Adaptativa está " "ativa.\n" "Qual você deseja manter?\n" -"SIM — Manter a Torre de Preparação\n" +"SIM — Manter a Torre de Preparo\n" "NÃO — Manter a Altura de Camada Adaptativa" msgid "" @@ -3871,10 +3872,10 @@ msgid "" "YES - Keep Prime Tower\n" "NO - Keep Independent Support Layer Height" msgstr "" -"A torre de preparação não funciona quando a Altura da Camada de Suporte " +"A torre de preparo não funciona quando a Altura da Camada de Suporte " "Independente está ativa.\n" "Qual você deseja manter?\n" -"SIM — Manter a Torre de Preparação\n" +"SIM — Manter a Torre de Preparo\n" "NÃO — Manter a Altura da Camada de Suporte Independente" msgid "" @@ -4244,13 +4245,15 @@ msgid "" "Invalid pattern. Use N, N#K, or a comma-separated list with optional #K per " "entry. Examples: 5, 5#2, 1,7,9, 5,9#2,18." msgstr "" +"Padrão inválido. Use N, N#K, ou uma lista separa por vírgulas com #K opcional " +"por entrada. Examplos: 5, 5#2, 1,7,9, 5,9#2,18." #, boost-format msgid "Invalid format. Expected vector format: \"%1%\"" msgstr "Formato inválido. Formato de vetor esperado: \"%1%\"" msgid "Pick" -msgstr "" +msgstr "Escolher" msgid "Layer Height" msgstr "Altura da Camada" @@ -4847,7 +4850,7 @@ msgid "Open a project file" msgstr "Abrir um arquivo de projeto" msgid "Recent files" -msgstr "" +msgstr "Arquivos recentes" msgid "Save Project" msgstr "Salvar Projeto" @@ -5303,7 +5306,7 @@ msgid "" "Do you want to stop this virtual camera?" msgstr "" "Outra câmera virtual está em execução.\n" -"O Orca Slicer suporta apenas uma única câmera virtual.\n" +"O OrcaSlicer suporta apenas uma única câmera virtual.\n" "Deseja parar esta câmera virtual?" #, c-format, boost-format @@ -5561,7 +5564,7 @@ msgid "Camera" msgstr "Câmera" msgid "Storage" -msgstr "" +msgstr "Armazenamento" msgid "Camera Setting" msgstr "Configuração da Câmera" @@ -5594,10 +5597,10 @@ msgid "Debug Info" msgstr "Informações de Depuração" msgid "No Storage" -msgstr "" +msgstr "Sem Armazenamento" msgid "Storage Abnormal" -msgstr "" +msgstr "Armazenamento Anormal" msgid "Cancel print" msgstr "Cancelar impressão" @@ -5814,18 +5817,18 @@ msgstr "" "OrcaSlicer." msgid "If you would like to try Orca Slicer Beta, you may click to" -msgstr "Se você gostaria de testar o Orca Slicer Beta, clique para" +msgstr "Se você gostaria de testar o OrcaSlicer Beta, clique para" msgid "Download Beta Version" msgstr "Baixar versão beta" msgid "The 3mf file version is newer than the current Orca Slicer version." msgstr "" -"A versão do arquivo 3mf é mais recente que a versão atual do Orca Slicer." +"A versão do arquivo 3mf é mais recente que a versão atual do OrcaSlicer." msgid "Update your Orca Slicer could enable all functionality in the 3mf file." msgstr "" -"Atualizar seu Orca Slicer poderia permitir todas as funcionalidades do " +"Atualizar seu OrcaSlicer poderia habilitar todas as funcionalidades do " "arquivo 3mf." msgid "Current Version: " @@ -5929,8 +5932,8 @@ msgstr[1] "%1$d objetos foram carregados como peças do objeto cortado." #, c-format, boost-format msgid "%1$d object was loaded with fuzzy skin painting." msgid_plural "%1$d objects were loaded with fuzzy skin painting." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%1$d objeto foi carregado com pintura de textura difusa." +msgstr[1] "%1$d objeto foram carregados com pintura de textura difusa." msgid "ERROR" msgstr "ERRO" @@ -5987,7 +5990,7 @@ msgid "Cut connectors" msgstr "Conectores de corte" msgid "Paint-on fuzzy skin" -msgstr "" +msgstr "Textura difusa pintada" msgid "Layers" msgstr "Camadas" @@ -6213,7 +6216,7 @@ msgid "" "presets." msgstr "" "Alguns filamentos desconhecidos foram mapeados para a predefinição genérica. " -"Por favor, atualize o Orca Slicer ou reinicie o Orca Slicer para verificar " +"Por favor, atualize o OrcaSlicer ou reinicie o OrcaSlicer para verificar " "se há uma atualização para as predefinições do sistema." #, boost-format @@ -6270,7 +6273,7 @@ msgid "Collapse sidebar" msgstr "Recolher barra lateral" msgid "Tab" -msgstr "" +msgstr "Tab" #, c-format, boost-format msgid "Loading file: %s" @@ -6556,7 +6559,7 @@ msgid "" "Importing to Orca Slicer failed. Please download the file and manually " "import it." msgstr "" -"A importação para a Orca Slicer falhou. Por favor, baixe o arquivo e importe " +"A importação para o OrcaSlicer falhou. Por favor, baixe o arquivo e importe " "manualmente." msgid "INFO:" @@ -6787,7 +6790,7 @@ msgid "" "on Orca Slicer(windows) or CAD softwares." msgstr "" "A função \"Corrigir Modelo\" está atualmente disponível apenas no Windows. " -"Por favor, repare o modelo no Orca Slicer (Windows) ou softwares CAD." +"Por favor, conserte o modelo no OrcaSlicer (Windows) ou softwares CAD." #, c-format, boost-format msgid "" @@ -6903,7 +6906,7 @@ msgid "Units" msgstr "Unidades" msgid "Allow only one OrcaSlicer instance" -msgstr "Permitir apenas uma instância OrcaSlicer" +msgstr "Permitir apenas uma instância do OrcaSlicer" msgid "" "On OSX there is always only one instance of app running by default. However " @@ -6979,10 +6982,11 @@ msgid "If enabled, reverses the direction of zoom with mouse wheel." msgstr "Se ativo, inverte a direção de zoom com a roda do mouse." msgid "Orbit speed multiplier" -msgstr "" +msgstr "Multiplicador de velocidade de órbita" msgid "Multiplies the orbit speed for finer or coarser camera movement." -msgstr "" +msgstr "Multiplica a velocidade da órbita para um movimento de câmera " +"mais fino ou mais grosseiro." msgid "Show splash screen" msgstr "Mostrar tela de abertura" @@ -7028,8 +7032,8 @@ msgstr "" msgid "Multi-device Management (Take effect after restarting Orca Slicer)." msgstr "" -"Gerenciamento de Multi-dispositivos (Entra em vigor após reiniciar o Orca " -"Slicer)." +"Gerenciamento de Multi-dispositivos (Entra em vigor após reiniciar o " +"OrcaSlicer)." msgid "" "With this option enabled, you can send a task to multiple devices at the " @@ -7116,13 +7120,13 @@ msgstr "" "abrir um .3mf?" msgid "Maximum recent files" -msgstr "" +msgstr "Máximo de arquivos recentes" msgid "Maximum count of recent files" -msgstr "" +msgstr "Contagem máxima de arquivos recentes" msgid "Add model files (stl/step) to recent file list." -msgstr "" +msgstr "Adicionar arquivos de modelo (stl/step) à lista de arquivos recentes." msgid "Clear my choice on the unsaved projects." msgstr "Limpar minha escolha nos projetos não salvos." @@ -7366,7 +7370,7 @@ msgid "Publish" msgstr "Publicar" msgid "Publish was cancelled" -msgstr "" +msgstr "Publicação cancelada" msgid "Slicing Plate 1" msgstr "Fatiando Placa 1" @@ -7616,7 +7620,7 @@ msgstr "" #, c-format, boost-format msgid "nozzle in preset: %.1f %s" -msgstr "" +msgstr "bico na predefinição: %.1f %s" #, c-format, boost-format msgid "nozzle memorized: %.1f %s" @@ -7688,7 +7692,7 @@ msgstr "" "impressora." msgid "The printer is required to be in the same LAN as Orca Slicer." -msgstr "A impressora deve estar na mesma LAN do Orca Slicer." +msgstr "A impressora deve estar na mesma LAN do OrcaSlicer." msgid "The printer does not support sending to printer SD card." msgstr "A impressora não suporta enviar para o cartão SD da impressora." @@ -7865,22 +7869,24 @@ msgid "" "A prime tower is required for smooth timelapse. There may be flaws on the " "model without prime tower. Are you sure you want to disable prime tower?" msgstr "" -"Uma torre de preparação é necessária para um timelapse suave. Pode haver " -"falhas no modelo sem a torre de preparação. Tem certeza de que deseja " -"desativar a torre de preparação?" +"Uma torre de preparo é necessária para um timelapse suave. Pode haver " +"falhas no modelo sem a torre de preparo. Tem certeza de que deseja " +"desativar a torre de preparo?" msgid "" "Enabling both precise Z height and the prime tower may cause the size of " "prime tower to increase. Do you still want to enable?" msgstr "" +"Habilitar a altura Z precisa e a torre de preparo pode fazer com que o " +"tamanho da torre de preparo aumente. Deseja habilitar mesmo assim?" msgid "" "A prime tower is required for smooth timelapse. There may be flaws on the " "model without prime tower. Do you want to enable prime tower?" msgstr "" -"Uma torre de preparação é necessária para um timelapse suave. Pode haver " -"falhas no modelo sem a torre de preparação. Deseja ativar a torre de " -"preparação?" +"Uma torre de preparo é necessária para um timelapse suave. Pode haver " +"falhas no modelo sem a torre de preparo. Deseja ativar a torre de " +"preparo?" msgid "Still print by object?" msgstr "Ainda imprimir por objeto?" @@ -7891,6 +7897,10 @@ msgid "" "0 top Z distance, 0 interface spacing, interlaced rectilinear pattern and " "disable independent support layer height" msgstr "" +"Ao usar material de suporte para a interface de suporte, recomendamos as " +"seguintes configurações:\n" +"distância Z superior 0, espaçamento de interface 0, padrão retilíneo " +"entrelaçado e desabilitar altura da camada de suporte independente" msgid "" "Change these settings automatically?\n" @@ -7921,6 +7931,12 @@ msgid "" "support. Please proceed with caution and thoroughly check for any potential " "printing issues.Are you sure you want to enable this option?" msgstr "" +"Padrões de preenchimento são projetados para lidar com a rotação " +"automaticamente para garantir a impressão adequada e atingir os efeitos " +"pretendidos (Ex. Giroide, Cúbico). Girar o padrão de preenchimento esparso " +"atual pode causar suporte insuficiente. Prossiga com cautela e verifique " +"cuidadosamente se há possíveis problemas de impressão. Tem certeza de que " +"deseja habilitar esta opção?" msgid "" "Layer height is too small.\n" @@ -8136,7 +8152,7 @@ msgid "Multimaterial" msgstr "Multimaterial" msgid "Prime tower" -msgstr "Torre de preparação" +msgstr "Torre de preparo" msgid "Filament for Features" msgstr "Filamento para Recursos" @@ -8531,6 +8547,9 @@ msgid "" "If the preset corresponds to a filament currently in use on your printer, " "please reset the filament information for that slot." msgstr "" +"Tem certeza de que deseja excluir a predefinição selecionada?\n" +"Se a predefinição corresponde a um filamento atualmente em uso em sua " +"impressora, redefina as informações do filamento para esse slot." #, boost-format msgid "Are you sure to %1% the selected preset?" @@ -8857,16 +8876,16 @@ msgstr "" #, boost-format msgid "For constant flow rate, hold %1% while dragging." -msgstr "" +msgstr "Para uma taxa de fluxo constante, segure %1% enquanto arrasta." msgid "Total ramming" -msgstr "" +msgstr "Moldeamento total" msgid "Volume" msgstr "Volume" msgid "Ramming line" -msgstr "" +msgstr "Linha de moldeamento" msgid "Auto-Calc" msgstr "Auto-Calc" @@ -8882,7 +8901,7 @@ msgid "" "changed. You could disable the auto-calculate in Orca Slicer > Preferences" msgstr "" "O Orca recalculará seus volumes de purga toda vez que a cor dos filamentos " -"for alterada. Você pode desativar o cálculo automático em Orca Slicer > " +"for alterada. Você pode desativar o cálculo automático em OrcaSlicer > " "Preferências" msgid "Flushing volume (mm³) for each filament pair." @@ -8933,7 +8952,7 @@ msgid "" "install BambuStudio or seek after-sales help." msgstr "" "Componente BambuSource ausente registrado para reprodução de mídia! " -"Reinstale o BambuStudio ou procure ajuda pós-venda." +"Reinstale o Bambu Studio ou procure ajuda pós-venda." msgid "" "Using a BambuSource from a different install, video play may not work " @@ -8949,7 +8968,7 @@ msgid "" msgstr "" "Seu sistema não possui codecs H.264 para o GStreamer, que são necessários " "para reproduzir vídeos. (Tente instalar os pacotes gstreamer1.0-plugins-bad " -"ou gstreamer1.0-libav e depois reinicie o Orca Slicer?)" +"ou gstreamer1.0-libav e depois reinicie o OrcaSlicer?)" msgid "Bambu Network plug-in not detected." msgstr "Plug-in de Rede Bambu não detectado." @@ -9015,7 +9034,7 @@ msgid "Collapse/Expand the sidebar" msgstr "Recolher/Expandir a barra lateral" msgid "Any arrow" -msgstr "" +msgstr "Qualquer seta" msgid "Movement in camera space" msgstr "Movimento no espaço da câmera" @@ -9084,34 +9103,34 @@ msgid "Select all objects" msgstr "Selecionar todos os objetos" msgid "Gizmo move" -msgstr "Mover gizmo" +msgstr "Gizmo mover" msgid "Gizmo rotate" -msgstr "Rotacionar gizmo" +msgstr "Gizmo rotacionar" msgid "Gizmo scale" -msgstr "Escala do gizmo" +msgstr "Gizmo escala" msgid "Gizmo place face on bed" -msgstr "Posicionar face do gizmo na mesa" +msgstr "Gizmo posicionar face na mesa" msgid "Gizmo cut" -msgstr "Cortar gizmo" +msgstr "Gizmo cortar" msgid "Gizmo mesh boolean" msgstr "Gizmo malha booleana" msgid "Gizmo FDM paint-on fuzzy skin" -msgstr "" +msgstr "Gizmo FDM pintura em textura difusa" msgid "Gizmo SLA support points" -msgstr "Pontos de suporte SLA do gizmo" +msgstr "Gizmo de pontos de suporte SLA" msgid "Gizmo FDM paint-on seam" -msgstr "Costura de pintura FDM do gizmo" +msgstr "Gizmo de costura de pintura FDM" msgid "Gizmo text emboss/engrave" -msgstr "Texturizar/gravar texto no gizmo" +msgstr "Gizmo Texturizar/gravar texto" msgid "Gizmo measure" msgstr "Gizmo medir" @@ -9204,7 +9223,7 @@ msgstr "Atualização do plug-in de rede" msgid "" "Click OK to update the Network plug-in when Orca Slicer launches next time." msgstr "" -"Clique em OK para atualizar o plug-in de rede quando o Orca Slicer for " +"Clique em OK para atualizar o plug-in de rede quando o OrcaSlicer for " "iniciado novamente." #, c-format, boost-format @@ -9212,7 +9231,7 @@ msgid "A new Network plug-in (%s) is available. Do you want to install it?" msgstr "Um novo plug-in de rede (%s) está disponível, deseja instalá-lo?" msgid "New version of Orca Slicer" -msgstr "Nova versão do Orca Slicer" +msgstr "Nova versão do OrcaSlicer" msgid "Skip this Version" msgstr "Pular esta versão" @@ -9262,7 +9281,7 @@ msgstr "Conecte a impressora usando IP e código de acesso" msgid "" "Step 1. Please confirm Orca Slicer and your printer are in the same LAN." msgstr "" -"Passo 1. Confirme se o Orca Slicer e sua impressora estão na mesma LAN." +"Passo 1. Confirme se o OrcaSlicer e sua impressora estão na mesma LAN." msgid "" "Step 2. If the IP and Access Code below are different from the actual values " @@ -9665,7 +9684,7 @@ msgstr "" "impressão." msgid "Prime Tower" -msgstr "Torre de Preparação" +msgstr "Torre de Preparo" msgid " is too close to others, and collisions may be caused.\n" msgstr " está muito perto de outros, e colisões podem ocorrer.\n" @@ -9742,7 +9761,7 @@ msgid "" "proceed with caution." msgstr "" "Diferentes diâmetros de bico e diferentes diâmetros de filamento podem não " -"funcionar bem quando a torre de preparação estiver habilitada. É muito " +"funcionar bem quando a torre de preparo estiver habilitada. É muito " "experimental, então prossiga com cautela." msgid "" @@ -9763,56 +9782,56 @@ msgid "" "The prime tower is currently only supported for the Marlin, RepRap/Sprinter, " "RepRapFirmware and Repetier G-code flavors." msgstr "" -"A torre de preparação atualmente só é suportada para os G-code do tipo " +"A torre de preparo atualmente só é suportada para os G-code do tipo " "Marlin, RepRap/Sprinter, RepRapFirmware e Repetier." msgid "The prime tower is not supported in \"By object\" print." -msgstr "A torre de preparação não é suportada na impressão \"Por objeto\"." +msgstr "A torre de preparo não é suportada na impressão \"Por objeto\"." msgid "" "The prime tower is not supported when adaptive layer height is on. It " "requires that all objects have the same layer height." msgstr "" -"A torre de preparação não é suportada quando a altura de camada adaptativa " +"A torre de preparo não é suportada quando a altura de camada adaptativa " "está ativa. Isso requer que todos os objetos tenham a mesma altura de camada." msgid "" "The prime tower requires \"support gap\" to be multiple of layer height." msgstr "" -"A torre de preparação requer que o \"vão de suporte\" seja múltiplo da " +"A torre de preparo requer que o \"vão de suporte\" seja múltiplo da " "altura da camada." msgid "The prime tower requires that all objects have the same layer heights." msgstr "" -"A torre de preparação requer que todos os objetos tenham as mesmas alturas " +"A torre de preparo requer que todos os objetos tenham as mesmas alturas " "de camada." msgid "" "The prime tower requires that all objects are printed over the same number " "of raft layers." msgstr "" -"A torre de preparação requer que todos os objetos sejam impressos sobre o " +"A torre de preparo requer que todos os objetos sejam impressos sobre o " "mesmo número de camadas da jangada." msgid "" "The prime tower is only supported for multiple objects if they are printed " "with the same support_top_z_distance." msgstr "" -"A torre de preparação só é suportada para vários objetos se eles forem " +"A torre de preparo só é suportada para vários objetos se eles forem " "impressos com a mesma support_top_z_distance." msgid "" "The prime tower requires that all objects are sliced with the same layer " "heights." msgstr "" -"A torre de preparação requer que todos os objetos sejam fatiados com as " +"A torre de preparo requer que todos os objetos sejam fatiados com as " "mesmas alturas de camada." msgid "" "The prime tower is only supported if all objects have the same variable " "layer height." msgstr "" -"A torre de preparação só é suportada se todos os objetos tiverem a mesma " +"A torre de preparo só é suportada se todos os objetos tiverem a mesma " "altura de camada variável." msgid "" @@ -9840,7 +9859,7 @@ msgstr "" msgid "" "The prime tower requires that support has the same layer height with object." msgstr "" -"A torre de preparação requer que o suporte tenha a mesma altura de camada do " +"A torre de preparo requer que o suporte tenha a mesma altura de camada do " "objeto." msgid "" @@ -9970,6 +9989,8 @@ msgid "" "The precise wall option will be ignored for outer-inner or inner-outer-inner " "wall sequences." msgstr "" +"A opção de parede precisa será ignorada para sequências externa-interna ou " +"interna-externa-interna." msgid "" "Filament shrinkage will not be used because filament shrinkage for the used " @@ -10084,7 +10105,7 @@ msgid "" "user name and password into the URL in the following format: https://" "username:password@your-octopi-address/" msgstr "" -"O Orca Slicer pode enviar arquivos G-code para um host de impressora. Este " +"O OrcaSlicer pode enviar arquivos G-code para um host de impressora. Este " "campo deve conter o nome do host, o endereço IP ou a URL da instância do " "host de impressora. O host de impressão atrás do HAProxy com autenticação " "básica ativada pode ser acessado colocando o nome de usuário e senha na URL " @@ -10106,7 +10127,7 @@ msgid "" "Orca Slicer can upload G-code files to a printer host. This field should " "contain the API Key or the password required for authentication." msgstr "" -"O Orca Slicer pode enviar arquivos G-code para um host de impressora. Este " +"O OrcaSlicer pode enviar arquivos G-code para um host de impressora. Este " "campo deve conter a Chave da API ou a senha necessária para autenticação." msgid "Name of the printer." @@ -10187,6 +10208,8 @@ msgid "" "Bed temperature for layers except the initial one. A value of 0 means the " "filament does not support printing on the Cool Plate SuperTack." msgstr "" +"Temperatura da mesa para camadas exceto a inicial. O valor 0 significa que o " +"filamento não suporta a impressão na Placa Fria SuperTack." msgid "" "Bed temperature for layers except the initial one. A value of 0 means the " @@ -10281,11 +10304,11 @@ msgid "Smooth High Temp Plate" msgstr "Placa de Alta Temp. Lisa" msgid "Default bed type" -msgstr "" +msgstr "Tipo de placa padrão" msgid "" "Default bed type for the printer (supports both numeric and string format)." -msgstr "" +msgstr "Tipo de placa padrão para a impressora (suporta formato numérico ou string)." msgid "First layer print sequence" msgstr "Sequência de impressão da primeira camada" @@ -10612,6 +10635,10 @@ msgid "" "layer consistency. NOTE: This option will be ignored for outer-inner or " "inner-outer-inner wall sequences." msgstr "" +"Melhora a precisão da casca ajustando o espaçamento da parede externa. " +"Isso também melhora a consistência da camada. Nota: Esta opção será ignorada " +"se a sequência da parede for externa-interna ou interna-externa-interna." + msgid "Only one wall on top surfaces" msgstr "Parede única em superfícies superiores" @@ -12025,7 +12052,7 @@ msgstr "" "Após uma troca de ferramenta, a posição exata do filamento recém-carregado " "dentro do bico pode não ser conhecida, e a pressão do filamento " "provavelmente ainda não está estável. Antes de purgar a cabeça de impressão " -"em um preenchimento ou em um objeto de sacrifício, o Orca Slicer sempre " +"em um preenchimento ou em um objeto de sacrifício, o OrcaSlicer sempre " "preparará essa quantidade de material na torre de limpeza para produzir " "extrusões sucessivas de preenchimento ou de objeto de sacrifício de forma " "confiável." @@ -12178,7 +12205,7 @@ msgstr "" "de resistência ideais." msgid "Insert solid layers" -msgstr "" +msgstr "Inserir camadas sólidas" msgid "" "Insert solid infill at specific layers. Use N to insert every Nth layer, N#K " @@ -12186,6 +12213,11 @@ msgid "" "'5#' equals '5#1'), or a comma-separated list (e.g. 1,7,9) to insert at " "explicit layers. Layers are 1-based." msgstr "" +"Insere preenchimento sólido em camadas específicas. Use N para inserir a " +"cada enésima camada, N#K para inserir K camadas sólidas consecutivas a cada " +"enésima camada (K é opcional, ou seja, '5#' é igual a '5#1'), ou uma lista " +"separada por vírgulas (Ex. 1,7,9) para inserir em camadas esplícitas. Camadas " +"são baseadas em 1." msgid "Fill Multiline" msgstr "Multilinhas de Preenchimento" @@ -12254,7 +12286,7 @@ msgid "TPMS-D" msgstr "TPMS-D" msgid "TPMS-FK" -msgstr "" +msgstr "TPMS-FK" msgid "Gyroid" msgstr "Giroide" @@ -12303,13 +12335,12 @@ msgid "" msgstr "" "Conecte uma linha de preenchimento a um perímetro interno com um segmento " "curto de um perímetro adicional. Se expresso como porcentagem (exemplo: " -"15%), é calculado sobre a largura de extrusão do preenchimento. O Orca " -"Slicer tenta conectar duas linhas de preenchimento próximas a um segmento " -"curto de perímetro. Se nenhum segmento de perímetro mais curto que " -"infill_anchor_max for encontrado, a linha de preenchimento é conectada a um " -"segmento de perímetro em apenas um lado e o comprimento do segmento de " -"perímetro tomado é limitado a este parâmetro, mas não mais do que " -"anchor_length_max.\n" +"15%), é calculado sobre a largura de extrusão do preenchimento. O OrcaSlicer " +"tenta conectar duas linhas de preenchimento próximas a um segmento curto de " +"perímetro. Se nenhum segmento de perímetro mais curto que infill_anchor_max " +"for encontrado, a linha de preenchimento é conectada a um segmento de " +"perímetro em apenas um lado e o comprimento do segmento de perímetro tomado " +"é limitado a este parâmetro, mas não mais do que anchor_length_max.\n" "Defina este parâmetro como zero para desabilitar os perímetros de ancoragem " "conectados a uma única linha de preenchimento." @@ -12336,12 +12367,12 @@ msgid "" msgstr "" "Conecte uma linha de preenchimento a um perímetro interno com um segmento " "curto de um perímetro adicional. Se expresso como porcentagem (exemplo: " -"15%), é calculado sobre a largura de extrusão do preenchimento. O Orca " -"Slicer tenta conectar duas linhas de preenchimento próximas a um segmento " -"curto de perímetro. Se nenhum segmento de perímetro mais curto que este " -"parâmetro for encontrado, a linha de preenchimento é conectada a um segmento " -"de perímetro em apenas um lado e o comprimento do segmento de perímetro " -"tomado é limitado a infill_anchor, mas não mais do que este parâmetro.\n" +"15%), é calculado sobre a largura de extrusão do preenchimento. O OrcaSlicer " +"tenta conectar duas linhas de preenchimento próximas a um segmento curto de " +"perímetro. Se nenhum segmento de perímetro mais curto que este parâmetro for " +"encontrado, a linha de preenchimento é conectada a um segmento de perímetro " +"em apenas um lado e o comprimento do segmento de perímetro tomado é limitado " +"a infill_anchor, mas não mais do que este parâmetro.\n" "Se definido como 0, o antigo algoritmo de conexão de preenchimento será " "usado, ele deve criar o mesmo resultado que com 1000 e 0." @@ -12562,6 +12593,11 @@ msgid "" "low volumetric flow rate, making the interface smoother.\n" "Set to -1 to disable it." msgstr "" +"Esta velocidade do ventilador de resfriamento de peças é aplicada ao passar " +"a ferro. Definir este parâmetro para uma velocidade menor que a normal reduz " +"a possibilidade de entupimento do bico devido ao baixo fluxo volumétrico, " +"tornando a interface mais suave.\n" +"Defina como -1 para desabilitá-lo." msgid "" "Randomly jitter while printing the wall, so that the surface has a rough " @@ -12966,10 +13002,10 @@ msgstr "" "Habilite esta opção se sua impressora usa pellets em vez de filamentos." msgid "Support multi bed types" -msgstr "Suportar vários tipos de mesa" +msgstr "Suportar vários tipos de placa" msgid "Enable this option if you want to use multiple bed types." -msgstr "Ative esta opção se quiser usar vários tipos de mesa." +msgstr "Ative esta opção se quiser usar vários tipos de placa." msgid "Label objects" msgstr "Etiquetar objetos" @@ -13037,6 +13073,14 @@ msgid "" "setting is ignored. Note: some infill patterns (e.g., Gyroid) control " "rotation themselves; use with care." msgstr "" +"Gira a direção do preenchimento esparso por camada usando um gabarito de " +"ângulos. Insira graus separados por vírgula (por exemplo, '0, 30, 60, 90'). " +"Os ângulos são aplicados em ordem por camada e repetidos quando a lista " +"termina. Sintaxe avançada suportada: '+5' gira +5° a cada camada; '+5#5' " +"gira +5° a cada 5 camadas. Consulte a Wiki para obter detalhes. Quando um " +"modelo é definido, a configuração padrão de direção do preenchimento é " +"ignorada. Observação: alguns padrões de preenchimento (por exemplo, Giróide) " +"tem seu próprio controle de rotação, use com cuidado." msgid "°" msgstr "°" @@ -13121,13 +13165,16 @@ msgid "Adjust the line width of the selected skeleton paths." msgstr "Ajuste da largura da linha dos caminhos de esqueleto selecionados." msgid "Symmetric infill Y axis" -msgstr "" +msgstr "Preenchimento simétrico no eixo Y" msgid "" "If the model has two parts that are symmetric about the Y axis, and you want " "these parts to have symmetric textures, please click this option on one of " "the parts." msgstr "" +"Se o modelo tiver duas partes simétricas em relação ao eixo Y e você quiser " +"que essas partes tenham texturas simétricas, clique nesta opção em uma das " +"partes." msgid "Infill combination - Max layer height" msgstr "Combinação de preenchimento - Altura máx da camada" @@ -13420,6 +13467,11 @@ msgid "" "and flow correction factor. Each pair is on a separate line, followed by a " "semicolon, in the following format: \"1.234, 5.678;\"" msgstr "" +"Modelo de Compensação de Fluxo, usado para ajustar o fluxo para áreas de " +"preenchimento pequenas. O modelo é expresso como um par de valores " +"separados por vírgula para o comprimento de extrusão e o fator de " +"correção de fluxo. Cada par em uma linha separeada, seguido por " +"ponto-e-vírgula, no seguinte formato: \"1.234, 5.678;\"" msgid "Maximum speed X" msgstr "Velocidade máxima X" @@ -13541,6 +13593,9 @@ msgid "" "printer, ringing on the surface of the model are avoided.\n" "Please turn this option off when testing ringing." msgstr "" +"Ao reduzir a velocidade da parede externa para evitar a zona de ressonância " +"da impressora, evita-se o efeito de anéis na superfície do modelo.\n" +"Desative esta opção ao testar o efeito de anéis." msgid "Min" msgstr "Mín" @@ -13626,7 +13681,7 @@ msgstr "" "partida para extrusoras de acionamento direto e 5-10 mm³/s² para estilo " "Bowden.\n" "\n" -"Este recurso é conhecido como Equalizador de Pressão no slicer Prusa.\n" +"Este recurso é conhecido como Equalizador de Pressão no PrusaSlicer.\n" "\n" "Nota: este parâmetro desativa o ajuste de arco." @@ -13723,7 +13778,7 @@ msgid "" "Orca Slicer can upload G-code files to a printer host. This field must " "contain the kind of the host." msgstr "" -"O Orca Slicer pode carregar arquivos de G-code para um hospedeiro de " +"O OrcaSlicer pode carregar arquivos de G-code para um hospedeiro de " "impressora. Este campo deve conter o tipo de hospedeiro." msgid "Nozzle volume" @@ -13908,7 +13963,7 @@ msgstr "" "personalizados, basta listar seus caminhos absolutos aqui. Separe vários " "scripts com um ponto e vírgula. Os scripts receberão o caminho absoluto para " "o arquivo G-code como primeiro argumento, e eles podem acessar as " -"configurações do Orca Slicer lendo variáveis de ambiente." +"configurações do OrcaSlicer lendo variáveis de ambiente." msgid "Printer type" msgstr "Tipo de impressora" @@ -14442,6 +14497,9 @@ msgid "" "is useful, on occasion, to conserve filament but may cause the draft shield/" "skirt to warp / crack." msgstr "" +"Limitar as voltas da saia e escudo de ar a uma parede após a primeira " +"camada. Isso é útil ocasionalmente para conservar filamento, mas pode fazer " +"com que o escudo de ar entorte ou rache." msgid "Draft shield" msgstr "Escudo de ar" @@ -14631,7 +14689,7 @@ msgstr "" "suave for selecionado, a extrusora se moverá para fora após cada camada ser " "impressa e então tirará uma captura de tela. Como o filamento derretido pode " "vazar do bico durante o processo de tirar uma captura de tela, é necessário " -"uma torre de preparação para o modo suave para limpar o bico." +"uma torre de preparo para o modo suave para limpar o bico." msgid "Traditional" msgstr "Tradicional" @@ -14706,10 +14764,10 @@ msgstr "" "ação de troca manual de filamento." msgid "Purge in prime tower" -msgstr "Purgar na torre de preparação" +msgstr "Purgar na torre de preparo" msgid "Purge remaining filament into prime tower." -msgstr "Purgar o filamento restante na torre de preparação." +msgstr "Purgar o filamento restante na torre de preparo." msgid "Enable filament ramming" msgstr "" @@ -14933,6 +14991,8 @@ msgid "" "Spacing of interface lines. Zero means solid interface.\n" "Force using solid interface when support ironing is enabled." msgstr "" +"Espaçamento das linhas de interface. Zero significa interface sólida.\n" +"Força o uso de interface sólida quando passar a ferro está habilitado." msgid "Bottom interface spacing" msgstr "Espaçamento da interface inferior" @@ -15033,7 +15093,7 @@ msgid "" msgstr "" "A camada de suporte usa uma altura de camada independente da camada do " "objeto. Isso é para suportar a personalização do vão-Z e economizar tempo de " -"impressão. Esta opção será inválida quando a torre de preparação estiver " +"impressão. Esta opção será inválida quando a torre de preparo estiver " "ativa." msgid "Threshold angle" @@ -15187,7 +15247,7 @@ msgstr "" "grandes cavidades do suporte de árvore." msgid "Ironing Support Interface" -msgstr "" +msgstr "Passar a Ferro a Interface de Suporte" msgid "" "Ironing is using small flow to print on same height of support interface " @@ -15195,6 +15255,10 @@ msgid "" "interface being ironed. When enabled, support interface will be extruded as " "solid too." msgstr "" +"A passagem a ferro utiliza um fluxo pequeno para imprimir na mesma altura da " +"interface de suporte novamente para torná-la mais lisa. Esta configuração " +"controla se a interface de suporte está sendo passada a ferro. Quando " +"ativada, a interface de suporte também será extrudada como sólida." msgid "Support Ironing Pattern" msgstr "" @@ -15207,6 +15271,9 @@ msgid "" "support interface layer height. Too high value results in overextrusion on " "the surface." msgstr "" +"A quantidade de material a extrudar durante o passar a ferro. Relativo ao " +"fluxo da altura normal da camada de interface. Um valor muito alto resulta em " +"superextrusão na superfície." msgid "Support Ironing line spacing" msgstr "" @@ -15442,7 +15509,7 @@ msgid "The volume of material to prime extruder on tower." msgstr "O volume de material para preparar a extrusora na torre." msgid "Width of the prime tower." -msgstr "Largura da torre de preparação." +msgstr "Largura da torre de preparo." msgid "Wipe tower rotation angle" msgstr "Ângulo de rotação da torre de limpeza" @@ -15451,7 +15518,7 @@ msgid "Wipe tower rotation angle with respect to X axis." msgstr "Ângulo de rotação da torre de limpeza em relação ao eixo X." msgid "Width of the brim." -msgstr "" +msgstr "Largura da borda." msgid "Stabilization cone apex angle" msgstr "Ângulo do ápice do cone de estabilização" @@ -15579,7 +15646,7 @@ msgstr "" "objetos. Isso pode reduzir a quantidade de resíduos e diminuir o tempo de " "impressão. Se as paredes forem impressas com filamento transparente, o " "preenchimento de cor mista será visível do lado de fora. Isso não terá " -"efeito, a menos que a torre de preparação esteja ativa." +"efeito, a menos que a torre de preparo esteja ativa." msgid "" "Purging after filament change will be done inside objects' support. This may " @@ -15588,7 +15655,7 @@ msgid "" msgstr "" "A purga após a troca de filamento será feita dentro do suporte dos objetos. " "Isso pode reduzir a quantidade de resíduos e diminuir o tempo de impressão. " -"Isso não terá efeito, a menos que a torre de preparação esteja ativa." +"Isso não terá efeito, a menos que a torre de preparo esteja ativa." msgid "" "This object will be used to purge the nozzle after a filament change to save " @@ -15598,7 +15665,7 @@ msgstr "" "Este objeto será usado para purgar o bico após uma troca de filamento para " "economizar filamento e diminuir o tempo de impressão. As cores dos objetos " "serão misturadas como resultado. Isso não terá efeito a menos que a torre de " -"preparação esteja ativa." +"preparo esteja ativa." msgid "Maximal bridging distance" msgstr "Distância máxima de ponte" @@ -16604,6 +16671,10 @@ msgid "" "is also fuzzy skin painted.\n" "XY Size compensation cannot be combined with fuzzy skin painting." msgstr "" +"Um objeto habilitou a compensação de tamanho XY, que não será usada porque " +"também tem uma pintura de textura difusa.\n" +"A compensação de tamanho XY não pode ser combinada com a pintura de textura " +"difusa." msgid "Object name" msgstr "Nome do objeto" @@ -16837,6 +16908,14 @@ msgid "" "3. If the max volumetric speed or print temperature is changed in the " "filament setting." msgstr "" +"Agora adicionamos a auto-calibração para diferentes filamentos, que é " +"totalmente automatizada e o resultado será salvo na impressora para uso " +"futuro. Você só precisa fazer a calibração nos seguintes casos limitados:\n" +"1. Se você introduzir um novo filamento de marcas/modelos diferentes ou " +"se o filamento estiver úmido;\n" +"2. Se o bico estiver desgastado ou for substituído por um novo;\n" +"3. Se o fluxo volumétrico máximo ou a temperatura de impressão forem " +"alteradas na configuração do filamento." msgid "About this calibration" msgstr "Sobre esta calibração" @@ -17375,7 +17454,7 @@ msgid "Input shaping Frequency test" msgstr "Teste de Frequência da modelagem de entrada" msgid "Test model" -msgstr "" +msgstr "Modelo de teste" msgid "Ringing Tower" msgstr "" @@ -17450,6 +17529,7 @@ msgstr "Configurações de Desvio de Junção" msgid "Note: Lower values = sharper corners but slower speeds" msgstr "" +"Nota: Valores mais baixos = cantos mais nítidos, mas velocidades mais lentas" msgid "" "Please input valid values:\n" @@ -17525,7 +17605,7 @@ msgid "" "The selected bed type does not match the file. Please confirm before " "starting the print." msgstr "" -"O tipo de mesa selecionado não corresponde ao arquivo. Por favor, confirme " +"O tipo de placa selecionado não corresponde ao arquivo. Por favor, confirme " "antes de iniciar a impressão." msgid "Time-lapse" @@ -18815,7 +18895,7 @@ msgid "" "3D scene operations?" msgstr "" "Como usar atalhos de teclado\n" -"Você sabia que o Orca Slicer oferece uma ampla gama de atalhos de teclado e " +"Você sabia que o OrcaSlicer oferece uma ampla gama de atalhos de teclado e " "operações de cena 3D?" #: resources/data/hints.ini: [hint:Reverse on odd] @@ -18904,7 +18984,7 @@ msgid "" msgstr "" "Funcionalidade de Busca\n" "Você sabia que pode usar a ferramenta de busca para encontrar rapidamente " -"uma configuração específica do Orca Slicer?" +"uma configuração específica do OrcaSlicer?" #: resources/data/hints.ini: [hint:Simplify Model] msgid "" @@ -18947,7 +19027,7 @@ msgstr "" "Subtrair uma Peça\n" "Você sabia que pode subtrair uma malha da outra usando o modificador de peça " "negativa? Dessa forma, você pode, por exemplo, criar facilmente furos " -"redimensionáveis diretamente no Orca Slicer." +"redimensionáveis diretamente no OrcaSlicer." #: resources/data/hints.ini: [hint:STEP] msgid "" @@ -18960,7 +19040,7 @@ msgstr "" "STEP\n" "Você sabia que pode melhorar a qualidade da impressão fatiando um arquivo " "STEP ao invés de um STL?\n" -"Orca Slicer é compatível com arquivos STEP, gerando resultados mais suaves " +"O OrcaSlicer é compatível com arquivos STEP, gerando resultados mais suaves " "do que um STL em baixa resolução. Tente!" #: resources/data/hints.ini: [hint:Z seam location] @@ -19120,43 +19200,9 @@ msgstr "" "aumentar adequadamente a temperatura da mesa aquecida pode reduzir a " "probabilidade de empenamento?" -#~ msgid "" -#~ "Improve shell precision by adjusting outer wall spacing. This also " -#~ "improves layer consistency." -#~ msgstr "" -#~ "Melhora a precisão da casca ajustando o espaçamento da parede externa. " -#~ "Isso também melhora a consistência da camada." - #~ msgid "Enable filament ramming." #~ msgstr "Ativar moldeamento de ponta de filamento." -#~ msgid "Alt + Mouse wheel" -#~ msgstr "Alt + Roda do Mouse" - -#~ msgid "Ctrl + Mouse wheel" -#~ msgstr "Ctrl + Roda do mouse" - -#~ msgid "Shift + Left mouse button" -#~ msgstr "Shift + Botão esquerdo do mouse" - -#~ msgid "Alt + Shift + Enter" -#~ msgstr "Alt + Shift + Enter" - -#~ msgid "Shift + Mouse move up or down" -#~ msgstr "Shift + Mover mouse para cima ou para baixo" - -#~ msgid "Left mouse button:" -#~ msgstr "Botão esquerdo do mouse:" - -#~ msgid "Right mouse button:" -#~ msgstr "Botão direito do mouse:" - -#~ msgid "Shift + Left mouse button:" -#~ msgstr "Shift + Botão esquerdo do mouse:" - -#~ msgid "Shift + Right mouse button:" -#~ msgstr "Shift + Botão direito do mouse:" - #~ msgid "Recent projects" #~ msgstr "Projetos recentes" @@ -19166,57 +19212,6 @@ msgstr "" #~ msgid "Maximum count of recent projects" #~ msgstr "Contagem máxima de projetos recentes" -#~ msgid "⌘+Shift+G" -#~ msgstr "⌘+Shift+G" - -#~ msgid "Ctrl+Shift+G" -#~ msgstr "Ctrl+Shift+G" - -#~ msgid "Shift+A" -#~ msgstr "Shift+A" - -#~ msgid "Shift+Tab" -#~ msgstr "Shift+Tab" - -#~ msgid "⌘+Any arrow" -#~ msgstr "⌘+Qualquer seta" - -#~ msgid "⌥+Left mouse button" -#~ msgstr "Botão esquerdo do mouse ⌥+" - -#~ msgid "⌘+Left mouse button" -#~ msgstr "Botão esquerdo do mouse ⌘+" - -#~ msgid "Ctrl+Any arrow" -#~ msgstr "Ctrl+Qualquer seta" - -#~ msgid "Alt+Left mouse button" -#~ msgstr "Botão esquerdo do mouse Alt+" - -#~ msgid "Ctrl+Left mouse button" -#~ msgstr "Botão esquerdo do mouse Ctrl+" - -#~ msgid "Shift+Left mouse button" -#~ msgstr "Botão esquerdo do mouse Shift+" - -#~ msgid "Shift+Any arrow" -#~ msgstr "Shift+Qualquer seta" - -#~ msgid "⌘+Mouse wheel" -#~ msgstr "⌘+Roda do mouse" - -#~ msgid "⌥+Mouse wheel" -#~ msgstr "⌥+Roda do mouse" - -#~ msgid "Ctrl+Mouse wheel" -#~ msgstr "Ctrl+Roda do mouse" - -#~ msgid "Alt+Mouse wheel" -#~ msgstr "Alt+Roda do mouse" - -#~ msgid "Shift+Mouse wheel" -#~ msgstr "Shift+Roda do mouse" - #~ msgid "" #~ "This parameter adds a rotation of sparse infill direction to each layer " #~ "according to the specified template. The template is a comma-separated " @@ -19236,10 +19231,6 @@ msgstr "" #~ msgid "Set Position" #~ msgstr "Definir Posição" -#~ msgid "Right click the icon to fix model object" -#~ msgstr "" -#~ "Clique com o botão direito no ícone para corrigir o objeto do modelo" - #~ msgid "Color Scheme" #~ msgstr "Esquema de Cores" @@ -19302,17 +19293,6 @@ msgstr "" #~ msgid "Bind with Access Code" #~ msgstr "Vincular com Código de Acesso" -#~ msgid "" -#~ "When using support material for the support interface, we recommend the " -#~ "following settings:\n" -#~ "0 top z distance, 0 interface spacing, interlaced rectilinear pattern and " -#~ "disable independent support layer height" -#~ msgstr "" -#~ "Ao usar material de suporte para a interface de suporte, recomendamos as " -#~ "seguintes configurações:\n" -#~ "distância Z superior 0, espaçamento de interface 0, padrão retilíneo " -#~ "entrelaçado e desabilitar altura da camada de suporte independente" - #~ msgid "Ramming settings" #~ msgstr "Configurações de moldeamento" @@ -19361,17 +19341,6 @@ msgstr "" #~ msgid "Rotate the solid infill direction by 90° for each layer." #~ msgstr "Rotaciona a direção do preenchimento em 90° para cada camada." -#~ msgid "" -#~ "Flow Compensation Model, used to adjust the flow for small infill areas. " -#~ "The model is expressed as a comma separated pair of values for extrusion " -#~ "length and flow correction factors, one per line, in the following " -#~ "format: \"1.234,5.678\"" -#~ msgstr "" -#~ "Modelo de Compensação de Fluxo, usado para ajustar o fluxo para áreas de " -#~ "preenchimento pequenas. O modelo é expresso como um par de valores " -#~ "separados por vírgula para o comprimento de extrusão e os fatores de " -#~ "correção de fluxo, um por linha, no seguinte formato: \"1.234,5.678\"" - #~ msgid "Retract on top layer" #~ msgstr "Retração na camada superior" @@ -19395,19 +19364,6 @@ msgstr "" #~ msgid "Single loop draft shield" #~ msgstr "Escudo de ar de uma volta" -#~ msgid "" -#~ "Limits the draft shield loops to one wall after the first layer. This is " -#~ "useful, on occasion, to conserve filament but may cause the draft shield " -#~ "to warp / crack." -#~ msgstr "" -#~ "Limitar as voltas do escudo de ar a uma parede após a primeira camada. " -#~ "Isso é útil, ocasionalmente, para conservar filamento, mas pode fazer com " -#~ "que o escudo de ar entorte/quebre." - -#~ msgid "Spacing of interface lines. Zero means solid interface." -#~ msgstr "" -#~ "Espaçamento das linhas de interface. Zero significa interface sólida." - #~ msgid "" #~ "Minimum thickness of thin features. Model features that are thinner than " #~ "this value will not be printed, while features thicker than this value " @@ -19419,26 +19375,6 @@ msgstr "" #~ "espessos que esse valor serão alargados até a largura mínima da parede. É " #~ "expresso como uma porcentagem sobre o diâmetro do bico." -#~ msgid "" -#~ "We now have added the auto-calibration for different filaments, which is " -#~ "fully automated and the result will be saved into the printer for future " -#~ "use. You only need to do the calibration in the following limited cases:\n" -#~ "1. If you introduce a new filament of different brands/models or the " -#~ "filament is damp\n" -#~ "2. If the nozzle is worn out or replaced with a new one\n" -#~ "3. If the max volumetric speed or print temperature is changed in the " -#~ "filament setting" -#~ msgstr "" -#~ "Adicionamos agora a auto-calibração para diferentes filamentos, que é " -#~ "totalmente automatizada e o resultado será salvo na impressora para uso " -#~ "futuro. Você só precisa fazer a calibração nos seguintes casos " -#~ "limitados:\n" -#~ "1. Se você introduzir um novo filamento de marcas/modelos diferentes ou " -#~ "se o filamento estiver úmido;\n" -#~ "2. se o bico estiver desgastado ou substituído por um novo;\n" -#~ "3. Se o fluxo volumétrico máximo ou a temperatura de impressão forem " -#~ "alteradas na configuração do filamento." - #~ msgid "step: " #~ msgstr "passo: " @@ -19533,7 +19469,7 @@ msgstr "" #~ msgid "" #~ "Step 1, please confirm Orca Slicer and your printer are in the same LAN." #~ msgstr "" -#~ "Passo 1, por favor confirme se o Orca Slicer e sua impressora estão na " +#~ "Passo 1, por favor confirme se o OrcaSlicer e sua impressora estão na " #~ "mesma LAN." #~ msgid "" @@ -19596,17 +19532,6 @@ msgstr "" #~ "Densidade de pontes externas. 100% significa ponte sólida. O padrão é " #~ "100%." -#~ msgid "" -#~ "Improve shell precision by adjusting outer wall spacing. This also " -#~ "improves layer consistency.\n" -#~ "Note: This setting will only take effect if the wall sequence is " -#~ "configured to Inner-Outer" -#~ msgstr "" -#~ "Melhora a precisão da casca ajustando o espaçamento da parede externa. " -#~ "Isso também melhora a consistência da camada.\n" -#~ "Nota: Esta configuração só terá efeito se a sequência da parede estiver " -#~ "configurada para Interior-Exterior" - #~ msgid "" #~ "The minimum printing speed that the printer will slow down to to attempt " #~ "to maintain the minimum layer time above, when slow down for better layer " @@ -19819,13 +19744,13 @@ msgstr "" #~ "allowed when prime tower is enabled." #~ msgstr "" #~ "Diâmetros de bico diferentes e diâmetros de filamento diferentes não são " -#~ "permitidos quando a torre de preparação está ativa." +#~ "permitidos quando a torre de preparo está ativa." #~ msgid "" #~ "Ooze prevention is currently not supported with the prime tower enabled." #~ msgstr "" #~ "A prevenção de vazamento atualmente não é suportada com a torre de " -#~ "preparação ativa." +#~ "prepao ativa." #~ msgid "" #~ "Interlocking depth of a segmented region. Zero disables this feature." diff --git a/resources/profiles/Afinia.json b/resources/profiles/Afinia.json new file mode 100644 index 0000000000..b25329b0ed --- /dev/null +++ b/resources/profiles/Afinia.json @@ -0,0 +1,194 @@ +{ + "name": "Afinia", + "version": "02.03.01.01", + "force_update": "0", + "description": "Afinia configurations", + "machine_model_list": [ + { + "name": "Afinia H+1(HS)", + "sub_path": "machine/Afinia H+1(HS).json" + } + ], + "process_list": [ + { + "name": "fdm_process_common", + "sub_path": "process/fdm_process_common.json" + }, + { + "name": "fdm_process_afinia_common", + "sub_path": "process/fdm_process_afinia_common.json" + }, + { + "name": "fdm_process_afinia_HS_common", + "sub_path": "process/fdm_process_afinia_HS_common.json" + }, + { + "name": "0.12mm Fine @Afinia H+1(HS)", + "sub_path": "process/0.12mm Fine @Afinia H+1(HS).json" + }, + { + "name": "0.16mm Optimal @Afinia H+1(HS)", + "sub_path": "process/0.16mm Optimal @Afinia H+1(HS).json" + }, + { + "name": "0.20mm Standard @Afinia H+1(HS)", + "sub_path": "process/0.20mm Standard @Afinia H+1(HS).json" + }, + { + "name": "0.24mm Draft @Afinia H+1(HS)", + "sub_path": "process/0.24mm Draft @Afinia H+1(HS).json" + }, + { + "name": "0.28mm Extra Draft @Afinia H+1(HS)", + "sub_path": "process/0.28mm Extra Draft @Afinia H+1(HS).json" + }, + { + "name": "fdm_process_afinia_0.18_nozzle_0.6", + "sub_path": "process/fdm_process_afinia_0.18_nozzle_0.6.json" + }, + { + "name": "fdm_process_afinia_0.24_nozzle_0.6", + "sub_path": "process/fdm_process_afinia_0.24_nozzle_0.6.json" + }, + { + "name": "fdm_process_afinia_0.30_nozzle_0.6", + "sub_path": "process/fdm_process_afinia_0.30_nozzle_0.6.json" + }, + { + "name": "fdm_process_afinia_0.36_nozzle_0.6", + "sub_path": "process/fdm_process_afinia_0.36_nozzle_0.6.json" + }, + { + "name": "fdm_process_afinia_0.42_nozzle_0.6", + "sub_path": "process/fdm_process_afinia_0.42_nozzle_0.6.json" + }, + { + "name": "fdm_process_afinia_0.18_nozzle_0.6_HS", + "sub_path": "process/fdm_process_afinia_0.18_nozzle_0.6_HS.json" + }, + { + "name": "fdm_process_afinia_0.24_nozzle_0.6_HS", + "sub_path": "process/fdm_process_afinia_0.24_nozzle_0.6_HS.json" + }, + { + "name": "fdm_process_afinia_0.30_nozzle_0.6_HS", + "sub_path": "process/fdm_process_afinia_0.30_nozzle_0.6_HS.json" + }, + { + "name": "fdm_process_afinia_0.36_nozzle_0.6_HS", + "sub_path": "process/fdm_process_afinia_0.36_nozzle_0.6_HS.json" + }, + { + "name": "fdm_process_afinia_0.42_nozzle_0.6_HS", + "sub_path": "process/fdm_process_afinia_0.42_nozzle_0.6_HS.json" + }, + { + "name": "0.18mm Fine @Afinia H+1(HS) 0.6 nozzle", + "sub_path": "process/0.18mm Fine @Afinia H+1(HS) 0.6 nozzle.json" + }, + { + "name": "0.24mm Standard @Afinia H+1(HS) 0.6 nozzle", + "sub_path": "process/0.24mm Standard @Afinia H+1(HS) 0.6 nozzle.json" + }, + { + "name": "0.30mm Standard @Afinia H+1(HS) 0.6 nozzle", + "sub_path": "process/0.30mm Standard @Afinia H+1(HS) 0.6 nozzle.json" + }, + { + "name": "0.30mm Strength @Afinia H+1(HS) 0.6 nozzle", + "sub_path": "process/0.30mm Strength @Afinia H+1(HS) 0.6 nozzle.json" + }, + { + "name": "0.36mm Draft @Afinia H+1(HS) 0.6 nozzle", + "sub_path": "process/0.36mm Draft @Afinia H+1(HS) 0.6 nozzle.json" + }, + { + "name": "0.42mm Extra Draft @Afinia H+1(HS) 0.6 nozzle", + "sub_path": "process/0.42mm Extra Draft @Afinia H+1(HS) 0.6 nozzle.json" + } + ], + "filament_list": [ + { + "name": "fdm_filament_common", + "sub_path": "filament/fdm_filament_common.json" + }, + { + "name": "fdm_filament_pla", + "sub_path": "filament/fdm_filament_pla.json" + }, + { + "name": "fdm_filament_abs", + "sub_path": "filament/fdm_filament_abs.json" + }, + { + "name": "fdm_filament_tpu", + "sub_path": "filament/fdm_filament_tpu.json" + }, + { + "name": "Afinia PLA", + "sub_path": "filament/Afinia PLA.json" + }, + { + "name": "Afinia Value PLA", + "sub_path": "filament/Afinia Value PLA.json" + }, + { + "name": "Afinia ABS", + "sub_path": "filament/Afinia ABS.json" + }, + { + "name": "Afinia ABS+", + "sub_path": "filament/Afinia ABS+.json" + }, + { + "name": "Afinia Value ABS", + "sub_path": "filament/Afinia Value ABS.json" + }, + { + "name": "Afinia TPU", + "sub_path": "filament/Afinia TPU.json" + }, + { + "name": "Afinia PLA@HS", + "sub_path": "filament/Afinia PLA@HS.json" + }, + { + "name": "Afinia Value PLA@HS", + "sub_path": "filament/Afinia Value PLA@HS.json" + }, + { + "name": "Afinia ABS@HS", + "sub_path": "filament/Afinia ABS@HS.json" + }, + { + "name": "Afinia Value ABS@HS", + "sub_path": "filament/Afinia Value ABS@HS.json" + }, + { + "name": "Afinia ABS+@HS", + "sub_path": "filament/Afinia ABS+@HS.json" + }, + { + "name": "Afinia TPU@HS", + "sub_path": "filament/Afinia TPU@HS.json" + } + ], + "machine_list": [ + { + "name": "fdm_machine_common", + "sub_path": "machine/fdm_machine_common.json" + }, + { + "name": "fdm_afinia_common", + "sub_path": "machine/fdm_afinia_common.json" + }, + { + "name": "Afinia H+1(HS) 0.4 nozzle", + "sub_path": "machine/Afinia H+1(HS) 0.4 nozzle.json" + }, + { + "name": "Afinia H+1(HS) 0.6 nozzle", + "sub_path": "machine/Afinia H+1(HS) 0.6 nozzle.json" + } + ] +} diff --git a/resources/profiles/Afinia/Afinia H+1(HS)_cover.png b/resources/profiles/Afinia/Afinia H+1(HS)_cover.png new file mode 100644 index 0000000000..c16a5f37eb Binary files /dev/null and b/resources/profiles/Afinia/Afinia H+1(HS)_cover.png differ diff --git a/resources/profiles/Afinia/filament/Afinia ABS+.json b/resources/profiles/Afinia/filament/Afinia ABS+.json new file mode 100644 index 0000000000..354711d667 --- /dev/null +++ b/resources/profiles/Afinia/filament/Afinia ABS+.json @@ -0,0 +1,37 @@ +{ + "type": "filament", + "filament_id": "GFB00", + "setting_id": "GFSB00", + "name": "Afinia ABS+", + "from": "system", + "instantiation": "true", + "inherits": "fdm_filament_abs", + "filament_flow_ratio": [ + "0.95" + ], + "filament_cost": [ + "24.99" + ], + "filament_vendor": [ + "Afinia" + ], + "fan_max_speed": [ + "60" + ], + "filament_max_volumetric_speed": [ + "16" + ], + "nozzle_temperature": [ + "275" + ], + "nozzle_temperature_initial_layer": [ + "275" + ], + "slow_down_layer_time": [ + "12" + ], + "compatible_printers": [ + "Afinia H400 Pro 0.4 nozzle", + "Afinia H400 Pro 0.6 nozzle" + ] +} diff --git a/resources/profiles/Afinia/filament/Afinia ABS+@HS.json b/resources/profiles/Afinia/filament/Afinia ABS+@HS.json new file mode 100644 index 0000000000..7d682604ad --- /dev/null +++ b/resources/profiles/Afinia/filament/Afinia ABS+@HS.json @@ -0,0 +1,37 @@ +{ + "type": "filament", + "filament_id": "GFB00_01", + "setting_id": "GFSB00", + "name": "Afinia ABS+@HS", + "from": "system", + "instantiation": "true", + "inherits": "fdm_filament_abs", + "filament_flow_ratio": [ + "0.95" + ], + "filament_cost": [ + "24.99" + ], + "filament_vendor": [ + "Afinia" + ], + "fan_max_speed": [ + "60" + ], + "filament_max_volumetric_speed": [ + "16" + ], + "nozzle_temperature": [ + "275" + ], + "nozzle_temperature_initial_layer": [ + "275" + ], + "slow_down_layer_time": [ + "12" + ], + "compatible_printers": [ + "Afinia H+1(HS) 0.4 nozzle", + "Afinia H+1(HS) 0.6 nozzle" + ] +} diff --git a/resources/profiles/Afinia/filament/Afinia ABS.json b/resources/profiles/Afinia/filament/Afinia ABS.json new file mode 100644 index 0000000000..b0029f46c6 --- /dev/null +++ b/resources/profiles/Afinia/filament/Afinia ABS.json @@ -0,0 +1,31 @@ +{ + "type": "filament", + "filament_id": "GFB00", + "setting_id": "GFSB00", + "name": "Afinia ABS", + "from": "system", + "instantiation": "true", + "inherits": "fdm_filament_abs", + "filament_flow_ratio": [ + "0.95" + ], + "filament_cost": [ + "24.99" + ], + "filament_vendor": [ + "Afinia" + ], + "fan_max_speed": [ + "60" + ], + "filament_max_volumetric_speed": [ + "16" + ], + "slow_down_layer_time": [ + "12" + ], + "compatible_printers": [ + "Afinia H400 Pro 0.4 nozzle", + "Afinia H400 Pro 0.6 nozzle" + ] +} diff --git a/resources/profiles/Afinia/filament/Afinia ABS@HS.json b/resources/profiles/Afinia/filament/Afinia ABS@HS.json new file mode 100644 index 0000000000..b82219c42d --- /dev/null +++ b/resources/profiles/Afinia/filament/Afinia ABS@HS.json @@ -0,0 +1,31 @@ +{ + "type": "filament", + "filament_id": "GFB00_01", + "setting_id": "GFSB00", + "name": "Afinia ABS@HS", + "from": "system", + "instantiation": "true", + "inherits": "fdm_filament_abs", + "filament_flow_ratio": [ + "0.95" + ], + "filament_cost": [ + "24.99" + ], + "filament_vendor": [ + "Afinia" + ], + "fan_max_speed": [ + "60" + ], + "filament_max_volumetric_speed": [ + "16" + ], + "slow_down_layer_time": [ + "12" + ], + "compatible_printers": [ + "Afinia H+1(HS) 0.4 nozzle", + "Afinia H+1(HS) 0.6 nozzle" + ] +} diff --git a/resources/profiles/Afinia/filament/Afinia PLA.json b/resources/profiles/Afinia/filament/Afinia PLA.json new file mode 100644 index 0000000000..05906f0ea1 --- /dev/null +++ b/resources/profiles/Afinia/filament/Afinia PLA.json @@ -0,0 +1,34 @@ +{ + "type": "filament", + "filament_id": "GFA00", + "setting_id": "GFSA00", + "name": "Afinia PLA", + "from": "system", + "instantiation": "true", + "inherits": "fdm_filament_pla", + "filament_cost": [ + "24.99" + ], + "filament_density": [ + "1.26" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "21" + ], + "filament_vendor": [ + "Afinia" + ], + "filament_long_retractions_when_cut": [ + "1" + ], + "filament_retraction_distances_when_cut": [ + "18" + ], + "compatible_printers": [ + "Afinia H400 Pro 0.4 nozzle", + "Afinia H400 Pro 0.6 nozzle" + ] +} diff --git a/resources/profiles/Afinia/filament/Afinia PLA@HS.json b/resources/profiles/Afinia/filament/Afinia PLA@HS.json new file mode 100644 index 0000000000..b2950ed1d6 --- /dev/null +++ b/resources/profiles/Afinia/filament/Afinia PLA@HS.json @@ -0,0 +1,34 @@ +{ + "type": "filament", + "filament_id": "GFA00_01", + "setting_id": "GFSA00", + "name": "Afinia PLA@HS", + "from": "system", + "instantiation": "true", + "inherits": "fdm_filament_pla", + "filament_cost": [ + "24.99" + ], + "filament_density": [ + "1.26" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "21" + ], + "filament_vendor": [ + "Afinia" + ], + "filament_long_retractions_when_cut": [ + "1" + ], + "filament_retraction_distances_when_cut": [ + "18" + ], + "compatible_printers": [ + "Afinia H+1(HS) 0.4 nozzle", + "Afinia H+1(HS) 0.6 nozzle" + ] +} diff --git a/resources/profiles/Afinia/filament/Afinia TPU.json b/resources/profiles/Afinia/filament/Afinia TPU.json new file mode 100644 index 0000000000..bc5c8691a0 --- /dev/null +++ b/resources/profiles/Afinia/filament/Afinia TPU.json @@ -0,0 +1,27 @@ +{ + "type": "filament", + "name": "Afinia TPU", + "inherits": "fdm_filament_tpu", + "from": "system", + "filament_id": "GFU01", + "instantiation": "true", + "filament_vendor": [ + "Afinia" + ], + "filament_density": [ + "1.22" + ], + "nozzle_temperature_initial_layer": [ + "230" + ], + "filament_cost": [ + "41.99" + ], + "nozzle_temperature": [ + "230" + ], + "compatible_printers": [ + "Afinia H400 Pro 0.4 nozzle", + "Afinia H400 Pro 0.6 nozzle" + ] +} diff --git a/resources/profiles/Afinia/filament/Afinia TPU@HS.json b/resources/profiles/Afinia/filament/Afinia TPU@HS.json new file mode 100644 index 0000000000..b6ba69eacb --- /dev/null +++ b/resources/profiles/Afinia/filament/Afinia TPU@HS.json @@ -0,0 +1,27 @@ +{ + "type": "filament", + "name": "Afinia TPU@HS", + "inherits": "fdm_filament_tpu", + "from": "system", + "filament_id": "GFU01_01", + "instantiation": "true", + "filament_vendor": [ + "Afinia" + ], + "filament_density": [ + "1.22" + ], + "nozzle_temperature_initial_layer": [ + "230" + ], + "filament_cost": [ + "41.99" + ], + "nozzle_temperature": [ + "230" + ], + "compatible_printers": [ + "Afinia H+1(HS) 0.4 nozzle", + "Afinia H+1(HS) 0.6 nozzle" + ] +} diff --git a/resources/profiles/Afinia/filament/Afinia Value ABS.json b/resources/profiles/Afinia/filament/Afinia Value ABS.json new file mode 100644 index 0000000000..301dcf5ab6 --- /dev/null +++ b/resources/profiles/Afinia/filament/Afinia Value ABS.json @@ -0,0 +1,37 @@ +{ + "type": "filament", + "filament_id": "GFB00", + "setting_id": "GFSB00", + "name": "Afinia Value ABS", + "from": "system", + "instantiation": "true", + "inherits": "fdm_filament_abs", + "filament_flow_ratio": [ + "0.95" + ], + "filament_cost": [ + "24.99" + ], + "filament_vendor": [ + "Afinia" + ], + "fan_max_speed": [ + "60" + ], + "filament_max_volumetric_speed": [ + "16" + ], + "nozzle_temperature": [ + "245" + ], + "nozzle_temperature_initial_layer": [ + "245" + ], + "slow_down_layer_time": [ + "12" + ], + "compatible_printers": [ + "Afinia H400 Pro 0.4 nozzle", + "Afinia H400 Pro 0.6 nozzle" + ] +} diff --git a/resources/profiles/Afinia/filament/Afinia Value ABS@HS.json b/resources/profiles/Afinia/filament/Afinia Value ABS@HS.json new file mode 100644 index 0000000000..611b61ad64 --- /dev/null +++ b/resources/profiles/Afinia/filament/Afinia Value ABS@HS.json @@ -0,0 +1,37 @@ +{ + "type": "filament", + "filament_id": "GFB00_01", + "setting_id": "GFSB00", + "name": "Afinia Value ABS@HS", + "from": "system", + "instantiation": "true", + "inherits": "fdm_filament_abs", + "filament_flow_ratio": [ + "0.95" + ], + "filament_cost": [ + "24.99" + ], + "filament_vendor": [ + "Afinia" + ], + "fan_max_speed": [ + "60" + ], + "filament_max_volumetric_speed": [ + "16" + ], + "nozzle_temperature": [ + "245" + ], + "nozzle_temperature_initial_layer": [ + "245" + ], + "slow_down_layer_time": [ + "12" + ], + "compatible_printers": [ + "Afinia H+1(HS) 0.4 nozzle", + "Afinia H+1(HS) 0.6 nozzle" + ] +} diff --git a/resources/profiles/Afinia/filament/Afinia Value PLA.json b/resources/profiles/Afinia/filament/Afinia Value PLA.json new file mode 100644 index 0000000000..f8904735fe --- /dev/null +++ b/resources/profiles/Afinia/filament/Afinia Value PLA.json @@ -0,0 +1,40 @@ +{ + "type": "filament", + "filament_id": "GFA00", + "setting_id": "GFSA00", + "name": "Afinia Value PLA", + "from": "system", + "instantiation": "true", + "inherits": "fdm_filament_pla", + "filament_cost": [ + "24.99" + ], + "filament_density": [ + "1.26" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "21" + ], + "filament_vendor": [ + "Afinia" + ], + "filament_long_retractions_when_cut": [ + "1" + ], + "filament_retraction_distances_when_cut": [ + "18" + ], + "nozzle_temperature": [ + "190" + ], + "nozzle_temperature_initial_layer": [ + "190" + ], + "compatible_printers": [ + "Afinia H400 Pro 0.4 nozzle", + "Afinia H400 Pro 0.6 nozzle" + ] +} diff --git a/resources/profiles/Afinia/filament/Afinia Value PLA@HS.json b/resources/profiles/Afinia/filament/Afinia Value PLA@HS.json new file mode 100644 index 0000000000..77e496b5ec --- /dev/null +++ b/resources/profiles/Afinia/filament/Afinia Value PLA@HS.json @@ -0,0 +1,40 @@ +{ + "type": "filament", + "filament_id": "GFA00_01", + "setting_id": "GFSA00", + "name": "Afinia Value PLA@HS", + "from": "system", + "instantiation": "true", + "inherits": "fdm_filament_pla", + "filament_cost": [ + "24.99" + ], + "filament_density": [ + "1.26" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "21" + ], + "filament_vendor": [ + "Afinia" + ], + "filament_long_retractions_when_cut": [ + "1" + ], + "filament_retraction_distances_when_cut": [ + "18" + ], + "nozzle_temperature": [ + "190" + ], + "nozzle_temperature_initial_layer": [ + "190" + ], + "compatible_printers": [ + "Afinia H+1(HS) 0.4 nozzle", + "Afinia H+1(HS) 0.6 nozzle" + ] +} diff --git a/resources/profiles/Afinia/filament/fdm_filament_abs.json b/resources/profiles/Afinia/filament/fdm_filament_abs.json new file mode 100644 index 0000000000..50dc3facf1 --- /dev/null +++ b/resources/profiles/Afinia/filament/fdm_filament_abs.json @@ -0,0 +1,82 @@ +{ + "type": "filament", + "name": "fdm_filament_abs", + "inherits": "fdm_filament_common", + "from": "system", + "instantiation": "false", + "activate_air_filtration": [ + "0" + ], + "cool_plate_temp": [ + "0" + ], + "cool_plate_temp_initial_layer": [ + "0" + ], + "eng_plate_temp": [ + "90" + ], + "eng_plate_temp_initial_layer": [ + "90" + ], + "fan_cooling_layer_time": [ + "30" + ], + "fan_max_speed": [ + "80" + ], + "fan_min_speed": [ + "10" + ], + "filament_cost": [ + "20" + ], + "filament_density": [ + "1.04" + ], + "filament_max_volumetric_speed": [ + "28.6" + ], + "filament_type": [ + "ABS" + ], + "hot_plate_temp": [ + "90" + ], + "hot_plate_temp_initial_layer": [ + "90" + ], + "nozzle_temperature": [ + "270" + ], + "nozzle_temperature_initial_layer": [ + "270" + ], + "nozzle_temperature_range_high": [ + "280" + ], + "nozzle_temperature_range_low": [ + "240" + ], + "overhang_fan_speed": [ + "80" + ], + "overhang_fan_threshold": [ + "25%" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "slow_down_layer_time": [ + "3" + ], + "slow_down_min_speed": [ + "20" + ], + "textured_plate_temp": [ + "90" + ], + "textured_plate_temp_initial_layer": [ + "90" + ] +} diff --git a/resources/profiles/Afinia/filament/fdm_filament_common.json b/resources/profiles/Afinia/filament/fdm_filament_common.json new file mode 100644 index 0000000000..3fb3a8da5e --- /dev/null +++ b/resources/profiles/Afinia/filament/fdm_filament_common.json @@ -0,0 +1,166 @@ +{ + "type": "filament", + "name": "fdm_filament_common", + "from": "system", + "instantiation": "false", + "activate_air_filtration": [ + "0" + ], + "chamber_temperatures": [ + "0" + ], + "close_fan_the_first_x_layers": [ + "3" + ], + "complete_print_exhaust_fan_speed": [ + "70" + ], + "cool_plate_temp": [ + "60" + ], + "cool_plate_temp_initial_layer": [ + "60" + ], + "during_print_exhaust_fan_speed": [ + "70" + ], + "eng_plate_temp": [ + "60" + ], + "eng_plate_temp_initial_layer": [ + "60" + ], + "fan_cooling_layer_time": [ + "60" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "35" + ], + "filament_cost": [ + "0" + ], + "filament_density": [ + "0" + ], + "filament_deretraction_speed": [ + "nil" + ], + "filament_diameter": [ + "1.75" + ], + "filament_flow_ratio": [ + "1" + ], + "filament_is_support": [ + "0" + ], + "filament_long_retractions_when_cut": [ + "nil" + ], + "filament_max_volumetric_speed": [ + "0" + ], + "filament_minimal_purge_on_wipe_tower": [ + "15" + ], + "filament_retract_before_wipe": [ + "nil" + ], + "filament_retract_restart_extra": [ + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil" + ], + "filament_retraction_length": [ + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil" + ], + "filament_retraction_speed": [ + "nil" + ], + "filament_settings_id": [ + "" + ], + "filament_soluble": [ + "0" + ], + "filament_type": [ + "PLA" + ], + "filament_vendor": [ + "Generic" + ], + "filament_wipe": [ + "nil" + ], + "filament_wipe_distance": [ + "nil" + ], + "filament_z_hop": [ + "nil" + ], + "filament_z_hop_types": [ + "nil" + ], + "full_fan_speed_layer": [ + "0" + ], + "hot_plate_temp": [ + "60" + ], + "hot_plate_temp_initial_layer": [ + "60" + ], + "nozzle_temperature": [ + "200" + ], + "nozzle_temperature_initial_layer": [ + "200" + ], + "overhang_fan_speed": [ + "100" + ], + "overhang_fan_threshold": [ + "95%" + ], + "reduce_fan_stop_start_freq": [ + "0" + ], + "required_nozzle_HRC": [ + "3" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "slow_down_layer_time": [ + "8" + ], + "slow_down_min_speed": [ + "10" + ], + "temperature_vitrification": [ + "100" + ], + "textured_plate_temp": [ + "60" + ], + "textured_plate_temp_initial_layer": [ + "60" + ], + "compatible_printers": [], + "filament_start_gcode": [ + "; Filament gcode\n;{if activate_air_filtration[current_extruder] && support_air_filtration}\n;M106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n;{endif}" + ], + "filament_end_gcode": [ + "; filament end gcode \n;M106 P3 S0\n" + ] +} diff --git a/resources/profiles/Afinia/filament/fdm_filament_pla.json b/resources/profiles/Afinia/filament/fdm_filament_pla.json new file mode 100644 index 0000000000..349acbdcc5 --- /dev/null +++ b/resources/profiles/Afinia/filament/fdm_filament_pla.json @@ -0,0 +1,82 @@ +{ + "type": "filament", + "name": "fdm_filament_pla", + "inherits": "fdm_filament_common", + "from": "system", + "instantiation": "false", + "fan_cooling_layer_time": [ + "100" + ], + "filament_max_volumetric_speed": [ + "12" + ], + "filament_density": [ + "1.24" + ], + "filament_cost": [ + "20" + ], + "cool_plate_temp": [ + "35" + ], + "eng_plate_temp": [ + "0" + ], + "hot_plate_temp": [ + "60" + ], + "textured_plate_temp": [ + "60" + ], + "cool_plate_temp_initial_layer": [ + "35" + ], + "eng_plate_temp_initial_layer": [ + "0" + ], + "hot_plate_temp_initial_layer": [ + "60" + ], + "textured_plate_temp_initial_layer": [ + "60" + ], + "nozzle_temperature_initial_layer": [ + "220" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "fan_min_speed": [ + "100" + ], + "overhang_fan_threshold": [ + "50%" + ], + "close_fan_the_first_x_layers": [ + "1" + ], + "nozzle_temperature": [ + "220" + ], + "temperature_vitrification": [ + "45" + ], + "nozzle_temperature_range_low": [ + "190" + ], + "nozzle_temperature_range_high": [ + "240" + ], + "slow_down_min_speed": [ + "20" + ], + "slow_down_layer_time": [ + "4" + ], + "additional_cooling_fan_speed": [ + "70" + ], + "filament_start_gcode": [ + "; filament start gcode\n;{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n;{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n;{endif}\n\n;{if activate_air_filtration[current_extruder] && support_air_filtration}\n;M106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n;{endif}" + ] +} diff --git a/resources/profiles/Afinia/filament/fdm_filament_tpu.json b/resources/profiles/Afinia/filament/fdm_filament_tpu.json new file mode 100644 index 0000000000..1914ac3029 --- /dev/null +++ b/resources/profiles/Afinia/filament/fdm_filament_tpu.json @@ -0,0 +1,79 @@ +{ + "type": "filament", + "name": "fdm_filament_tpu", + "inherits": "fdm_filament_common", + "from": "system", + "instantiation": "false", + "additional_cooling_fan_speed": [ + "70" + ], + "close_fan_the_first_x_layers": [ + "1" + ], + "cool_plate_temp": [ + "30" + ], + "cool_plate_temp_initial_layer": [ + "30" + ], + "eng_plate_temp": [ + "30" + ], + "eng_plate_temp_initial_layer": [ + "30" + ], + "fan_cooling_layer_time": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_cost": [ + "20" + ], + "filament_density": [ + "1.24" + ], + "filament_max_volumetric_speed": [ + "8" + ], + "filament_retraction_length": [ + "2.0" + ], + "filament_type": [ + "TPU" + ], + "hot_plate_temp": [ + "35" + ], + "hot_plate_temp_initial_layer": [ + "35" + ], + "nozzle_temperature": [ + "240" + ], + "nozzle_temperature_initial_layer": [ + "240" + ], + "nozzle_temperature_range_high": [ + "250" + ], + "nozzle_temperature_range_low": [ + "200" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "temperature_vitrification": [ + "30" + ], + "textured_plate_temp": [ + "35" + ], + "textured_plate_temp_initial_layer": [ + "35" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >30)||(bed_temperature_initial_layer[current_extruder] >30)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ] +} diff --git a/resources/profiles/Afinia/machine/Afinia H+1(HS) 0.4 nozzle.json b/resources/profiles/Afinia/machine/Afinia H+1(HS) 0.4 nozzle.json new file mode 100644 index 0000000000..023c10c104 --- /dev/null +++ b/resources/profiles/Afinia/machine/Afinia H+1(HS) 0.4 nozzle.json @@ -0,0 +1,21 @@ +{ + "type": "machine", + "setting_id": "GM001", + "name": "Afinia H+1(HS) 0.4 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_afinia_common", + "printer_model": "Afinia H+1(HS)", + "default_print_profile": "0.20mm Standard @Afinia H+1(HS)", + "nozzle_diameter": [ + "0.4" + ], + "printer_variant": "0.4", + "printable_area": [ + "0x0", + "207x0", + "207x255", + "0x255" + ], + "printable_height": "230" +} \ No newline at end of file diff --git a/resources/profiles/Afinia/machine/Afinia H+1(HS) 0.6 nozzle.json b/resources/profiles/Afinia/machine/Afinia H+1(HS) 0.6 nozzle.json new file mode 100644 index 0000000000..f8d6a58926 --- /dev/null +++ b/resources/profiles/Afinia/machine/Afinia H+1(HS) 0.6 nozzle.json @@ -0,0 +1,26 @@ +{ + "type": "machine", + "setting_id": "GM001", + "name": "Afinia H+1(HS) 0.6 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "Afinia H+1(HS) 0.4 nozzle", + "printer_model": "Afinia H+1(HS)", + "default_print_profile": "0.30mm Strength @Afinia H+1(HS) 0.6 nozzle", + "nozzle_diameter": [ + "0.6" + ], + "printer_variant": "0.6", + "max_layer_height": [ + "0.42" + ], + "min_layer_height": [ + "0.18" + ], + "retraction_length": [ + "1.4" + ], + "retraction_minimum_travel": [ + "3" + ] +} \ No newline at end of file diff --git a/resources/profiles/Afinia/machine/Afinia H+1(HS).json b/resources/profiles/Afinia/machine/Afinia H+1(HS).json new file mode 100644 index 0000000000..9a882476eb --- /dev/null +++ b/resources/profiles/Afinia/machine/Afinia H+1(HS).json @@ -0,0 +1,12 @@ +{ + "type": "machine_model", + "name": "Afinia H+1(HS)", + "model_id": "my_afinia_h_1_hs_01", + "nozzle_diameter": "0.4;0.6", + "machine_tech": "FFF", + "family": "Afinia", + "bed_model": "", + "bed_texture": "", + "hotend_model": "", + "default_materials": "Afinia ABS;Afinia PLA" +} diff --git a/resources/profiles/Afinia/machine/fdm_afinia_common.json b/resources/profiles/Afinia/machine/fdm_afinia_common.json new file mode 100644 index 0000000000..4ba6250b3a --- /dev/null +++ b/resources/profiles/Afinia/machine/fdm_afinia_common.json @@ -0,0 +1,60 @@ +{ + "type": "machine", + "name": "fdm_afinia_common", + "from": "system", + "instantiation": "false", + "inherits": "fdm_machine_common", + "gcode_flavor": "klipper", + "machine_max_acceleration_e": ["5000", "5000"], + "machine_max_acceleration_extruding": ["20000", "20000"], + "machine_max_acceleration_retracting": ["5000", "5000"], + "machine_max_acceleration_travel": ["20000", "20000"], + "machine_max_acceleration_x": ["20000", "20000"], + "machine_max_acceleration_y": ["20000", "20000"], + "machine_max_acceleration_z": ["500", "200"], + "machine_max_speed_e": ["25", "25"], + "machine_max_speed_x": ["500", "200"], + "machine_max_speed_y": ["500", "200"], + "machine_max_speed_z": ["12", "12"], + "machine_max_jerk_e": ["2.5", "2.5"], + "machine_max_jerk_x": ["9", "9"], + "machine_max_jerk_y": ["9", "9"], + "machine_max_jerk_z": ["0.2", "0.4"], + "machine_min_extruding_rate": ["0", "0"], + "machine_min_travel_rate": ["0", "0"], + "max_layer_height": ["0.32"], + "min_layer_height": ["0.08"], + "printable_height": "250", + "extruder_clearance_radius": "65", + "extruder_clearance_height_to_rod": "36", + "extruder_clearance_height_to_lid": "140", + "printer_settings_id": "", + "printer_technology": "FFF", + "printer_variant": "0.4", + "retraction_minimum_travel": ["1"], + "retract_before_wipe": ["70%"], + "retract_when_changing_layer": ["1"], + "retraction_length": ["0.8"], + "retract_length_toolchange": ["2"], + "z_hop": ["0.4"], + "retract_restart_extra": ["0"], + "retract_restart_extra_toolchange": ["0"], + "retraction_speed": ["30"], + "deretraction_speed": ["30"], + "z_hop_types": "Normal Lift", + "silent_mode": "0", + "single_extruder_multi_material": "1", + "change_filament_gcode": "", + "wipe": ["1"], + "default_filament_profile": [""], + "default_print_profile": "0.20mm Standard @Afinia H+1(HS)", + "bed_exclude_area": ["0x0"], + "machine_start_gcode": ";M190 S[bed_temperature_initial_layer_single]\n;M109 S[nozzle_temperature_initial_layer]\nPRINT_START EXTRUDER=[nozzle_temperature_initial_layer] BED=[bed_temperature_initial_layer_single]\n", + "machine_end_gcode": "PRINT_END", + "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]", + "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n", + "machine_pause_gcode": "PAUSE", + "scan_first_layer": "0", + "nozzle_type": "undefine", + "auxiliary_fan": "0" +} diff --git a/resources/profiles/Afinia/machine/fdm_machine_common.json b/resources/profiles/Afinia/machine/fdm_machine_common.json new file mode 100644 index 0000000000..5785f57b19 --- /dev/null +++ b/resources/profiles/Afinia/machine/fdm_machine_common.json @@ -0,0 +1,119 @@ +{ + "type": "machine", + "name": "fdm_machine_common", + "from": "system", + "instantiation": "false", + "printer_technology": "FFF", + "deretraction_speed": [ + "40" + ], + "extruder_colour": [ + "#FCE94F" + ], + "extruder_offset": [ + "0x0" + ], + "gcode_flavor": "marlin", + "silent_mode": "0", + "machine_max_acceleration_e": [ + "5000" + ], + "machine_max_acceleration_extruding": [ + "10000" + ], + "machine_max_acceleration_retracting": [ + "1000" + ], + "machine_max_acceleration_x": [ + "10000" + ], + "machine_max_acceleration_y": [ + "10000" + ], + "machine_max_acceleration_z": [ + "500" + ], + "machine_max_speed_e": [ + "60" + ], + "machine_max_speed_x": [ + "500" + ], + "machine_max_speed_y": [ + "500" + ], + "machine_max_speed_z": [ + "10" + ], + "machine_max_jerk_e": [ + "5" + ], + "machine_max_jerk_x": [ + "8" + ], + "machine_max_jerk_y": [ + "8" + ], + "machine_max_jerk_z": [ + "0.4" + ], + "machine_min_extruding_rate": [ + "0" + ], + "machine_min_travel_rate": [ + "0" + ], + "max_layer_height": [ + "0.32" + ], + "min_layer_height": [ + "0.08" + ], + "printable_height": "250", + "extruder_clearance_radius": "65", + "extruder_clearance_height_to_rod": "36", + "extruder_clearance_height_to_lid": "140", + "nozzle_diameter": [ + "0.4" + ], + "printer_settings_id": "", + "printer_variant": "0.4", + "retraction_minimum_travel": [ + "2" + ], + "retract_before_wipe": [ + "70%" + ], + "retract_when_changing_layer": [ + "1" + ], + "retraction_length": [ + "5" + ], + "retract_length_toolchange": [ + "1" + ], + "z_hop": [ + "0" + ], + "retract_restart_extra": [ + "0" + ], + "retract_restart_extra_toolchange": [ + "0" + ], + "retraction_speed": [ + "60" + ], + "single_extruder_multi_material": "1", + "change_filament_gcode": "", + "wipe": [ + "1" + ], + "default_print_profile": "", + "machine_start_gcode": "G0 Z20 F9000\nG92 E0; G1 E-10 F1200\nG28\nM970 Q1 A10 B10 C130 K0\nM970 Q1 A10 B131 C250 K1\nM974 Q1 S1 P0\nM970 Q0 A10 B10 C130 H20 K0\nM970 Q0 A10 B131 C250 K1\nM974 Q0 S1 P0\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\nG29 ;Home\nG90;\nG92 E0 ;Reset Extruder \nG1 Z2.0 F3000 ;Move Z Axis up \nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nM109 S205;\nG1 X10.1 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder \nG1 X110 Y110 Z2.0 F3000 ;Move Z Axis up", + "machine_end_gcode": "M400 ; wait for buffer to clear\nG92 E0 ; zero the extruder\nG1 E-4.0 F3600; retract \nG91\nG1 Z3;\nM104 S0 ; turn off hotend\nM140 S0 ; turn off bed\nM106 S0 ; turn off fan\nG90 \nG0 X110 Y200 F3600 \nprint_end", + "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]", + "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n", + "machine_pause_gcode": "M601" +} diff --git a/resources/profiles/Afinia/process/0.12mm Fine @Afinia H+1(HS).json b/resources/profiles/Afinia/process/0.12mm Fine @Afinia H+1(HS).json new file mode 100644 index 0000000000..23bdba8295 --- /dev/null +++ b/resources/profiles/Afinia/process/0.12mm Fine @Afinia H+1(HS).json @@ -0,0 +1,30 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.12mm Fine @Afinia H+1(HS)", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_afinia_HS_common", + "layer_height": "0.12", + "bottom_shell_layers": "5", + "elefant_foot_compensation": "0.15", + "top_shell_layers": "5", + "top_shell_thickness": "0.6", + "bridge_flow": "1", + "initial_layer_speed": "50", + "initial_layer_infill_speed": "105", + "outer_wall_speed": "150", + "inner_wall_speed": "200", + "sparse_infill_speed": "200", + "internal_solid_infill_speed": "200", + "gap_infill_speed": "150", + "overhang_1_4_speed": "60", + "overhang_2_4_speed": "30", + "overhang_3_4_speed": "10", + "support_threshold_angle": "20", + "support_top_z_distance": "0.12", + "support_bottom_z_distance": "0.12", + "compatible_printers": [ + "Afinia H+1(HS) 0.4 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Afinia/process/0.16mm Optimal @Afinia H+1(HS).json b/resources/profiles/Afinia/process/0.16mm Optimal @Afinia H+1(HS).json new file mode 100644 index 0000000000..525f159f5a --- /dev/null +++ b/resources/profiles/Afinia/process/0.16mm Optimal @Afinia H+1(HS).json @@ -0,0 +1,30 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.16mm Optimal @Afinia H+1(HS)", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_afinia_HS_common", + "layer_height": "0.16", + "elefant_foot_compensation": "0.15", + "bottom_shell_layers": "4", + "top_shell_layers": "6", + "top_shell_thickness": "1.0", + "bridge_flow": "1", + "initial_layer_speed": "50", + "initial_layer_infill_speed": "105", + "outer_wall_speed": "150", + "inner_wall_speed": "200", + "sparse_infill_speed": "200", + "internal_solid_infill_speed": "200", + "gap_infill_speed": "150", + "overhang_1_4_speed": "60", + "overhang_2_4_speed": "30", + "overhang_3_4_speed": "10", + "support_threshold_angle": "25", + "support_top_z_distance": "0.16", + "support_bottom_z_distance": "0.16", + "compatible_printers": [ + "Afinia H+1(HS) 0.4 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Afinia/process/0.18mm Fine @Afinia H+1(HS) 0.6 nozzle.json b/resources/profiles/Afinia/process/0.18mm Fine @Afinia H+1(HS) 0.6 nozzle.json new file mode 100644 index 0000000000..7de0121d05 --- /dev/null +++ b/resources/profiles/Afinia/process/0.18mm Fine @Afinia H+1(HS) 0.6 nozzle.json @@ -0,0 +1,15 @@ +{ + "type": "process", + "name": "0.18mm Fine @Afinia H+1(HS) 0.6 nozzle", + "inherits": "fdm_process_afinia_0.18_nozzle_0.6_HS", + "from": "system", + "setting_id": "GP021", + "instantiation": "true", + "description": "It has a smaller layer height and results in smoother surface and higher printing quality.", + "elefant_foot_compensation": "0.15", + "smooth_coefficient": "150", + "overhang_totally_speed": "50", + "compatible_printers": [ + "Afinia H+1(HS) 0.6 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Afinia/process/0.20mm Standard @Afinia H+1(HS).json b/resources/profiles/Afinia/process/0.20mm Standard @Afinia H+1(HS).json new file mode 100644 index 0000000000..54d7f74bf4 --- /dev/null +++ b/resources/profiles/Afinia/process/0.20mm Standard @Afinia H+1(HS).json @@ -0,0 +1,22 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.20mm Standard @Afinia H+1(HS)", + "from": "system", + "inherits": "fdm_process_afinia_HS_common", + "instantiation": "true", + "elefant_foot_compensation": "0.15", + "top_shell_thickness": "1.0", + "bridge_flow": "1", + "initial_layer_speed": "50", + "initial_layer_infill_speed": "105", + "outer_wall_speed": "150", + "inner_wall_speed": "200", + "sparse_infill_speed": "200", + "internal_solid_infill_speed": "200", + "gap_infill_speed": "150", + "top_shell_layers": "5", + "compatible_printers": [ + "Afinia H+1(HS) 0.4 nozzle" + ] +} diff --git a/resources/profiles/Afinia/process/0.24mm Draft @Afinia H+1(HS).json b/resources/profiles/Afinia/process/0.24mm Draft @Afinia H+1(HS).json new file mode 100644 index 0000000000..3a34b22d3b --- /dev/null +++ b/resources/profiles/Afinia/process/0.24mm Draft @Afinia H+1(HS).json @@ -0,0 +1,25 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.24mm Draft @Afinia H+1(HS)", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_afinia_HS_common", + "layer_height": "0.24", + "elefant_foot_compensation": "0.15", + "top_surface_line_width": "0.45", + "top_shell_thickness": "1.0", + "bridge_flow": "1", + "initial_layer_speed": "50", + "initial_layer_infill_speed": "105", + "outer_wall_speed": "150", + "inner_wall_speed": "200", + "sparse_infill_speed": "200", + "internal_solid_infill_speed": "200", + "gap_infill_speed": "150", + "support_threshold_angle": "35", + "top_shell_layers": "4", + "compatible_printers": [ + "Afinia H+1(HS) 0.4 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Afinia/process/0.24mm Standard @Afinia H+1(HS) 0.6 nozzle.json b/resources/profiles/Afinia/process/0.24mm Standard @Afinia H+1(HS) 0.6 nozzle.json new file mode 100644 index 0000000000..6c6fc996ea --- /dev/null +++ b/resources/profiles/Afinia/process/0.24mm Standard @Afinia H+1(HS) 0.6 nozzle.json @@ -0,0 +1,15 @@ +{ + "type": "process", + "name": "0.24mm Standard @Afinia H+1(HS) 0.6 nozzle", + "inherits": "fdm_process_afinia_0.24_nozzle_0.6_HS", + "from": "system", + "setting_id": "GP022", + "instantiation": "true", + "description": "It has a balanced layer height for good quality and reasonable printing time.", + "elefant_foot_compensation": "0.15", + "smooth_coefficient": "150", + "overhang_totally_speed": "50", + "compatible_printers": [ + "Afinia H+1(HS) 0.6 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Afinia/process/0.28mm Extra Draft @Afinia H+1(HS).json b/resources/profiles/Afinia/process/0.28mm Extra Draft @Afinia H+1(HS).json new file mode 100644 index 0000000000..fb6ac16d7b --- /dev/null +++ b/resources/profiles/Afinia/process/0.28mm Extra Draft @Afinia H+1(HS).json @@ -0,0 +1,25 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.28mm Extra Draft @Afinia H+1(HS)", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_afinia_HS_common", + "layer_height": "0.28", + "elefant_foot_compensation": "0.15", + "top_surface_line_width": "0.45", + "top_shell_thickness": "1.0", + "bridge_flow": "1", + "initial_layer_speed": "50", + "initial_layer_infill_speed": "105", + "outer_wall_speed": "200", + "inner_wall_speed": "200", + "sparse_infill_speed": "200", + "internal_solid_infill_speed": "200", + "gap_infill_speed": "200", + "support_threshold_angle": "40", + "top_shell_layers": "4", + "compatible_printers": [ + "Afinia H+1(HS) 0.4 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Afinia/process/0.30mm Standard @Afinia H+1(HS) 0.6 nozzle.json b/resources/profiles/Afinia/process/0.30mm Standard @Afinia H+1(HS) 0.6 nozzle.json new file mode 100644 index 0000000000..4c0c79a151 --- /dev/null +++ b/resources/profiles/Afinia/process/0.30mm Standard @Afinia H+1(HS) 0.6 nozzle.json @@ -0,0 +1,15 @@ +{ + "type": "process", + "name": "0.30mm Standard @Afinia H+1(HS) 0.6 nozzle", + "inherits": "fdm_process_afinia_0.30_nozzle_0.6_HS", + "from": "system", + "setting_id": "GP023", + "instantiation": "true", + "description": "It has a big layer height, and results in apparent layer lines and ordinary printing quality and printing time.", + "elefant_foot_compensation": "0.15", + "smooth_coefficient": "150", + "overhang_totally_speed": "50", + "compatible_printers": [ + "Afinia H+1(HS) 0.6 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Afinia/process/0.30mm Strength @Afinia H+1(HS) 0.6 nozzle.json b/resources/profiles/Afinia/process/0.30mm Strength @Afinia H+1(HS) 0.6 nozzle.json new file mode 100644 index 0000000000..16702b9da4 --- /dev/null +++ b/resources/profiles/Afinia/process/0.30mm Strength @Afinia H+1(HS) 0.6 nozzle.json @@ -0,0 +1,17 @@ +{ + "type": "process", + "name": "0.30mm Strength @Afinia H+1(HS) 0.6 nozzle", + "inherits": "fdm_process_afinia_0.30_nozzle_0.6_HS", + "from": "system", + "setting_id": "GP024", + "instantiation": "true", + "description": "It has a big layer height with optimized settings for stronger parts.", + "elefant_foot_compensation": "0.15", + "smooth_coefficient": "150", + "overhang_totally_speed": "50", + "sparse_infill_density": "25%", + "wall_loops": "3", + "compatible_printers": [ + "Afinia H+1(HS) 0.6 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Afinia/process/0.36mm Draft @Afinia H+1(HS) 0.6 nozzle.json b/resources/profiles/Afinia/process/0.36mm Draft @Afinia H+1(HS) 0.6 nozzle.json new file mode 100644 index 0000000000..c1e1b6564f --- /dev/null +++ b/resources/profiles/Afinia/process/0.36mm Draft @Afinia H+1(HS) 0.6 nozzle.json @@ -0,0 +1,15 @@ +{ + "type": "process", + "name": "0.36mm Draft @Afinia H+1(HS) 0.6 nozzle", + "inherits": "fdm_process_afinia_0.36_nozzle_0.6_HS", + "from": "system", + "setting_id": "GP025", + "instantiation": "true", + "description": "It has a bigger layer height for faster printing but with more visible layer lines.", + "elefant_foot_compensation": "0.15", + "smooth_coefficient": "150", + "overhang_totally_speed": "50", + "compatible_printers": [ + "Afinia H+1(HS) 0.6 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Afinia/process/0.42mm Extra Draft @Afinia H+1(HS) 0.6 nozzle.json b/resources/profiles/Afinia/process/0.42mm Extra Draft @Afinia H+1(HS) 0.6 nozzle.json new file mode 100644 index 0000000000..4d8c101bde --- /dev/null +++ b/resources/profiles/Afinia/process/0.42mm Extra Draft @Afinia H+1(HS) 0.6 nozzle.json @@ -0,0 +1,15 @@ +{ + "type": "process", + "name": "0.42mm Extra Draft @Afinia H+1(HS) 0.6 nozzle", + "inherits": "fdm_process_afinia_0.42_nozzle_0.6_HS", + "from": "system", + "setting_id": "GP026", + "instantiation": "true", + "description": "It has the biggest layer height for fastest printing but with very visible layer lines.", + "elefant_foot_compensation": "0.15", + "smooth_coefficient": "150", + "overhang_totally_speed": "50", + "compatible_printers": [ + "Afinia H+1(HS) 0.6 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Afinia/process/fdm_process_afinia_0.18_nozzle_0.6.json b/resources/profiles/Afinia/process/fdm_process_afinia_0.18_nozzle_0.6.json new file mode 100644 index 0000000000..e9fb7c853c --- /dev/null +++ b/resources/profiles/Afinia/process/fdm_process_afinia_0.18_nozzle_0.6.json @@ -0,0 +1,26 @@ +{ + "type": "process", + "name": "fdm_process_afinia_0.18_nozzle_0.6", + "inherits": "fdm_process_afinia_common", + "from": "system", + "instantiation": "false", + "layer_height": "0.18", + "initial_layer_print_height": "0.18", + "bridge_flow": "1", + "line_width": "0.62", + "outer_wall_line_width": "0.62", + "ironing_inset": "0.31", + "initial_layer_line_width": "0.62", + "sparse_infill_line_width": "0.62", + "inner_wall_line_width": "0.62", + "internal_solid_infill_line_width": "0.62", + "support_line_width": "0.62", + "top_surface_line_width": "0.62", + "initial_layer_speed": "35", + "initial_layer_infill_speed": "55", + "sparse_infill_speed": "100", + "top_surface_speed": "120", + "bridge_speed": "30", + "overhang_3_4_speed": "15", + "tree_support_tip_diameter": "1.2" +} \ No newline at end of file diff --git a/resources/profiles/Afinia/process/fdm_process_afinia_0.18_nozzle_0.6_HS.json b/resources/profiles/Afinia/process/fdm_process_afinia_0.18_nozzle_0.6_HS.json new file mode 100644 index 0000000000..f4328e6f49 --- /dev/null +++ b/resources/profiles/Afinia/process/fdm_process_afinia_0.18_nozzle_0.6_HS.json @@ -0,0 +1,26 @@ +{ + "type": "process", + "name": "fdm_process_afinia_0.18_nozzle_0.6_HS", + "inherits": "fdm_process_afinia_HS_common", + "from": "system", + "instantiation": "false", + "layer_height": "0.18", + "initial_layer_print_height": "0.18", + "bridge_flow": "1", + "line_width": "0.62", + "outer_wall_line_width": "0.62", + "ironing_inset": "0.31", + "initial_layer_line_width": "0.62", + "sparse_infill_line_width": "0.62", + "inner_wall_line_width": "0.62", + "internal_solid_infill_line_width": "0.62", + "support_line_width": "0.62", + "top_surface_line_width": "0.62", + "initial_layer_speed": "35", + "initial_layer_infill_speed": "55", + "sparse_infill_speed": "100", + "top_surface_speed": "120", + "bridge_speed": "30", + "overhang_3_4_speed": "15", + "tree_support_tip_diameter": "1.2" +} \ No newline at end of file diff --git a/resources/profiles/Afinia/process/fdm_process_afinia_0.24_nozzle_0.6.json b/resources/profiles/Afinia/process/fdm_process_afinia_0.24_nozzle_0.6.json new file mode 100644 index 0000000000..f953c4cfe0 --- /dev/null +++ b/resources/profiles/Afinia/process/fdm_process_afinia_0.24_nozzle_0.6.json @@ -0,0 +1,26 @@ +{ + "type": "process", + "name": "fdm_process_afinia_0.24_nozzle_0.6", + "inherits": "fdm_process_afinia_common", + "from": "system", + "instantiation": "false", + "layer_height": "0.24", + "initial_layer_print_height": "0.24", + "bridge_flow": "1", + "line_width": "0.62", + "outer_wall_line_width": "0.62", + "ironing_inset": "0.31", + "initial_layer_line_width": "0.62", + "sparse_infill_line_width": "0.62", + "inner_wall_line_width": "0.62", + "internal_solid_infill_line_width": "0.62", + "support_line_width": "0.62", + "top_surface_line_width": "0.62", + "initial_layer_speed": "35", + "initial_layer_infill_speed": "55", + "sparse_infill_speed": "100", + "top_surface_speed": "130", + "bridge_speed": "30", + "overhang_3_4_speed": "15", + "tree_support_tip_diameter": "1.2" +} \ No newline at end of file diff --git a/resources/profiles/Afinia/process/fdm_process_afinia_0.24_nozzle_0.6_HS.json b/resources/profiles/Afinia/process/fdm_process_afinia_0.24_nozzle_0.6_HS.json new file mode 100644 index 0000000000..c1f989f703 --- /dev/null +++ b/resources/profiles/Afinia/process/fdm_process_afinia_0.24_nozzle_0.6_HS.json @@ -0,0 +1,26 @@ +{ + "type": "process", + "name": "fdm_process_afinia_0.24_nozzle_0.6_HS", + "inherits": "fdm_process_afinia_HS_common", + "from": "system", + "instantiation": "false", + "layer_height": "0.24", + "initial_layer_print_height": "0.24", + "bridge_flow": "1", + "line_width": "0.62", + "outer_wall_line_width": "0.62", + "ironing_inset": "0.31", + "initial_layer_line_width": "0.62", + "sparse_infill_line_width": "0.62", + "inner_wall_line_width": "0.62", + "internal_solid_infill_line_width": "0.62", + "support_line_width": "0.62", + "top_surface_line_width": "0.62", + "initial_layer_speed": "35", + "initial_layer_infill_speed": "55", + "sparse_infill_speed": "100", + "top_surface_speed": "130", + "bridge_speed": "30", + "overhang_3_4_speed": "15", + "tree_support_tip_diameter": "1.2" +} \ No newline at end of file diff --git a/resources/profiles/Afinia/process/fdm_process_afinia_0.30_nozzle_0.6.json b/resources/profiles/Afinia/process/fdm_process_afinia_0.30_nozzle_0.6.json new file mode 100644 index 0000000000..850260615c --- /dev/null +++ b/resources/profiles/Afinia/process/fdm_process_afinia_0.30_nozzle_0.6.json @@ -0,0 +1,26 @@ +{ + "type": "process", + "name": "fdm_process_afinia_0.30_nozzle_0.6", + "inherits": "fdm_process_afinia_common", + "from": "system", + "instantiation": "false", + "layer_height": "0.3", + "initial_layer_print_height": "0.3", + "bridge_flow": "1", + "line_width": "0.62", + "outer_wall_line_width": "0.62", + "ironing_inset": "0.31", + "initial_layer_line_width": "0.62", + "sparse_infill_line_width": "0.62", + "inner_wall_line_width": "0.62", + "internal_solid_infill_line_width": "0.62", + "support_line_width": "0.62", + "top_surface_line_width": "0.62", + "initial_layer_speed": "35", + "initial_layer_infill_speed": "55", + "sparse_infill_speed": "100", + "top_surface_speed": "150", + "bridge_speed": "30", + "overhang_3_4_speed": "15", + "tree_support_tip_diameter": "1.2" +} \ No newline at end of file diff --git a/resources/profiles/Afinia/process/fdm_process_afinia_0.30_nozzle_0.6_HS.json b/resources/profiles/Afinia/process/fdm_process_afinia_0.30_nozzle_0.6_HS.json new file mode 100644 index 0000000000..4ef5a8b928 --- /dev/null +++ b/resources/profiles/Afinia/process/fdm_process_afinia_0.30_nozzle_0.6_HS.json @@ -0,0 +1,26 @@ +{ + "type": "process", + "name": "fdm_process_afinia_0.30_nozzle_0.6_HS", + "inherits": "fdm_process_afinia_HS_common", + "from": "system", + "instantiation": "false", + "layer_height": "0.3", + "initial_layer_print_height": "0.3", + "bridge_flow": "1", + "line_width": "0.62", + "outer_wall_line_width": "0.62", + "ironing_inset": "0.31", + "initial_layer_line_width": "0.62", + "sparse_infill_line_width": "0.62", + "inner_wall_line_width": "0.62", + "internal_solid_infill_line_width": "0.62", + "support_line_width": "0.62", + "top_surface_line_width": "0.62", + "initial_layer_speed": "35", + "initial_layer_infill_speed": "55", + "sparse_infill_speed": "100", + "top_surface_speed": "150", + "bridge_speed": "30", + "overhang_3_4_speed": "15", + "tree_support_tip_diameter": "1.2" +} \ No newline at end of file diff --git a/resources/profiles/Afinia/process/fdm_process_afinia_0.36_nozzle_0.6.json b/resources/profiles/Afinia/process/fdm_process_afinia_0.36_nozzle_0.6.json new file mode 100644 index 0000000000..884e6114c0 --- /dev/null +++ b/resources/profiles/Afinia/process/fdm_process_afinia_0.36_nozzle_0.6.json @@ -0,0 +1,26 @@ +{ + "type": "process", + "name": "fdm_process_afinia_0.36_nozzle_0.6", + "inherits": "fdm_process_afinia_common", + "from": "system", + "instantiation": "false", + "layer_height": "0.36", + "initial_layer_print_height": "0.36", + "bridge_flow": "1", + "line_width": "0.62", + "outer_wall_line_width": "0.62", + "ironing_inset": "0.31", + "initial_layer_line_width": "0.62", + "sparse_infill_line_width": "0.62", + "inner_wall_line_width": "0.62", + "internal_solid_infill_line_width": "0.62", + "support_line_width": "0.62", + "top_surface_line_width": "0.62", + "initial_layer_speed": "35", + "initial_layer_infill_speed": "55", + "sparse_infill_speed": "100", + "top_surface_speed": "140", + "bridge_speed": "30", + "overhang_3_4_speed": "15", + "tree_support_tip_diameter": "1.2" +} \ No newline at end of file diff --git a/resources/profiles/Afinia/process/fdm_process_afinia_0.36_nozzle_0.6_HS.json b/resources/profiles/Afinia/process/fdm_process_afinia_0.36_nozzle_0.6_HS.json new file mode 100644 index 0000000000..b1ec86fd36 --- /dev/null +++ b/resources/profiles/Afinia/process/fdm_process_afinia_0.36_nozzle_0.6_HS.json @@ -0,0 +1,26 @@ +{ + "type": "process", + "name": "fdm_process_afinia_0.36_nozzle_0.6_HS", + "inherits": "fdm_process_afinia_HS_common", + "from": "system", + "instantiation": "false", + "layer_height": "0.36", + "initial_layer_print_height": "0.36", + "bridge_flow": "1", + "line_width": "0.62", + "outer_wall_line_width": "0.62", + "ironing_inset": "0.31", + "initial_layer_line_width": "0.62", + "sparse_infill_line_width": "0.62", + "inner_wall_line_width": "0.62", + "internal_solid_infill_line_width": "0.62", + "support_line_width": "0.62", + "top_surface_line_width": "0.62", + "initial_layer_speed": "35", + "initial_layer_infill_speed": "55", + "sparse_infill_speed": "100", + "top_surface_speed": "140", + "bridge_speed": "30", + "overhang_3_4_speed": "15", + "tree_support_tip_diameter": "1.2" +} \ No newline at end of file diff --git a/resources/profiles/Afinia/process/fdm_process_afinia_0.42_nozzle_0.6.json b/resources/profiles/Afinia/process/fdm_process_afinia_0.42_nozzle_0.6.json new file mode 100644 index 0000000000..501f2ba435 --- /dev/null +++ b/resources/profiles/Afinia/process/fdm_process_afinia_0.42_nozzle_0.6.json @@ -0,0 +1,26 @@ +{ + "type": "process", + "name": "fdm_process_afinia_0.42_nozzle_0.6", + "inherits": "fdm_process_afinia_common", + "from": "system", + "instantiation": "false", + "layer_height": "0.42", + "initial_layer_print_height": "0.42", + "bridge_flow": "1", + "line_width": "0.62", + "outer_wall_line_width": "0.62", + "ironing_inset": "0.31", + "initial_layer_line_width": "0.62", + "sparse_infill_line_width": "0.62", + "inner_wall_line_width": "0.62", + "internal_solid_infill_line_width": "0.62", + "support_line_width": "0.62", + "top_surface_line_width": "0.62", + "initial_layer_speed": "35", + "initial_layer_infill_speed": "55", + "sparse_infill_speed": "100", + "top_surface_speed": "130", + "bridge_speed": "30", + "overhang_3_4_speed": "15", + "tree_support_tip_diameter": "1.2" +} \ No newline at end of file diff --git a/resources/profiles/Afinia/process/fdm_process_afinia_0.42_nozzle_0.6_HS.json b/resources/profiles/Afinia/process/fdm_process_afinia_0.42_nozzle_0.6_HS.json new file mode 100644 index 0000000000..e5876d9843 --- /dev/null +++ b/resources/profiles/Afinia/process/fdm_process_afinia_0.42_nozzle_0.6_HS.json @@ -0,0 +1,26 @@ +{ + "type": "process", + "name": "fdm_process_afinia_0.42_nozzle_0.6_HS", + "inherits": "fdm_process_afinia_HS_common", + "from": "system", + "instantiation": "false", + "layer_height": "0.42", + "initial_layer_print_height": "0.42", + "bridge_flow": "1", + "line_width": "0.62", + "outer_wall_line_width": "0.62", + "ironing_inset": "0.31", + "initial_layer_line_width": "0.62", + "sparse_infill_line_width": "0.62", + "inner_wall_line_width": "0.62", + "internal_solid_infill_line_width": "0.62", + "support_line_width": "0.62", + "top_surface_line_width": "0.62", + "initial_layer_speed": "35", + "initial_layer_infill_speed": "55", + "sparse_infill_speed": "100", + "top_surface_speed": "130", + "bridge_speed": "30", + "overhang_3_4_speed": "15", + "tree_support_tip_diameter": "1.2" +} \ No newline at end of file diff --git a/resources/profiles/Afinia/process/fdm_process_afinia_HS_common.json b/resources/profiles/Afinia/process/fdm_process_afinia_HS_common.json new file mode 100644 index 0000000000..c8ea47e3b5 --- /dev/null +++ b/resources/profiles/Afinia/process/fdm_process_afinia_HS_common.json @@ -0,0 +1,15 @@ +{ + "type": "process", + "name": "fdm_process_afinia_HS_common", + "inherits": "fdm_process_afinia_common", + "from": "system", + "instantiation": "false", + "default_acceleration": "4000", + "travel_acceleration": "4000", + "outer_wall_acceleration": "2500", + "inner_wall_acceleration": "3000", + "initial_layer_acceleration": "500", + "top_surface_acceleration": "2000", + "travel_speed": "200", + "compatible_printers": [] +} \ No newline at end of file diff --git a/resources/profiles/Afinia/process/fdm_process_afinia_common.json b/resources/profiles/Afinia/process/fdm_process_afinia_common.json new file mode 100644 index 0000000000..09a0c06458 --- /dev/null +++ b/resources/profiles/Afinia/process/fdm_process_afinia_common.json @@ -0,0 +1,79 @@ +{ + "type": "process", + "name": "fdm_process_afinia_common", + "inherits": "fdm_process_common", + "from": "system", + "instantiation": "false", + "max_travel_detour_distance": "0", + "bottom_surface_pattern": "monotonic", + "bottom_shell_layers": "3", + "bottom_shell_thickness": "0", + "bridge_speed": "50", + "brim_object_gap": "0.1", + "compatible_printers_condition": "", + "draft_shield": "disabled", + "elefant_foot_compensation": "0", + "enable_arc_fitting": "1", + "default_acceleration": "6000", + "travel_acceleration": "6000", + "outer_wall_acceleration": "3000", + "inner_wall_acceleration": "5000", + "top_surface_acceleration": "2000", + "initial_layer_acceleration": "500", + "line_width": "0.42", + "internal_bridge_support_thickness": "0.8", + "initial_layer_line_width": "0.5", + "initial_layer_speed": "50", + "initial_layer_infill_speed": "90", + "outer_wall_speed": "120", + "inner_wall_speed": "160", + "gap_infill_speed": "50", + "sparse_infill_speed": "250", + "ironing_flow": "10%", + "ironing_spacing": "0.15", + "ironing_speed": "30", + "ironing_type": "no ironing", + "layer_height": "0.2", + "reduce_infill_retraction": "1", + "filename_format": "{input_filename_base}_{filament_type[0]}_{print_time}.gcode", + "detect_overhang_wall": "1", + "overhang_1_4_speed": "0", + "overhang_2_4_speed": "50", + "overhang_3_4_speed": "30", + "overhang_4_4_speed": "10", + "only_one_wall_top": "1", + "seam_position": "aligned", + "skirt_height": "1", + "skirt_loops": "0", + "minimum_sparse_infill_area": "15", + "internal_solid_infill_line_width": "0.42", + "internal_solid_infill_speed": "180", + "resolution": "0.012", + "support_type": "normal(auto)", + "support_style": "default", + "support_top_z_distance": "0.2", + "support_bottom_z_distance": "0.2", + "support_interface_bottom_layers": "2", + "support_interface_spacing": "0.5", + "support_expansion": "0", + "support_base_pattern_spacing": "2.5", + "support_speed": "200", + "support_interface_speed": "80", + "support_threshold_angle": "30", + "support_object_xy_distance": "0.35", + "tree_support_branch_diameter": "2", + "tree_support_branch_angle": "45", + "tree_support_wall_count": "0", + "top_surface_pattern": "monotonicline", + "top_surface_speed": "200", + "top_shell_layers": "3", + "top_shell_thickness": "0.8", + "travel_speed": "500", + "enable_prime_tower": "1", + "wipe_tower_no_sparse_layers": "0", + "prime_tower_width": "35", + "wall_generator": "classic", + "exclude_object": "1", + "wall_infill_order": "outer wall/inner wall/infill", + "compatible_printers": [] +} \ No newline at end of file diff --git a/resources/profiles/Afinia/process/fdm_process_common.json b/resources/profiles/Afinia/process/fdm_process_common.json new file mode 100644 index 0000000000..2d65f5f50e --- /dev/null +++ b/resources/profiles/Afinia/process/fdm_process_common.json @@ -0,0 +1,72 @@ +{ + "type": "process", + "name": "fdm_process_common", + "from": "system", + "instantiation": "false", + "adaptive_layer_height": "0", + "reduce_crossing_wall": "0", + "bridge_flow": "0.95", + "bridge_speed": "50", + "brim_width": "5", + "print_sequence": "by layer", + "default_acceleration": "10000", + "bridge_no_support": "0", + "elefant_foot_compensation": "0.1", + "outer_wall_line_width": "0.42", + "outer_wall_speed": "120", + "inner_wall_speed": "160", + "line_width": "0.45", + "infill_direction": "45", + "sparse_infill_density": "15%", + "sparse_infill_pattern": "crosshatch", + "initial_layer_line_width": "0.42", + "initial_layer_print_height": "0.2", + "initial_layer_speed": "50", + "initial_layer_infill_speed": "90", + "gap_infill_speed": "50", + "infill_combination": "0", + "sparse_infill_line_width": "0.45", + "infill_wall_overlap": "15%", + "sparse_infill_speed": "200", + "interface_shells": "0", + "detect_overhang_wall": "0", + "reduce_infill_retraction": "0", + "filename_format": "{input_filename_base}.gcode", + "wall_loops": "2", + "inner_wall_line_width": "0.45", + "print_settings_id": "", + "raft_layers": "0", + "seam_position": "nearest", + "skirt_distance": "2", + "skirt_height": "2", + "minimum_sparse_infill_area": "0", + "internal_solid_infill_line_width": "0.45", + "internal_solid_infill_speed": "180", + "spiral_mode": "0", + "standby_temperature_delta": "-5", + "enable_support": "0", + "support_filament": "0", + "support_line_width": "0.42", + "support_interface_filament": "0", + "support_on_build_plate_only": "0", + "support_top_z_distance": "0.15", + "support_interface_loop_pattern": "0", + "support_interface_top_layers": "2", + "support_interface_spacing": "0", + "support_interface_speed": "80", + "support_interface_pattern": "auto", + "support_base_pattern": "default", + "support_base_pattern_spacing": "2", + "support_speed": "200", + "support_threshold_angle": "40", + "support_object_xy_distance": "0.5", + "detect_thin_wall": "0", + "top_surface_line_width": "0.42", + "top_surface_speed": "120", + "travel_speed": "400", + "enable_prime_tower": "0", + "prime_tower_width": "60", + "xy_hole_compensation": "0", + "xy_contour_compensation": "0", + "compatible_printers": [] +} \ No newline at end of file diff --git a/resources/profiles/Prusa.json b/resources/profiles/Prusa.json index d699c72644..5ccf1dd822 100644 --- a/resources/profiles/Prusa.json +++ b/resources/profiles/Prusa.json @@ -1,6 +1,6 @@ { "name": "Prusa", - "version": "02.03.01.00", + "version": "02.03.01.01", "force_update": "0", "description": "Prusa configurations", "machine_model_list": [ diff --git a/resources/profiles/Prusa/machine/Prusa MINI 0.25 nozzle.json b/resources/profiles/Prusa/machine/Prusa MINI 0.25 nozzle.json index b1c19b80cc..48aad4e9fa 100644 --- a/resources/profiles/Prusa/machine/Prusa MINI 0.25 nozzle.json +++ b/resources/profiles/Prusa/machine/Prusa MINI 0.25 nozzle.json @@ -84,7 +84,7 @@ "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n", "machine_end_gcode": "G1 E-1 F2100 ; retract\n{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+2, max_print_height)} F720 ; Move print head up{endif}\nG1 X178 Y178 F4200 ; park print head\n{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+30, max_print_height)} F720 ; Move print head further up{endif}\nG4 ; wait\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nM221 S100 ; reset flow\nM900 K0 ; reset LA\nM84 ; disable motors\n; max_layer_z = [max_layer_z]", "machine_pause_gcode": "M601", - "machine_start_gcode": "M862.3 P \"[printer_model]\" ; printer model check\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S170 ; set extruder temp for bed leveling\nM140 S[first_layer_bed_temperature] ; set bed temp\nM109 R170 ; wait for bed leveling temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM204 T1250 ; set travel acceleration\nG28 ; home all without mesh bed level\nG29 ; mesh bed leveling \nM204 T[machine_max_acceleration_travel] ; restore travel acceleration\nM104 S[first_layer_temperature] ; set extruder temp\nG92 E0\nG1 Y-2 X179 F2400\nG1 Z3 F720\nM109 S[first_layer_temperature] ; wait for extruder temp\n\n; intro line\nG1 X170 F1000\nG1 Z0.2 F720\nG1 X110 E8 F900\nG1 X40 E10 F700\nG92 E0\n\nM221 S95 ; set flow", + "machine_start_gcode": "M862.3 P \"MINI\" ; printer model check\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S170 ; set extruder temp for bed leveling\nM140 S[first_layer_bed_temperature] ; set bed temp\nM109 R170 ; wait for bed leveling temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM204 T1250 ; set travel acceleration\nG28 ; home all without mesh bed level\nG29 ; mesh bed leveling \nM204 T[machine_max_acceleration_travel] ; restore travel acceleration\nM104 S[first_layer_temperature] ; set extruder temp\nG92 E0\nG1 Y-2 X179 F2400\nG1 Z3 F720\nM109 S[first_layer_temperature] ; wait for extruder temp\n\n; intro line\nG1 X170 F1000\nG1 Z0.2 F720\nG1 X110 E8 F900\nG1 X40 E10 F700\nG92 E0\n\nM221 S95 ; set flow", "printer_notes": "Don't remove the following keywords! These keywords are used in the \"compatible printer\" condition of the print and filament profiles to link the particular print and filament profiles to this printer profile.\nPRINTER_VENDOR_PRUSA3D\nPRINTER_MODEL_MINI\n", "scan_first_layer": "0", "machine_load_filament_time": "17", diff --git a/resources/profiles/Prusa/machine/Prusa MINI 0.4 nozzle.json b/resources/profiles/Prusa/machine/Prusa MINI 0.4 nozzle.json index 930458ba05..705db6d8b8 100644 --- a/resources/profiles/Prusa/machine/Prusa MINI 0.4 nozzle.json +++ b/resources/profiles/Prusa/machine/Prusa MINI 0.4 nozzle.json @@ -78,7 +78,7 @@ "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n", "machine_end_gcode": "G1 E-1 F2100 ; retract\n{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+2, max_print_height)} F720 ; Move print head up{endif}\nG1 X178 Y178 F4200 ; park print head\n{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+30, max_print_height)} F720 ; Move print head further up{endif}\nG4 ; wait\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nM221 S100 ; reset flow\nM900 K0 ; reset LA\nM84 ; disable motors\n; max_layer_z = [max_layer_z]", "machine_pause_gcode": "M601", - "machine_start_gcode": "M862.3 P \"[printer_model]\" ; printer model check\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S170 ; set extruder temp for bed leveling\nM140 S[first_layer_bed_temperature] ; set bed temp\nM109 R170 ; wait for bed leveling temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM204 T1250 ; set travel acceleration\nG28 ; home all without mesh bed level\nG29 ; mesh bed leveling \nM204 T[machine_max_acceleration_travel] ; restore travel acceleration\nM104 S[first_layer_temperature] ; set extruder temp\nG92 E0\nG1 Y-2 X179 F2400\nG1 Z3 F720\nM109 S[first_layer_temperature] ; wait for extruder temp\n\n; intro line\nG1 X170 F1000\nG1 Z0.2 F720\nG1 X110 E8 F900\nG1 X40 E10 F700\nG92 E0\n\nM221 S95 ; set flow", + "machine_start_gcode": "M862.3 P \"MINI\" ; printer model check\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S170 ; set extruder temp for bed leveling\nM140 S[first_layer_bed_temperature] ; set bed temp\nM109 R170 ; wait for bed leveling temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM204 T1250 ; set travel acceleration\nG28 ; home all without mesh bed level\nG29 ; mesh bed leveling \nM204 T[machine_max_acceleration_travel] ; restore travel acceleration\nM104 S[first_layer_temperature] ; set extruder temp\nG92 E0\nG1 Y-2 X179 F2400\nG1 Z3 F720\nM109 S[first_layer_temperature] ; wait for extruder temp\n\n; intro line\nG1 X170 F1000\nG1 Z0.2 F720\nG1 X110 E8 F900\nG1 X40 E10 F700\nG92 E0\n\nM221 S95 ; set flow", "printer_notes": "Don't remove the following keywords! These keywords are used in the \"compatible printer\" condition of the print and filament profiles to link the particular print and filament profiles to this printer profile.\nPRINTER_VENDOR_PRUSA3D\nPRINTER_MODEL_MINI\n", "scan_first_layer": "0", "machine_load_filament_time": "17", diff --git a/resources/profiles/Prusa/machine/Prusa MINI 0.6 nozzle.json b/resources/profiles/Prusa/machine/Prusa MINI 0.6 nozzle.json index bb6c87f54a..764beb282e 100644 --- a/resources/profiles/Prusa/machine/Prusa MINI 0.6 nozzle.json +++ b/resources/profiles/Prusa/machine/Prusa MINI 0.6 nozzle.json @@ -78,7 +78,7 @@ "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n", "machine_end_gcode": "G1 E-1 F2100 ; retract\n{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+2, max_print_height)} F720 ; Move print head up{endif}\nG1 X178 Y178 F4200 ; park print head\n{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+30, max_print_height)} F720 ; Move print head further up{endif}\nG4 ; wait\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nM221 S100 ; reset flow\nM900 K0 ; reset LA\nM84 ; disable motors\n; max_layer_z = [max_layer_z]", "machine_pause_gcode": "M601", - "machine_start_gcode": "M862.3 P \"[printer_model]\" ; printer model check\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S170 ; set extruder temp for bed leveling\nM140 S[first_layer_bed_temperature] ; set bed temp\nM109 R170 ; wait for bed leveling temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM204 T1250 ; set travel acceleration\nG28 ; home all without mesh bed level\nG29 ; mesh bed leveling \nM204 T[machine_max_acceleration_travel] ; restore travel acceleration\nM104 S[first_layer_temperature] ; set extruder temp\nG92 E0\nG1 Y-2 X179 F2400\nG1 Z3 F720\nM109 S[first_layer_temperature] ; wait for extruder temp\n\n; intro line\nG1 X170 F1000\nG1 Z0.2 F720\nG1 X110 E8 F900\nG1 X40 E10 F700\nG92 E0\n\nM221 S95 ; set flow", + "machine_start_gcode": "M862.3 P \"MINI\" ; printer model check\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S170 ; set extruder temp for bed leveling\nM140 S[first_layer_bed_temperature] ; set bed temp\nM109 R170 ; wait for bed leveling temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM204 T1250 ; set travel acceleration\nG28 ; home all without mesh bed level\nG29 ; mesh bed leveling \nM204 T[machine_max_acceleration_travel] ; restore travel acceleration\nM104 S[first_layer_temperature] ; set extruder temp\nG92 E0\nG1 Y-2 X179 F2400\nG1 Z3 F720\nM109 S[first_layer_temperature] ; wait for extruder temp\n\n; intro line\nG1 X170 F1000\nG1 Z0.2 F720\nG1 X110 E8 F900\nG1 X40 E10 F700\nG92 E0\n\nM221 S95 ; set flow", "printer_notes": "Don't remove the following keywords! These keywords are used in the \"compatible printer\" condition of the print and filament profiles to link the particular print and filament profiles to this printer profile.\nPRINTER_VENDOR_PRUSA3D\nPRINTER_MODEL_MINI\n", "scan_first_layer": "0", "machine_load_filament_time": "17", diff --git a/resources/profiles/Prusa/machine/Prusa MINI 0.8 nozzle.json b/resources/profiles/Prusa/machine/Prusa MINI 0.8 nozzle.json index 46adfc1e1c..0a7620dd04 100644 --- a/resources/profiles/Prusa/machine/Prusa MINI 0.8 nozzle.json +++ b/resources/profiles/Prusa/machine/Prusa MINI 0.8 nozzle.json @@ -78,7 +78,7 @@ "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n", "machine_end_gcode": "G1 E-1 F2100 ; retract\n{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+2, max_print_height)} F720 ; Move print head up{endif}\nG1 X178 Y178 F4200 ; park print head\n{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+30, max_print_height)} F720 ; Move print head further up{endif}\nG4 ; wait\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nM221 S100 ; reset flow\nM900 K0 ; reset LA\nM84 ; disable motors\n; max_layer_z = [max_layer_z]", "machine_pause_gcode": "M601", - "machine_start_gcode": "M862.3 P \"[printer_model]\" ; printer model check\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S170 ; set extruder temp for bed leveling\nM140 S[first_layer_bed_temperature] ; set bed temp\nM109 R170 ; wait for bed leveling temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM204 T1250 ; set travel acceleration\nG28 ; home all without mesh bed level\nG29 ; mesh bed leveling \nM204 T[machine_max_acceleration_travel] ; restore travel acceleration\nM104 S[first_layer_temperature] ; set extruder temp\nG92 E0\nG1 Y-2 X179 F2400\nG1 Z3 F720\nM109 S[first_layer_temperature] ; wait for extruder temp\n\n; intro line\nG1 X170 F1000\nG1 Z0.2 F720\nG1 X110 E8 F900\nG1 X40 E10 F700\nG92 E0\n\nM221 S95 ; set flow", + "machine_start_gcode": "M862.3 P \"MINI\" ; printer model check\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S170 ; set extruder temp for bed leveling\nM140 S[first_layer_bed_temperature] ; set bed temp\nM109 R170 ; wait for bed leveling temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM204 T1250 ; set travel acceleration\nG28 ; home all without mesh bed level\nG29 ; mesh bed leveling \nM204 T[machine_max_acceleration_travel] ; restore travel acceleration\nM104 S[first_layer_temperature] ; set extruder temp\nG92 E0\nG1 Y-2 X179 F2400\nG1 Z3 F720\nM109 S[first_layer_temperature] ; wait for extruder temp\n\n; intro line\nG1 X170 F1000\nG1 Z0.2 F720\nG1 X110 E8 F900\nG1 X40 E10 F700\nG92 E0\n\nM221 S95 ; set flow", "printer_notes": "Don't remove the following keywords! These keywords are used in the \"compatible printer\" condition of the print and filament profiles to link the particular print and filament profiles to this printer profile.\nPRINTER_VENDOR_PRUSA3D\nPRINTER_MODEL_MINI\n", "scan_first_layer": "0", "machine_load_filament_time": "17", diff --git a/resources/profiles/Prusa/machine/Prusa MK3S 0.25 nozzle.json b/resources/profiles/Prusa/machine/Prusa MK3S 0.25 nozzle.json index cc9e304182..5282b85706 100644 --- a/resources/profiles/Prusa/machine/Prusa MK3S 0.25 nozzle.json +++ b/resources/profiles/Prusa/machine/Prusa MK3S 0.25 nozzle.json @@ -42,7 +42,7 @@ "host_type": "prusalink", "printable_height": "210", "machine_pause_gcode": "M601", - "machine_start_gcode": "M862.3 P \"[printer_model]\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM115 U3.13.0 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\n{if filament_settings_id[initial_tool]=~/.*Prusament PA11.*/}\nG1 Z0.3 F720\nG1 Y-3 F1000 ; go outside print area\nG92 E0\nG1 X60 E9 F1000 ; intro line\nG1 X100 E9 F1000 ; intro line\n{else}\nG1 Z0.2 F720\nG1 Y-3 F1000 ; go outside print area\nG92 E0\nG1 X60 E9 F1000 ; intro line\nG1 X100 E12.5 F1000 ; intro line\n{endif}\nG92 E0\nM221 S{if layer_height<0.075}100{else}95{endif}", + "machine_start_gcode": "M862.3 P \"MK3S\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM115 U3.13.0 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\n{if filament_settings_id[initial_tool]=~/.*Prusament PA11.*/}\nG1 Z0.3 F720\nG1 Y-3 F1000 ; go outside print area\nG92 E0\nG1 X60 E9 F1000 ; intro line\nG1 X100 E9 F1000 ; intro line\n{else}\nG1 Z0.2 F720\nG1 Y-3 F1000 ; go outside print area\nG92 E0\nG1 X60 E9 F1000 ; intro line\nG1 X100 E12.5 F1000 ; intro line\n{endif}\nG92 E0\nM221 S{if layer_height<0.075}100{else}95{endif}", "machine_end_gcode": "{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+1, max_print_height)} F720 ; Move print head up{endif}\nG1 X0 Y200 F3600 ; park\n{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+49, max_print_height)} F720 ; Move print head further up{endif}\nG4 ; wait\nM221 S100 ; reset flow\nM900 K0 ; reset LA\n{if print_settings_id=~/.*(DETAIL @MK3S|QUALITY @MK3S|@0.25 nozzle MK3).*/}M907 E538 ; reset extruder motor current{endif}\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nM84 ; disable motors\n; max_layer_z = [max_layer_z]", "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]", "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n", diff --git a/resources/profiles/Prusa/machine/Prusa MK3S 0.4 nozzle.json b/resources/profiles/Prusa/machine/Prusa MK3S 0.4 nozzle.json index 5d8439df54..191f4b1368 100644 --- a/resources/profiles/Prusa/machine/Prusa MK3S 0.4 nozzle.json +++ b/resources/profiles/Prusa/machine/Prusa MK3S 0.4 nozzle.json @@ -42,7 +42,7 @@ "host_type": "prusalink", "printable_height": "210", "machine_pause_gcode": "M601", - "machine_start_gcode": "M862.3 P \"[printer_model]\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM115 U3.13.0 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\n{if filament_settings_id[initial_tool]=~/.*Prusament PA11.*/}\nG1 Z0.3 F720\nG1 Y-3 F1000 ; go outside print area\nG92 E0\nG1 X60 E9 F1000 ; intro line\nG1 X100 E9 F1000 ; intro line\n{else}\nG1 Z0.2 F720\nG1 Y-3 F1000 ; go outside print area\nG92 E0\nG1 X60 E9 F1000 ; intro line\nG1 X100 E12.5 F1000 ; intro line\n{endif}\nG92 E0\nM221 S{if layer_height<0.075}100{else}95{endif}", + "machine_start_gcode": "M862.3 P \"MK3S\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM115 U3.13.0 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\n{if filament_settings_id[initial_tool]=~/.*Prusament PA11.*/}\nG1 Z0.3 F720\nG1 Y-3 F1000 ; go outside print area\nG92 E0\nG1 X60 E9 F1000 ; intro line\nG1 X100 E9 F1000 ; intro line\n{else}\nG1 Z0.2 F720\nG1 Y-3 F1000 ; go outside print area\nG92 E0\nG1 X60 E9 F1000 ; intro line\nG1 X100 E12.5 F1000 ; intro line\n{endif}\nG92 E0\nM221 S{if layer_height<0.075}100{else}95{endif}", "machine_end_gcode": "{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+1, max_print_height)} F720 ; Move print head up{endif}\nG1 X0 Y200 F3600 ; park\n{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+49, max_print_height)} F720 ; Move print head further up{endif}\nG4 ; wait\nM221 S100 ; reset flow\nM900 K0 ; reset LA\n{if print_settings_id=~/.*(DETAIL @MK3S|QUALITY @MK3S|@0.25 nozzle MK3).*/}M907 E538 ; reset extruder motor current{endif}\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nM84 ; disable motors\n; max_layer_z = [max_layer_z]", "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]", "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n", diff --git a/resources/profiles/Prusa/machine/Prusa MK3S 0.6 nozzle.json b/resources/profiles/Prusa/machine/Prusa MK3S 0.6 nozzle.json index 38b9324df2..3bcc20332a 100644 --- a/resources/profiles/Prusa/machine/Prusa MK3S 0.6 nozzle.json +++ b/resources/profiles/Prusa/machine/Prusa MK3S 0.6 nozzle.json @@ -42,7 +42,7 @@ "host_type": "prusalink", "printable_height": "210", "machine_pause_gcode": "M601", - "machine_start_gcode": "M862.3 P \"[printer_model]\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM115 U3.13.0 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\n{if filament_settings_id[initial_tool]=~/.*Prusament PA11.*/}\nG1 Z0.3 F720\nG1 Y-3 F1000 ; go outside print area\nG92 E0\nG1 X60 E9 F1000 ; intro line\nG1 X100 E9 F1000 ; intro line\n{else}\nG1 Z0.2 F720\nG1 Y-3 F1000 ; go outside print area\nG92 E0\nG1 X60 E9 F1000 ; intro line\nG1 X100 E12.5 F1000 ; intro line\n{endif}\nG92 E0\nM221 S{if layer_height<0.075}100{else}95{endif}", + "machine_start_gcode": "M862.3 P \"MK3S\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM115 U3.13.0 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\n{if filament_settings_id[initial_tool]=~/.*Prusament PA11.*/}\nG1 Z0.3 F720\nG1 Y-3 F1000 ; go outside print area\nG92 E0\nG1 X60 E9 F1000 ; intro line\nG1 X100 E9 F1000 ; intro line\n{else}\nG1 Z0.2 F720\nG1 Y-3 F1000 ; go outside print area\nG92 E0\nG1 X60 E9 F1000 ; intro line\nG1 X100 E12.5 F1000 ; intro line\n{endif}\nG92 E0\nM221 S{if layer_height<0.075}100{else}95{endif}", "machine_end_gcode": "{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+1, max_print_height)} F720 ; Move print head up{endif}\nG1 X0 Y200 F3600 ; park\n{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+49, max_print_height)} F720 ; Move print head further up{endif}\nG4 ; wait\nM221 S100 ; reset flow\nM900 K0 ; reset LA\n{if print_settings_id=~/.*(DETAIL @MK3S|QUALITY @MK3S|@0.25 nozzle MK3).*/}M907 E538 ; reset extruder motor current{endif}\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nM84 ; disable motors\n; max_layer_z = [max_layer_z]", "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]", "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n", diff --git a/resources/profiles/Prusa/machine/Prusa MK3S 0.8 nozzle.json b/resources/profiles/Prusa/machine/Prusa MK3S 0.8 nozzle.json index e006ce29fc..bde3819ca6 100644 --- a/resources/profiles/Prusa/machine/Prusa MK3S 0.8 nozzle.json +++ b/resources/profiles/Prusa/machine/Prusa MK3S 0.8 nozzle.json @@ -42,7 +42,7 @@ "host_type": "prusalink", "printable_height": "210", "machine_pause_gcode": "M601", - "machine_start_gcode": "M862.3 P \"[printer_model]\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM115 U3.13.0 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\n{if filament_settings_id[initial_tool]=~/.*Prusament PA11.*/}\nG1 Z0.3 F720\nG1 Y-3 F1000 ; go outside print area\nG92 E0\nG1 X60 E9 F1000 ; intro line\nG1 X100 E9 F1000 ; intro line\n{else}\nG1 Z0.2 F720\nG1 Y-3 F1000 ; go outside print area\nG92 E0\nG1 X60 E9 F1000 ; intro line\nG1 X100 E12.5 F1000 ; intro line\n{endif}\nG92 E0\nM221 S{if layer_height<0.075}100{else}95{endif}", + "machine_start_gcode": "M862.3 P \"MK3S\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM115 U3.13.0 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\n{if filament_settings_id[initial_tool]=~/.*Prusament PA11.*/}\nG1 Z0.3 F720\nG1 Y-3 F1000 ; go outside print area\nG92 E0\nG1 X60 E9 F1000 ; intro line\nG1 X100 E9 F1000 ; intro line\n{else}\nG1 Z0.2 F720\nG1 Y-3 F1000 ; go outside print area\nG92 E0\nG1 X60 E9 F1000 ; intro line\nG1 X100 E12.5 F1000 ; intro line\n{endif}\nG92 E0\nM221 S{if layer_height<0.075}100{else}95{endif}", "machine_end_gcode": "{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+1, max_print_height)} F720 ; Move print head up{endif}\nG1 X0 Y200 F3600 ; park\n{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+49, max_print_height)} F720 ; Move print head further up{endif}\nG4 ; wait\nM221 S100 ; reset flow\nM900 K0 ; reset LA\n{if print_settings_id=~/.*(DETAIL @MK3S|QUALITY @MK3S|@0.25 nozzle MK3).*/}M907 E538 ; reset extruder motor current{endif}\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nM84 ; disable motors\n; max_layer_z = [max_layer_z]", "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]", "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n", diff --git a/resources/profiles/Prusa/machine/fdm_machine_common_mk4s.json b/resources/profiles/Prusa/machine/fdm_machine_common_mk4s.json index 8c7fa84157..0e41973b4c 100644 --- a/resources/profiles/Prusa/machine/fdm_machine_common_mk4s.json +++ b/resources/profiles/Prusa/machine/fdm_machine_common_mk4s.json @@ -85,7 +85,7 @@ "40" ], "machine_start_gcode": [ - "M17 ; enable steppers\nM862.1 P[nozzle_diameter] ; nozzle check\nM862.3 P \"[printer_model]\" ; printer model check\nM862.5 P2 ; g-code level check\nM862.6 P\"Input shaper\" ; FW feature check\nM115 U6.1.3+7898\n\nM555 X{(min(print_bed_max[0], first_layer_print_min[0] + 32) - 32)} Y{(max(0, first_layer_print_min[1]) - 4)} W{((min(print_bed_max[0], max(first_layer_print_min[0] + 32, first_layer_print_max[0])))) - ((min(print_bed_max[0], first_layer_print_min[0] + 32) - 32))} H{((first_layer_print_max[1])) - ((max(0, first_layer_print_min[1]) - 4))}\n\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\n\nM140 S[first_layer_bed_temperature] ; set bed temp\nM104 T0 S{((filament_notes[0]=~/.*HT_MBL10.*/) ? (first_layer_temperature[0] - 10) : (filament_type[0] == \"PC\" or filament_type[0] == \"PA\") ? (first_layer_temperature[0] - 25) : (filament_type[0] == \"FLEX\") ? 210 : (filament_type[0]=~/.*PET.*/) ? 175 : 170)} ; set extruder temp for bed leveling\nM109 T0 R{((filament_notes[0]=~/.*HT_MBL10.*/) ? (first_layer_temperature[0] - 10) : (filament_type[0] == \"PC\" or filament_type[0] == \"PA\") ? (first_layer_temperature[0] - 25) : (filament_type[0] == \"FLEX\") ? 210 : (filament_type[0]=~/.*PET.*/) ? 175 : 170)} ; wait for temp\n\nM84 E ; turn off E motor\n\nG28 ; home all without mesh bed level\n\nG1 X42 Y-4 Z5 F4800\n\nM302 S160 ; lower cold extrusion limit to 160C\n\n{if filament_type[initial_tool]==\"FLEX\"}\nG1 E-4 F2400 ; retraction\n{else}\nG1 E-2 F2400 ; retraction\n{endif}\n\nM84 E ; turn off E motor\n\nG29 P9 X10 Y-4 W32 H4\n\n{if first_layer_bed_temperature[initial_tool]<=60}M106 S100{endif}\n\nG0 Z40 F10000\n\nM190 S[first_layer_bed_temperature] ; wait for bed temp\n\nM107\n\n;\n; MBL\n;\nM84 E ; turn off E motor\nG29 P1 ; invalidate mbl & probe print area\nG29 P1 X0 Y0 W50 H20 C ; probe near purge place\nG29 P3.2 ; interpolate mbl probes\nG29 P3.13 ; extrapolate mbl outside probe area\nG29 A ; activate mbl\n\n; prepare for purge\nM104 S{first_layer_temperature[0]}\nG0 X0 Y-4 Z15 F4800 ; move away and ready for the purge\nM109 S{first_layer_temperature[0]}\n\nG92 E0\nM569 S0 E ; set spreadcycle mode for extruder\n\n;\n; Extrude purge line\n;\nG92 E0 ; reset extruder position\nG1 E{(filament_type[0] == \"FLEX\" ? 4 : 2)} F2400 ; deretraction after the initial one before nozzle cleaning\nG0 E7 X15 Z0.2 F500 ; purge\nG0 X25 E4 F500 ; purge\nG0 X35 E4 F650 ; purge\nG0 X45 E4 F800 ; purge\nG0 X48 Z0.05 F8000 ; wipe, move close to the bed\nG0 X51 Z0.2 F8000 ; wipe, move quickly away from the bed\n\nG92 E0\nM221 S100 ; set flow to 100%" + "M17 ; enable steppers\nM862.1 P[nozzle_diameter] ; nozzle check\nM862.3 P \"MK4S\" ; printer model check\nM862.5 P2 ; g-code level check\nM862.6 P\"Input shaper\" ; FW feature check\nM115 U6.1.3+7898\n\nM555 X{(min(print_bed_max[0], first_layer_print_min[0] + 32) - 32)} Y{(max(0, first_layer_print_min[1]) - 4)} W{((min(print_bed_max[0], max(first_layer_print_min[0] + 32, first_layer_print_max[0])))) - ((min(print_bed_max[0], first_layer_print_min[0] + 32) - 32))} H{((first_layer_print_max[1])) - ((max(0, first_layer_print_min[1]) - 4))}\n\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\n\nM140 S[first_layer_bed_temperature] ; set bed temp\nM104 T0 S{((filament_notes[0]=~/.*HT_MBL10.*/) ? (first_layer_temperature[0] - 10) : (filament_type[0] == \"PC\" or filament_type[0] == \"PA\") ? (first_layer_temperature[0] - 25) : (filament_type[0] == \"FLEX\") ? 210 : (filament_type[0]=~/.*PET.*/) ? 175 : 170)} ; set extruder temp for bed leveling\nM109 T0 R{((filament_notes[0]=~/.*HT_MBL10.*/) ? (first_layer_temperature[0] - 10) : (filament_type[0] == \"PC\" or filament_type[0] == \"PA\") ? (first_layer_temperature[0] - 25) : (filament_type[0] == \"FLEX\") ? 210 : (filament_type[0]=~/.*PET.*/) ? 175 : 170)} ; wait for temp\n\nM84 E ; turn off E motor\n\nG28 ; home all without mesh bed level\n\nG1 X42 Y-4 Z5 F4800\n\nM302 S160 ; lower cold extrusion limit to 160C\n\n{if filament_type[initial_tool]==\"FLEX\"}\nG1 E-4 F2400 ; retraction\n{else}\nG1 E-2 F2400 ; retraction\n{endif}\n\nM84 E ; turn off E motor\n\nG29 P9 X10 Y-4 W32 H4\n\n{if first_layer_bed_temperature[initial_tool]<=60}M106 S100{endif}\n\nG0 Z40 F10000\n\nM190 S[first_layer_bed_temperature] ; wait for bed temp\n\nM107\n\n;\n; MBL\n;\nM84 E ; turn off E motor\nG29 P1 ; invalidate mbl & probe print area\nG29 P1 X0 Y0 W50 H20 C ; probe near purge place\nG29 P3.2 ; interpolate mbl probes\nG29 P3.13 ; extrapolate mbl outside probe area\nG29 A ; activate mbl\n\n; prepare for purge\nM104 S{first_layer_temperature[0]}\nG0 X0 Y-4 Z15 F4800 ; move away and ready for the purge\nM109 S{first_layer_temperature[0]}\n\nG92 E0\nM569 S0 E ; set spreadcycle mode for extruder\n\n;\n; Extrude purge line\n;\nG92 E0 ; reset extruder position\nG1 E{(filament_type[0] == \"FLEX\" ? 4 : 2)} F2400 ; deretraction after the initial one before nozzle cleaning\nG0 E7 X15 Z0.2 F500 ; purge\nG0 X25 E4 F500 ; purge\nG0 X35 E4 F650 ; purge\nG0 X45 E4 F800 ; purge\nG0 X48 Z0.05 F8000 ; wipe, move close to the bed\nG0 X51 Z0.2 F8000 ; wipe, move quickly away from the bed\n\nG92 E0\nM221 S100 ; set flow to 100%" ], "max_layer_height": "0.30", "min_layer_height": "0.07", diff --git a/resources/profiles/Qidi/machine/Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/machine/Qidi Q1 Pro 0.4 nozzle.json index 32809b749d..33508f61df 100644 --- a/resources/profiles/Qidi/machine/Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi Q1 Pro 0.4 nozzle.json @@ -31,7 +31,7 @@ "printable_height": "240", "nozzle_type": "hardened_steel", "max_layer_height": [ - "0.28" + "0.32" ], "min_layer_height": [ "0.08" diff --git a/resources/profiles/Qidi/machine/Qidi Q2 0.4 nozzle.json b/resources/profiles/Qidi/machine/Qidi Q2 0.4 nozzle.json index 17780991da..b7082e9bdb 100644 --- a/resources/profiles/Qidi/machine/Qidi Q2 0.4 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi Q2 0.4 nozzle.json @@ -57,7 +57,7 @@ "270x270", "0x270" ], - "printable_height": "260", + "printable_height": "256", "retract_lift_below": [ "259" ], @@ -66,4 +66,4 @@ "thumbnail_size": [ "50x50" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Qidi/machine/Qidi X-CF Pro 0.4 nozzle.json b/resources/profiles/Qidi/machine/Qidi X-CF Pro 0.4 nozzle.json index 7486f3d9e9..b916219bf0 100644 --- a/resources/profiles/Qidi/machine/Qidi X-CF Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi X-CF Pro 0.4 nozzle.json @@ -76,7 +76,7 @@ "0.4" ], "max_layer_height": [ - "0" + "0.32" ], "min_layer_height": [ "0.07" diff --git a/resources/profiles/Qidi/machine/Qidi X-Max 0.4 nozzle.json b/resources/profiles/Qidi/machine/Qidi X-Max 0.4 nozzle.json index cfcb4a50e9..1b6c241594 100644 --- a/resources/profiles/Qidi/machine/Qidi X-Max 0.4 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi X-Max 0.4 nozzle.json @@ -76,7 +76,7 @@ "0.4" ], "max_layer_height": [ - "0" + "0.32" ], "min_layer_height": [ "0.07" diff --git a/resources/profiles/Qidi/machine/Qidi X-Max 3 0.4 nozzle.json b/resources/profiles/Qidi/machine/Qidi X-Max 3 0.4 nozzle.json index d2cb0720d0..920470ce75 100644 --- a/resources/profiles/Qidi/machine/Qidi X-Max 3 0.4 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi X-Max 3 0.4 nozzle.json @@ -21,7 +21,7 @@ "nozzle_type": "hardened_steel", "auxiliary_fan": "1", "max_layer_height": [ - "0.28" + "0.32" ], "min_layer_height": [ "0.08" diff --git a/resources/profiles/Qidi/machine/Qidi X-Plus 0.4 nozzle.json b/resources/profiles/Qidi/machine/Qidi X-Plus 0.4 nozzle.json index c224a7db92..783eea4931 100644 --- a/resources/profiles/Qidi/machine/Qidi X-Plus 0.4 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi X-Plus 0.4 nozzle.json @@ -76,7 +76,7 @@ "0.4" ], "max_layer_height": [ - "0" + "0.32" ], "min_layer_height": [ "0.07" diff --git a/resources/profiles/Qidi/machine/Qidi X-Plus 3 0.4 nozzle.json b/resources/profiles/Qidi/machine/Qidi X-Plus 3 0.4 nozzle.json index aa3fb3d877..39889fc610 100644 --- a/resources/profiles/Qidi/machine/Qidi X-Plus 3 0.4 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi X-Plus 3 0.4 nozzle.json @@ -20,7 +20,7 @@ "printable_height": "270", "nozzle_type": "hardened_steel", "max_layer_height": [ - "0.28" + "0.32" ], "min_layer_height": [ "0.08" diff --git a/resources/profiles/Qidi/machine/Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/machine/Qidi X-Plus 4 0.4 nozzle.json index b5c0a16a94..af3c931791 100644 --- a/resources/profiles/Qidi/machine/Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi X-Plus 4 0.4 nozzle.json @@ -35,7 +35,7 @@ "printable_height": "280", "nozzle_type": "hardened_steel", "max_layer_height": [ - "0.28" + "0.32" ], "min_layer_height": [ "0.08" diff --git a/resources/profiles/Qidi/machine/Qidi X-Smart 3 0.4 nozzle.json b/resources/profiles/Qidi/machine/Qidi X-Smart 3 0.4 nozzle.json index 325c73990c..99f3f41bc2 100644 --- a/resources/profiles/Qidi/machine/Qidi X-Smart 3 0.4 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi X-Smart 3 0.4 nozzle.json @@ -21,7 +21,7 @@ "nozzle_type": "hardened_steel", "auxiliary_fan": "1", "max_layer_height": [ - "0.3" + "0.32" ], "min_layer_height": [ "0.07" diff --git a/resources/profiles/Qidi/machine/fdm_machine_common.json b/resources/profiles/Qidi/machine/fdm_machine_common.json index 866e48cd73..f2916ef38a 100644 --- a/resources/profiles/Qidi/machine/fdm_machine_common.json +++ b/resources/profiles/Qidi/machine/fdm_machine_common.json @@ -64,7 +64,7 @@ "0" ], "max_layer_height": [ - "0.28" + "0.32" ], "min_layer_height": [ "0.08" diff --git a/resources/profiles/Qidi/machine/fdm_q_common.json b/resources/profiles/Qidi/machine/fdm_q_common.json index fbad3dbe7e..a36bf68f68 100644 --- a/resources/profiles/Qidi/machine/fdm_q_common.json +++ b/resources/profiles/Qidi/machine/fdm_q_common.json @@ -86,7 +86,7 @@ "machine_switch_extruder_time": "0", "machine_unload_filament_time": "0", "max_layer_height": [ - "0.28" + "0.32" ], "min_layer_height": [ "0.08" diff --git a/resources/profiles/Sovol.json b/resources/profiles/Sovol.json index 4160de89cc..1ffbee4d95 100644 --- a/resources/profiles/Sovol.json +++ b/resources/profiles/Sovol.json @@ -5,6 +5,10 @@ "force_update": "0", "description": "Sovol configurations", "machine_model_list": [ + { + "name": "Sovol SV01", + "sub_path": "machine/Sovol SV01.json" + }, { "name": "Sovol SV01 Pro", "sub_path": "machine/Sovol SV01 Pro.json" @@ -48,6 +52,10 @@ { "name": "Sovol Zero", "sub_path": "machine/Sovol Zero.json" + }, + { + "name": "Sovol SV08 MAX", + "sub_path": "machine/Sovol SV08 MAX.json" } ], "process_list": [ @@ -107,6 +115,10 @@ "name": "0.20mm High-Speed @Sovol SV06", "sub_path": "process/0.20mm High-Speed @Sovol SV06.json" }, + { + "name": "0.20mm Standard @Sovol SV01", + "sub_path": "process/0.20mm Standard @Sovol SV01.json" + }, { "name": "0.20mm Standard @Sovol SV01Pro", "sub_path": "process/0.20mm Standard @Sovol SV01Pro.json" @@ -174,6 +186,18 @@ { "name": "0.40mm Standard @Sovol SV08 0.8 nozzle", "sub_path": "process/0.40mm Standard @Sovol SV08 0.8 nozzle.json" + }, + { + "name": "0.20mm Standard @Sovol SV08 MAX 0.4 nozzle", + "sub_path": "process/0.20mm Standard @Sovol SV08 MAX 0.4 nozzle.json" + }, + { + "name": "0.30mm Standard @Sovol SV08 MAX 0.6 nozzle", + "sub_path": "process/0.30mm Standard @Sovol SV08 MAX 0.6 nozzle.json" + }, + { + "name": "0.40mm Standard @Sovol SV08 MAX 0.8 nozzle", + "sub_path": "process/0.40mm Standard @Sovol SV08 MAX 0.8 nozzle.json" } ], "filament_list": [ @@ -268,6 +292,38 @@ { "name": "Sovol Zero TPU", "sub_path": "filament/Sovol Zero TPU.json" + }, + { + "name": "Generic PLA @Sovol SV08 MAX", + "sub_path": "filament/Generic PLA @Sovol SV08 MAX.json" + }, + { + "name": "Generic PLA Silk @Sovol SV08 MAX", + "sub_path": "filament/Generic PLA Silk @Sovol SV08 MAX.json" + }, + { + "name": "Generic ABS @Sovol SV08 MAX", + "sub_path": "filament/Generic ABS @Sovol SV08 MAX.json" + }, + { + "name": "Generic PETG @Sovol SV08 MAX", + "sub_path": "filament/Generic PETG @Sovol SV08 MAX.json" + }, + { + "name": "Polymaker PETG @Sovol SV08 MAX", + "sub_path": "filament/Polymaker PETG @Sovol SV08 MAX.json" + }, + { + "name": "SUNLU PETG @Sovol SV08 MAX", + "sub_path": "filament/SUNLU PETG @Sovol SV08 MAX.json" + }, + { + "name": "Generic TPU @Sovol SV08 MAX", + "sub_path": "filament/Generic TPU @Sovol SV08 MAX.json" + }, + { + "name": "Generic PC @Sovol SV08 MAX", + "sub_path": "filament/Generic PC @Sovol SV08 MAX.json" } ], "machine_list": [ @@ -275,6 +331,10 @@ "name": "fdm_machine_common", "sub_path": "machine/fdm_machine_common.json" }, + { + "name": "Sovol SV01 0.4 nozzle", + "sub_path": "machine/Sovol SV01 0.4 nozzle.json" + }, { "name": "Sovol SV01 Pro 0.4 nozzle", "sub_path": "machine/Sovol SV01 Pro 0.4 nozzle.json" @@ -346,6 +406,18 @@ { "name": "Sovol Zero 0.4 nozzle", "sub_path": "machine/Sovol Zero 0.4 nozzle.json" + }, + { + "name": "Sovol SV08 MAX 0.4 nozzle", + "sub_path": "machine/Sovol SV08 MAX 0.4 nozzle.json" + }, + { + "name": "Sovol SV08 MAX 0.6 nozzle", + "sub_path": "machine/Sovol SV08 MAX 0.6 nozzle.json" + }, + { + "name": "Sovol SV08 MAX 0.8 nozzle", + "sub_path": "machine/Sovol SV08 MAX 0.8 nozzle.json" } ] } \ No newline at end of file diff --git a/resources/profiles/Sovol/Sovol SV01_cover.png b/resources/profiles/Sovol/Sovol SV01_cover.png new file mode 100644 index 0000000000..25eed18db9 Binary files /dev/null and b/resources/profiles/Sovol/Sovol SV01_cover.png differ diff --git a/resources/profiles/Sovol/Sovol SV08 MAX_cover.png b/resources/profiles/Sovol/Sovol SV08 MAX_cover.png new file mode 100644 index 0000000000..b39df9b317 Binary files /dev/null and b/resources/profiles/Sovol/Sovol SV08 MAX_cover.png differ diff --git a/resources/profiles/Sovol/Sovol Zero_cover.png b/resources/profiles/Sovol/Sovol Zero_cover.png old mode 100755 new mode 100644 diff --git a/resources/profiles/Sovol/filament/Generic ABS @Sovol SV08 MAX.json b/resources/profiles/Sovol/filament/Generic ABS @Sovol SV08 MAX.json new file mode 100644 index 0000000000..4709d7c457 --- /dev/null +++ b/resources/profiles/Sovol/filament/Generic ABS @Sovol SV08 MAX.json @@ -0,0 +1,72 @@ +{ + "type": "filament", + "filament_id": "GFL99", + "setting_id": "GFSA04", + "name": "Generic ABS @Sovol SV08 MAX", + "from": "system", + "instantiation": "true", + "inherits": "Generic ABS @System", + "filament_flow_ratio": ["0.98"], + "filament_max_volumetric_speed": ["20"], + "nozzle_temperature_initial_layer": [ + "280" + ], + "nozzle_temperature": [ + "270" + ], + "nozzle_temperature_range_low": [ + "230" + ], + "nozzle_temperature_range_high": [ + "300" + ], + "hot_plate_temp": [ + "95" + ], + "hot_plate_temp_initial_layer": [ + "95" + ], + "fan_min_speed": [ + "10" + ], + "fan_max_speed": [ + "60" + ], + "fan_cooling_layer_time": [ + "30" + ], + "full_fan_speed_layer": [ + "3" + ], + "slow_down_layer_time": [ + "12" + ], + "slow_down_min_speed": [ + "10" + ], + "overhang_fan_speed": [ + "100" + ], + "overhang_fan_threshold": [ + "25%" + ], + "temperature_vitrification": [ + "60" + ], + "activate_air_filtration": ["0"], + "close_fan_the_first_x_layers": [ + "1" + ], + "complete_print_exhaust_fan_speed": [ + "50" + ], + "during_print_exhaust_fan_speed": [ + "50" + ], + "additional_cooling_fan_speed":["0"], + "compatible_printers": [ + "Sovol SV08 MAX 0.4 nozzle", + "Sovol SV08 MAX 0.6 nozzle", + "Sovol SV08 MAX 0.8 nozzle" + ] +} diff --git a/resources/profiles/Sovol/filament/Generic PC @Sovol SV08 MAX.json b/resources/profiles/Sovol/filament/Generic PC @Sovol SV08 MAX.json new file mode 100644 index 0000000000..c7c9273f5f --- /dev/null +++ b/resources/profiles/Sovol/filament/Generic PC @Sovol SV08 MAX.json @@ -0,0 +1,67 @@ +{ + "type": "filament", + "filament_id": "GFL99", + "setting_id": "GFSA04", + "name": "Generic PC @Sovol SV08 MAX", + "from": "system", + "instantiation": "true", + "inherits": "Generic PC @System", + "filament_flow_ratio": ["0.98"], + "filament_max_volumetric_speed": ["18"], + "compatible_printers": [ + "Sovol SV08 MAX 0.4 nozzle", + "Sovol SV08 MAX 0.6 nozzle", + "Sovol SV08 MAX 0.8 nozzle" + ], + "close_fan_the_first_x_layers": "3", + "nozzle_temperature_initial_layer": [ + "280" + ], + "nozzle_temperature": [ + "260" + ], + "nozzle_temperature_range_low": [ + "190" + ], + "nozzle_temperature_range_high": [ + "350" + ], + "hot_plate_temp" : [ + "100" + ], + "hot_plate_temp_initial_layer" : [ + "100" + ], + "fan_min_speed": [ + "10" + ], + "fan_max_speed": [ + "40" + ], + "fan_cooling_layer_time": [ + "30" + ], + "full_fan_speed_layer": [ + "3" + ], + "slow_down_layer_time": [ + "12" + ], + "slow_down_min_speed": [ + "10" + ], + "dont_slow_down_outer_wall": "0", + "overhang_fan_speed": [ + "60" + ], + "overhang_fan_threshold": [ + "25%" + ], + "temperature_vitrification": [ + "60" + ], + "additional_cooling_fan_speed": "0", + "activate_air_filtration": ["0"], + "during_print_exhaust_fan_speed": "50", + "complete_print_exhaust_fan_speed": "50" +} diff --git a/resources/profiles/Sovol/filament/Generic PETG @Sovol SV08 MAX.json b/resources/profiles/Sovol/filament/Generic PETG @Sovol SV08 MAX.json new file mode 100644 index 0000000000..f737d1f71d --- /dev/null +++ b/resources/profiles/Sovol/filament/Generic PETG @Sovol SV08 MAX.json @@ -0,0 +1,77 @@ +{ + "type": "filament", + "filament_id": "GFL99", + "setting_id": "GFSA04", + "name": "Generic PETG @Sovol SV08 MAX", + "from": "system", + "instantiation": "true", + "inherits": "Generic PETG @System", + "filament_flow_ratio": ["0.98"], + "filament_max_volumetric_speed": [ + "15" + ], + "enable_pressure_advance": "1", + "pressure_advance": "0.048", + "nozzle_temperature_initial_layer": [ + "265" + ], + "nozzle_temperature": [ + "255" + ], + "nozzle_temperature_range_low": [ + "230" + ], + "nozzle_temperature_range_high": [ + "280" + ], + "hot_plate_temp": [ + "80" + ], + "hot_plate_temp_initial_layer": [ + "80" + ], + "fan_min_speed": [ + "30" + ], + "fan_max_speed": [ + "50" + ], + "fan_cooling_layer_time": [ + "30" + ], + "full_fan_speed_layer": [ + "3" + ], + "slow_down_layer_time": [ + "8" + ], + "slow_down_min_speed": [ + "10" + ], + "overhang_fan_speed": [ + "100" + ], + "overhang_fan_threshold": [ + "10%" + ], + "temperature_vitrification": [ + "60" + ], + "close_fan_the_first_x_layers": [ + "1" + ], + "filament_retraction_length": [ + "0.5" + ], + "filament_z_hop": [ + "0.4" + ], + "activate_air_filtration": ["0"], + "during_print_exhaust_fan_speed": "50", + "complete_print_exhaust_fan_speed": "50", + "compatible_printers": [ + "Sovol SV08 MAX 0.4 nozzle", + "Sovol SV08 MAX 0.6 nozzle", + "Sovol SV08 MAX 0.8 nozzle" + ] +} diff --git a/resources/profiles/Sovol/filament/Generic PLA @Sovol SV08 MAX.json b/resources/profiles/Sovol/filament/Generic PLA @Sovol SV08 MAX.json new file mode 100644 index 0000000000..4fef549108 --- /dev/null +++ b/resources/profiles/Sovol/filament/Generic PLA @Sovol SV08 MAX.json @@ -0,0 +1,68 @@ +{ + "type": "filament", + "filament_id": "GFL99", + "setting_id": "GFSA04", + "name": "Generic PLA @Sovol SV08 MAX", + "from": "system", + "instantiation": "true", + "inherits": "Generic PLA @System", + "filament_flow_ratio": ["0.98"], + "filament_max_volumetric_speed": ["21"], + "compatible_printers": [ + "Sovol SV08 MAX 0.4 nozzle", + "Sovol SV08 MAX 0.6 nozzle", + "Sovol SV08 MAX 0.8 nozzle" + ], + "nozzle_temperature_initial_layer": [ + "250" + ], + "nozzle_temperature": [ + "230" + ], + "nozzle_temperature_range_low": [ + "190" + ], + "nozzle_temperature_range_high": [ + "250" + ], + "hot_plate_temp" : [ + "65" + ], + "hot_plate_temp_initial_layer" : [ + "65" + ], + "fan_min_speed": [ + "80" + ], + "fan_max_speed": [ + "100" + ], + "fan_cooling_layer_time": [ + "50" + ], + "slow_down_layer_time": [ + "6" + ], + "full_fan_speed_layer": [ + "3" + ], + "slow_down_min_speed": [ + "10" + ], + "dont_slow_down_outer_wall": "0", + "overhang_fan_speed": [ + "100" + ], + "overhang_fan_threshold": [ + "50%" + ], + "temperature_vitrification": [ + "60" + ], + "enable_pressure_advance": "1", + "pressure_advance": "0.036", + "additional_cooling_fan_speed": "75%", + "activate_air_filtration": ["0"], + "during_print_exhaust_fan_speed": "50%", + "complete_print_exhaust_fan_speed": "50%" +} diff --git a/resources/profiles/Sovol/filament/Generic PLA Silk @Sovol SV08 MAX.json b/resources/profiles/Sovol/filament/Generic PLA Silk @Sovol SV08 MAX.json new file mode 100644 index 0000000000..a388c1567c --- /dev/null +++ b/resources/profiles/Sovol/filament/Generic PLA Silk @Sovol SV08 MAX.json @@ -0,0 +1,69 @@ +{ + "type": "filament", + "filament_id": "GFL99", + "setting_id": "GFSA04", + "name": "Generic PLA Silk @Sovol SV08 MAX", + "from": "system", + "instantiation": "true", + "inherits": "Generic PLA @System", + "filament_flow_ratio": ["0.98"], + "filament_max_volumetric_speed": ["15"], + "compatible_printers": [ + "Sovol SV08 MAX 0.4 nozzle", + "Sovol SV08 MAX 0.6 nozzle", + "Sovol SV08 MAX 0.8 nozzle" + ], + "nozzle_temperature_initial_layer": [ + "250" + ], + "nozzle_temperature": [ + "230" + ], + "nozzle_temperature_range_low": [ + "190" + ], + "nozzle_temperature_range_high": [ + "250" + ], + "hot_plate_temp" : [ + "65" + ], + "hot_plate_temp_initial_layer" : [ + "65" + ], + "fan_min_speed": [ + "80" + ], + "fan_max_speed": [ + "100" + ], + "fan_cooling_layer_time": [ + "50" + ], + "slow_down_layer_time": [ + "6" + ], + "full_fan_speed_layer": [ + "3" + ], + "slow_down_min_speed": [ + "10" + ], + "dont_slow_down_outer_wall": "0", + "overhang_fan_speed": [ + "100" + ], + "overhang_fan_threshold": [ + "50%" + ], + "temperature_vitrification": [ + "60" + ], + "enable_pressure_advance": "1", + "pressure_advance": "0.038", + "filament_z_hop": "0.4", + "additional_cooling_fan_speed": "75%", + "activate_air_filtration": ["0"], + "during_print_exhaust_fan_speed": "50%", + "complete_print_exhaust_fan_speed": "50%" +} diff --git a/resources/profiles/Sovol/filament/Generic TPU @Sovol SV08 MAX.json b/resources/profiles/Sovol/filament/Generic TPU @Sovol SV08 MAX.json new file mode 100644 index 0000000000..c7987ca18e --- /dev/null +++ b/resources/profiles/Sovol/filament/Generic TPU @Sovol SV08 MAX.json @@ -0,0 +1,73 @@ +{ + "type": "filament", + "filament_id": "GFL99", + "setting_id": "GFSA04", + "name": "Generic TPU @Sovol SV08 MAX", + "from": "system", + "instantiation": "true", + "inherits": "Generic TPU @System", + "filament_flow_ratio": ["0.98"], + "filament_max_volumetric_speed": [ + "3" + ], + "nozzle_temperature": [ + "240" + ], + "nozzle_temperature_initial_layer": [ + "250" + ], + "nozzle_temperature_range_low": [ + "190" + ], + "nozzle_temperature_range_high": [ + "250" + ], + "hot_plate_temp" : [ + "85" + ], + "hot_plate_temp_initial_layer" : [ + "85" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "fan_cooling_layer_time": [ + "50" + ], + "full_fan_speed_layer": [ + "3" + ], + "slow_down_layer_time": [ + "8" + ], + "slow_down_min_speed": [ + "10" + ], + "overhang_fan_speed": [ + "100" + ], + "overhang_fan_threshold": [ + "25%" + ], + "temperature_vitrification": [ + "60" + ], + "filament_retraction_length": [ + "0.4" + ], + "filament_z_hop": [ + "0.4" + ], + "additional_cooling_fan_speed": "50", + "activate_air_filtration": ["0"], + "during_print_exhaust_fan_speed": "100", + "complete_print_exhaust_fan_speed": "50", + "compatible_printers": [ + "Sovol SV08 MAX 0.4 nozzle", + "Sovol SV08 MAX 0.6 nozzle", + "Sovol SV08 MAX 0.8 nozzle" + ] +} diff --git a/resources/profiles/Sovol/filament/Polymaker PETG @Sovol SV08 MAX.json b/resources/profiles/Sovol/filament/Polymaker PETG @Sovol SV08 MAX.json new file mode 100644 index 0000000000..839a5eb5cc --- /dev/null +++ b/resources/profiles/Sovol/filament/Polymaker PETG @Sovol SV08 MAX.json @@ -0,0 +1,78 @@ +{ + "type": "filament", + "filament_id": "GFL99", + "setting_id": "GFSA04", + "name": "Polymaker PETG @Sovol SV08 MAX", + "from": "system", + "instantiation": "true", + "inherits": "Generic PETG @System", + "filament_flow_ratio": ["0.98"], + "filament_max_volumetric_speed": [ + "12" + ], + "enable_pressure_advance": "1", + "pressure_advance": "0.08", + "nozzle_temperature_initial_layer": [ + "275" + ], + "nozzle_temperature": [ + "270" + ], + "nozzle_temperature_range_low": [ + "230" + ], + "nozzle_temperature_range_high": [ + "280" + ], + "hot_plate_temp": [ + "80" + ], + "hot_plate_temp_initial_layer": [ + "80" + ], + "fan_min_speed": [ + "10" + ], + "fan_max_speed": [ + "40" + ], + "fan_cooling_layer_time": [ + "30" + ], + "full_fan_speed_layer": [ + "3" + ], + "slow_down_layer_time": [ + "12" + ], + "slow_down_min_speed": [ + "10" + ], + "overhang_fan_speed": [ + "100" + ], + "overhang_fan_threshold": [ + "10%" + ], + "temperature_vitrification": [ + "60" + ], + "close_fan_the_first_x_layers": [ + "1" + ], + "filament_retraction_length": [ + "0.5" + ], + "filament_z_hop": [ + "0.4" + ], + "dont_slow_down_outer_wall": "1", + "activate_air_filtration": ["0"], + "during_print_exhaust_fan_speed": "50", + "complete_print_exhaust_fan_speed": "50", + "compatible_printers": [ + "Sovol SV08 MAX 0.4 nozzle", + "Sovol SV08 MAX 0.6 nozzle", + "Sovol SV08 MAX 0.8 nozzle" + ] +} diff --git a/resources/profiles/Sovol/filament/SUNLU PETG @Sovol SV08 MAX.json b/resources/profiles/Sovol/filament/SUNLU PETG @Sovol SV08 MAX.json new file mode 100644 index 0000000000..fbd3065c80 --- /dev/null +++ b/resources/profiles/Sovol/filament/SUNLU PETG @Sovol SV08 MAX.json @@ -0,0 +1,78 @@ +{ + "type": "filament", + "filament_id": "GFL99", + "setting_id": "GFSA04", + "name": "SUNLU PETG @Sovol SV08 MAX", + "from": "system", + "instantiation": "true", + "inherits": "Generic PETG @System", + "filament_flow_ratio": ["0.98"], + "filament_max_volumetric_speed": [ + "13" + ], + "enable_pressure_advance": "1", + "pressure_advance": "0.052", + "nozzle_temperature_initial_layer": [ + "265" + ], + "nozzle_temperature": [ + "255" + ], + "nozzle_temperature_range_low": [ + "230" + ], + "nozzle_temperature_range_high": [ + "280" + ], + "hot_plate_temp": [ + "80" + ], + "hot_plate_temp_initial_layer": [ + "80" + ], + "fan_min_speed": [ + "10" + ], + "fan_max_speed": [ + "40" + ], + "fan_cooling_layer_time": [ + "30" + ], + "full_fan_speed_layer": [ + "3" + ], + "slow_down_layer_time": [ + "12" + ], + "slow_down_min_speed": [ + "10" + ], + "overhang_fan_speed": [ + "100" + ], + "overhang_fan_threshold": [ + "10%" + ], + "temperature_vitrification": [ + "60" + ], + "close_fan_the_first_x_layers": [ + "1" + ], + "filament_retraction_length": [ + "0.5" + ], + "filament_z_hop": [ + "0.4" + ], + "dont_slow_down_outer_wall": "1", + "activate_air_filtration": ["0"], + "during_print_exhaust_fan_speed": "50", + "complete_print_exhaust_fan_speed": "50", + "compatible_printers": [ + "Sovol SV08 MAX 0.4 nozzle", + "Sovol SV08 MAX 0.6 nozzle", + "Sovol SV08 MAX 0.8 nozzle" + ] +} diff --git a/resources/profiles/Sovol/machine/Sovol SV01 0.4 nozzle.json b/resources/profiles/Sovol/machine/Sovol SV01 0.4 nozzle.json new file mode 100644 index 0000000000..6c71c2da51 --- /dev/null +++ b/resources/profiles/Sovol/machine/Sovol SV01 0.4 nozzle.json @@ -0,0 +1,109 @@ +{ + "type": "machine", + "setting_id": "GM001", + "name": "Sovol SV01 0.4 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_machine_common", + "printer_model": "Sovol SV01", + "default_print_profile": "0.20mm Standard @Sovol SV01", + "nozzle_diameter": [ + "0.4" + ], + "printable_area": [ + "0x0", + "280x0", + "280x240", + "0x240" + ], + "printable_height": "300", + "nozzle_type": "undefine", + "auxiliary_fan": "0", + "machine_max_acceleration_extruding": [ + "500", + "500" + ], + "machine_max_acceleration_retracting": [ + "1000", + "1000" + ], + "machine_max_acceleration_travel": [ + "1500", + "1250" + ], + "machine_max_acceleration_x": [ + "500", + "500" + ], + "machine_max_acceleration_y": [ + "500", + "500" + ], + "machine_max_acceleration_z": [ + "100", + "100" + ], + "machine_max_speed_e": [ + "60", + "60" + ], + "machine_max_speed_x": [ + "500", + "500" + ], + "machine_max_speed_y": [ + "500", + "500" + ], + "machine_max_speed_z": [ + "10", + "10" + ], + "machine_max_jerk_e": [ + "5", + "5" + ], + "machine_max_jerk_x": [ + "8", + "8" + ], + "machine_max_jerk_y": [ + "8", + "8" + ], + "machine_max_jerk_z": [ + "0.4", + "0.4" + ], + "max_layer_height": [ + "0.32" + ], + "min_layer_height": [ + "0.08" + ], + "printer_settings_id": "Sovol", + "retraction_minimum_travel": [ + "2" + ], + "retract_before_wipe": [ + "70%" + ], + "retraction_length": [ + "1" + ], + "retract_length_toolchange": [ + "1" + ], + "deretraction_speed": [ + "40" + ], + "single_extruder_multi_material": "1", + "change_filament_gcode": "M600", + "machine_pause_gcode": "M0", + "default_filament_profile": [ + "Generic PLA @System" + ], + "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/Sovol/machine/Sovol SV01.json b/resources/profiles/Sovol/machine/Sovol SV01.json new file mode 100644 index 0000000000..cb22cd6b8c --- /dev/null +++ b/resources/profiles/Sovol/machine/Sovol SV01.json @@ -0,0 +1,12 @@ +{ + "type": "machine_model", + "name": "Sovol SV01", + "model_id": "Sovol-SV01", + "nozzle_diameter": "0.4", + "machine_tech": "FFF", + "family": "Sovol", + "bed_model": "sovol_sv01pro_buildplate_model.stl", + "bed_texture": "sovol_sv01pro_buildplate_texture.png", + "hotend_model": "", + "default_materials": "Generic ABS @System;Generic PETG @System;Generic PLA @System" +} diff --git a/resources/profiles/Sovol/machine/Sovol SV08 MAX 0.4 nozzle.json b/resources/profiles/Sovol/machine/Sovol SV08 MAX 0.4 nozzle.json new file mode 100644 index 0000000000..85a7530d56 --- /dev/null +++ b/resources/profiles/Sovol/machine/Sovol SV08 MAX 0.4 nozzle.json @@ -0,0 +1,118 @@ +{ + "type": "machine", + "setting_id": "GM001", + "name": "Sovol SV08 MAX 0.4 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_machine_common", + "printer_model": "Sovol SV08 MAX", + "default_print_profile": "0.20mm Standard @Sovol SV08 MAX 0.4 nozzle", + "printer_variant": "0.4", + "nozzle_diameter": [ + "0.4" + ], + "retract_before_wipe": [ + "100%" + ], + "printable_area": [ + "0x0", + "500x0", + "500x500", + "0x500" + ], + "printable_height": "500", + "printer_structure": "corexy", + "gcode_flavor": "klipper", + "retraction_length": [ + "0.8" + ], + "machine_max_speed_e": [ + "50" + ], + "machine_max_speed_x": [ + "800" + ], + "machine_max_speed_y": [ + "800" + ], + "machine_max_speed_z": [ + "10" + ], + "machine_max_acceleration_e": [ + "20000" + ], + "machine_max_acceleration_extruding": [ + "40000" + ], + "machine_max_acceleration_retracting": [ + "5000" + ], + "machine_max_acceleration_travel": [ + "40000" + ], + "machine_max_acceleration_x": [ + "40000" + ], + "machine_max_acceleration_y": [ + "40000" + ], + "machine_max_acceleration_z": [ + "500" + ], + "machine_max_jerk_e": [ + "5" + ], + "machine_max_jerk_x": [ + "20" + ], + "machine_max_jerk_y": [ + "20" + ], + "machine_max_jerk_z": [ + "2.5" + ], + "z_hop": [ + "0.6" + ], + "travel_slope": [ + "2" + ], + "retraction_speed": [ + "40" + ], + "deretraction_speed": [ + "40" + ], + "retraction_minimum_travel": [ + "0" + ], + "retract_length_toolchange": [ + "2" + ], + "wipe": [ + "1" + ], + "wipe_distance": [ + "2" + ], + "z_hop_types": [ + "Auto Lift" + ], + "thumbnails": [ + "32x32", + "64x64", + "160x160", + "256x256" + ], + "retract_lift_below": [ + "498" + ], + "auxiliary_fan": "0", + "thumbnails_format": "PNG", + "before_layer_change_gcode": "TIMELAPSE_TAKE_FRAME\nG92 E0\nSET_PRINT_STATS_INFO CURRENT_LAYER=[layer_num]\n", + "machine_start_gcode": "G28\nM140 S[bed_temperature_initial_layer_single] ;set bed temp\nM190 S[bed_temperature_initial_layer_single] ;wait for bed temp\nSTART_PRINT\nG90\nG1 X0 Y0 F12000\nG1 Z0.300 F600\nM104 S[nozzle_temperature_initial_layer] ;set extruder temp\nM109 S[nozzle_temperature_initial_layer];wait for extruder temp\n{if first_layer_print_min[0] - 3 > print_bed_min[0]}\nG90\nM83\nG1 E-0.100 F600\nG1 X{first_layer_print_min[0] - 3} Y{first_layer_print_min[1]} F12000\nG1 Z0.3 F600 ;Move to start position\nG1 E0.100 F600\nG1 Y{first_layer_print_min[1] + 5 * 6} E{5 * 0.24 * 6} F{outer_wall_volumetric_speed * 5 * 30}\nG1 Y{first_layer_print_min[1] + 5 * 6 * 2} E{5 * 0.16 * 6} F{outer_wall_volumetric_speed * 5 * 30}\nG1 E-0.100 F600\nG1 Z1 F600\nG1 X{first_layer_print_min[0] - 2} Y{first_layer_print_min[1]} F12000\nG1 Z0.3 F600 ;Move to start position\nG1 E0.100 F600\nG1 Y{first_layer_print_min[1] + 5 * 6} E{5 * 0.24 * 6} F{outer_wall_volumetric_speed * 5 * 30}\nG1 Y{first_layer_print_min[1] + 5 * 6 * 2} E{5 * 0.16 * 6} F{outer_wall_volumetric_speed * 5 * 30}\nG1 E-0.100 F600\n{else}\nG90\nM83\nG1 E-0.100 Z3 F600\nG1 X-1.5 Y{first_layer_print_min[1]} F{outer_wall_volumetric_speed * 5 * 30}\nG1 Z0.3 F600\nG1 E0.100 F600\nG1 Y{first_layer_print_min[1] + 5 * 6} E{5 * 0.24 * 6} F{outer_wall_volumetric_speed * 5 * 30}\nG1 Y{first_layer_print_min[1] + 5 * 6 * 2} E{5 * 0.16 * 6} F{outer_wall_volumetric_speed * 5 * 30}\nG1 X-0.5 Y{first_layer_print_min[1]} F{outer_wall_volumetric_speed * 5 * 30}\nG1 Z0.3 F600\nG1 E0.100 F600\nG1 Y{first_layer_print_min[1] + 5 * 6} E{5 * 0.24 * 6} F{outer_wall_volumetric_speed * 5 * 30}\nG1 Y{first_layer_print_min[1] + 5 * 6 * 2} E{5 * 0.16 * 6} F{outer_wall_volumetric_speed * 5 * 30}\nG1 E-0.100 Z3 F600\nM400\n{endif}\nSET_PRINT_STATS_INFO TOTAL_LAYER=[total_layer_count]\n\n", + "machine_end_gcode": "END_PRINT\n", + "default_filament_profile": [ + "Generic PLA @Sovol SV08 MAX" + ] +} \ No newline at end of file diff --git a/resources/profiles/Sovol/machine/Sovol SV08 MAX 0.6 nozzle.json b/resources/profiles/Sovol/machine/Sovol SV08 MAX 0.6 nozzle.json new file mode 100644 index 0000000000..7d9deb0567 --- /dev/null +++ b/resources/profiles/Sovol/machine/Sovol SV08 MAX 0.6 nozzle.json @@ -0,0 +1,124 @@ +{ + "type": "machine", + "setting_id": "GM001", + "name": "Sovol SV08 MAX 0.6 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_machine_common", + "printer_model": "Sovol SV08 MAX", + "default_print_profile": "0.30mm Standard @Sovol SV08 MAX 0.6 nozzle", + "printer_variant": "0.6", + "nozzle_diameter": [ + "0.6" + ], + "min_layer_height": [ + "0.12" + ], + "max_layer_height": [ + "0.42" + ], + "retract_before_wipe": [ + "0%" + ], + "printable_area": [ + "0x0", + "500x0", + "500x500", + "0x500" + ], + "printable_height": "500", + "printer_structure": "corexy", + "gcode_flavor": "klipper", + "retraction_length": [ + "1.8" + ], + "retract_restart_extra": [ + "0.1" + ], + "machine_max_speed_e": [ + "50" + ], + "machine_max_speed_x": [ + "800" + ], + "machine_max_speed_y": [ + "800" + ], + "machine_max_speed_z": [ + "10" + ], + "machine_max_acceleration_e": [ + "20000" + ], + "machine_max_acceleration_extruding": [ + "40000" + ], + "machine_max_acceleration_retracting": [ + "5000" + ], + "machine_max_acceleration_travel": [ + "40000" + ], + "machine_max_acceleration_x": [ + "40000" + ], + "machine_max_acceleration_y": [ + "40000" + ], + "machine_max_acceleration_z": [ + "500" + ], + "machine_max_jerk_e": [ + "5" + ], + "machine_max_jerk_x": [ + "20" + ], + "machine_max_jerk_y": [ + "20" + ], + "machine_max_jerk_z": [ + "2.5" + ], + "z_hop": [ + "0.6" + ], + "retraction_speed": [ + "40" + ], + "deretraction_speed": [ + "40" + ], + "retraction_minimum_travel": [ + "0" + ], + "retract_length_toolchange": [ + "2" + ], + "wipe": [ + "1" + ], + "wipe_distance": [ + "3" + ], + "z_hop_types": [ + "Auto Lift" + ], + "thumbnails": [ + "32x32", + "64x64", + "160x160", + "256x256" + ], + "retract_lift_below": [ + "498" + ], + "auxiliary_fan": "0", + "thumbnails_format": "PNG", + "before_layer_change_gcode": "TIMELAPSE_TAKE_FRAME\nG92 E0\nSET_PRINT_STATS_INFO CURRENT_LAYER=[layer_num]\n", + "machine_start_gcode": "G28\nM140 S[bed_temperature_initial_layer_single] ;set bed temp\nM190 S[bed_temperature_initial_layer_single] ;wait for bed temp\nSTART_PRINT\nG90\nG1 X0 Y0 F12000\nG1 Z0.300 F600\nM104 S[nozzle_temperature_initial_layer] ;set extruder temp\nM109 S[nozzle_temperature_initial_layer];wait for extruder temp\n{if first_layer_print_min[0] - 3 > print_bed_min[0]}\nG90\nM83\nG1 E-0.100 F600\nG1 X{first_layer_print_min[0] - 3} Y{first_layer_print_min[1]} F12000\nG1 Z0.3 F600 ;Move to start position\nG1 E0.100 F600\nG1 Y{first_layer_print_min[1] + 5 * 6} E{5 * 0.24 * 6} F{outer_wall_volumetric_speed * 5 * 30}\nG1 Y{first_layer_print_min[1] + 5 * 6 * 2} E{5 * 0.16 * 6} F{outer_wall_volumetric_speed * 5 * 30}\nG1 E-0.100 F600\nG1 Z1 F600\nG1 X{first_layer_print_min[0] - 2} Y{first_layer_print_min[1]} F12000\nG1 Z0.3 F600 ;Move to start position\nG1 E0.100 F600\nG1 Y{first_layer_print_min[1] + 5 * 6} E{5 * 0.24 * 6} F{outer_wall_volumetric_speed * 5 * 30}\nG1 Y{first_layer_print_min[1] + 5 * 6 * 2} E{5 * 0.16 * 6} F{outer_wall_volumetric_speed * 5 * 30}\nG1 E-0.100 F600\n{else}\nG90\nM83\nG1 E-0.100 Z3 F600\nG1 X-1.5 Y{first_layer_print_min[1]} F{outer_wall_volumetric_speed * 5 * 30}\nG1 Z0.3 F600\nG1 E0.100 F600\nG1 Y{first_layer_print_min[1] + 5 * 6} E{5 * 0.24 * 6} F{outer_wall_volumetric_speed * 5 * 30}\nG1 Y{first_layer_print_min[1] + 5 * 6 * 2} E{5 * 0.16 * 6} F{outer_wall_volumetric_speed * 5 * 30}\nG1 X-0.5 Y{first_layer_print_min[1]} F{outer_wall_volumetric_speed * 5 * 30}\nG1 Z0.3 F600\nG1 E0.100 F600\nG1 Y{first_layer_print_min[1] + 5 * 6} E{5 * 0.24 * 6} F{outer_wall_volumetric_speed * 5 * 30}\nG1 Y{first_layer_print_min[1] + 5 * 6 * 2} E{5 * 0.16 * 6} F{outer_wall_volumetric_speed * 5 * 30}\nG1 E-0.100 Z3 F600\nM400\n{endif}\nSET_PRINT_STATS_INFO TOTAL_LAYER=[total_layer_count]\n\n", + "machine_end_gcode": "END_PRINT\n", + "default_filament_profile": [ + "Generic PLA @Sovol SV08 MAX" + ] +} \ No newline at end of file diff --git a/resources/profiles/Sovol/machine/Sovol SV08 MAX 0.8 nozzle.json b/resources/profiles/Sovol/machine/Sovol SV08 MAX 0.8 nozzle.json new file mode 100644 index 0000000000..53786e6d1a --- /dev/null +++ b/resources/profiles/Sovol/machine/Sovol SV08 MAX 0.8 nozzle.json @@ -0,0 +1,124 @@ +{ + "type": "machine", + "setting_id": "GM001", + "name": "Sovol SV08 MAX 0.8 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_machine_common", + "printer_model": "Sovol SV08 MAX", + "default_print_profile": "0.40mm Standard @Sovol SV08 MAX 0.8 nozzle", + "printer_variant": "0.8", + "nozzle_diameter": [ + "0.8" + ], + "min_layer_height": [ + "0.16" + ], + "max_layer_height": [ + "0.56" + ], + "retract_before_wipe": [ + "0%" + ], + "printable_area": [ + "0x0", + "500x0", + "500x500", + "0x500" + ], + "printable_height": "500", + "printer_structure": "corexy", + "gcode_flavor": "klipper", + "retraction_length": [ + "3.0" + ], + "retract_restart_extra": [ + "0.1" + ], + "machine_max_speed_e": [ + "50" + ], + "machine_max_speed_x": [ + "800" + ], + "machine_max_speed_y": [ + "800" + ], + "machine_max_speed_z": [ + "10" + ], + "machine_max_acceleration_e": [ + "20000" + ], + "machine_max_acceleration_extruding": [ + "40000" + ], + "machine_max_acceleration_retracting": [ + "5000" + ], + "machine_max_acceleration_travel": [ + "40000" + ], + "machine_max_acceleration_x": [ + "40000" + ], + "machine_max_acceleration_y": [ + "40000" + ], + "machine_max_acceleration_z": [ + "500" + ], + "machine_max_jerk_e": [ + "5" + ], + "machine_max_jerk_x": [ + "20" + ], + "machine_max_jerk_y": [ + "20" + ], + "machine_max_jerk_z": [ + "2.5" + ], + "z_hop": [ + "0.6" + ], + "retraction_speed": [ + "40" + ], + "deretraction_speed": [ + "40" + ], + "retraction_minimum_travel": [ + "0" + ], + "retract_length_toolchange": [ + "2" + ], + "wipe": [ + "1" + ], + "wipe_distance": [ + "2" + ], + "z_hop_types": [ + "Auto Lift" + ], + "thumbnails": [ + "32x32", + "64x64", + "160x160", + "256x256" + ], + "retract_lift_below": [ + "498" + ], + "auxiliary_fan": "0", + "thumbnails_format": "PNG", + "before_layer_change_gcode": "TIMELAPSE_TAKE_FRAME\nG92 E0\nSET_PRINT_STATS_INFO CURRENT_LAYER=[layer_num]\n", + "machine_start_gcode": "G28\nM140 S[bed_temperature_initial_layer_single] ;set bed temp\nM190 S[bed_temperature_initial_layer_single] ;wait for bed temp\nSTART_PRINT\nG90\nG1 X0 Y0 F12000\nG1 Z0.300 F600\nM104 S[nozzle_temperature_initial_layer] ;set extruder temp\nM109 S[nozzle_temperature_initial_layer];wait for extruder temp\n{if first_layer_print_min[0] - 3 > print_bed_min[0]}\nG90\nM83\nG1 E-0.100 F600\nG1 X{first_layer_print_min[0] - 3} Y{first_layer_print_min[1]} F12000\nG1 Z0.3 F600 ;Move to start position\nG1 E0.100 F600\nG1 Y{first_layer_print_min[1] + 5 * 6} E{5 * 0.24 * 6} F{outer_wall_volumetric_speed * 5 * 30}\nG1 Y{first_layer_print_min[1] + 5 * 6 * 2} E{5 * 0.16 * 6} F{outer_wall_volumetric_speed * 5 * 30}\nG1 E-0.100 F600\nG1 Z1 F600\nG1 X{first_layer_print_min[0] - 2} Y{first_layer_print_min[1]} F12000\nG1 Z0.3 F600 ;Move to start position\nG1 E0.100 F600\nG1 Y{first_layer_print_min[1] + 5 * 6} E{5 * 0.24 * 6} F{outer_wall_volumetric_speed * 5 * 30}\nG1 Y{first_layer_print_min[1] + 5 * 6 * 2} E{5 * 0.16 * 6} F{outer_wall_volumetric_speed * 5 * 30}\nG1 E-0.100 F600\n{else}\nG90\nM83\nG1 E-0.100 Z3 F600\nG1 X-1.5 Y{first_layer_print_min[1]} F{outer_wall_volumetric_speed * 5 * 30}\nG1 Z0.3 F600\nG1 E0.100 F600\nG1 Y{first_layer_print_min[1] + 5 * 6} E{5 * 0.24 * 6} F{outer_wall_volumetric_speed * 5 * 30}\nG1 Y{first_layer_print_min[1] + 5 * 6 * 2} E{5 * 0.16 * 6} F{outer_wall_volumetric_speed * 5 * 30}\nG1 X-0.5 Y{first_layer_print_min[1]} F{outer_wall_volumetric_speed * 5 * 30}\nG1 Z0.3 F600\nG1 E0.100 F600\nG1 Y{first_layer_print_min[1] + 5 * 6} E{5 * 0.24 * 6} F{outer_wall_volumetric_speed * 5 * 30}\nG1 Y{first_layer_print_min[1] + 5 * 6 * 2} E{5 * 0.16 * 6} F{outer_wall_volumetric_speed * 5 * 30}\nG1 E-0.100 Z3 F600\nM400\n{endif}\nSET_PRINT_STATS_INFO TOTAL_LAYER=[total_layer_count]\n\n", + "machine_end_gcode": "END_PRINT\n", + "default_filament_profile": [ + "Generic PLA @Sovol SV08 MAX" + ] +} \ No newline at end of file diff --git a/resources/profiles/Sovol/machine/Sovol SV08 MAX.json b/resources/profiles/Sovol/machine/Sovol SV08 MAX.json new file mode 100644 index 0000000000..4b57988730 --- /dev/null +++ b/resources/profiles/Sovol/machine/Sovol SV08 MAX.json @@ -0,0 +1,12 @@ +{ + "type": "machine_model", + "name": "Sovol SV08 MAX", + "model_id": "Sovol-SV08 MAX", + "nozzle_diameter": "0.4;0.6;0.8", + "machine_tech": "FFF", + "family": "Sovol", + "bed_model": "sovol_sv08_max_buildplate_model.stl", + "bed_texture": "sovol_sv08_max_buildplate_texture.png", + "hotend_model": "", + "default_materials": "Generic PLA;Generic PLA Silk;Generic ABS;Generic PETG;Polymaker PETG;SUNLU PETG;Generic TPU;Generic PC" +} diff --git a/resources/profiles/Sovol/process/0.20mm Standard @Sovol SV01.json b/resources/profiles/Sovol/process/0.20mm Standard @Sovol SV01.json new file mode 100644 index 0000000000..da82bf5f81 --- /dev/null +++ b/resources/profiles/Sovol/process/0.20mm Standard @Sovol SV01.json @@ -0,0 +1,109 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.20mm Standard @Sovol SV01", + "from": "system", + "inherits": "fdm_process_common", + "instantiation": "true", + "adaptive_layer_height": "1", + "reduce_crossing_wall": "0", + "layer_height": "0.20", + "max_travel_detour_distance": "0", + "bottom_surface_pattern": "monotonic", + "bottom_shell_layers": "5", + "bottom_shell_thickness": "0", + "bridge_flow": "0.85", + "bridge_speed": "25", + "brim_width": "0", + "brim_object_gap": "0", + "compatible_printers_condition": "", + "print_sequence": "by layer", + "default_acceleration": "0", + "outer_wall_acceleration": "0", + "top_surface_acceleration": "0", + "bridge_no_support": "0", + "draft_shield": "disabled", + "elefant_foot_compensation": "0.1", + "enable_arc_fitting": "0", + "outer_wall_line_width": "0.42", + "wall_infill_order": "inner wall/outer wall/infill", + "line_width": "0.44", + "infill_direction": "45", + "sparse_infill_density": "15%", + "sparse_infill_pattern": "crosshatch", + "initial_layer_acceleration": "0", + "travel_acceleration": "0", + "inner_wall_acceleration": "0", + "initial_layer_line_width": "0.42", + "initial_layer_print_height": "0.24", + "infill_combination": "0", + "sparse_infill_line_width": "0.44", + "infill_wall_overlap": "23%", + "interface_shells": "0", + "ironing_flow": "15%", + "ironing_spacing": "0.25", + "ironing_speed": "15", + "ironing_type": "no ironing", + "reduce_infill_retraction": "1", + "filename_format": "{printer_model}_{input_filename_base}_{filament_type[0]}_{layer_height}_{print_time}.gcode", + "detect_overhang_wall": "1", + "overhang_1_4_speed": "0", + "overhang_2_4_speed": "20", + "overhang_3_4_speed": "15", + "overhang_4_4_speed": "10", + "inner_wall_line_width": "0.45", + "wall_loops": "3", + "print_settings_id": "", + "raft_layers": "0", + "seam_position": "aligned", + "skirt_distance": "3", + "skirt_height": "2", + "skirt_loops": "2", + "minimum_sparse_infill_area": "10", + "internal_solid_infill_line_width": "0", + "spiral_mode": "0", + "standby_temperature_delta": "-5", + "enable_support": "0", + "resolution": "0.012", + "support_type": "normal(auto)", + "support_style": "grid", + "support_on_build_plate_only": "0", + "support_top_z_distance": "0.18", + "support_filament": "0", + "support_line_width": "0.38", + "support_interface_loop_pattern": "0", + "support_interface_filament": "0", + "support_interface_top_layers": "3", + "support_interface_bottom_layers": "-1", + "support_interface_spacing": "0.2", + "support_interface_speed": "100%", + "support_base_pattern": "rectilinear", + "support_base_pattern_spacing": "0.2", + "support_speed": "40", + "support_threshold_angle": "40", + "support_object_xy_distance": "60%", + "tree_support_branch_angle": "40", + "tree_support_wall_count": "0", + "detect_thin_wall": "1", + "top_surface_pattern": "monotonic", + "top_surface_line_width": "0.38", + "top_shell_layers": "5", + "top_shell_thickness": "0.8", + "initial_layer_speed": "35%", + "initial_layer_infill_speed": "35%", + "outer_wall_speed": "25", + "inner_wall_speed": "40", + "internal_solid_infill_speed": "40", + "top_surface_speed": "30", + "gap_infill_speed": "30", + "sparse_infill_speed": "60", + "travel_speed": "150", + "enable_prime_tower": "0", + "wipe_tower_no_sparse_layers": "0", + "prime_tower_width": "60", + "xy_hole_compensation": "0", + "xy_contour_compensation": "0", + "compatible_printers": [ + "Sovol SV01 0.4 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Sovol/process/0.20mm Standard @Sovol SV08 MAX 0.4 nozzle.json b/resources/profiles/Sovol/process/0.20mm Standard @Sovol SV08 MAX 0.4 nozzle.json new file mode 100644 index 0000000000..c1a02a0b29 --- /dev/null +++ b/resources/profiles/Sovol/process/0.20mm Standard @Sovol SV08 MAX 0.4 nozzle.json @@ -0,0 +1,148 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.20mm Standard @Sovol SV08 MAX 0.4 nozzle", + "from": "system", + "inherits": "fdm_process_common", + "instantiation": "true", + "adaptive_layer_height": "1", + "reduce_crossing_wall": "0", + "max_travel_detour_distance": "100%", + "layer_height": "0.20", + "bottom_surface_pattern": "rectilinear", + "bottom_shell_layers": "3", + "bottom_shell_thickness": "0", + "bottom_solid_infill_flow_ratio": "1", + "bridge_flow": "1", + "internal_bridge_flow": "1", + "bridge_speed": "50", + "internal_bridge_speed" : "200", + "brim_type": "auto_brim", + "brim_width": "5", + "brim_object_gap": "0", + "compatible_printers_condition": "", + "print_sequence": "by layer", + "default_acceleration": "20000", + "outer_wall_acceleration": "6000", + "top_surface_acceleration": "5000", + "bridge_no_support": "0", + "draft_shield": "disabled", + "elefant_foot_compensation": "0", + "enable_arc_fitting": "0", + "exclude_object": "1", + "outer_wall_line_width": "0.42", + "wall_infill_order": "inner wall/outer wall/infill", + "line_width": "0.4", + "infill_direction": "45", + "sparse_infill_density": "10%", + "sparse_infill_pattern": "grid", + "internal_solid_infill_acceleration": "50%", + "initial_layer_acceleration": "1000", + "initial_solid_infill_acceleration": "3000", + "travel_acceleration": "20000", + "inner_wall_acceleration": "8000", + "outer_wall_jerk": "5", + "inner_wall_jerk": "5", + "infill_jerk": "5", + "top_surface_jerk": "5", + "initial_layer_jerk": "5", + "travel_jerk": "5", + "initial_layer_line_width": "0.5", + "initial_layer_print_height": "0.25", + "infill_combination": "0", + "sparse_infill_line_width": "0.45", + "infill_wall_overlap": "25%", + "interface_shells": "0", + "ironing_flow": "15%", + "ironing_spacing": "0.25", + "ironing_speed": "15", + "ironing_type": "no ironing", + "reduce_infill_retraction": "1", + "filename_format": "{printer_model}_{input_filename_base}_{filament_type[0]}_{layer_height}_{print_time}.gcode", + "detect_overhang_wall": "1", + "overhang_1_4_speed": "0", + "overhang_2_4_speed": "50", + "overhang_3_4_speed": "30", + "overhang_4_4_speed": "20", + "inner_wall_line_width": "0.45", + "wall_loops": "2", + "print_settings_id": "", + "raft_layers": "0", + "seam_position": "aligned", + "skirt_distance": "0.8", + "skirt_height": "1", + "skirt_loops": "1", + "minimum_sparse_infill_area": "15", + "internal_solid_infill_line_width": "0.45", + "spiral_mode": "0", + "standby_temperature_delta": "-5", + "enable_support": "0", + "resolution": "0.012", + "support_type": "normal(auto)", + "support_style": "default", + "support_on_build_plate_only": "0", + "support_top_z_distance": "0.235", + "support_bottom_z_distance": "0.235", + "support_filament": "0", + "support_line_width": "0.45", + "support_interface_loop_pattern": "0", + "support_interface_filament": "0", + "support_interface_top_layers": "2", + "support_interface_bottom_layers": "-1", + "support_interface_spacing": "0.5", + "support_bottom_interface_spacing": "0.5", + "support_interface_speed": "100%", + "support_interface_pattern": "auto", + "support_base_pattern": "rectilinear", + "support_base_pattern_spacing": "3.5", + "support_speed": "80", + "support_threshold_angle": "20", + "support_object_xy_distance": "0.35", + "raft_first_layer_density": "100%", + "raft_first_layer_expansion": "10", + "tree_support_branch_angle": "40", + "tree_support_wall_count": "0", + "detect_thin_wall": "0", + "top_surface_pattern": "monotonic", + "top_surface_line_width": "0.38", + "top_shell_layers": "4", + "top_shell_thickness": "1", + "initial_layer_speed": "40", + "initial_layer_infill_speed": "65", + "initial_layer_travel_speed": "60%", + "outer_wall_speed": "200", + "inner_wall_speed": "300", + "small_perimeter_speed": "50%", + "internal_solid_infill_speed": "230", + "top_surface_speed": "180", + "gap_infill_speed": "180", + "sparse_infill_speed": "400", + "accel_to_decel_enable": "1", + "accel_to_decel_factor": "50%", + "travel_speed": "600", + "enable_prime_tower": "0", + "wipe_tower_no_sparse_layers": "0", + "prime_tower_width": "60", + "xy_hole_compensation": "0", + "xy_contour_compensation": "0", + "bridge_acceleration": "50%", + "seam_gap": "5%", + "precise_outer_wall": "1", + "precise_z_height": "1", + "wall_generator": "classic", + "gcode_label_objects": "1", + "slow_down_layers": "3", + "top_solid_infill_flow_ratio": "0.9", + "only_one_wall_top": "1", + "wall_loop_direction": "clockwise", + "top_bottom_infill_wall_overlap": "25%", + "filter_out_gap_fill": "0", + "detect_narrow_internal_solid_infill": "1", + "thick_bridges": "0", + "thick_internal_bridges":"0", + "bridge_angle": "0", + "post_process": [], + "compatible_printers": [ + "Sovol SV08 MAX 0.4 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Sovol/process/0.30mm Standard @Sovol SV08 MAX 0.6 nozzle.json b/resources/profiles/Sovol/process/0.30mm Standard @Sovol SV08 MAX 0.6 nozzle.json new file mode 100644 index 0000000000..3f941a43bc --- /dev/null +++ b/resources/profiles/Sovol/process/0.30mm Standard @Sovol SV08 MAX 0.6 nozzle.json @@ -0,0 +1,147 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.30mm Standard @Sovol SV08 MAX 0.6 nozzle", + "from": "system", + "inherits": "fdm_process_common", + "instantiation": "true", + "adaptive_layer_height": "1", + "reduce_crossing_wall": "0", + "max_travel_detour_distance": "100%", + "layer_height": "0.30", + "bottom_surface_pattern": "rectilinear", + "bottom_shell_layers": "3", + "bottom_shell_thickness": "0", + "bridge_flow": "1", + "internal_bridge_flow": "1", + "bridge_speed": "30", + "internal_bridge_speed" : "50", + "brim_type": "auto_brim", + "brim_width": "5", + "brim_object_gap": "0", + "compatible_printers_condition": "", + "print_sequence": "by layer", + "default_acceleration": "20000", + "outer_wall_acceleration": "6000", + "top_surface_acceleration": "5000", + "bridge_no_support": "0", + "draft_shield": "disabled", + "elefant_foot_compensation": "0", + "enable_arc_fitting": "0", + "exclude_object": "1", + "outer_wall_line_width": "0.6", + "wall_infill_order": "inner wall/outer wall/infill", + "line_width": "0.6", + "infill_direction": "45", + "sparse_infill_density": "10%", + "sparse_infill_pattern": "grid", + "internal_solid_infill_acceleration": "50%", + "initial_layer_acceleration": "1000", + "initial_solid_infill_acceleration": "3000", + "travel_acceleration": "20000", + "inner_wall_acceleration": "8000", + "outer_wall_jerk": "5", + "inner_wall_jerk": "5", + "infill_jerk": "5", + "top_surface_jerk": "5", + "initial_layer_jerk": "5", + "travel_jerk": "5", + "initial_layer_line_width": "0.6", + "initial_layer_print_height": "0.3", + "infill_combination": "0", + "sparse_infill_line_width": "0.6", + "infill_wall_overlap": "15%", + "interface_shells": "0", + "ironing_flow": "15%", + "ironing_spacing": "0.25", + "ironing_speed": "15", + "ironing_type": "no ironing", + "reduce_infill_retraction": "1", + "filename_format": "{printer_model}_{input_filename_base}_{filament_type[0]}_{layer_height}_{print_time}.gcode", + "detect_overhang_wall": "1", + "overhang_1_4_speed": "0", + "overhang_2_4_speed": "30", + "overhang_3_4_speed": "20", + "overhang_4_4_speed": "10", + "inner_wall_line_width": "0.6", + "wall_loops": "2", + "print_settings_id": "", + "raft_layers": "0", + "seam_position": "aligned", + "skirt_distance": "0.8", + "skirt_height": "1", + "skirt_loops": "1", + "minimum_sparse_infill_area": "15", + "internal_solid_infill_line_width": "0.6", + "spiral_mode": "0", + "standby_temperature_delta": "-5", + "enable_support": "0", + "resolution": "0.012", + "support_type": "normal(auto)", + "support_style": "default", + "support_on_build_plate_only": "0", + "support_top_z_distance": "0.235", + "support_bottom_z_distance": "0.235", + "support_filament": "0", + "support_line_width": "0.6", + "support_interface_loop_pattern": "0", + "support_interface_filament": "0", + "support_interface_top_layers": "2", + "support_interface_bottom_layers": "-1", + "support_interface_spacing": "0.5", + "support_bottom_interface_spacing": "0.5", + "support_interface_speed": "100%", + "support_interface_pattern": "auto", + "support_base_pattern": "rectilinear", + "support_base_pattern_spacing": "3.5", + "support_speed": "50", + "support_threshold_angle": "40", + "support_object_xy_distance": "0.35", + "raft_first_layer_density": "100%", + "raft_first_layer_expansion": "10", + "tree_support_branch_angle": "40", + "tree_support_wall_count": "0", + "detect_thin_wall": "0", + "top_surface_pattern": "monotonic", + "top_surface_line_width": "0.6", + "top_shell_layers": "4", + "top_shell_thickness": "1", + "initial_layer_speed": "35", + "initial_layer_infill_speed": "55", + "initial_layer_travel_speed": "60%", + "outer_wall_speed": "140", + "inner_wall_speed": "160", + "small_perimeter_speed": "50%", + "internal_solid_infill_speed": "160", + "top_surface_speed": "150", + "gap_infill_speed": "50", + "sparse_infill_speed": "160", + "accel_to_decel_enable": "1", + "accel_to_decel_factor": "50%", + "travel_speed": "600", + "enable_prime_tower": "0", + "wipe_tower_no_sparse_layers": "0", + "prime_tower_width": "60", + "xy_hole_compensation": "0", + "xy_contour_compensation": "0", + "bridge_acceleration": "50%", + "seam_gap": "5%", + "precise_outer_wall": "1", + "precise_z_height": "1", + "wall_generator": "classic", + "gcode_label_objects": "1", + "slow_down_layers": "3", + "top_solid_infill_flow_ratio": "0.9", + "only_one_wall_top": "1", + "wall_loop_direction": "clockwise", + "top_bottom_infill_wall_overlap": "25%", + "filter_out_gap_fill": "0", + "detect_narrow_internal_solid_infill": "1", + "thick_bridges": "0", + "thick_internal_bridges":"0", + "bridge_angle": "0", + "post_process": [], + "compatible_printers": [ + "Sovol SV08 MAX 0.6 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Sovol/process/0.40mm Standard @Sovol SV08 MAX 0.8 nozzle.json b/resources/profiles/Sovol/process/0.40mm Standard @Sovol SV08 MAX 0.8 nozzle.json new file mode 100644 index 0000000000..906b3de3fd --- /dev/null +++ b/resources/profiles/Sovol/process/0.40mm Standard @Sovol SV08 MAX 0.8 nozzle.json @@ -0,0 +1,147 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.40mm Standard @Sovol SV08 MAX 0.8 nozzle", + "from": "system", + "inherits": "fdm_process_common", + "instantiation": "true", + "adaptive_layer_height": "1", + "reduce_crossing_wall": "0", + "max_travel_detour_distance": "100%", + "layer_height": "0.40", + "bottom_surface_pattern": "rectilinear", + "bottom_shell_layers": "3", + "bottom_shell_thickness": "0", + "bridge_flow": "1", + "internal_bridge_flow": "1", + "bridge_speed": "30", + "internal_bridge_speed" : "50", + "brim_type": "auto_brim", + "brim_width": "5", + "brim_object_gap": "0", + "compatible_printers_condition": "", + "print_sequence": "by layer", + "default_acceleration": "20000", + "outer_wall_acceleration": "6000", + "top_surface_acceleration": "5000", + "bridge_no_support": "0", + "draft_shield": "disabled", + "elefant_foot_compensation": "0", + "enable_arc_fitting": "0", + "exclude_object": "1", + "outer_wall_line_width": "0.8", + "wall_infill_order": "inner wall/outer wall/infill", + "line_width": "0.8", + "infill_direction": "45", + "sparse_infill_density": "10%", + "sparse_infill_pattern": "grid", + "internal_solid_infill_acceleration": "50%", + "initial_layer_acceleration": "1000", + "initial_solid_infill_acceleration": "3000", + "travel_acceleration": "20000", + "inner_wall_acceleration": "8000", + "outer_wall_jerk": "5", + "inner_wall_jerk": "5", + "infill_jerk": "5", + "top_surface_jerk": "5", + "initial_layer_jerk": "5", + "travel_jerk": "5", + "initial_layer_line_width": "0.8", + "initial_layer_print_height": "0.4", + "infill_combination": "0", + "sparse_infill_line_width": "0.8", + "infill_wall_overlap": "15%", + "interface_shells": "0", + "ironing_flow": "15%", + "ironing_spacing": "0.25", + "ironing_speed": "15", + "ironing_type": "no ironing", + "reduce_infill_retraction": "1", + "filename_format": "{printer_model}_{input_filename_base}_{filament_type[0]}_{layer_height}_{print_time}.gcode", + "detect_overhang_wall": "1", + "overhang_1_4_speed": "0", + "overhang_2_4_speed": "30", + "overhang_3_4_speed": "10", + "overhang_4_4_speed": "5", + "inner_wall_line_width": "0.8", + "wall_loops": "2", + "print_settings_id": "", + "raft_layers": "0", + "seam_position": "aligned", + "skirt_distance": "0.8", + "skirt_height": "1", + "skirt_loops": "1", + "minimum_sparse_infill_area": "15", + "internal_solid_infill_line_width": "0.8", + "spiral_mode": "0", + "standby_temperature_delta": "-5", + "enable_support": "0", + "resolution": "0.012", + "support_type": "normal(auto)", + "support_style": "default", + "support_on_build_plate_only": "0", + "support_top_z_distance": "0.235", + "support_bottom_z_distance": "0.235", + "support_filament": "0", + "support_line_width": "0.8", + "support_interface_loop_pattern": "0", + "support_interface_filament": "0", + "support_interface_top_layers": "2", + "support_interface_bottom_layers": "-1", + "support_interface_spacing": "0.5", + "support_bottom_interface_spacing": "0.5", + "support_interface_speed": "100%", + "support_interface_pattern": "auto", + "support_base_pattern": "rectilinear", + "support_base_pattern_spacing": "3.5", + "support_speed": "50", + "support_threshold_angle": "20", + "support_object_xy_distance": "0.35", + "raft_first_layer_density": "100%", + "raft_first_layer_expansion": "10", + "tree_support_branch_angle": "40", + "tree_support_wall_count": "0", + "detect_thin_wall": "0", + "top_surface_pattern": "monotonic", + "top_surface_line_width": "0.8", + "top_shell_layers": "3", + "top_shell_thickness": "1", + "initial_layer_speed": "30", + "initial_layer_infill_speed": "55", + "initial_layer_travel_speed": "60%", + "outer_wall_speed": "120", + "inner_wall_speed": "150", + "small_perimeter_speed": "50%", + "internal_solid_infill_speed": "150", + "top_surface_speed": "120", + "gap_infill_speed": "50", + "sparse_infill_speed": "120", + "accel_to_decel_enable": "1", + "accel_to_decel_factor": "50%", + "travel_speed": "600", + "enable_prime_tower": "0", + "wipe_tower_no_sparse_layers": "0", + "prime_tower_width": "60", + "xy_hole_compensation": "0", + "xy_contour_compensation": "0", + "bridge_acceleration": "50%", + "seam_gap": "5%", + "precise_outer_wall": "1", + "precise_z_height": "1", + "wall_generator": "classic", + "gcode_label_objects": "1", + "slow_down_layers": "3", + "top_solid_infill_flow_ratio": "0.9", + "only_one_wall_top": "1", + "wall_loop_direction": "clockwise", + "top_bottom_infill_wall_overlap": "25%", + "filter_out_gap_fill": "0", + "detect_narrow_internal_solid_infill": "1", + "thick_bridges": "0", + "thick_internal_bridges":"0", + "bridge_angle": "0", + "post_process": [], + "compatible_printers": [ + "Sovol SV08 MAX 0.8 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Sovol/sovol_sv08_max_buildplate_model.stl b/resources/profiles/Sovol/sovol_sv08_max_buildplate_model.stl new file mode 100644 index 0000000000..c57c423f7e --- /dev/null +++ b/resources/profiles/Sovol/sovol_sv08_max_buildplate_model.stl @@ -0,0 +1,4426 @@ +solid ASCII + facet normal -0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex -1.919098e+02 -2.550000e+02 -2.000000e+00 + vertex -1.930080e+02 -2.551221e+02 -2.000000e+00 + vertex -2.530000e+02 -2.550000e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex -2.530000e+02 -2.550000e+02 -2.000000e+00 + vertex -1.930080e+02 -2.551221e+02 -2.000000e+00 + vertex -1.940525e+02 -2.554824e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex -2.530000e+02 -2.550000e+02 -2.000000e+00 + vertex -1.940525e+02 -2.554824e+02 -2.000000e+00 + vertex -1.949923e+02 -2.560632e+02 -2.000000e+00 + endloop + endfacet + facet normal -0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex -1.949923e+02 -2.560632e+02 -2.000000e+00 + vertex -1.957817e+02 -2.568363e+02 -2.000000e+00 + vertex -2.530000e+02 -2.550000e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex -2.530000e+02 -2.550000e+02 -2.000000e+00 + vertex -1.957817e+02 -2.568363e+02 -2.000000e+00 + vertex -1.963820e+02 -2.577639e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 -0.000000e+00 -1.000000e+00 + outer loop + vertex -2.530000e+02 -2.550000e+02 -2.000000e+00 + vertex -1.963820e+02 -2.577639e+02 -2.000000e+00 + vertex -2.544721e+02 -2.560557e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex -2.544721e+02 -2.560557e+02 -2.000000e+00 + vertex -1.963820e+02 -2.577639e+02 -2.000000e+00 + vertex -2.513820e+02 -2.622361e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex -2.513820e+02 -2.622361e+02 -2.000000e+00 + vertex -1.963820e+02 -2.577639e+02 -2.000000e+00 + vertex -1.986180e+02 -2.622361e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex -2.513820e+02 -2.622361e+02 -2.000000e+00 + vertex -1.986180e+02 -2.622361e+02 -2.000000e+00 + vertex -2.507817e+02 -2.631637e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex -2.507817e+02 -2.631637e+02 -2.000000e+00 + vertex -1.986180e+02 -2.622361e+02 -2.000000e+00 + vertex -1.992183e+02 -2.631637e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex -2.507817e+02 -2.631637e+02 -2.000000e+00 + vertex -1.992183e+02 -2.631637e+02 -2.000000e+00 + vertex -2.469098e+02 -2.650000e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex -2.469098e+02 -2.650000e+02 -2.000000e+00 + vertex -1.992183e+02 -2.631637e+02 -2.000000e+00 + vertex -2.030902e+02 -2.650000e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex -2.030902e+02 -2.650000e+02 -2.000000e+00 + vertex -1.992183e+02 -2.631637e+02 -2.000000e+00 + vertex -2.000077e+02 -2.639368e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex -2.030902e+02 -2.650000e+02 -2.000000e+00 + vertex -2.000077e+02 -2.639368e+02 -2.000000e+00 + vertex -2.009475e+02 -2.645176e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex -2.009475e+02 -2.645176e+02 -2.000000e+00 + vertex -2.019920e+02 -2.648779e+02 -2.000000e+00 + vertex -2.030902e+02 -2.650000e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex -2.480080e+02 -2.648779e+02 -2.000000e+00 + vertex -2.490525e+02 -2.645176e+02 -2.000000e+00 + vertex -2.469098e+02 -2.650000e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex -2.469098e+02 -2.650000e+02 -2.000000e+00 + vertex -2.490525e+02 -2.645176e+02 -2.000000e+00 + vertex -2.499923e+02 -2.639368e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex -2.469098e+02 -2.650000e+02 -2.000000e+00 + vertex -2.499923e+02 -2.639368e+02 -2.000000e+00 + vertex -2.507817e+02 -2.631637e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex -2.544721e+02 -2.560557e+02 -2.000000e+00 + vertex -2.547630e+02 -2.553407e+02 -2.000000e+00 + vertex -2.530000e+02 -2.550000e+02 -2.000000e+00 + endloop + endfacet + facet normal -0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex -2.530000e+02 -2.550000e+02 -2.000000e+00 + vertex -2.547630e+02 -2.553407e+02 -2.000000e+00 + vertex -2.535176e+02 -2.549319e+02 -2.000000e+00 + endloop + endfacet + facet normal -0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex -2.535176e+02 -2.549319e+02 -2.000000e+00 + vertex -2.547630e+02 -2.553407e+02 -2.000000e+00 + vertex -2.540000e+02 -2.547321e+02 -2.000000e+00 + endloop + endfacet + facet normal -0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex -2.540000e+02 -2.547321e+02 -2.000000e+00 + vertex -2.547630e+02 -2.553407e+02 -2.000000e+00 + vertex -2.549404e+02 -2.545893e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex -2.540000e+02 -2.547321e+02 -2.000000e+00 + vertex -2.549404e+02 -2.545893e+02 -2.000000e+00 + vertex -2.544142e+02 -2.544142e+02 -2.000000e+00 + endloop + endfacet + facet normal -0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex -2.544142e+02 -2.544142e+02 -2.000000e+00 + vertex -2.549404e+02 -2.545893e+02 -2.000000e+00 + vertex -2.547321e+02 -2.540000e+02 -2.000000e+00 + endloop + endfacet + facet normal -0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex -2.547321e+02 -2.540000e+02 -2.000000e+00 + vertex -2.549404e+02 -2.545893e+02 -2.000000e+00 + vertex -2.550000e+02 -2.538197e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex -2.547321e+02 -2.540000e+02 -2.000000e+00 + vertex -2.550000e+02 -2.538197e+02 -2.000000e+00 + vertex -2.549319e+02 -2.535176e+02 -2.000000e+00 + endloop + endfacet + facet normal -0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex -2.549319e+02 -2.535176e+02 -2.000000e+00 + vertex -2.550000e+02 -2.538197e+02 -2.000000e+00 + vertex -2.550000e+02 -2.530000e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex 1.919098e+02 -2.550000e+02 -2.000000e+00 + vertex 2.530000e+02 -2.550000e+02 -2.000000e+00 + vertex 1.930080e+02 -2.551221e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex 1.930080e+02 -2.551221e+02 -2.000000e+00 + vertex 2.530000e+02 -2.550000e+02 -2.000000e+00 + vertex 1.940525e+02 -2.554824e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex 1.940525e+02 -2.554824e+02 -2.000000e+00 + vertex 2.530000e+02 -2.550000e+02 -2.000000e+00 + vertex 1.949923e+02 -2.560632e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex 1.949923e+02 -2.560632e+02 -2.000000e+00 + vertex 2.530000e+02 -2.550000e+02 -2.000000e+00 + vertex 1.957817e+02 -2.568363e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex 1.957817e+02 -2.568363e+02 -2.000000e+00 + vertex 2.530000e+02 -2.550000e+02 -2.000000e+00 + vertex 1.963820e+02 -2.577639e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex 1.963820e+02 -2.577639e+02 -2.000000e+00 + vertex 2.530000e+02 -2.550000e+02 -2.000000e+00 + vertex 2.544721e+02 -2.560557e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex 1.963820e+02 -2.577639e+02 -2.000000e+00 + vertex 2.544721e+02 -2.560557e+02 -2.000000e+00 + vertex 2.513820e+02 -2.622361e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex 2.544721e+02 -2.560557e+02 -2.000000e+00 + vertex 2.530000e+02 -2.550000e+02 -2.000000e+00 + vertex 2.547630e+02 -2.553407e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex 2.547630e+02 -2.553407e+02 -2.000000e+00 + vertex 2.530000e+02 -2.550000e+02 -2.000000e+00 + vertex 2.535176e+02 -2.549319e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex 2.547630e+02 -2.553407e+02 -2.000000e+00 + vertex 2.535176e+02 -2.549319e+02 -2.000000e+00 + vertex 2.540000e+02 -2.547321e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex 2.547630e+02 -2.553407e+02 -2.000000e+00 + vertex 2.540000e+02 -2.547321e+02 -2.000000e+00 + vertex 2.549404e+02 -2.545893e+02 -2.000000e+00 + endloop + endfacet + facet normal -0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex 2.549404e+02 -2.545893e+02 -2.000000e+00 + vertex 2.540000e+02 -2.547321e+02 -2.000000e+00 + vertex 2.544142e+02 -2.544142e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex 2.549404e+02 -2.545893e+02 -2.000000e+00 + vertex 2.544142e+02 -2.544142e+02 -2.000000e+00 + vertex 2.547321e+02 -2.540000e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex 2.549404e+02 -2.545893e+02 -2.000000e+00 + vertex 2.547321e+02 -2.540000e+02 -2.000000e+00 + vertex 2.550000e+02 -2.538197e+02 -2.000000e+00 + endloop + endfacet + facet normal -0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex 2.550000e+02 -2.538197e+02 -2.000000e+00 + vertex 2.547321e+02 -2.540000e+02 -2.000000e+00 + vertex 2.549319e+02 -2.535176e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex 2.550000e+02 -2.538197e+02 -2.000000e+00 + vertex 2.549319e+02 -2.535176e+02 -2.000000e+00 + vertex 2.550000e+02 -2.530000e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex 2.507817e+02 -2.631637e+02 -2.000000e+00 + vertex 1.992183e+02 -2.631637e+02 -2.000000e+00 + vertex 2.513820e+02 -2.622361e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex 2.513820e+02 -2.622361e+02 -2.000000e+00 + vertex 1.992183e+02 -2.631637e+02 -2.000000e+00 + vertex 1.986180e+02 -2.622361e+02 -2.000000e+00 + endloop + endfacet + facet normal -0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex 2.513820e+02 -2.622361e+02 -2.000000e+00 + vertex 1.986180e+02 -2.622361e+02 -2.000000e+00 + vertex 1.963820e+02 -2.577639e+02 -2.000000e+00 + endloop + endfacet + facet normal -0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex 2.499923e+02 -2.639368e+02 -2.000000e+00 + vertex 2.469098e+02 -2.650000e+02 -2.000000e+00 + vertex 2.507817e+02 -2.631637e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex 2.507817e+02 -2.631637e+02 -2.000000e+00 + vertex 2.469098e+02 -2.650000e+02 -2.000000e+00 + vertex 2.030902e+02 -2.650000e+02 -2.000000e+00 + endloop + endfacet + facet normal -0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex 2.507817e+02 -2.631637e+02 -2.000000e+00 + vertex 2.030902e+02 -2.650000e+02 -2.000000e+00 + vertex 1.992183e+02 -2.631637e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex 1.992183e+02 -2.631637e+02 -2.000000e+00 + vertex 2.030902e+02 -2.650000e+02 -2.000000e+00 + vertex 2.000077e+02 -2.639368e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex 2.000077e+02 -2.639368e+02 -2.000000e+00 + vertex 2.030902e+02 -2.650000e+02 -2.000000e+00 + vertex 2.009475e+02 -2.645176e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex 2.009475e+02 -2.645176e+02 -2.000000e+00 + vertex 2.030902e+02 -2.650000e+02 -2.000000e+00 + vertex 2.019920e+02 -2.648779e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex 2.499923e+02 -2.639368e+02 -2.000000e+00 + vertex 2.490525e+02 -2.645176e+02 -2.000000e+00 + vertex 2.469098e+02 -2.650000e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex 2.469098e+02 -2.650000e+02 -2.000000e+00 + vertex 2.490525e+02 -2.645176e+02 -2.000000e+00 + vertex 2.480080e+02 -2.648779e+02 -2.000000e+00 + endloop + endfacet + facet normal 8.395388e-01 -5.432997e-01 0.000000e+00 + outer loop + vertex 2.513820e+02 -2.622361e+02 -2.000000e+00 + vertex 2.513820e+02 -2.622361e+02 0.000000e+00 + vertex 2.507817e+02 -2.631637e+02 -2.000000e+00 + endloop + endfacet + facet normal 8.395388e-01 -5.432997e-01 0.000000e+00 + outer loop + vertex 2.507817e+02 -2.631637e+02 -2.000000e+00 + vertex 2.513820e+02 -2.622361e+02 0.000000e+00 + vertex 2.507817e+02 -2.631637e+02 0.000000e+00 + endloop + endfacet + facet normal 6.997190e-01 -7.144182e-01 0.000000e+00 + outer loop + vertex 2.507817e+02 -2.631637e+02 -2.000000e+00 + vertex 2.507817e+02 -2.631637e+02 0.000000e+00 + vertex 2.499923e+02 -2.639368e+02 -2.000000e+00 + endloop + endfacet + facet normal 6.997190e-01 -7.144182e-01 0.000000e+00 + outer loop + vertex 2.499923e+02 -2.639368e+02 -2.000000e+00 + vertex 2.507817e+02 -2.631637e+02 0.000000e+00 + vertex 2.499923e+02 -2.639368e+02 0.000000e+00 + endloop + endfacet + facet normal 5.257311e-01 -8.506508e-01 0.000000e+00 + outer loop + vertex 2.499923e+02 -2.639368e+02 -2.000000e+00 + vertex 2.499923e+02 -2.639368e+02 0.000000e+00 + vertex 2.490525e+02 -2.645176e+02 -2.000000e+00 + endloop + endfacet + facet normal 5.257311e-01 -8.506508e-01 0.000000e+00 + outer loop + vertex 2.490525e+02 -2.645176e+02 -2.000000e+00 + vertex 2.499923e+02 -2.639368e+02 0.000000e+00 + vertex 2.490525e+02 -2.645176e+02 0.000000e+00 + endloop + endfacet + facet normal 3.260712e-01 -9.453452e-01 0.000000e+00 + outer loop + vertex 2.490525e+02 -2.645176e+02 -2.000000e+00 + vertex 2.490525e+02 -2.645176e+02 0.000000e+00 + vertex 2.480080e+02 -2.648779e+02 -2.000000e+00 + endloop + endfacet + facet normal 3.260712e-01 -9.453452e-01 0.000000e+00 + outer loop + vertex 2.480080e+02 -2.648779e+02 -2.000000e+00 + vertex 2.490525e+02 -2.645176e+02 0.000000e+00 + vertex 2.480080e+02 -2.648779e+02 0.000000e+00 + endloop + endfacet + facet normal 1.104888e-01 -9.938774e-01 0.000000e+00 + outer loop + vertex 2.480080e+02 -2.648779e+02 -2.000000e+00 + vertex 2.480080e+02 -2.648779e+02 0.000000e+00 + vertex 2.469098e+02 -2.650000e+02 -2.000000e+00 + endloop + endfacet + facet normal 1.104888e-01 -9.938774e-01 0.000000e+00 + outer loop + vertex 2.469098e+02 -2.650000e+02 -2.000000e+00 + vertex 2.480080e+02 -2.648779e+02 0.000000e+00 + vertex 2.469098e+02 -2.650000e+02 0.000000e+00 + endloop + endfacet + facet normal 8.944272e-01 -4.472136e-01 0.000000e+00 + outer loop + vertex 2.513820e+02 -2.622361e+02 -2.000000e+00 + vertex 2.544721e+02 -2.560557e+02 -2.000000e+00 + vertex 2.513820e+02 -2.622361e+02 0.000000e+00 + endloop + endfacet + facet normal 8.944272e-01 -4.472136e-01 0.000000e+00 + outer loop + vertex 2.513820e+02 -2.622361e+02 0.000000e+00 + vertex 2.544721e+02 -2.560557e+02 -2.000000e+00 + vertex 2.544721e+02 -2.560557e+02 0.000000e+00 + endloop + endfacet + facet normal 9.970158e-01 -7.719772e-02 0.000000e+00 + outer loop + vertex 2.550000e+02 -2.538197e+02 -2.000000e+00 + vertex 2.550000e+02 -2.538197e+02 0.000000e+00 + vertex 2.549404e+02 -2.545893e+02 -2.000000e+00 + endloop + endfacet + facet normal 9.970158e-01 -7.719772e-02 -1.416845e-14 + outer loop + vertex 2.549404e+02 -2.545893e+02 -2.000000e+00 + vertex 2.550000e+02 -2.538197e+02 0.000000e+00 + vertex 2.549404e+02 -2.545893e+02 0.000000e+00 + endloop + endfacet + facet normal 9.732490e-01 -2.297529e-01 -1.383070e-14 + outer loop + vertex 2.549404e+02 -2.545893e+02 -2.000000e+00 + vertex 2.549404e+02 -2.545893e+02 0.000000e+00 + vertex 2.547630e+02 -2.553407e+02 0.000000e+00 + endloop + endfacet + facet normal 9.262819e-01 -3.768313e-01 0.000000e+00 + outer loop + vertex 2.544721e+02 -2.560557e+02 0.000000e+00 + vertex 2.544721e+02 -2.560557e+02 -2.000000e+00 + vertex 2.547630e+02 -2.553407e+02 0.000000e+00 + endloop + endfacet + facet normal 9.262819e-01 -3.768313e-01 0.000000e+00 + outer loop + vertex 2.547630e+02 -2.553407e+02 0.000000e+00 + vertex 2.544721e+02 -2.560557e+02 -2.000000e+00 + vertex 2.547630e+02 -2.553407e+02 -2.000000e+00 + endloop + endfacet + facet normal 9.732490e-01 -2.297529e-01 0.000000e+00 + outer loop + vertex 2.547630e+02 -2.553407e+02 0.000000e+00 + vertex 2.547630e+02 -2.553407e+02 -2.000000e+00 + vertex 2.549404e+02 -2.545893e+02 -2.000000e+00 + endloop + endfacet + facet normal -1.104888e-01 -9.938774e-01 0.000000e+00 + outer loop + vertex 2.030902e+02 -2.650000e+02 -2.000000e+00 + vertex 2.030902e+02 -2.650000e+02 0.000000e+00 + vertex 2.019920e+02 -2.648779e+02 -2.000000e+00 + endloop + endfacet + facet normal -1.104888e-01 -9.938774e-01 0.000000e+00 + outer loop + vertex 2.019920e+02 -2.648779e+02 -2.000000e+00 + vertex 2.030902e+02 -2.650000e+02 0.000000e+00 + vertex 2.019920e+02 -2.648779e+02 0.000000e+00 + endloop + endfacet + facet normal -3.260712e-01 -9.453452e-01 0.000000e+00 + outer loop + vertex 2.019920e+02 -2.648779e+02 -2.000000e+00 + vertex 2.019920e+02 -2.648779e+02 0.000000e+00 + vertex 2.009475e+02 -2.645176e+02 -2.000000e+00 + endloop + endfacet + facet normal -3.260712e-01 -9.453452e-01 0.000000e+00 + outer loop + vertex 2.009475e+02 -2.645176e+02 -2.000000e+00 + vertex 2.019920e+02 -2.648779e+02 0.000000e+00 + vertex 2.009475e+02 -2.645176e+02 0.000000e+00 + endloop + endfacet + facet normal -5.257311e-01 -8.506508e-01 0.000000e+00 + outer loop + vertex 2.009475e+02 -2.645176e+02 -2.000000e+00 + vertex 2.009475e+02 -2.645176e+02 0.000000e+00 + vertex 2.000077e+02 -2.639368e+02 -2.000000e+00 + endloop + endfacet + facet normal -5.257311e-01 -8.506508e-01 0.000000e+00 + outer loop + vertex 2.000077e+02 -2.639368e+02 -2.000000e+00 + vertex 2.009475e+02 -2.645176e+02 0.000000e+00 + vertex 2.000077e+02 -2.639368e+02 0.000000e+00 + endloop + endfacet + facet normal -6.997190e-01 -7.144182e-01 0.000000e+00 + outer loop + vertex 2.000077e+02 -2.639368e+02 -2.000000e+00 + vertex 2.000077e+02 -2.639368e+02 0.000000e+00 + vertex 1.992183e+02 -2.631637e+02 -2.000000e+00 + endloop + endfacet + facet normal -6.997190e-01 -7.144182e-01 0.000000e+00 + outer loop + vertex 1.992183e+02 -2.631637e+02 -2.000000e+00 + vertex 2.000077e+02 -2.639368e+02 0.000000e+00 + vertex 1.992183e+02 -2.631637e+02 0.000000e+00 + endloop + endfacet + facet normal -8.395388e-01 -5.432997e-01 0.000000e+00 + outer loop + vertex 1.992183e+02 -2.631637e+02 -2.000000e+00 + vertex 1.992183e+02 -2.631637e+02 0.000000e+00 + vertex 1.986180e+02 -2.622361e+02 -2.000000e+00 + endloop + endfacet + facet normal -8.395388e-01 -5.432997e-01 0.000000e+00 + outer loop + vertex 1.986180e+02 -2.622361e+02 -2.000000e+00 + vertex 1.992183e+02 -2.631637e+02 0.000000e+00 + vertex 1.986180e+02 -2.622361e+02 0.000000e+00 + endloop + endfacet + facet normal -8.944272e-01 -4.472136e-01 -0.000000e+00 + outer loop + vertex 1.986180e+02 -2.622361e+02 0.000000e+00 + vertex 1.963820e+02 -2.577639e+02 0.000000e+00 + vertex 1.986180e+02 -2.622361e+02 -2.000000e+00 + endloop + endfacet + facet normal -8.944272e-01 -4.472136e-01 0.000000e+00 + outer loop + vertex 1.986180e+02 -2.622361e+02 -2.000000e+00 + vertex 1.963820e+02 -2.577639e+02 0.000000e+00 + vertex 1.963820e+02 -2.577639e+02 -2.000000e+00 + endloop + endfacet + facet normal -1.104888e-01 -9.938774e-01 -0.000000e+00 + outer loop + vertex 1.919098e+02 -2.550000e+02 0.000000e+00 + vertex 1.919098e+02 -2.550000e+02 -2.000000e+00 + vertex 1.930080e+02 -2.551221e+02 0.000000e+00 + endloop + endfacet + facet normal -1.104888e-01 -9.938774e-01 -0.000000e+00 + outer loop + vertex 1.930080e+02 -2.551221e+02 0.000000e+00 + vertex 1.919098e+02 -2.550000e+02 -2.000000e+00 + vertex 1.930080e+02 -2.551221e+02 -2.000000e+00 + endloop + endfacet + facet normal -3.260712e-01 -9.453452e-01 -0.000000e+00 + outer loop + vertex 1.930080e+02 -2.551221e+02 0.000000e+00 + vertex 1.930080e+02 -2.551221e+02 -2.000000e+00 + vertex 1.940525e+02 -2.554824e+02 0.000000e+00 + endloop + endfacet + facet normal -3.260712e-01 -9.453452e-01 -0.000000e+00 + outer loop + vertex 1.940525e+02 -2.554824e+02 0.000000e+00 + vertex 1.930080e+02 -2.551221e+02 -2.000000e+00 + vertex 1.940525e+02 -2.554824e+02 -2.000000e+00 + endloop + endfacet + facet normal -5.257311e-01 -8.506508e-01 -0.000000e+00 + outer loop + vertex 1.940525e+02 -2.554824e+02 0.000000e+00 + vertex 1.940525e+02 -2.554824e+02 -2.000000e+00 + vertex 1.949923e+02 -2.560632e+02 0.000000e+00 + endloop + endfacet + facet normal -5.257311e-01 -8.506508e-01 -0.000000e+00 + outer loop + vertex 1.949923e+02 -2.560632e+02 0.000000e+00 + vertex 1.940525e+02 -2.554824e+02 -2.000000e+00 + vertex 1.949923e+02 -2.560632e+02 -2.000000e+00 + endloop + endfacet + facet normal -6.997190e-01 -7.144182e-01 -0.000000e+00 + outer loop + vertex 1.949923e+02 -2.560632e+02 0.000000e+00 + vertex 1.949923e+02 -2.560632e+02 -2.000000e+00 + vertex 1.957817e+02 -2.568363e+02 0.000000e+00 + endloop + endfacet + facet normal -6.997190e-01 -7.144182e-01 -0.000000e+00 + outer loop + vertex 1.957817e+02 -2.568363e+02 0.000000e+00 + vertex 1.949923e+02 -2.560632e+02 -2.000000e+00 + vertex 1.957817e+02 -2.568363e+02 -2.000000e+00 + endloop + endfacet + facet normal -8.395388e-01 -5.432997e-01 -0.000000e+00 + outer loop + vertex 1.957817e+02 -2.568363e+02 0.000000e+00 + vertex 1.957817e+02 -2.568363e+02 -2.000000e+00 + vertex 1.963820e+02 -2.577639e+02 0.000000e+00 + endloop + endfacet + facet normal -8.395388e-01 -5.432997e-01 -0.000000e+00 + outer loop + vertex 1.963820e+02 -2.577639e+02 0.000000e+00 + vertex 1.957817e+02 -2.568363e+02 -2.000000e+00 + vertex 1.963820e+02 -2.577639e+02 -2.000000e+00 + endloop + endfacet + facet normal 8.395388e-01 -5.432997e-01 0.000000e+00 + outer loop + vertex -1.963820e+02 -2.577639e+02 0.000000e+00 + vertex -1.963820e+02 -2.577639e+02 -2.000000e+00 + vertex -1.957817e+02 -2.568363e+02 0.000000e+00 + endloop + endfacet + facet normal 8.395388e-01 -5.432997e-01 0.000000e+00 + outer loop + vertex -1.957817e+02 -2.568363e+02 0.000000e+00 + vertex -1.963820e+02 -2.577639e+02 -2.000000e+00 + vertex -1.957817e+02 -2.568363e+02 -2.000000e+00 + endloop + endfacet + facet normal 6.997190e-01 -7.144182e-01 0.000000e+00 + outer loop + vertex -1.957817e+02 -2.568363e+02 0.000000e+00 + vertex -1.957817e+02 -2.568363e+02 -2.000000e+00 + vertex -1.949923e+02 -2.560632e+02 0.000000e+00 + endloop + endfacet + facet normal 6.997190e-01 -7.144182e-01 0.000000e+00 + outer loop + vertex -1.949923e+02 -2.560632e+02 0.000000e+00 + vertex -1.957817e+02 -2.568363e+02 -2.000000e+00 + vertex -1.949923e+02 -2.560632e+02 -2.000000e+00 + endloop + endfacet + facet normal 5.257311e-01 -8.506508e-01 0.000000e+00 + outer loop + vertex -1.949923e+02 -2.560632e+02 0.000000e+00 + vertex -1.949923e+02 -2.560632e+02 -2.000000e+00 + vertex -1.940525e+02 -2.554824e+02 0.000000e+00 + endloop + endfacet + facet normal 5.257311e-01 -8.506508e-01 0.000000e+00 + outer loop + vertex -1.940525e+02 -2.554824e+02 0.000000e+00 + vertex -1.949923e+02 -2.560632e+02 -2.000000e+00 + vertex -1.940525e+02 -2.554824e+02 -2.000000e+00 + endloop + endfacet + facet normal 3.260712e-01 -9.453452e-01 0.000000e+00 + outer loop + vertex -1.940525e+02 -2.554824e+02 0.000000e+00 + vertex -1.940525e+02 -2.554824e+02 -2.000000e+00 + vertex -1.930080e+02 -2.551221e+02 0.000000e+00 + endloop + endfacet + facet normal 3.260712e-01 -9.453452e-01 0.000000e+00 + outer loop + vertex -1.930080e+02 -2.551221e+02 0.000000e+00 + vertex -1.940525e+02 -2.554824e+02 -2.000000e+00 + vertex -1.930080e+02 -2.551221e+02 -2.000000e+00 + endloop + endfacet + facet normal 1.104888e-01 -9.938774e-01 0.000000e+00 + outer loop + vertex -1.930080e+02 -2.551221e+02 0.000000e+00 + vertex -1.930080e+02 -2.551221e+02 -2.000000e+00 + vertex -1.919098e+02 -2.550000e+02 0.000000e+00 + endloop + endfacet + facet normal 1.104888e-01 -9.938774e-01 0.000000e+00 + outer loop + vertex -1.919098e+02 -2.550000e+02 0.000000e+00 + vertex -1.930080e+02 -2.551221e+02 -2.000000e+00 + vertex -1.919098e+02 -2.550000e+02 -2.000000e+00 + endloop + endfacet + facet normal 8.395388e-01 -5.432997e-01 0.000000e+00 + outer loop + vertex -1.986180e+02 -2.622361e+02 -2.000000e+00 + vertex -1.986180e+02 -2.622361e+02 0.000000e+00 + vertex -1.992183e+02 -2.631637e+02 -2.000000e+00 + endloop + endfacet + facet normal 8.395388e-01 -5.432997e-01 0.000000e+00 + outer loop + vertex -1.992183e+02 -2.631637e+02 -2.000000e+00 + vertex -1.986180e+02 -2.622361e+02 0.000000e+00 + vertex -1.992183e+02 -2.631637e+02 0.000000e+00 + endloop + endfacet + facet normal 6.997190e-01 -7.144182e-01 0.000000e+00 + outer loop + vertex -1.992183e+02 -2.631637e+02 -2.000000e+00 + vertex -1.992183e+02 -2.631637e+02 0.000000e+00 + vertex -2.000077e+02 -2.639368e+02 -2.000000e+00 + endloop + endfacet + facet normal 6.997190e-01 -7.144182e-01 0.000000e+00 + outer loop + vertex -2.000077e+02 -2.639368e+02 -2.000000e+00 + vertex -1.992183e+02 -2.631637e+02 0.000000e+00 + vertex -2.000077e+02 -2.639368e+02 0.000000e+00 + endloop + endfacet + facet normal 5.257311e-01 -8.506508e-01 0.000000e+00 + outer loop + vertex -2.000077e+02 -2.639368e+02 -2.000000e+00 + vertex -2.000077e+02 -2.639368e+02 0.000000e+00 + vertex -2.009475e+02 -2.645176e+02 -2.000000e+00 + endloop + endfacet + facet normal 5.257311e-01 -8.506508e-01 0.000000e+00 + outer loop + vertex -2.009475e+02 -2.645176e+02 -2.000000e+00 + vertex -2.000077e+02 -2.639368e+02 0.000000e+00 + vertex -2.009475e+02 -2.645176e+02 0.000000e+00 + endloop + endfacet + facet normal 3.260712e-01 -9.453452e-01 0.000000e+00 + outer loop + vertex -2.009475e+02 -2.645176e+02 -2.000000e+00 + vertex -2.009475e+02 -2.645176e+02 0.000000e+00 + vertex -2.019920e+02 -2.648779e+02 -2.000000e+00 + endloop + endfacet + facet normal 3.260712e-01 -9.453452e-01 0.000000e+00 + outer loop + vertex -2.019920e+02 -2.648779e+02 -2.000000e+00 + vertex -2.009475e+02 -2.645176e+02 0.000000e+00 + vertex -2.019920e+02 -2.648779e+02 0.000000e+00 + endloop + endfacet + facet normal 1.104888e-01 -9.938774e-01 0.000000e+00 + outer loop + vertex -2.019920e+02 -2.648779e+02 -2.000000e+00 + vertex -2.019920e+02 -2.648779e+02 0.000000e+00 + vertex -2.030902e+02 -2.650000e+02 -2.000000e+00 + endloop + endfacet + facet normal 1.104888e-01 -9.938774e-01 0.000000e+00 + outer loop + vertex -2.030902e+02 -2.650000e+02 -2.000000e+00 + vertex -2.019920e+02 -2.648779e+02 0.000000e+00 + vertex -2.030902e+02 -2.650000e+02 0.000000e+00 + endloop + endfacet + facet normal 8.944272e-01 -4.472136e-01 0.000000e+00 + outer loop + vertex -1.963820e+02 -2.577639e+02 0.000000e+00 + vertex -1.986180e+02 -2.622361e+02 0.000000e+00 + vertex -1.963820e+02 -2.577639e+02 -2.000000e+00 + endloop + endfacet + facet normal 8.944272e-01 -4.472136e-01 0.000000e+00 + outer loop + vertex -1.963820e+02 -2.577639e+02 -2.000000e+00 + vertex -1.986180e+02 -2.622361e+02 0.000000e+00 + vertex -1.986180e+02 -2.622361e+02 -2.000000e+00 + endloop + endfacet + facet normal -9.262819e-01 -3.768313e-01 0.000000e+00 + outer loop + vertex -2.544721e+02 -2.560557e+02 -2.000000e+00 + vertex -2.544721e+02 -2.560557e+02 0.000000e+00 + vertex -2.547630e+02 -2.553407e+02 -2.000000e+00 + endloop + endfacet + facet normal -9.262819e-01 -3.768313e-01 0.000000e+00 + outer loop + vertex -2.547630e+02 -2.553407e+02 -2.000000e+00 + vertex -2.544721e+02 -2.560557e+02 0.000000e+00 + vertex -2.547630e+02 -2.553407e+02 0.000000e+00 + endloop + endfacet + facet normal -9.732490e-01 -2.297529e-01 0.000000e+00 + outer loop + vertex -2.547630e+02 -2.553407e+02 -2.000000e+00 + vertex -2.547630e+02 -2.553407e+02 0.000000e+00 + vertex -2.549404e+02 -2.545893e+02 0.000000e+00 + endloop + endfacet + facet normal -9.970158e-01 -7.719772e-02 -0.000000e+00 + outer loop + vertex -2.550000e+02 -2.538197e+02 0.000000e+00 + vertex -2.550000e+02 -2.538197e+02 -2.000000e+00 + vertex -2.549404e+02 -2.545893e+02 0.000000e+00 + endloop + endfacet + facet normal -9.970158e-01 -7.719772e-02 -0.000000e+00 + outer loop + vertex -2.549404e+02 -2.545893e+02 0.000000e+00 + vertex -2.550000e+02 -2.538197e+02 -2.000000e+00 + vertex -2.549404e+02 -2.545893e+02 -2.000000e+00 + endloop + endfacet + facet normal -9.732490e-01 -2.297529e-01 -0.000000e+00 + outer loop + vertex -2.549404e+02 -2.545893e+02 0.000000e+00 + vertex -2.549404e+02 -2.545893e+02 -2.000000e+00 + vertex -2.547630e+02 -2.553407e+02 -2.000000e+00 + endloop + endfacet + facet normal -8.944272e-01 -4.472136e-01 0.000000e+00 + outer loop + vertex -2.544721e+02 -2.560557e+02 -2.000000e+00 + vertex -2.513820e+02 -2.622361e+02 -2.000000e+00 + vertex -2.544721e+02 -2.560557e+02 0.000000e+00 + endloop + endfacet + facet normal -8.944272e-01 -4.472136e-01 0.000000e+00 + outer loop + vertex -2.544721e+02 -2.560557e+02 0.000000e+00 + vertex -2.513820e+02 -2.622361e+02 -2.000000e+00 + vertex -2.513820e+02 -2.622361e+02 0.000000e+00 + endloop + endfacet + facet normal -1.104888e-01 -9.938774e-01 0.000000e+00 + outer loop + vertex -2.469098e+02 -2.650000e+02 -2.000000e+00 + vertex -2.469098e+02 -2.650000e+02 0.000000e+00 + vertex -2.480080e+02 -2.648779e+02 -2.000000e+00 + endloop + endfacet + facet normal -1.104888e-01 -9.938774e-01 0.000000e+00 + outer loop + vertex -2.480080e+02 -2.648779e+02 -2.000000e+00 + vertex -2.469098e+02 -2.650000e+02 0.000000e+00 + vertex -2.480080e+02 -2.648779e+02 0.000000e+00 + endloop + endfacet + facet normal -3.260712e-01 -9.453452e-01 0.000000e+00 + outer loop + vertex -2.480080e+02 -2.648779e+02 -2.000000e+00 + vertex -2.480080e+02 -2.648779e+02 0.000000e+00 + vertex -2.490525e+02 -2.645176e+02 -2.000000e+00 + endloop + endfacet + facet normal -3.260712e-01 -9.453452e-01 0.000000e+00 + outer loop + vertex -2.490525e+02 -2.645176e+02 -2.000000e+00 + vertex -2.480080e+02 -2.648779e+02 0.000000e+00 + vertex -2.490525e+02 -2.645176e+02 0.000000e+00 + endloop + endfacet + facet normal -5.257311e-01 -8.506508e-01 0.000000e+00 + outer loop + vertex -2.490525e+02 -2.645176e+02 -2.000000e+00 + vertex -2.490525e+02 -2.645176e+02 0.000000e+00 + vertex -2.499923e+02 -2.639368e+02 -2.000000e+00 + endloop + endfacet + facet normal -5.257311e-01 -8.506508e-01 0.000000e+00 + outer loop + vertex -2.499923e+02 -2.639368e+02 -2.000000e+00 + vertex -2.490525e+02 -2.645176e+02 0.000000e+00 + vertex -2.499923e+02 -2.639368e+02 0.000000e+00 + endloop + endfacet + facet normal -6.997190e-01 -7.144182e-01 0.000000e+00 + outer loop + vertex -2.499923e+02 -2.639368e+02 -2.000000e+00 + vertex -2.499923e+02 -2.639368e+02 0.000000e+00 + vertex -2.507817e+02 -2.631637e+02 -2.000000e+00 + endloop + endfacet + facet normal -6.997190e-01 -7.144182e-01 0.000000e+00 + outer loop + vertex -2.507817e+02 -2.631637e+02 -2.000000e+00 + vertex -2.499923e+02 -2.639368e+02 0.000000e+00 + vertex -2.507817e+02 -2.631637e+02 0.000000e+00 + endloop + endfacet + facet normal -8.395388e-01 -5.432997e-01 0.000000e+00 + outer loop + vertex -2.507817e+02 -2.631637e+02 -2.000000e+00 + vertex -2.507817e+02 -2.631637e+02 0.000000e+00 + vertex -2.513820e+02 -2.622361e+02 -2.000000e+00 + endloop + endfacet + facet normal -8.395388e-01 -5.432997e-01 0.000000e+00 + outer loop + vertex -2.513820e+02 -2.622361e+02 -2.000000e+00 + vertex -2.507817e+02 -2.631637e+02 0.000000e+00 + vertex -2.513820e+02 -2.622361e+02 0.000000e+00 + endloop + endfacet + facet normal -0.000000e+00 -1.000000e+00 -0.000000e+00 + outer loop + vertex -2.030902e+02 -2.650000e+02 0.000000e+00 + vertex -2.469098e+02 -2.650000e+02 0.000000e+00 + vertex -2.030902e+02 -2.650000e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 -1.000000e+00 0.000000e+00 + outer loop + vertex -2.030902e+02 -2.650000e+02 -2.000000e+00 + vertex -2.469098e+02 -2.650000e+02 0.000000e+00 + vertex -2.469098e+02 -2.650000e+02 -2.000000e+00 + endloop + endfacet + facet normal 9.396926e-01 3.420201e-01 -0.000000e+00 + outer loop + vertex 1.321177e+02 2.593714e+02 -2.000000e+00 + vertex 1.300691e+02 2.650000e+02 -2.000000e+00 + vertex 1.321177e+02 2.593714e+02 0.000000e+00 + endloop + endfacet + facet normal 9.396926e-01 3.420201e-01 0.000000e+00 + outer loop + vertex 1.321177e+02 2.593714e+02 0.000000e+00 + vertex 1.300691e+02 2.650000e+02 -2.000000e+00 + vertex 1.300691e+02 2.650000e+02 0.000000e+00 + endloop + endfacet + facet normal -9.434211e-01 3.315971e-01 0.000000e+00 + outer loop + vertex 1.378823e+02 2.593714e+02 0.000000e+00 + vertex 1.378823e+02 2.593714e+02 -2.000000e+00 + vertex 1.376417e+02 2.586870e+02 0.000000e+00 + endloop + endfacet + facet normal -9.434211e-01 3.315971e-01 0.000000e+00 + outer loop + vertex 1.376417e+02 2.586870e+02 0.000000e+00 + vertex 1.378823e+02 2.593714e+02 -2.000000e+00 + vertex 1.376417e+02 2.586870e+02 -2.000000e+00 + endloop + endfacet + facet normal -8.339572e-01 5.518292e-01 0.000000e+00 + outer loop + vertex 1.376417e+02 2.586870e+02 0.000000e+00 + vertex 1.376417e+02 2.586870e+02 -2.000000e+00 + vertex 1.372413e+02 2.580819e+02 0.000000e+00 + endloop + endfacet + facet normal -8.339572e-01 5.518292e-01 0.000000e+00 + outer loop + vertex 1.372413e+02 2.580819e+02 0.000000e+00 + vertex 1.376417e+02 2.586870e+02 -2.000000e+00 + vertex 1.372413e+02 2.580819e+02 -2.000000e+00 + endloop + endfacet + facet normal -6.740517e-01 7.386842e-01 0.000000e+00 + outer loop + vertex 1.372413e+02 2.580819e+02 0.000000e+00 + vertex 1.372413e+02 2.580819e+02 -2.000000e+00 + vertex 1.367054e+02 2.575929e+02 0.000000e+00 + endloop + endfacet + facet normal -6.740517e-01 7.386842e-01 0.000000e+00 + outer loop + vertex 1.367054e+02 2.575929e+02 0.000000e+00 + vertex 1.372413e+02 2.580819e+02 -2.000000e+00 + vertex 1.367054e+02 2.575929e+02 -2.000000e+00 + endloop + endfacet + facet normal -4.733766e-01 8.808601e-01 0.000000e+00 + outer loop + vertex 1.367054e+02 2.575929e+02 0.000000e+00 + vertex 1.367054e+02 2.575929e+02 -2.000000e+00 + vertex 1.360663e+02 2.572495e+02 0.000000e+00 + endloop + endfacet + facet normal -4.733766e-01 8.808601e-01 0.000000e+00 + outer loop + vertex 1.360663e+02 2.572495e+02 0.000000e+00 + vertex 1.367054e+02 2.575929e+02 -2.000000e+00 + vertex 1.360663e+02 2.572495e+02 -2.000000e+00 + endloop + endfacet + facet normal -2.440695e-01 9.697577e-01 0.000000e+00 + outer loop + vertex 1.360663e+02 2.572495e+02 0.000000e+00 + vertex 1.360663e+02 2.572495e+02 -2.000000e+00 + vertex 1.353628e+02 2.570724e+02 0.000000e+00 + endloop + endfacet + facet normal -2.440695e-01 9.697577e-01 0.000000e+00 + outer loop + vertex 1.353628e+02 2.570724e+02 0.000000e+00 + vertex 1.360663e+02 2.572495e+02 -2.000000e+00 + vertex 1.353628e+02 2.570724e+02 -2.000000e+00 + endloop + endfacet + facet normal -1.566989e-13 1.000000e+00 0.000000e+00 + outer loop + vertex 1.353628e+02 2.570724e+02 0.000000e+00 + vertex 1.353628e+02 2.570724e+02 -2.000000e+00 + vertex 1.346372e+02 2.570724e+02 0.000000e+00 + endloop + endfacet + facet normal -1.566989e-13 1.000000e+00 0.000000e+00 + outer loop + vertex 1.346372e+02 2.570724e+02 0.000000e+00 + vertex 1.353628e+02 2.570724e+02 -2.000000e+00 + vertex 1.346372e+02 2.570724e+02 -2.000000e+00 + endloop + endfacet + facet normal 2.440695e-01 9.697577e-01 0.000000e+00 + outer loop + vertex 1.346372e+02 2.570724e+02 0.000000e+00 + vertex 1.346372e+02 2.570724e+02 -2.000000e+00 + vertex 1.339337e+02 2.572495e+02 0.000000e+00 + endloop + endfacet + facet normal 2.440695e-01 9.697577e-01 0.000000e+00 + outer loop + vertex 1.339337e+02 2.572495e+02 0.000000e+00 + vertex 1.346372e+02 2.570724e+02 -2.000000e+00 + vertex 1.339337e+02 2.572495e+02 -2.000000e+00 + endloop + endfacet + facet normal 4.733766e-01 8.808601e-01 0.000000e+00 + outer loop + vertex 1.339337e+02 2.572495e+02 0.000000e+00 + vertex 1.339337e+02 2.572495e+02 -2.000000e+00 + vertex 1.332946e+02 2.575929e+02 0.000000e+00 + endloop + endfacet + facet normal 4.733766e-01 8.808601e-01 0.000000e+00 + outer loop + vertex 1.332946e+02 2.575929e+02 0.000000e+00 + vertex 1.339337e+02 2.572495e+02 -2.000000e+00 + vertex 1.332946e+02 2.575929e+02 -2.000000e+00 + endloop + endfacet + facet normal 6.740517e-01 7.386842e-01 0.000000e+00 + outer loop + vertex 1.332946e+02 2.575929e+02 0.000000e+00 + vertex 1.332946e+02 2.575929e+02 -2.000000e+00 + vertex 1.327587e+02 2.580819e+02 0.000000e+00 + endloop + endfacet + facet normal 6.740517e-01 7.386842e-01 0.000000e+00 + outer loop + vertex 1.327587e+02 2.580819e+02 0.000000e+00 + vertex 1.332946e+02 2.575929e+02 -2.000000e+00 + vertex 1.327587e+02 2.580819e+02 -2.000000e+00 + endloop + endfacet + facet normal 8.339572e-01 5.518292e-01 0.000000e+00 + outer loop + vertex 1.327587e+02 2.580819e+02 0.000000e+00 + vertex 1.327587e+02 2.580819e+02 -2.000000e+00 + vertex 1.323583e+02 2.586870e+02 0.000000e+00 + endloop + endfacet + facet normal 8.339572e-01 5.518292e-01 0.000000e+00 + outer loop + vertex 1.323583e+02 2.586870e+02 0.000000e+00 + vertex 1.327587e+02 2.580819e+02 -2.000000e+00 + vertex 1.323583e+02 2.586870e+02 -2.000000e+00 + endloop + endfacet + facet normal 9.434211e-01 3.315971e-01 0.000000e+00 + outer loop + vertex 1.323583e+02 2.586870e+02 0.000000e+00 + vertex 1.323583e+02 2.586870e+02 -2.000000e+00 + vertex 1.321177e+02 2.593714e+02 0.000000e+00 + endloop + endfacet + facet normal 9.434211e-01 3.315971e-01 0.000000e+00 + outer loop + vertex 1.321177e+02 2.593714e+02 0.000000e+00 + vertex 1.323583e+02 2.586870e+02 -2.000000e+00 + vertex 1.321177e+02 2.593714e+02 -2.000000e+00 + endloop + endfacet + facet normal -9.396926e-01 3.420201e-01 0.000000e+00 + outer loop + vertex 1.399309e+02 2.650000e+02 -2.000000e+00 + vertex 1.378823e+02 2.593714e+02 -2.000000e+00 + vertex 1.399309e+02 2.650000e+02 0.000000e+00 + endloop + endfacet + facet normal -9.396926e-01 3.420201e-01 0.000000e+00 + outer loop + vertex 1.399309e+02 2.650000e+02 0.000000e+00 + vertex 1.378823e+02 2.593714e+02 -2.000000e+00 + vertex 1.378823e+02 2.593714e+02 0.000000e+00 + endloop + endfacet + facet normal -0.000000e+00 -1.000000e+00 -0.000000e+00 + outer loop + vertex 2.469098e+02 -2.650000e+02 0.000000e+00 + vertex 2.030902e+02 -2.650000e+02 0.000000e+00 + vertex 2.469098e+02 -2.650000e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 -1.000000e+00 0.000000e+00 + outer loop + vertex 2.469098e+02 -2.650000e+02 -2.000000e+00 + vertex 2.030902e+02 -2.650000e+02 0.000000e+00 + vertex 2.030902e+02 -2.650000e+02 -2.000000e+00 + endloop + endfacet + facet normal 9.396926e-01 3.420201e-01 -1.335384e-14 + outer loop + vertex -1.378128e+02 2.591109e+02 -2.000000e+00 + vertex -1.399563e+02 2.650000e+02 -2.000000e+00 + vertex -1.378128e+02 2.591109e+02 0.000000e+00 + endloop + endfacet + facet normal 9.396926e-01 3.420201e-01 1.332176e-14 + outer loop + vertex -1.378128e+02 2.591109e+02 0.000000e+00 + vertex -1.399563e+02 2.650000e+02 -2.000000e+00 + vertex -1.399563e+02 2.650000e+02 0.000000e+00 + endloop + endfacet + facet normal -8.990516e-01 4.378427e-01 0.000000e+00 + outer loop + vertex -1.322071e+02 2.590502e+02 0.000000e+00 + vertex -1.322071e+02 2.590502e+02 -2.000000e+00 + vertex -1.325301e+02 2.583868e+02 0.000000e+00 + endloop + endfacet + facet normal -8.990516e-01 4.378427e-01 0.000000e+00 + outer loop + vertex -1.325301e+02 2.583868e+02 0.000000e+00 + vertex -1.322071e+02 2.590502e+02 -2.000000e+00 + vertex -1.325301e+02 2.583868e+02 -2.000000e+00 + endloop + endfacet + facet normal -7.622860e-01 6.472404e-01 0.000000e+00 + outer loop + vertex -1.325301e+02 2.583868e+02 0.000000e+00 + vertex -1.325301e+02 2.583868e+02 -2.000000e+00 + vertex -1.330077e+02 2.578244e+02 0.000000e+00 + endloop + endfacet + facet normal -7.622860e-01 6.472404e-01 -1.083273e-14 + outer loop + vertex -1.330077e+02 2.578244e+02 0.000000e+00 + vertex -1.325301e+02 2.583868e+02 -2.000000e+00 + vertex -1.330077e+02 2.578244e+02 -2.000000e+00 + endloop + endfacet + facet normal -5.778376e-01 8.161518e-01 -8.211566e-15 + outer loop + vertex -1.330077e+02 2.578244e+02 0.000000e+00 + vertex -1.330077e+02 2.578244e+02 -2.000000e+00 + vertex -1.336098e+02 2.573981e+02 0.000000e+00 + endloop + endfacet + facet normal -5.778376e-01 8.161518e-01 2.319643e-14 + outer loop + vertex -1.336098e+02 2.573981e+02 0.000000e+00 + vertex -1.330077e+02 2.578244e+02 -2.000000e+00 + vertex -1.336098e+02 2.573981e+02 -2.000000e+00 + endloop + endfacet + facet normal -3.572442e-01 9.340110e-01 2.654619e-14 + outer loop + vertex -1.336098e+02 2.573981e+02 0.000000e+00 + vertex -1.336098e+02 2.573981e+02 -2.000000e+00 + vertex -1.342990e+02 2.571345e+02 0.000000e+00 + endloop + endfacet + facet normal -3.572442e-01 9.340110e-01 0.000000e+00 + outer loop + vertex -1.342990e+02 2.571345e+02 0.000000e+00 + vertex -1.336098e+02 2.573981e+02 -2.000000e+00 + vertex -1.342990e+02 2.571345e+02 -2.000000e+00 + endloop + endfacet + facet normal -1.143044e-01 9.934458e-01 0.000000e+00 + outer loop + vertex -1.342990e+02 2.571345e+02 0.000000e+00 + vertex -1.342990e+02 2.571345e+02 -2.000000e+00 + vertex -1.350319e+02 2.570502e+02 0.000000e+00 + endloop + endfacet + facet normal -1.143044e-01 9.934458e-01 0.000000e+00 + outer loop + vertex -1.350319e+02 2.570502e+02 0.000000e+00 + vertex -1.342990e+02 2.571345e+02 -2.000000e+00 + vertex -1.350319e+02 2.570502e+02 -2.000000e+00 + endloop + endfacet + facet normal 1.357854e-01 9.907383e-01 0.000000e+00 + outer loop + vertex -1.350319e+02 2.570502e+02 0.000000e+00 + vertex -1.350319e+02 2.570502e+02 -2.000000e+00 + vertex -1.357629e+02 2.571504e+02 0.000000e+00 + endloop + endfacet + facet normal 1.357854e-01 9.907383e-01 0.000000e+00 + outer loop + vertex -1.357629e+02 2.571504e+02 0.000000e+00 + vertex -1.350319e+02 2.570502e+02 -2.000000e+00 + vertex -1.357629e+02 2.571504e+02 -2.000000e+00 + endloop + endfacet + facet normal 3.773816e-01 9.260579e-01 0.000000e+00 + outer loop + vertex -1.357629e+02 2.571504e+02 0.000000e+00 + vertex -1.357629e+02 2.571504e+02 -2.000000e+00 + vertex -1.364462e+02 2.574288e+02 0.000000e+00 + endloop + endfacet + facet normal 3.773816e-01 9.260579e-01 0.000000e+00 + outer loop + vertex -1.364462e+02 2.574288e+02 0.000000e+00 + vertex -1.357629e+02 2.571504e+02 -2.000000e+00 + vertex -1.364462e+02 2.574288e+02 -2.000000e+00 + endloop + endfacet + facet normal 5.953716e-01 8.034504e-01 0.000000e+00 + outer loop + vertex -1.364462e+02 2.574288e+02 0.000000e+00 + vertex -1.364462e+02 2.574288e+02 -2.000000e+00 + vertex -1.370390e+02 2.578681e+02 0.000000e+00 + endloop + endfacet + facet normal 5.953716e-01 8.034504e-01 0.000000e+00 + outer loop + vertex -1.370390e+02 2.578681e+02 0.000000e+00 + vertex -1.364462e+02 2.574288e+02 -2.000000e+00 + vertex -1.370390e+02 2.578681e+02 -2.000000e+00 + endloop + endfacet + facet normal 7.761199e-01 6.305854e-01 0.000000e+00 + outer loop + vertex -1.370390e+02 2.578681e+02 0.000000e+00 + vertex -1.370390e+02 2.578681e+02 -2.000000e+00 + vertex -1.375042e+02 2.584407e+02 0.000000e+00 + endloop + endfacet + facet normal 7.761199e-01 6.305854e-01 0.000000e+00 + outer loop + vertex -1.375042e+02 2.584407e+02 0.000000e+00 + vertex -1.370390e+02 2.578681e+02 -2.000000e+00 + vertex -1.375042e+02 2.584407e+02 -2.000000e+00 + endloop + endfacet + facet normal 9.083201e-01 4.182758e-01 0.000000e+00 + outer loop + vertex -1.375042e+02 2.584407e+02 0.000000e+00 + vertex -1.375042e+02 2.584407e+02 -2.000000e+00 + vertex -1.378128e+02 2.591109e+02 0.000000e+00 + endloop + endfacet + facet normal 9.083201e-01 4.182758e-01 -1.290800e-14 + outer loop + vertex -1.378128e+02 2.591109e+02 0.000000e+00 + vertex -1.375042e+02 2.584407e+02 -2.000000e+00 + vertex -1.378128e+02 2.591109e+02 -2.000000e+00 + endloop + endfacet + facet normal -9.396926e-01 3.420201e-01 -1.335384e-14 + outer loop + vertex -1.300415e+02 2.650000e+02 -2.000000e+00 + vertex -1.322071e+02 2.590502e+02 -2.000000e+00 + vertex -1.300415e+02 2.650000e+02 0.000000e+00 + endloop + endfacet + facet normal -9.396926e-01 3.420201e-01 0.000000e+00 + outer loop + vertex -1.300415e+02 2.650000e+02 0.000000e+00 + vertex -1.322071e+02 2.590502e+02 -2.000000e+00 + vertex -1.322071e+02 2.590502e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 -0.000000e+00 1.000000e+00 + outer loop + vertex 2.480080e+02 -2.648779e+02 0.000000e+00 + vertex 2.513820e+02 -2.622361e+02 0.000000e+00 + vertex 2.469098e+02 -2.650000e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 2.469098e+02 -2.650000e+02 0.000000e+00 + vertex 2.513820e+02 -2.622361e+02 0.000000e+00 + vertex 2.544721e+02 -2.560557e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 2.469098e+02 -2.650000e+02 0.000000e+00 + vertex 2.544721e+02 -2.560557e+02 0.000000e+00 + vertex 2.550000e+02 -2.538197e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 2.550000e+02 -2.538197e+02 0.000000e+00 + vertex 2.544721e+02 -2.560557e+02 0.000000e+00 + vertex 2.547630e+02 -2.553407e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 2.550000e+02 -2.538197e+02 0.000000e+00 + vertex 2.547630e+02 -2.553407e+02 0.000000e+00 + vertex 2.549404e+02 -2.545893e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 2.480080e+02 -2.648779e+02 0.000000e+00 + vertex 2.490525e+02 -2.645176e+02 0.000000e+00 + vertex 2.513820e+02 -2.622361e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 2.513820e+02 -2.622361e+02 0.000000e+00 + vertex 2.490525e+02 -2.645176e+02 0.000000e+00 + vertex 2.499923e+02 -2.639368e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 2.513820e+02 -2.622361e+02 0.000000e+00 + vertex 2.499923e+02 -2.639368e+02 0.000000e+00 + vertex 2.507817e+02 -2.631637e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 2.550000e+02 2.630000e+02 0.000000e+00 + vertex 1.919098e+02 -2.550000e+02 0.000000e+00 + vertex 2.550000e+02 -2.538197e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 2.550000e+02 -2.538197e+02 0.000000e+00 + vertex 1.919098e+02 -2.550000e+02 0.000000e+00 + vertex 1.930080e+02 -2.551221e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 2.550000e+02 -2.538197e+02 0.000000e+00 + vertex 1.930080e+02 -2.551221e+02 0.000000e+00 + vertex 1.940525e+02 -2.554824e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 2.549319e+02 2.635176e+02 0.000000e+00 + vertex 2.547321e+02 2.640000e+02 0.000000e+00 + vertex 2.550000e+02 2.630000e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 2.550000e+02 2.630000e+02 0.000000e+00 + vertex 2.547321e+02 2.640000e+02 0.000000e+00 + vertex 2.544142e+02 2.644142e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 2.550000e+02 2.630000e+02 0.000000e+00 + vertex 2.544142e+02 2.644142e+02 0.000000e+00 + vertex 2.540000e+02 2.647321e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 2.540000e+02 2.647321e+02 0.000000e+00 + vertex 2.535176e+02 2.649319e+02 0.000000e+00 + vertex 2.550000e+02 2.630000e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 2.550000e+02 2.630000e+02 0.000000e+00 + vertex 2.535176e+02 2.649319e+02 0.000000e+00 + vertex 2.530000e+02 2.650000e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 2.550000e+02 2.630000e+02 0.000000e+00 + vertex 2.530000e+02 2.650000e+02 0.000000e+00 + vertex 1.372413e+02 2.580819e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 1.372413e+02 2.580819e+02 0.000000e+00 + vertex 2.530000e+02 2.650000e+02 0.000000e+00 + vertex 1.376417e+02 2.586870e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 1.376417e+02 2.586870e+02 0.000000e+00 + vertex 2.530000e+02 2.650000e+02 0.000000e+00 + vertex 1.378823e+02 2.593714e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 1.378823e+02 2.593714e+02 0.000000e+00 + vertex 2.530000e+02 2.650000e+02 0.000000e+00 + vertex 1.399309e+02 2.650000e+02 0.000000e+00 + endloop + endfacet + facet normal -0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 1.372413e+02 2.580819e+02 0.000000e+00 + vertex 1.367054e+02 2.575929e+02 0.000000e+00 + vertex 2.550000e+02 2.630000e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 2.550000e+02 2.630000e+02 0.000000e+00 + vertex 1.367054e+02 2.575929e+02 0.000000e+00 + vertex 1.360663e+02 2.572495e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 2.550000e+02 2.630000e+02 0.000000e+00 + vertex 1.360663e+02 2.572495e+02 0.000000e+00 + vertex 1.919098e+02 -2.550000e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 1.919098e+02 -2.550000e+02 0.000000e+00 + vertex 1.360663e+02 2.572495e+02 0.000000e+00 + vertex 1.353628e+02 2.570724e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 1.919098e+02 -2.550000e+02 0.000000e+00 + vertex 1.353628e+02 2.570724e+02 0.000000e+00 + vertex 1.346372e+02 2.570724e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 1.346372e+02 2.570724e+02 0.000000e+00 + vertex 1.339337e+02 2.572495e+02 0.000000e+00 + vertex 1.919098e+02 -2.550000e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 1.919098e+02 -2.550000e+02 0.000000e+00 + vertex 1.339337e+02 2.572495e+02 0.000000e+00 + vertex -1.919098e+02 -2.550000e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.919098e+02 -2.550000e+02 0.000000e+00 + vertex 1.339337e+02 2.572495e+02 0.000000e+00 + vertex -1.336098e+02 2.573981e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.919098e+02 -2.550000e+02 0.000000e+00 + vertex -1.336098e+02 2.573981e+02 0.000000e+00 + vertex -1.342990e+02 2.571345e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 1.339337e+02 2.572495e+02 0.000000e+00 + vertex 1.332946e+02 2.575929e+02 0.000000e+00 + vertex -1.336098e+02 2.573981e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.336098e+02 2.573981e+02 0.000000e+00 + vertex 1.332946e+02 2.575929e+02 0.000000e+00 + vertex -1.330077e+02 2.578244e+02 0.000000e+00 + endloop + endfacet + facet normal -0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.330077e+02 2.578244e+02 0.000000e+00 + vertex 1.332946e+02 2.575929e+02 0.000000e+00 + vertex 1.327587e+02 2.580819e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.330077e+02 2.578244e+02 0.000000e+00 + vertex 1.327587e+02 2.580819e+02 0.000000e+00 + vertex -1.325301e+02 2.583868e+02 0.000000e+00 + endloop + endfacet + facet normal -0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.325301e+02 2.583868e+02 0.000000e+00 + vertex 1.327587e+02 2.580819e+02 0.000000e+00 + vertex 1.323583e+02 2.586870e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.325301e+02 2.583868e+02 0.000000e+00 + vertex 1.323583e+02 2.586870e+02 0.000000e+00 + vertex -1.322071e+02 2.590502e+02 0.000000e+00 + endloop + endfacet + facet normal -0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.322071e+02 2.590502e+02 0.000000e+00 + vertex 1.323583e+02 2.586870e+02 0.000000e+00 + vertex 1.321177e+02 2.593714e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.322071e+02 2.590502e+02 0.000000e+00 + vertex 1.321177e+02 2.593714e+02 0.000000e+00 + vertex -1.300415e+02 2.650000e+02 0.000000e+00 + endloop + endfacet + facet normal -0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.300415e+02 2.650000e+02 0.000000e+00 + vertex 1.321177e+02 2.593714e+02 0.000000e+00 + vertex 1.300691e+02 2.650000e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.342990e+02 2.571345e+02 0.000000e+00 + vertex -1.350319e+02 2.570502e+02 0.000000e+00 + vertex -1.919098e+02 -2.550000e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.919098e+02 -2.550000e+02 0.000000e+00 + vertex -1.350319e+02 2.570502e+02 0.000000e+00 + vertex -1.357629e+02 2.571504e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 -0.000000e+00 1.000000e+00 + outer loop + vertex -1.919098e+02 -2.550000e+02 0.000000e+00 + vertex -1.357629e+02 2.571504e+02 0.000000e+00 + vertex -2.550000e+02 2.630000e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -2.550000e+02 2.630000e+02 0.000000e+00 + vertex -1.357629e+02 2.571504e+02 0.000000e+00 + vertex -1.364462e+02 2.574288e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -2.550000e+02 2.630000e+02 0.000000e+00 + vertex -1.364462e+02 2.574288e+02 0.000000e+00 + vertex -1.370390e+02 2.578681e+02 0.000000e+00 + endloop + endfacet + facet normal -0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -2.550000e+02 2.630000e+02 0.000000e+00 + vertex -1.370390e+02 2.578681e+02 0.000000e+00 + vertex -2.530000e+02 2.650000e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -2.530000e+02 2.650000e+02 0.000000e+00 + vertex -1.370390e+02 2.578681e+02 0.000000e+00 + vertex -1.375042e+02 2.584407e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -2.530000e+02 2.650000e+02 0.000000e+00 + vertex -1.375042e+02 2.584407e+02 0.000000e+00 + vertex -1.378128e+02 2.591109e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.378128e+02 2.591109e+02 0.000000e+00 + vertex -1.399563e+02 2.650000e+02 0.000000e+00 + vertex -2.530000e+02 2.650000e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -2.530000e+02 2.650000e+02 0.000000e+00 + vertex -2.535176e+02 2.649319e+02 0.000000e+00 + vertex -2.550000e+02 2.630000e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -2.550000e+02 2.630000e+02 0.000000e+00 + vertex -2.535176e+02 2.649319e+02 0.000000e+00 + vertex -2.540000e+02 2.647321e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -2.550000e+02 2.630000e+02 0.000000e+00 + vertex -2.540000e+02 2.647321e+02 0.000000e+00 + vertex -2.544142e+02 2.644142e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -2.544142e+02 2.644142e+02 0.000000e+00 + vertex -2.547321e+02 2.640000e+02 0.000000e+00 + vertex -2.550000e+02 2.630000e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -2.550000e+02 2.630000e+02 0.000000e+00 + vertex -2.547321e+02 2.640000e+02 0.000000e+00 + vertex -2.549319e+02 2.635176e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -2.550000e+02 2.630000e+02 0.000000e+00 + vertex -2.550000e+02 -2.538197e+02 0.000000e+00 + vertex -1.919098e+02 -2.550000e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.919098e+02 -2.550000e+02 0.000000e+00 + vertex -2.550000e+02 -2.538197e+02 0.000000e+00 + vertex -1.930080e+02 -2.551221e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.930080e+02 -2.551221e+02 0.000000e+00 + vertex -2.550000e+02 -2.538197e+02 0.000000e+00 + vertex -1.940525e+02 -2.554824e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.940525e+02 -2.554824e+02 0.000000e+00 + vertex -2.550000e+02 -2.538197e+02 0.000000e+00 + vertex -1.949923e+02 -2.560632e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.949923e+02 -2.560632e+02 0.000000e+00 + vertex -2.550000e+02 -2.538197e+02 0.000000e+00 + vertex -1.957817e+02 -2.568363e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.957817e+02 -2.568363e+02 0.000000e+00 + vertex -2.550000e+02 -2.538197e+02 0.000000e+00 + vertex -2.030902e+02 -2.650000e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.957817e+02 -2.568363e+02 0.000000e+00 + vertex -2.030902e+02 -2.650000e+02 0.000000e+00 + vertex -1.963820e+02 -2.577639e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.963820e+02 -2.577639e+02 0.000000e+00 + vertex -2.030902e+02 -2.650000e+02 0.000000e+00 + vertex -1.986180e+02 -2.622361e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.986180e+02 -2.622361e+02 0.000000e+00 + vertex -2.030902e+02 -2.650000e+02 0.000000e+00 + vertex -2.019920e+02 -2.648779e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.986180e+02 -2.622361e+02 0.000000e+00 + vertex -2.019920e+02 -2.648779e+02 0.000000e+00 + vertex -2.009475e+02 -2.645176e+02 0.000000e+00 + endloop + endfacet + facet normal -0.000000e+00 -0.000000e+00 1.000000e+00 + outer loop + vertex -2.549404e+02 -2.545893e+02 0.000000e+00 + vertex -2.547630e+02 -2.553407e+02 0.000000e+00 + vertex -2.550000e+02 -2.538197e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -2.550000e+02 -2.538197e+02 0.000000e+00 + vertex -2.547630e+02 -2.553407e+02 0.000000e+00 + vertex -2.544721e+02 -2.560557e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -2.550000e+02 -2.538197e+02 0.000000e+00 + vertex -2.544721e+02 -2.560557e+02 0.000000e+00 + vertex -2.469098e+02 -2.650000e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -2.469098e+02 -2.650000e+02 0.000000e+00 + vertex -2.544721e+02 -2.560557e+02 0.000000e+00 + vertex -2.513820e+02 -2.622361e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -2.469098e+02 -2.650000e+02 0.000000e+00 + vertex -2.513820e+02 -2.622361e+02 0.000000e+00 + vertex -2.480080e+02 -2.648779e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -2.480080e+02 -2.648779e+02 0.000000e+00 + vertex -2.513820e+02 -2.622361e+02 0.000000e+00 + vertex -2.490525e+02 -2.645176e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -2.490525e+02 -2.645176e+02 0.000000e+00 + vertex -2.513820e+02 -2.622361e+02 0.000000e+00 + vertex -2.499923e+02 -2.639368e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -2.499923e+02 -2.639368e+02 0.000000e+00 + vertex -2.513820e+02 -2.622361e+02 0.000000e+00 + vertex -2.507817e+02 -2.631637e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 -0.000000e+00 1.000000e+00 + outer loop + vertex -2.469098e+02 -2.650000e+02 0.000000e+00 + vertex -2.030902e+02 -2.650000e+02 0.000000e+00 + vertex -2.550000e+02 -2.538197e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -2.009475e+02 -2.645176e+02 0.000000e+00 + vertex -2.000077e+02 -2.639368e+02 0.000000e+00 + vertex -1.986180e+02 -2.622361e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.986180e+02 -2.622361e+02 0.000000e+00 + vertex -2.000077e+02 -2.639368e+02 0.000000e+00 + vertex -1.992183e+02 -2.631637e+02 0.000000e+00 + endloop + endfacet + facet normal -0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 1.940525e+02 -2.554824e+02 0.000000e+00 + vertex 1.949923e+02 -2.560632e+02 0.000000e+00 + vertex 2.550000e+02 -2.538197e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 2.550000e+02 -2.538197e+02 0.000000e+00 + vertex 1.949923e+02 -2.560632e+02 0.000000e+00 + vertex 1.957817e+02 -2.568363e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 2.550000e+02 -2.538197e+02 0.000000e+00 + vertex 1.957817e+02 -2.568363e+02 0.000000e+00 + vertex 2.030902e+02 -2.650000e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 2.030902e+02 -2.650000e+02 0.000000e+00 + vertex 1.957817e+02 -2.568363e+02 0.000000e+00 + vertex 1.963820e+02 -2.577639e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 2.030902e+02 -2.650000e+02 0.000000e+00 + vertex 1.963820e+02 -2.577639e+02 0.000000e+00 + vertex 1.986180e+02 -2.622361e+02 0.000000e+00 + endloop + endfacet + facet normal -0.000000e+00 -0.000000e+00 1.000000e+00 + outer loop + vertex 1.992183e+02 -2.631637e+02 0.000000e+00 + vertex 2.000077e+02 -2.639368e+02 0.000000e+00 + vertex 1.986180e+02 -2.622361e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 1.986180e+02 -2.622361e+02 0.000000e+00 + vertex 2.000077e+02 -2.639368e+02 0.000000e+00 + vertex 2.009475e+02 -2.645176e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 1.986180e+02 -2.622361e+02 0.000000e+00 + vertex 2.009475e+02 -2.645176e+02 0.000000e+00 + vertex 2.019920e+02 -2.648779e+02 0.000000e+00 + endloop + endfacet + facet normal -0.000000e+00 -0.000000e+00 1.000000e+00 + outer loop + vertex 2.019920e+02 -2.648779e+02 0.000000e+00 + vertex 2.030902e+02 -2.650000e+02 0.000000e+00 + vertex 1.986180e+02 -2.622361e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 2.030902e+02 -2.650000e+02 0.000000e+00 + vertex 2.469098e+02 -2.650000e+02 0.000000e+00 + vertex 2.550000e+02 -2.538197e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 -0.000000e+00 1.000000e+00 + outer loop + vertex -1.378128e+02 2.591109e+02 -2.000000e+00 + vertex -1.377500e+02 2.600000e+02 -2.000000e+00 + vertex -1.399563e+02 2.650000e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.399563e+02 2.650000e+02 -2.000000e+00 + vertex -1.377500e+02 2.600000e+02 -2.000000e+00 + vertex -1.376563e+02 2.607118e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.399563e+02 2.650000e+02 -2.000000e+00 + vertex -1.376563e+02 2.607118e+02 -2.000000e+00 + vertex -1.373816e+02 2.613750e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 -0.000000e+00 1.000000e+00 + outer loop + vertex -1.375042e+02 2.584407e+02 -2.000000e+00 + vertex -1.373816e+02 2.586250e+02 -2.000000e+00 + vertex -1.378128e+02 2.591109e+02 -2.000000e+00 + endloop + endfacet + facet normal -0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.378128e+02 2.591109e+02 -2.000000e+00 + vertex -1.373816e+02 2.586250e+02 -2.000000e+00 + vertex -1.376563e+02 2.592882e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.378128e+02 2.591109e+02 -2.000000e+00 + vertex -1.376563e+02 2.592882e+02 -2.000000e+00 + vertex -1.377500e+02 2.600000e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.373816e+02 2.586250e+02 -2.000000e+00 + vertex -1.375042e+02 2.584407e+02 -2.000000e+00 + vertex -1.369445e+02 2.580555e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.369445e+02 2.580555e+02 -2.000000e+00 + vertex -1.375042e+02 2.584407e+02 -2.000000e+00 + vertex -1.370390e+02 2.578681e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.369445e+02 2.580555e+02 -2.000000e+00 + vertex -1.370390e+02 2.578681e+02 -2.000000e+00 + vertex -1.363750e+02 2.576184e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.363750e+02 2.576184e+02 -2.000000e+00 + vertex -1.370390e+02 2.578681e+02 -2.000000e+00 + vertex -1.364462e+02 2.574288e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.363750e+02 2.576184e+02 -2.000000e+00 + vertex -1.364462e+02 2.574288e+02 -2.000000e+00 + vertex -1.357118e+02 2.573437e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.357118e+02 2.573437e+02 -2.000000e+00 + vertex -1.364462e+02 2.574288e+02 -2.000000e+00 + vertex -1.357629e+02 2.571504e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.357118e+02 2.573437e+02 -2.000000e+00 + vertex -1.357629e+02 2.571504e+02 -2.000000e+00 + vertex -1.350319e+02 2.570502e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.357118e+02 2.573437e+02 -2.000000e+00 + vertex -1.350319e+02 2.570502e+02 -2.000000e+00 + vertex -1.350000e+02 2.572500e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.350000e+02 2.572500e+02 -2.000000e+00 + vertex -1.350319e+02 2.570502e+02 -2.000000e+00 + vertex -1.342990e+02 2.571345e+02 -2.000000e+00 + endloop + endfacet + facet normal -0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.350000e+02 2.572500e+02 -2.000000e+00 + vertex -1.342990e+02 2.571345e+02 -2.000000e+00 + vertex -1.342882e+02 2.573437e+02 -2.000000e+00 + endloop + endfacet + facet normal -0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.342882e+02 2.573437e+02 -2.000000e+00 + vertex -1.342990e+02 2.571345e+02 -2.000000e+00 + vertex -1.336098e+02 2.573981e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.342882e+02 2.573437e+02 -2.000000e+00 + vertex -1.336098e+02 2.573981e+02 -2.000000e+00 + vertex -1.336250e+02 2.576184e+02 -2.000000e+00 + endloop + endfacet + facet normal -0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.336250e+02 2.576184e+02 -2.000000e+00 + vertex -1.336098e+02 2.573981e+02 -2.000000e+00 + vertex -1.330077e+02 2.578244e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.336250e+02 2.576184e+02 -2.000000e+00 + vertex -1.330077e+02 2.578244e+02 -2.000000e+00 + vertex -1.330555e+02 2.580555e+02 -2.000000e+00 + endloop + endfacet + facet normal -0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.330555e+02 2.580555e+02 -2.000000e+00 + vertex -1.330077e+02 2.578244e+02 -2.000000e+00 + vertex -1.325301e+02 2.583868e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.330555e+02 2.580555e+02 -2.000000e+00 + vertex -1.325301e+02 2.583868e+02 -2.000000e+00 + vertex -1.326184e+02 2.586250e+02 -2.000000e+00 + endloop + endfacet + facet normal -0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.326184e+02 2.586250e+02 -2.000000e+00 + vertex -1.325301e+02 2.583868e+02 -2.000000e+00 + vertex -1.322071e+02 2.590502e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.326184e+02 2.586250e+02 -2.000000e+00 + vertex -1.322071e+02 2.590502e+02 -2.000000e+00 + vertex -1.323437e+02 2.592882e+02 -2.000000e+00 + endloop + endfacet + facet normal -0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.323437e+02 2.592882e+02 -2.000000e+00 + vertex -1.322071e+02 2.590502e+02 -2.000000e+00 + vertex -1.322500e+02 2.600000e+02 -2.000000e+00 + endloop + endfacet + facet normal -0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.322500e+02 2.600000e+02 -2.000000e+00 + vertex -1.322071e+02 2.590502e+02 -2.000000e+00 + vertex -1.300415e+02 2.650000e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 -0.000000e+00 1.000000e+00 + outer loop + vertex -1.322500e+02 2.600000e+02 -2.000000e+00 + vertex -1.300415e+02 2.650000e+02 -2.000000e+00 + vertex -1.323437e+02 2.607118e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 -0.000000e+00 1.000000e+00 + outer loop + vertex -1.323437e+02 2.607118e+02 -2.000000e+00 + vertex -1.300415e+02 2.650000e+02 -2.000000e+00 + vertex -1.326184e+02 2.613750e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 -0.000000e+00 1.000000e+00 + outer loop + vertex -1.326184e+02 2.613750e+02 -2.000000e+00 + vertex -1.300415e+02 2.650000e+02 -2.000000e+00 + vertex -1.330555e+02 2.619445e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 -0.000000e+00 1.000000e+00 + outer loop + vertex -1.330555e+02 2.619445e+02 -2.000000e+00 + vertex -1.300415e+02 2.650000e+02 -2.000000e+00 + vertex -1.336250e+02 2.623816e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 -0.000000e+00 1.000000e+00 + outer loop + vertex -1.336250e+02 2.623816e+02 -2.000000e+00 + vertex -1.300415e+02 2.650000e+02 -2.000000e+00 + vertex -1.342882e+02 2.626563e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 -0.000000e+00 1.000000e+00 + outer loop + vertex -1.342882e+02 2.626563e+02 -2.000000e+00 + vertex -1.300415e+02 2.650000e+02 -2.000000e+00 + vertex -1.350000e+02 2.627500e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 -0.000000e+00 1.000000e+00 + outer loop + vertex -1.350000e+02 2.627500e+02 -2.000000e+00 + vertex -1.300415e+02 2.650000e+02 -2.000000e+00 + vertex -1.399563e+02 2.650000e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.350000e+02 2.627500e+02 -2.000000e+00 + vertex -1.399563e+02 2.650000e+02 -2.000000e+00 + vertex -1.357118e+02 2.626563e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.357118e+02 2.626563e+02 -2.000000e+00 + vertex -1.399563e+02 2.650000e+02 -2.000000e+00 + vertex -1.363750e+02 2.623816e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.363750e+02 2.623816e+02 -2.000000e+00 + vertex -1.399563e+02 2.650000e+02 -2.000000e+00 + vertex -1.369445e+02 2.619445e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.369445e+02 2.619445e+02 -2.000000e+00 + vertex -1.399563e+02 2.650000e+02 -2.000000e+00 + vertex -1.373816e+02 2.613750e+02 -2.000000e+00 + endloop + endfacet + facet normal -1.305262e-01 -9.914449e-01 0.000000e+00 + outer loop + vertex -2.530000e+02 -2.550000e+02 -6.000000e+00 + vertex -2.530000e+02 -2.550000e+02 -2.000000e+00 + vertex -2.535176e+02 -2.549319e+02 -6.000000e+00 + endloop + endfacet + facet normal -1.305262e-01 -9.914449e-01 0.000000e+00 + outer loop + vertex -2.535176e+02 -2.549319e+02 -6.000000e+00 + vertex -2.530000e+02 -2.550000e+02 -2.000000e+00 + vertex -2.535176e+02 -2.549319e+02 -2.000000e+00 + endloop + endfacet + facet normal -3.826834e-01 -9.238795e-01 0.000000e+00 + outer loop + vertex -2.535176e+02 -2.549319e+02 -6.000000e+00 + vertex -2.535176e+02 -2.549319e+02 -2.000000e+00 + vertex -2.540000e+02 -2.547321e+02 -6.000000e+00 + endloop + endfacet + facet normal -3.826834e-01 -9.238795e-01 0.000000e+00 + outer loop + vertex -2.540000e+02 -2.547321e+02 -6.000000e+00 + vertex -2.535176e+02 -2.549319e+02 -2.000000e+00 + vertex -2.540000e+02 -2.547321e+02 -2.000000e+00 + endloop + endfacet + facet normal -6.087614e-01 -7.933533e-01 0.000000e+00 + outer loop + vertex -2.540000e+02 -2.547321e+02 -6.000000e+00 + vertex -2.540000e+02 -2.547321e+02 -2.000000e+00 + vertex -2.544142e+02 -2.544142e+02 -6.000000e+00 + endloop + endfacet + facet normal -6.087614e-01 -7.933533e-01 0.000000e+00 + outer loop + vertex -2.544142e+02 -2.544142e+02 -6.000000e+00 + vertex -2.540000e+02 -2.547321e+02 -2.000000e+00 + vertex -2.544142e+02 -2.544142e+02 -2.000000e+00 + endloop + endfacet + facet normal -7.933533e-01 -6.087614e-01 0.000000e+00 + outer loop + vertex -2.544142e+02 -2.544142e+02 -6.000000e+00 + vertex -2.544142e+02 -2.544142e+02 -2.000000e+00 + vertex -2.547321e+02 -2.540000e+02 -6.000000e+00 + endloop + endfacet + facet normal -7.933533e-01 -6.087614e-01 0.000000e+00 + outer loop + vertex -2.547321e+02 -2.540000e+02 -6.000000e+00 + vertex -2.544142e+02 -2.544142e+02 -2.000000e+00 + vertex -2.547321e+02 -2.540000e+02 -2.000000e+00 + endloop + endfacet + facet normal -9.238795e-01 -3.826834e-01 0.000000e+00 + outer loop + vertex -2.547321e+02 -2.540000e+02 -6.000000e+00 + vertex -2.547321e+02 -2.540000e+02 -2.000000e+00 + vertex -2.549319e+02 -2.535176e+02 -6.000000e+00 + endloop + endfacet + facet normal -9.238795e-01 -3.826834e-01 0.000000e+00 + outer loop + vertex -2.549319e+02 -2.535176e+02 -6.000000e+00 + vertex -2.547321e+02 -2.540000e+02 -2.000000e+00 + vertex -2.549319e+02 -2.535176e+02 -2.000000e+00 + endloop + endfacet + facet normal -9.914449e-01 -1.305262e-01 0.000000e+00 + outer loop + vertex -2.549319e+02 -2.535176e+02 -6.000000e+00 + vertex -2.549319e+02 -2.535176e+02 -2.000000e+00 + vertex -2.550000e+02 -2.530000e+02 -6.000000e+00 + endloop + endfacet + facet normal -9.914449e-01 -1.305262e-01 0.000000e+00 + outer loop + vertex -2.550000e+02 -2.530000e+02 -6.000000e+00 + vertex -2.549319e+02 -2.535176e+02 -2.000000e+00 + vertex -2.550000e+02 -2.530000e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 -1.000000e+00 0.000000e+00 + outer loop + vertex -2.530000e+02 -2.550000e+02 -2.000000e+00 + vertex -2.530000e+02 -2.550000e+02 -6.000000e+00 + vertex -1.919098e+02 -2.550000e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 -1.000000e+00 -0.000000e+00 + outer loop + vertex -1.919098e+02 -2.550000e+02 -2.000000e+00 + vertex -2.530000e+02 -2.550000e+02 -6.000000e+00 + vertex 2.530000e+02 -2.550000e+02 -6.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 -1.000000e+00 0.000000e+00 + outer loop + vertex -1.919098e+02 -2.550000e+02 -2.000000e+00 + vertex 2.530000e+02 -2.550000e+02 -6.000000e+00 + vertex 1.919098e+02 -2.550000e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 -1.000000e+00 0.000000e+00 + outer loop + vertex 1.919098e+02 -2.550000e+02 -2.000000e+00 + vertex 2.530000e+02 -2.550000e+02 -6.000000e+00 + vertex 2.530000e+02 -2.550000e+02 -2.000000e+00 + endloop + endfacet + facet normal -0.000000e+00 -1.000000e+00 -0.000000e+00 + outer loop + vertex 1.919098e+02 -2.550000e+02 0.000000e+00 + vertex -1.919098e+02 -2.550000e+02 0.000000e+00 + vertex 1.919098e+02 -2.550000e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 -1.000000e+00 0.000000e+00 + outer loop + vertex 1.919098e+02 -2.550000e+02 -2.000000e+00 + vertex -1.919098e+02 -2.550000e+02 0.000000e+00 + vertex -1.919098e+02 -2.550000e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex -2.535176e+02 -2.549319e+02 -6.000000e+00 + vertex -2.550000e+02 -2.530000e+02 -6.000000e+00 + vertex -2.530000e+02 -2.550000e+02 -6.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex -2.530000e+02 -2.550000e+02 -6.000000e+00 + vertex -2.550000e+02 -2.530000e+02 -6.000000e+00 + vertex -2.530000e+02 2.650000e+02 -6.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex -2.530000e+02 -2.550000e+02 -6.000000e+00 + vertex -2.530000e+02 2.650000e+02 -6.000000e+00 + vertex 2.530000e+02 2.650000e+02 -6.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex -2.535176e+02 -2.549319e+02 -6.000000e+00 + vertex -2.540000e+02 -2.547321e+02 -6.000000e+00 + vertex -2.550000e+02 -2.530000e+02 -6.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex -2.550000e+02 -2.530000e+02 -6.000000e+00 + vertex -2.540000e+02 -2.547321e+02 -6.000000e+00 + vertex -2.544142e+02 -2.544142e+02 -6.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex -2.550000e+02 -2.530000e+02 -6.000000e+00 + vertex -2.544142e+02 -2.544142e+02 -6.000000e+00 + vertex -2.547321e+02 -2.540000e+02 -6.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex -2.547321e+02 -2.540000e+02 -6.000000e+00 + vertex -2.549319e+02 -2.535176e+02 -6.000000e+00 + vertex -2.550000e+02 -2.530000e+02 -6.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex -2.550000e+02 -2.530000e+02 -6.000000e+00 + vertex -2.550000e+02 2.630000e+02 -6.000000e+00 + vertex -2.530000e+02 2.650000e+02 -6.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex -2.530000e+02 2.650000e+02 -6.000000e+00 + vertex -2.550000e+02 2.630000e+02 -6.000000e+00 + vertex -2.535176e+02 2.649319e+02 -6.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex -2.535176e+02 2.649319e+02 -6.000000e+00 + vertex -2.550000e+02 2.630000e+02 -6.000000e+00 + vertex -2.540000e+02 2.647321e+02 -6.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex -2.540000e+02 2.647321e+02 -6.000000e+00 + vertex -2.550000e+02 2.630000e+02 -6.000000e+00 + vertex -2.544142e+02 2.644142e+02 -6.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex -2.544142e+02 2.644142e+02 -6.000000e+00 + vertex -2.550000e+02 2.630000e+02 -6.000000e+00 + vertex -2.547321e+02 2.640000e+02 -6.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex -2.547321e+02 2.640000e+02 -6.000000e+00 + vertex -2.550000e+02 2.630000e+02 -6.000000e+00 + vertex -2.549319e+02 2.635176e+02 -6.000000e+00 + endloop + endfacet + facet normal -0.000000e+00 -0.000000e+00 -1.000000e+00 + outer loop + vertex 2.535176e+02 2.649319e+02 -6.000000e+00 + vertex 2.550000e+02 2.630000e+02 -6.000000e+00 + vertex 2.530000e+02 2.650000e+02 -6.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex 2.530000e+02 2.650000e+02 -6.000000e+00 + vertex 2.550000e+02 2.630000e+02 -6.000000e+00 + vertex 2.550000e+02 -2.530000e+02 -6.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex 2.530000e+02 2.650000e+02 -6.000000e+00 + vertex 2.550000e+02 -2.530000e+02 -6.000000e+00 + vertex 2.530000e+02 -2.550000e+02 -6.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex 2.530000e+02 -2.550000e+02 -6.000000e+00 + vertex 2.550000e+02 -2.530000e+02 -6.000000e+00 + vertex 2.535176e+02 -2.549319e+02 -6.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex 2.535176e+02 -2.549319e+02 -6.000000e+00 + vertex 2.550000e+02 -2.530000e+02 -6.000000e+00 + vertex 2.540000e+02 -2.547321e+02 -6.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex 2.540000e+02 -2.547321e+02 -6.000000e+00 + vertex 2.550000e+02 -2.530000e+02 -6.000000e+00 + vertex 2.544142e+02 -2.544142e+02 -6.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex 2.544142e+02 -2.544142e+02 -6.000000e+00 + vertex 2.550000e+02 -2.530000e+02 -6.000000e+00 + vertex 2.547321e+02 -2.540000e+02 -6.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex 2.547321e+02 -2.540000e+02 -6.000000e+00 + vertex 2.550000e+02 -2.530000e+02 -6.000000e+00 + vertex 2.549319e+02 -2.535176e+02 -6.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex 2.535176e+02 2.649319e+02 -6.000000e+00 + vertex 2.540000e+02 2.647321e+02 -6.000000e+00 + vertex 2.550000e+02 2.630000e+02 -6.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex 2.550000e+02 2.630000e+02 -6.000000e+00 + vertex 2.540000e+02 2.647321e+02 -6.000000e+00 + vertex 2.544142e+02 2.644142e+02 -6.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex 2.550000e+02 2.630000e+02 -6.000000e+00 + vertex 2.544142e+02 2.644142e+02 -6.000000e+00 + vertex 2.547321e+02 2.640000e+02 -6.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex 2.547321e+02 2.640000e+02 -6.000000e+00 + vertex 2.549319e+02 2.635176e+02 -6.000000e+00 + vertex 2.550000e+02 2.630000e+02 -6.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex 2.530000e+02 -2.550000e+02 -6.000000e+00 + vertex -2.530000e+02 -2.550000e+02 -6.000000e+00 + vertex 2.530000e+02 2.650000e+02 -6.000000e+00 + endloop + endfacet + facet normal 9.914449e-01 -1.305262e-01 0.000000e+00 + outer loop + vertex 2.550000e+02 -2.530000e+02 -6.000000e+00 + vertex 2.550000e+02 -2.530000e+02 -2.000000e+00 + vertex 2.549319e+02 -2.535176e+02 -6.000000e+00 + endloop + endfacet + facet normal 9.914449e-01 -1.305262e-01 0.000000e+00 + outer loop + vertex 2.549319e+02 -2.535176e+02 -6.000000e+00 + vertex 2.550000e+02 -2.530000e+02 -2.000000e+00 + vertex 2.549319e+02 -2.535176e+02 -2.000000e+00 + endloop + endfacet + facet normal 9.238795e-01 -3.826834e-01 0.000000e+00 + outer loop + vertex 2.549319e+02 -2.535176e+02 -6.000000e+00 + vertex 2.549319e+02 -2.535176e+02 -2.000000e+00 + vertex 2.547321e+02 -2.540000e+02 -6.000000e+00 + endloop + endfacet + facet normal 9.238795e-01 -3.826834e-01 0.000000e+00 + outer loop + vertex 2.547321e+02 -2.540000e+02 -6.000000e+00 + vertex 2.549319e+02 -2.535176e+02 -2.000000e+00 + vertex 2.547321e+02 -2.540000e+02 -2.000000e+00 + endloop + endfacet + facet normal 7.933533e-01 -6.087614e-01 0.000000e+00 + outer loop + vertex 2.547321e+02 -2.540000e+02 -6.000000e+00 + vertex 2.547321e+02 -2.540000e+02 -2.000000e+00 + vertex 2.544142e+02 -2.544142e+02 -6.000000e+00 + endloop + endfacet + facet normal 7.933533e-01 -6.087614e-01 0.000000e+00 + outer loop + vertex 2.544142e+02 -2.544142e+02 -6.000000e+00 + vertex 2.547321e+02 -2.540000e+02 -2.000000e+00 + vertex 2.544142e+02 -2.544142e+02 -2.000000e+00 + endloop + endfacet + facet normal 6.087614e-01 -7.933533e-01 0.000000e+00 + outer loop + vertex 2.544142e+02 -2.544142e+02 -6.000000e+00 + vertex 2.544142e+02 -2.544142e+02 -2.000000e+00 + vertex 2.540000e+02 -2.547321e+02 -6.000000e+00 + endloop + endfacet + facet normal 6.087614e-01 -7.933533e-01 0.000000e+00 + outer loop + vertex 2.540000e+02 -2.547321e+02 -6.000000e+00 + vertex 2.544142e+02 -2.544142e+02 -2.000000e+00 + vertex 2.540000e+02 -2.547321e+02 -2.000000e+00 + endloop + endfacet + facet normal 3.826834e-01 -9.238795e-01 0.000000e+00 + outer loop + vertex 2.540000e+02 -2.547321e+02 -6.000000e+00 + vertex 2.540000e+02 -2.547321e+02 -2.000000e+00 + vertex 2.535176e+02 -2.549319e+02 -6.000000e+00 + endloop + endfacet + facet normal 3.826834e-01 -9.238795e-01 0.000000e+00 + outer loop + vertex 2.535176e+02 -2.549319e+02 -6.000000e+00 + vertex 2.540000e+02 -2.547321e+02 -2.000000e+00 + vertex 2.535176e+02 -2.549319e+02 -2.000000e+00 + endloop + endfacet + facet normal 1.305262e-01 -9.914449e-01 0.000000e+00 + outer loop + vertex 2.535176e+02 -2.549319e+02 -6.000000e+00 + vertex 2.535176e+02 -2.549319e+02 -2.000000e+00 + vertex 2.530000e+02 -2.550000e+02 -6.000000e+00 + endloop + endfacet + facet normal 1.305262e-01 -9.914449e-01 0.000000e+00 + outer loop + vertex 2.530000e+02 -2.550000e+02 -6.000000e+00 + vertex 2.535176e+02 -2.549319e+02 -2.000000e+00 + vertex 2.530000e+02 -2.550000e+02 -2.000000e+00 + endloop + endfacet + facet normal 1.000000e+00 0.000000e+00 0.000000e+00 + outer loop + vertex 2.550000e+02 -2.530000e+02 -6.000000e+00 + vertex 2.550000e+02 2.630000e+02 -6.000000e+00 + vertex 2.550000e+02 -2.530000e+02 -2.000000e+00 + endloop + endfacet + facet normal 1.000000e+00 -0.000000e+00 0.000000e+00 + outer loop + vertex 2.550000e+02 -2.530000e+02 -2.000000e+00 + vertex 2.550000e+02 2.630000e+02 -6.000000e+00 + vertex 2.550000e+02 2.630000e+02 0.000000e+00 + endloop + endfacet + facet normal 1.000000e+00 0.000000e+00 -0.000000e+00 + outer loop + vertex 2.550000e+02 -2.530000e+02 -2.000000e+00 + vertex 2.550000e+02 2.630000e+02 0.000000e+00 + vertex 2.550000e+02 -2.538197e+02 0.000000e+00 + endloop + endfacet + facet normal 1.000000e+00 0.000000e+00 0.000000e+00 + outer loop + vertex 2.550000e+02 -2.538197e+02 0.000000e+00 + vertex 2.550000e+02 -2.538197e+02 -2.000000e+00 + vertex 2.550000e+02 -2.530000e+02 -2.000000e+00 + endloop + endfacet + facet normal 9.914449e-01 1.305262e-01 0.000000e+00 + outer loop + vertex 2.550000e+02 2.630000e+02 0.000000e+00 + vertex 2.550000e+02 2.630000e+02 -6.000000e+00 + vertex 2.549319e+02 2.635176e+02 0.000000e+00 + endloop + endfacet + facet normal 9.914449e-01 1.305262e-01 -4.696426e-15 + outer loop + vertex 2.549319e+02 2.635176e+02 0.000000e+00 + vertex 2.550000e+02 2.630000e+02 -6.000000e+00 + vertex 2.549319e+02 2.635176e+02 -6.000000e+00 + endloop + endfacet + facet normal 9.238795e-01 3.826834e-01 -4.376373e-15 + outer loop + vertex 2.549319e+02 2.635176e+02 0.000000e+00 + vertex 2.549319e+02 2.635176e+02 -6.000000e+00 + vertex 2.547321e+02 2.640000e+02 0.000000e+00 + endloop + endfacet + facet normal 9.238795e-01 3.826834e-01 0.000000e+00 + outer loop + vertex 2.547321e+02 2.640000e+02 0.000000e+00 + vertex 2.549319e+02 2.635176e+02 -6.000000e+00 + vertex 2.547321e+02 2.640000e+02 -6.000000e+00 + endloop + endfacet + facet normal 7.933533e-01 6.087614e-01 0.000000e+00 + outer loop + vertex 2.547321e+02 2.640000e+02 0.000000e+00 + vertex 2.547321e+02 2.640000e+02 -6.000000e+00 + vertex 2.544142e+02 2.644142e+02 0.000000e+00 + endloop + endfacet + facet normal 7.933533e-01 6.087614e-01 0.000000e+00 + outer loop + vertex 2.544142e+02 2.644142e+02 0.000000e+00 + vertex 2.547321e+02 2.640000e+02 -6.000000e+00 + vertex 2.544142e+02 2.644142e+02 -6.000000e+00 + endloop + endfacet + facet normal 6.087614e-01 7.933533e-01 0.000000e+00 + outer loop + vertex 2.544142e+02 2.644142e+02 0.000000e+00 + vertex 2.544142e+02 2.644142e+02 -6.000000e+00 + vertex 2.540000e+02 2.647321e+02 0.000000e+00 + endloop + endfacet + facet normal 6.087614e-01 7.933533e-01 -1.748806e-15 + outer loop + vertex 2.540000e+02 2.647321e+02 0.000000e+00 + vertex 2.544142e+02 2.644142e+02 -6.000000e+00 + vertex 2.540000e+02 2.647321e+02 -6.000000e+00 + endloop + endfacet + facet normal 3.826834e-01 9.238795e-01 -5.127239e-15 + outer loop + vertex 2.540000e+02 2.647321e+02 0.000000e+00 + vertex 2.540000e+02 2.647321e+02 -6.000000e+00 + vertex 2.535176e+02 2.649319e+02 0.000000e+00 + endloop + endfacet + facet normal 3.826834e-01 9.238795e-01 0.000000e+00 + outer loop + vertex 2.535176e+02 2.649319e+02 0.000000e+00 + vertex 2.540000e+02 2.647321e+02 -6.000000e+00 + vertex 2.535176e+02 2.649319e+02 -6.000000e+00 + endloop + endfacet + facet normal 1.305262e-01 9.914449e-01 0.000000e+00 + outer loop + vertex 2.535176e+02 2.649319e+02 0.000000e+00 + vertex 2.535176e+02 2.649319e+02 -6.000000e+00 + vertex 2.530000e+02 2.650000e+02 0.000000e+00 + endloop + endfacet + facet normal 1.305262e-01 9.914449e-01 0.000000e+00 + outer loop + vertex 2.530000e+02 2.650000e+02 0.000000e+00 + vertex 2.535176e+02 2.649319e+02 -6.000000e+00 + vertex 2.530000e+02 2.650000e+02 -6.000000e+00 + endloop + endfacet + facet normal -0.000000e+00 1.000000e+00 0.000000e+00 + outer loop + vertex 1.399309e+02 2.650000e+02 0.000000e+00 + vertex 2.530000e+02 2.650000e+02 0.000000e+00 + vertex 1.399309e+02 2.650000e+02 -2.000000e+00 + endloop + endfacet + facet normal -0.000000e+00 1.000000e+00 0.000000e+00 + outer loop + vertex 1.399309e+02 2.650000e+02 -2.000000e+00 + vertex 2.530000e+02 2.650000e+02 0.000000e+00 + vertex 2.530000e+02 2.650000e+02 -6.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 1.000000e+00 0.000000e+00 + outer loop + vertex 1.399309e+02 2.650000e+02 -2.000000e+00 + vertex 2.530000e+02 2.650000e+02 -6.000000e+00 + vertex 1.300691e+02 2.650000e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 1.000000e+00 0.000000e+00 + outer loop + vertex 1.300691e+02 2.650000e+02 -2.000000e+00 + vertex 2.530000e+02 2.650000e+02 -6.000000e+00 + vertex -1.300415e+02 2.650000e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 1.000000e+00 -0.000000e+00 + outer loop + vertex 1.300691e+02 2.650000e+02 -2.000000e+00 + vertex -1.300415e+02 2.650000e+02 -2.000000e+00 + vertex 1.300691e+02 2.650000e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 1.000000e+00 0.000000e+00 + outer loop + vertex 1.300691e+02 2.650000e+02 0.000000e+00 + vertex -1.300415e+02 2.650000e+02 -2.000000e+00 + vertex -1.300415e+02 2.650000e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 1.000000e+00 0.000000e+00 + outer loop + vertex 2.530000e+02 2.650000e+02 -6.000000e+00 + vertex -2.530000e+02 2.650000e+02 -6.000000e+00 + vertex -1.300415e+02 2.650000e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 1.000000e+00 0.000000e+00 + outer loop + vertex -1.300415e+02 2.650000e+02 -2.000000e+00 + vertex -2.530000e+02 2.650000e+02 -6.000000e+00 + vertex -1.399563e+02 2.650000e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 1.000000e+00 0.000000e+00 + outer loop + vertex -1.399563e+02 2.650000e+02 -2.000000e+00 + vertex -2.530000e+02 2.650000e+02 -6.000000e+00 + vertex -2.530000e+02 2.650000e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 1.000000e+00 0.000000e+00 + outer loop + vertex -1.399563e+02 2.650000e+02 -2.000000e+00 + vertex -2.530000e+02 2.650000e+02 0.000000e+00 + vertex -1.399563e+02 2.650000e+02 0.000000e+00 + endloop + endfacet + facet normal -1.305262e-01 9.914449e-01 0.000000e+00 + outer loop + vertex -2.530000e+02 2.650000e+02 0.000000e+00 + vertex -2.530000e+02 2.650000e+02 -6.000000e+00 + vertex -2.535176e+02 2.649319e+02 0.000000e+00 + endloop + endfacet + facet normal -1.305262e-01 9.914449e-01 -1.001115e-14 + outer loop + vertex -2.535176e+02 2.649319e+02 0.000000e+00 + vertex -2.530000e+02 2.650000e+02 -6.000000e+00 + vertex -2.535176e+02 2.649319e+02 -6.000000e+00 + endloop + endfacet + facet normal -3.826834e-01 9.238795e-01 -1.056550e-14 + outer loop + vertex -2.535176e+02 2.649319e+02 0.000000e+00 + vertex -2.535176e+02 2.649319e+02 -6.000000e+00 + vertex -2.540000e+02 2.647321e+02 0.000000e+00 + endloop + endfacet + facet normal -3.826834e-01 9.238795e-01 -3.625506e-15 + outer loop + vertex -2.540000e+02 2.647321e+02 0.000000e+00 + vertex -2.535176e+02 2.649319e+02 -6.000000e+00 + vertex -2.540000e+02 2.647321e+02 -6.000000e+00 + endloop + endfacet + facet normal -6.087614e-01 7.933533e-01 -5.767347e-15 + outer loop + vertex -2.540000e+02 2.647321e+02 0.000000e+00 + vertex -2.540000e+02 2.647321e+02 -6.000000e+00 + vertex -2.544142e+02 2.644142e+02 0.000000e+00 + endloop + endfacet + facet normal -6.087614e-01 7.933533e-01 -7.516153e-15 + outer loop + vertex -2.544142e+02 2.644142e+02 0.000000e+00 + vertex -2.540000e+02 2.647321e+02 -6.000000e+00 + vertex -2.544142e+02 2.644142e+02 -6.000000e+00 + endloop + endfacet + facet normal -7.933533e-01 6.087614e-01 -5.767347e-15 + outer loop + vertex -2.544142e+02 2.644142e+02 0.000000e+00 + vertex -2.544142e+02 2.644142e+02 -6.000000e+00 + vertex -2.547321e+02 2.640000e+02 0.000000e+00 + endloop + endfacet + facet normal -7.933533e-01 6.087614e-01 -3.758076e-15 + outer loop + vertex -2.547321e+02 2.640000e+02 0.000000e+00 + vertex -2.544142e+02 2.644142e+02 -6.000000e+00 + vertex -2.547321e+02 2.640000e+02 -6.000000e+00 + endloop + endfacet + facet normal -9.238795e-01 3.826834e-01 -4.376373e-15 + outer loop + vertex -2.547321e+02 2.640000e+02 0.000000e+00 + vertex -2.547321e+02 2.640000e+02 -6.000000e+00 + vertex -2.549319e+02 2.635176e+02 0.000000e+00 + endloop + endfacet + facet normal -9.238795e-01 3.826834e-01 0.000000e+00 + outer loop + vertex -2.549319e+02 2.635176e+02 0.000000e+00 + vertex -2.547321e+02 2.640000e+02 -6.000000e+00 + vertex -2.549319e+02 2.635176e+02 -6.000000e+00 + endloop + endfacet + facet normal -9.914449e-01 1.305262e-01 0.000000e+00 + outer loop + vertex -2.549319e+02 2.635176e+02 0.000000e+00 + vertex -2.549319e+02 2.635176e+02 -6.000000e+00 + vertex -2.550000e+02 2.630000e+02 0.000000e+00 + endloop + endfacet + facet normal -9.914449e-01 1.305262e-01 0.000000e+00 + outer loop + vertex -2.550000e+02 2.630000e+02 0.000000e+00 + vertex -2.549319e+02 2.635176e+02 -6.000000e+00 + vertex -2.550000e+02 2.630000e+02 -6.000000e+00 + endloop + endfacet + facet normal 8.660254e-01 -5.000000e-01 0.000000e+00 + outer loop + vertex 1.339608e+02 2.618000e+02 1.000000e+00 + vertex 1.329215e+02 2.600000e+02 1.000000e+00 + vertex 1.339608e+02 2.618000e+02 0.000000e+00 + endloop + endfacet + facet normal 8.660254e-01 -5.000000e-01 0.000000e+00 + outer loop + vertex 1.339608e+02 2.618000e+02 0.000000e+00 + vertex 1.329215e+02 2.600000e+02 1.000000e+00 + vertex 1.329215e+02 2.600000e+02 0.000000e+00 + endloop + endfacet + facet normal 8.660254e-01 5.000000e-01 0.000000e+00 + outer loop + vertex 1.329215e+02 2.600000e+02 1.000000e+00 + vertex 1.339608e+02 2.582000e+02 1.000000e+00 + vertex 1.329215e+02 2.600000e+02 0.000000e+00 + endloop + endfacet + facet normal 8.660254e-01 5.000000e-01 0.000000e+00 + outer loop + vertex 1.329215e+02 2.600000e+02 0.000000e+00 + vertex 1.339608e+02 2.582000e+02 1.000000e+00 + vertex 1.339608e+02 2.582000e+02 0.000000e+00 + endloop + endfacet + facet normal -0.000000e+00 1.000000e+00 0.000000e+00 + outer loop + vertex 1.339608e+02 2.582000e+02 1.000000e+00 + vertex 1.360392e+02 2.582000e+02 1.000000e+00 + vertex 1.339608e+02 2.582000e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 1.000000e+00 0.000000e+00 + outer loop + vertex 1.339608e+02 2.582000e+02 0.000000e+00 + vertex 1.360392e+02 2.582000e+02 1.000000e+00 + vertex 1.360392e+02 2.582000e+02 0.000000e+00 + endloop + endfacet + facet normal -8.660254e-01 5.000000e-01 0.000000e+00 + outer loop + vertex 1.360392e+02 2.582000e+02 1.000000e+00 + vertex 1.370785e+02 2.600000e+02 1.000000e+00 + vertex 1.360392e+02 2.582000e+02 0.000000e+00 + endloop + endfacet + facet normal -8.660254e-01 5.000000e-01 0.000000e+00 + outer loop + vertex 1.360392e+02 2.582000e+02 0.000000e+00 + vertex 1.370785e+02 2.600000e+02 1.000000e+00 + vertex 1.370785e+02 2.600000e+02 0.000000e+00 + endloop + endfacet + facet normal -8.660254e-01 -5.000000e-01 -0.000000e+00 + outer loop + vertex 1.370785e+02 2.600000e+02 1.000000e+00 + vertex 1.360392e+02 2.618000e+02 1.000000e+00 + vertex 1.370785e+02 2.600000e+02 0.000000e+00 + endloop + endfacet + facet normal -8.660254e-01 -5.000000e-01 0.000000e+00 + outer loop + vertex 1.370785e+02 2.600000e+02 0.000000e+00 + vertex 1.360392e+02 2.618000e+02 1.000000e+00 + vertex 1.360392e+02 2.618000e+02 0.000000e+00 + endloop + endfacet + facet normal -0.000000e+00 -1.000000e+00 -0.000000e+00 + outer loop + vertex 1.360392e+02 2.618000e+02 1.000000e+00 + vertex 1.339608e+02 2.618000e+02 1.000000e+00 + vertex 1.360392e+02 2.618000e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 -1.000000e+00 0.000000e+00 + outer loop + vertex 1.360392e+02 2.618000e+02 0.000000e+00 + vertex 1.339608e+02 2.618000e+02 1.000000e+00 + vertex 1.339608e+02 2.618000e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 1.360392e+02 2.618000e+02 0.000000e+00 + vertex 1.339608e+02 2.618000e+02 0.000000e+00 + vertex 1.370785e+02 2.600000e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 1.370785e+02 2.600000e+02 0.000000e+00 + vertex 1.339608e+02 2.618000e+02 0.000000e+00 + vertex 1.329215e+02 2.600000e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 1.370785e+02 2.600000e+02 0.000000e+00 + vertex 1.329215e+02 2.600000e+02 0.000000e+00 + vertex 1.360392e+02 2.582000e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 1.360392e+02 2.582000e+02 0.000000e+00 + vertex 1.329215e+02 2.600000e+02 0.000000e+00 + vertex 1.339608e+02 2.582000e+02 0.000000e+00 + endloop + endfacet + facet normal 8.660254e-01 -5.000000e-01 0.000000e+00 + outer loop + vertex -1.360392e+02 2.618000e+02 1.000000e+00 + vertex -1.370785e+02 2.600000e+02 1.000000e+00 + vertex -1.360392e+02 2.618000e+02 0.000000e+00 + endloop + endfacet + facet normal 8.660254e-01 -5.000000e-01 0.000000e+00 + outer loop + vertex -1.360392e+02 2.618000e+02 0.000000e+00 + vertex -1.370785e+02 2.600000e+02 1.000000e+00 + vertex -1.370785e+02 2.600000e+02 0.000000e+00 + endloop + endfacet + facet normal 8.660254e-01 5.000000e-01 0.000000e+00 + outer loop + vertex -1.370785e+02 2.600000e+02 1.000000e+00 + vertex -1.360392e+02 2.582000e+02 1.000000e+00 + vertex -1.370785e+02 2.600000e+02 0.000000e+00 + endloop + endfacet + facet normal 8.660254e-01 5.000000e-01 0.000000e+00 + outer loop + vertex -1.370785e+02 2.600000e+02 0.000000e+00 + vertex -1.360392e+02 2.582000e+02 1.000000e+00 + vertex -1.360392e+02 2.582000e+02 0.000000e+00 + endloop + endfacet + facet normal -0.000000e+00 1.000000e+00 0.000000e+00 + outer loop + vertex -1.360392e+02 2.582000e+02 1.000000e+00 + vertex -1.339608e+02 2.582000e+02 1.000000e+00 + vertex -1.360392e+02 2.582000e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 1.000000e+00 0.000000e+00 + outer loop + vertex -1.360392e+02 2.582000e+02 0.000000e+00 + vertex -1.339608e+02 2.582000e+02 1.000000e+00 + vertex -1.339608e+02 2.582000e+02 0.000000e+00 + endloop + endfacet + facet normal -8.660254e-01 5.000000e-01 0.000000e+00 + outer loop + vertex -1.339608e+02 2.582000e+02 1.000000e+00 + vertex -1.329215e+02 2.600000e+02 1.000000e+00 + vertex -1.339608e+02 2.582000e+02 0.000000e+00 + endloop + endfacet + facet normal -8.660254e-01 5.000000e-01 0.000000e+00 + outer loop + vertex -1.339608e+02 2.582000e+02 0.000000e+00 + vertex -1.329215e+02 2.600000e+02 1.000000e+00 + vertex -1.329215e+02 2.600000e+02 0.000000e+00 + endloop + endfacet + facet normal -8.660254e-01 -5.000000e-01 -0.000000e+00 + outer loop + vertex -1.329215e+02 2.600000e+02 1.000000e+00 + vertex -1.339608e+02 2.618000e+02 1.000000e+00 + vertex -1.329215e+02 2.600000e+02 0.000000e+00 + endloop + endfacet + facet normal -8.660254e-01 -5.000000e-01 0.000000e+00 + outer loop + vertex -1.329215e+02 2.600000e+02 0.000000e+00 + vertex -1.339608e+02 2.618000e+02 1.000000e+00 + vertex -1.339608e+02 2.618000e+02 0.000000e+00 + endloop + endfacet + facet normal -0.000000e+00 -1.000000e+00 -0.000000e+00 + outer loop + vertex -1.339608e+02 2.618000e+02 1.000000e+00 + vertex -1.360392e+02 2.618000e+02 1.000000e+00 + vertex -1.339608e+02 2.618000e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 -1.000000e+00 0.000000e+00 + outer loop + vertex -1.339608e+02 2.618000e+02 0.000000e+00 + vertex -1.360392e+02 2.618000e+02 1.000000e+00 + vertex -1.360392e+02 2.618000e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.339608e+02 2.618000e+02 0.000000e+00 + vertex -1.360392e+02 2.618000e+02 0.000000e+00 + vertex -1.329215e+02 2.600000e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.329215e+02 2.600000e+02 0.000000e+00 + vertex -1.360392e+02 2.618000e+02 0.000000e+00 + vertex -1.370785e+02 2.600000e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.329215e+02 2.600000e+02 0.000000e+00 + vertex -1.370785e+02 2.600000e+02 0.000000e+00 + vertex -1.339608e+02 2.582000e+02 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.339608e+02 2.582000e+02 0.000000e+00 + vertex -1.370785e+02 2.600000e+02 0.000000e+00 + vertex -1.360392e+02 2.582000e+02 0.000000e+00 + endloop + endfacet + facet normal 9.914449e-01 -1.305262e-01 0.000000e+00 + outer loop + vertex 1.376563e+02 2.592882e+02 1.000000e+00 + vertex 1.376563e+02 2.592882e+02 -2.000000e+00 + vertex 1.377500e+02 2.600000e+02 1.000000e+00 + endloop + endfacet + facet normal 9.914449e-01 -1.305262e-01 0.000000e+00 + outer loop + vertex 1.377500e+02 2.600000e+02 1.000000e+00 + vertex 1.376563e+02 2.592882e+02 -2.000000e+00 + vertex 1.377500e+02 2.600000e+02 -2.000000e+00 + endloop + endfacet + facet normal 9.914449e-01 1.305262e-01 0.000000e+00 + outer loop + vertex 1.377500e+02 2.600000e+02 1.000000e+00 + vertex 1.377500e+02 2.600000e+02 -2.000000e+00 + vertex 1.376563e+02 2.607118e+02 1.000000e+00 + endloop + endfacet + facet normal 9.914449e-01 1.305262e-01 0.000000e+00 + outer loop + vertex 1.376563e+02 2.607118e+02 1.000000e+00 + vertex 1.377500e+02 2.600000e+02 -2.000000e+00 + vertex 1.376563e+02 2.607118e+02 -2.000000e+00 + endloop + endfacet + facet normal 9.238795e-01 3.826834e-01 0.000000e+00 + outer loop + vertex 1.376563e+02 2.607118e+02 1.000000e+00 + vertex 1.376563e+02 2.607118e+02 -2.000000e+00 + vertex 1.373816e+02 2.613750e+02 1.000000e+00 + endloop + endfacet + facet normal 9.238795e-01 3.826834e-01 0.000000e+00 + outer loop + vertex 1.373816e+02 2.613750e+02 1.000000e+00 + vertex 1.376563e+02 2.607118e+02 -2.000000e+00 + vertex 1.373816e+02 2.613750e+02 -2.000000e+00 + endloop + endfacet + facet normal 7.933533e-01 6.087614e-01 0.000000e+00 + outer loop + vertex 1.373816e+02 2.613750e+02 1.000000e+00 + vertex 1.373816e+02 2.613750e+02 -2.000000e+00 + vertex 1.369445e+02 2.619445e+02 1.000000e+00 + endloop + endfacet + facet normal 7.933533e-01 6.087614e-01 0.000000e+00 + outer loop + vertex 1.369445e+02 2.619445e+02 1.000000e+00 + vertex 1.373816e+02 2.613750e+02 -2.000000e+00 + vertex 1.369445e+02 2.619445e+02 -2.000000e+00 + endloop + endfacet + facet normal 6.087614e-01 7.933533e-01 0.000000e+00 + outer loop + vertex 1.369445e+02 2.619445e+02 1.000000e+00 + vertex 1.369445e+02 2.619445e+02 -2.000000e+00 + vertex 1.363750e+02 2.623816e+02 1.000000e+00 + endloop + endfacet + facet normal 6.087614e-01 7.933533e-01 0.000000e+00 + outer loop + vertex 1.363750e+02 2.623816e+02 1.000000e+00 + vertex 1.369445e+02 2.619445e+02 -2.000000e+00 + vertex 1.363750e+02 2.623816e+02 -2.000000e+00 + endloop + endfacet + facet normal 3.826834e-01 9.238795e-01 0.000000e+00 + outer loop + vertex 1.363750e+02 2.623816e+02 1.000000e+00 + vertex 1.363750e+02 2.623816e+02 -2.000000e+00 + vertex 1.357118e+02 2.626563e+02 1.000000e+00 + endloop + endfacet + facet normal 3.826834e-01 9.238795e-01 0.000000e+00 + outer loop + vertex 1.357118e+02 2.626563e+02 1.000000e+00 + vertex 1.363750e+02 2.623816e+02 -2.000000e+00 + vertex 1.357118e+02 2.626563e+02 -2.000000e+00 + endloop + endfacet + facet normal 1.305262e-01 9.914449e-01 0.000000e+00 + outer loop + vertex 1.357118e+02 2.626563e+02 1.000000e+00 + vertex 1.357118e+02 2.626563e+02 -2.000000e+00 + vertex 1.350000e+02 2.627500e+02 1.000000e+00 + endloop + endfacet + facet normal 1.305262e-01 9.914449e-01 0.000000e+00 + outer loop + vertex 1.350000e+02 2.627500e+02 1.000000e+00 + vertex 1.357118e+02 2.626563e+02 -2.000000e+00 + vertex 1.350000e+02 2.627500e+02 -2.000000e+00 + endloop + endfacet + facet normal -1.305262e-01 9.914449e-01 0.000000e+00 + outer loop + vertex 1.350000e+02 2.627500e+02 1.000000e+00 + vertex 1.350000e+02 2.627500e+02 -2.000000e+00 + vertex 1.342882e+02 2.626563e+02 1.000000e+00 + endloop + endfacet + facet normal -1.305262e-01 9.914449e-01 0.000000e+00 + outer loop + vertex 1.342882e+02 2.626563e+02 1.000000e+00 + vertex 1.350000e+02 2.627500e+02 -2.000000e+00 + vertex 1.342882e+02 2.626563e+02 -2.000000e+00 + endloop + endfacet + facet normal -3.826834e-01 9.238795e-01 0.000000e+00 + outer loop + vertex 1.342882e+02 2.626563e+02 1.000000e+00 + vertex 1.342882e+02 2.626563e+02 -2.000000e+00 + vertex 1.336250e+02 2.623816e+02 1.000000e+00 + endloop + endfacet + facet normal -3.826834e-01 9.238795e-01 0.000000e+00 + outer loop + vertex 1.336250e+02 2.623816e+02 1.000000e+00 + vertex 1.342882e+02 2.626563e+02 -2.000000e+00 + vertex 1.336250e+02 2.623816e+02 -2.000000e+00 + endloop + endfacet + facet normal -6.087614e-01 7.933533e-01 0.000000e+00 + outer loop + vertex 1.336250e+02 2.623816e+02 1.000000e+00 + vertex 1.336250e+02 2.623816e+02 -2.000000e+00 + vertex 1.330555e+02 2.619445e+02 1.000000e+00 + endloop + endfacet + facet normal -6.087614e-01 7.933533e-01 0.000000e+00 + outer loop + vertex 1.330555e+02 2.619445e+02 1.000000e+00 + vertex 1.336250e+02 2.623816e+02 -2.000000e+00 + vertex 1.330555e+02 2.619445e+02 -2.000000e+00 + endloop + endfacet + facet normal -7.933533e-01 6.087614e-01 0.000000e+00 + outer loop + vertex 1.330555e+02 2.619445e+02 1.000000e+00 + vertex 1.330555e+02 2.619445e+02 -2.000000e+00 + vertex 1.326184e+02 2.613750e+02 1.000000e+00 + endloop + endfacet + facet normal -7.933533e-01 6.087614e-01 0.000000e+00 + outer loop + vertex 1.326184e+02 2.613750e+02 1.000000e+00 + vertex 1.330555e+02 2.619445e+02 -2.000000e+00 + vertex 1.326184e+02 2.613750e+02 -2.000000e+00 + endloop + endfacet + facet normal -9.238795e-01 3.826834e-01 0.000000e+00 + outer loop + vertex 1.326184e+02 2.613750e+02 1.000000e+00 + vertex 1.326184e+02 2.613750e+02 -2.000000e+00 + vertex 1.323437e+02 2.607118e+02 1.000000e+00 + endloop + endfacet + facet normal -9.238795e-01 3.826834e-01 0.000000e+00 + outer loop + vertex 1.323437e+02 2.607118e+02 1.000000e+00 + vertex 1.326184e+02 2.613750e+02 -2.000000e+00 + vertex 1.323437e+02 2.607118e+02 -2.000000e+00 + endloop + endfacet + facet normal -9.914449e-01 1.305262e-01 0.000000e+00 + outer loop + vertex 1.323437e+02 2.607118e+02 1.000000e+00 + vertex 1.323437e+02 2.607118e+02 -2.000000e+00 + vertex 1.322500e+02 2.600000e+02 1.000000e+00 + endloop + endfacet + facet normal -9.914449e-01 1.305262e-01 0.000000e+00 + outer loop + vertex 1.322500e+02 2.600000e+02 1.000000e+00 + vertex 1.323437e+02 2.607118e+02 -2.000000e+00 + vertex 1.322500e+02 2.600000e+02 -2.000000e+00 + endloop + endfacet + facet normal -9.914449e-01 -1.305262e-01 -0.000000e+00 + outer loop + vertex 1.322500e+02 2.600000e+02 1.000000e+00 + vertex 1.322500e+02 2.600000e+02 -2.000000e+00 + vertex 1.323437e+02 2.592882e+02 1.000000e+00 + endloop + endfacet + facet normal -9.914449e-01 -1.305262e-01 -0.000000e+00 + outer loop + vertex 1.323437e+02 2.592882e+02 1.000000e+00 + vertex 1.322500e+02 2.600000e+02 -2.000000e+00 + vertex 1.323437e+02 2.592882e+02 -2.000000e+00 + endloop + endfacet + facet normal -9.238795e-01 -3.826834e-01 -0.000000e+00 + outer loop + vertex 1.323437e+02 2.592882e+02 1.000000e+00 + vertex 1.323437e+02 2.592882e+02 -2.000000e+00 + vertex 1.326184e+02 2.586250e+02 1.000000e+00 + endloop + endfacet + facet normal -9.238795e-01 -3.826834e-01 -0.000000e+00 + outer loop + vertex 1.326184e+02 2.586250e+02 1.000000e+00 + vertex 1.323437e+02 2.592882e+02 -2.000000e+00 + vertex 1.326184e+02 2.586250e+02 -2.000000e+00 + endloop + endfacet + facet normal -7.933533e-01 -6.087614e-01 -0.000000e+00 + outer loop + vertex 1.326184e+02 2.586250e+02 1.000000e+00 + vertex 1.326184e+02 2.586250e+02 -2.000000e+00 + vertex 1.330555e+02 2.580555e+02 1.000000e+00 + endloop + endfacet + facet normal -7.933533e-01 -6.087614e-01 -0.000000e+00 + outer loop + vertex 1.330555e+02 2.580555e+02 1.000000e+00 + vertex 1.326184e+02 2.586250e+02 -2.000000e+00 + vertex 1.330555e+02 2.580555e+02 -2.000000e+00 + endloop + endfacet + facet normal -6.087614e-01 -7.933533e-01 -0.000000e+00 + outer loop + vertex 1.330555e+02 2.580555e+02 1.000000e+00 + vertex 1.330555e+02 2.580555e+02 -2.000000e+00 + vertex 1.336250e+02 2.576184e+02 1.000000e+00 + endloop + endfacet + facet normal -6.087614e-01 -7.933533e-01 -0.000000e+00 + outer loop + vertex 1.336250e+02 2.576184e+02 1.000000e+00 + vertex 1.330555e+02 2.580555e+02 -2.000000e+00 + vertex 1.336250e+02 2.576184e+02 -2.000000e+00 + endloop + endfacet + facet normal -3.826834e-01 -9.238795e-01 -0.000000e+00 + outer loop + vertex 1.336250e+02 2.576184e+02 1.000000e+00 + vertex 1.336250e+02 2.576184e+02 -2.000000e+00 + vertex 1.342882e+02 2.573437e+02 1.000000e+00 + endloop + endfacet + facet normal -3.826834e-01 -9.238795e-01 -0.000000e+00 + outer loop + vertex 1.342882e+02 2.573437e+02 1.000000e+00 + vertex 1.336250e+02 2.576184e+02 -2.000000e+00 + vertex 1.342882e+02 2.573437e+02 -2.000000e+00 + endloop + endfacet + facet normal -1.305262e-01 -9.914449e-01 -0.000000e+00 + outer loop + vertex 1.342882e+02 2.573437e+02 1.000000e+00 + vertex 1.342882e+02 2.573437e+02 -2.000000e+00 + vertex 1.350000e+02 2.572500e+02 1.000000e+00 + endloop + endfacet + facet normal -1.305262e-01 -9.914449e-01 -0.000000e+00 + outer loop + vertex 1.350000e+02 2.572500e+02 1.000000e+00 + vertex 1.342882e+02 2.573437e+02 -2.000000e+00 + vertex 1.350000e+02 2.572500e+02 -2.000000e+00 + endloop + endfacet + facet normal 1.305262e-01 -9.914449e-01 0.000000e+00 + outer loop + vertex 1.350000e+02 2.572500e+02 1.000000e+00 + vertex 1.350000e+02 2.572500e+02 -2.000000e+00 + vertex 1.357118e+02 2.573437e+02 1.000000e+00 + endloop + endfacet + facet normal 1.305262e-01 -9.914449e-01 0.000000e+00 + outer loop + vertex 1.357118e+02 2.573437e+02 1.000000e+00 + vertex 1.350000e+02 2.572500e+02 -2.000000e+00 + vertex 1.357118e+02 2.573437e+02 -2.000000e+00 + endloop + endfacet + facet normal 3.826834e-01 -9.238795e-01 0.000000e+00 + outer loop + vertex 1.357118e+02 2.573437e+02 1.000000e+00 + vertex 1.357118e+02 2.573437e+02 -2.000000e+00 + vertex 1.363750e+02 2.576184e+02 1.000000e+00 + endloop + endfacet + facet normal 3.826834e-01 -9.238795e-01 0.000000e+00 + outer loop + vertex 1.363750e+02 2.576184e+02 1.000000e+00 + vertex 1.357118e+02 2.573437e+02 -2.000000e+00 + vertex 1.363750e+02 2.576184e+02 -2.000000e+00 + endloop + endfacet + facet normal 6.087614e-01 -7.933533e-01 0.000000e+00 + outer loop + vertex 1.363750e+02 2.576184e+02 1.000000e+00 + vertex 1.363750e+02 2.576184e+02 -2.000000e+00 + vertex 1.369445e+02 2.580555e+02 1.000000e+00 + endloop + endfacet + facet normal 6.087614e-01 -7.933533e-01 0.000000e+00 + outer loop + vertex 1.369445e+02 2.580555e+02 1.000000e+00 + vertex 1.363750e+02 2.576184e+02 -2.000000e+00 + vertex 1.369445e+02 2.580555e+02 -2.000000e+00 + endloop + endfacet + facet normal 7.933533e-01 -6.087614e-01 0.000000e+00 + outer loop + vertex 1.369445e+02 2.580555e+02 1.000000e+00 + vertex 1.369445e+02 2.580555e+02 -2.000000e+00 + vertex 1.373816e+02 2.586250e+02 1.000000e+00 + endloop + endfacet + facet normal 7.933533e-01 -6.087614e-01 0.000000e+00 + outer loop + vertex 1.373816e+02 2.586250e+02 1.000000e+00 + vertex 1.369445e+02 2.580555e+02 -2.000000e+00 + vertex 1.373816e+02 2.586250e+02 -2.000000e+00 + endloop + endfacet + facet normal 9.238795e-01 -3.826834e-01 0.000000e+00 + outer loop + vertex 1.373816e+02 2.586250e+02 1.000000e+00 + vertex 1.373816e+02 2.586250e+02 -2.000000e+00 + vertex 1.376563e+02 2.592882e+02 1.000000e+00 + endloop + endfacet + facet normal 9.238795e-01 -3.826834e-01 0.000000e+00 + outer loop + vertex 1.376563e+02 2.592882e+02 1.000000e+00 + vertex 1.373816e+02 2.586250e+02 -2.000000e+00 + vertex 1.376563e+02 2.592882e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 1.339608e+02 2.618000e+02 1.000000e+00 + vertex 1.326184e+02 2.613750e+02 1.000000e+00 + vertex 1.329215e+02 2.600000e+02 1.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 1.329215e+02 2.600000e+02 1.000000e+00 + vertex 1.326184e+02 2.613750e+02 1.000000e+00 + vertex 1.323437e+02 2.607118e+02 1.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 1.329215e+02 2.600000e+02 1.000000e+00 + vertex 1.323437e+02 2.607118e+02 1.000000e+00 + vertex 1.322500e+02 2.600000e+02 1.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 1.360392e+02 2.618000e+02 1.000000e+00 + vertex 1.350000e+02 2.627500e+02 1.000000e+00 + vertex 1.339608e+02 2.618000e+02 1.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 1.339608e+02 2.618000e+02 1.000000e+00 + vertex 1.350000e+02 2.627500e+02 1.000000e+00 + vertex 1.342882e+02 2.626563e+02 1.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 -0.000000e+00 1.000000e+00 + outer loop + vertex 1.339608e+02 2.618000e+02 1.000000e+00 + vertex 1.342882e+02 2.626563e+02 1.000000e+00 + vertex 1.336250e+02 2.623816e+02 1.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 -0.000000e+00 1.000000e+00 + outer loop + vertex 1.370785e+02 2.600000e+02 1.000000e+00 + vertex 1.373816e+02 2.613750e+02 1.000000e+00 + vertex 1.360392e+02 2.618000e+02 1.000000e+00 + endloop + endfacet + facet normal -0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 1.360392e+02 2.618000e+02 1.000000e+00 + vertex 1.373816e+02 2.613750e+02 1.000000e+00 + vertex 1.369445e+02 2.619445e+02 1.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 1.360392e+02 2.618000e+02 1.000000e+00 + vertex 1.369445e+02 2.619445e+02 1.000000e+00 + vertex 1.363750e+02 2.623816e+02 1.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 1.360392e+02 2.582000e+02 1.000000e+00 + vertex 1.373816e+02 2.586250e+02 1.000000e+00 + vertex 1.370785e+02 2.600000e+02 1.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 1.370785e+02 2.600000e+02 1.000000e+00 + vertex 1.373816e+02 2.586250e+02 1.000000e+00 + vertex 1.376563e+02 2.592882e+02 1.000000e+00 + endloop + endfacet + facet normal -0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 1.370785e+02 2.600000e+02 1.000000e+00 + vertex 1.376563e+02 2.592882e+02 1.000000e+00 + vertex 1.377500e+02 2.600000e+02 1.000000e+00 + endloop + endfacet + facet normal -0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 1.339608e+02 2.582000e+02 1.000000e+00 + vertex 1.350000e+02 2.572500e+02 1.000000e+00 + vertex 1.360392e+02 2.582000e+02 1.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 1.360392e+02 2.582000e+02 1.000000e+00 + vertex 1.350000e+02 2.572500e+02 1.000000e+00 + vertex 1.357118e+02 2.573437e+02 1.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 1.360392e+02 2.582000e+02 1.000000e+00 + vertex 1.357118e+02 2.573437e+02 1.000000e+00 + vertex 1.363750e+02 2.576184e+02 1.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 1.329215e+02 2.600000e+02 1.000000e+00 + vertex 1.326184e+02 2.586250e+02 1.000000e+00 + vertex 1.339608e+02 2.582000e+02 1.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 1.339608e+02 2.582000e+02 1.000000e+00 + vertex 1.326184e+02 2.586250e+02 1.000000e+00 + vertex 1.330555e+02 2.580555e+02 1.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 1.339608e+02 2.582000e+02 1.000000e+00 + vertex 1.330555e+02 2.580555e+02 1.000000e+00 + vertex 1.336250e+02 2.576184e+02 1.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 1.377500e+02 2.600000e+02 1.000000e+00 + vertex 1.376563e+02 2.607118e+02 1.000000e+00 + vertex 1.370785e+02 2.600000e+02 1.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 1.370785e+02 2.600000e+02 1.000000e+00 + vertex 1.376563e+02 2.607118e+02 1.000000e+00 + vertex 1.373816e+02 2.613750e+02 1.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 1.363750e+02 2.623816e+02 1.000000e+00 + vertex 1.357118e+02 2.626563e+02 1.000000e+00 + vertex 1.360392e+02 2.618000e+02 1.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 1.360392e+02 2.618000e+02 1.000000e+00 + vertex 1.357118e+02 2.626563e+02 1.000000e+00 + vertex 1.350000e+02 2.627500e+02 1.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 1.336250e+02 2.623816e+02 1.000000e+00 + vertex 1.330555e+02 2.619445e+02 1.000000e+00 + vertex 1.339608e+02 2.618000e+02 1.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 1.339608e+02 2.618000e+02 1.000000e+00 + vertex 1.330555e+02 2.619445e+02 1.000000e+00 + vertex 1.326184e+02 2.613750e+02 1.000000e+00 + endloop + endfacet + facet normal -0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 1.322500e+02 2.600000e+02 1.000000e+00 + vertex 1.323437e+02 2.592882e+02 1.000000e+00 + vertex 1.329215e+02 2.600000e+02 1.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 1.329215e+02 2.600000e+02 1.000000e+00 + vertex 1.323437e+02 2.592882e+02 1.000000e+00 + vertex 1.326184e+02 2.586250e+02 1.000000e+00 + endloop + endfacet + facet normal -0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 1.336250e+02 2.576184e+02 1.000000e+00 + vertex 1.342882e+02 2.573437e+02 1.000000e+00 + vertex 1.339608e+02 2.582000e+02 1.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 1.339608e+02 2.582000e+02 1.000000e+00 + vertex 1.342882e+02 2.573437e+02 1.000000e+00 + vertex 1.350000e+02 2.572500e+02 1.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 -0.000000e+00 1.000000e+00 + outer loop + vertex 1.363750e+02 2.576184e+02 1.000000e+00 + vertex 1.369445e+02 2.580555e+02 1.000000e+00 + vertex 1.360392e+02 2.582000e+02 1.000000e+00 + endloop + endfacet + facet normal -0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 1.360392e+02 2.582000e+02 1.000000e+00 + vertex 1.369445e+02 2.580555e+02 1.000000e+00 + vertex 1.373816e+02 2.586250e+02 1.000000e+00 + endloop + endfacet + facet normal 9.914449e-01 -1.305262e-01 0.000000e+00 + outer loop + vertex -1.323437e+02 2.592882e+02 1.000000e+00 + vertex -1.323437e+02 2.592882e+02 -2.000000e+00 + vertex -1.322500e+02 2.600000e+02 1.000000e+00 + endloop + endfacet + facet normal 9.914449e-01 -1.305262e-01 0.000000e+00 + outer loop + vertex -1.322500e+02 2.600000e+02 1.000000e+00 + vertex -1.323437e+02 2.592882e+02 -2.000000e+00 + vertex -1.322500e+02 2.600000e+02 -2.000000e+00 + endloop + endfacet + facet normal 9.914449e-01 1.305262e-01 0.000000e+00 + outer loop + vertex -1.322500e+02 2.600000e+02 1.000000e+00 + vertex -1.322500e+02 2.600000e+02 -2.000000e+00 + vertex -1.323437e+02 2.607118e+02 1.000000e+00 + endloop + endfacet + facet normal 9.914449e-01 1.305262e-01 0.000000e+00 + outer loop + vertex -1.323437e+02 2.607118e+02 1.000000e+00 + vertex -1.322500e+02 2.600000e+02 -2.000000e+00 + vertex -1.323437e+02 2.607118e+02 -2.000000e+00 + endloop + endfacet + facet normal 9.238795e-01 3.826834e-01 0.000000e+00 + outer loop + vertex -1.323437e+02 2.607118e+02 1.000000e+00 + vertex -1.323437e+02 2.607118e+02 -2.000000e+00 + vertex -1.326184e+02 2.613750e+02 1.000000e+00 + endloop + endfacet + facet normal 9.238795e-01 3.826834e-01 0.000000e+00 + outer loop + vertex -1.326184e+02 2.613750e+02 1.000000e+00 + vertex -1.323437e+02 2.607118e+02 -2.000000e+00 + vertex -1.326184e+02 2.613750e+02 -2.000000e+00 + endloop + endfacet + facet normal 7.933533e-01 6.087614e-01 0.000000e+00 + outer loop + vertex -1.326184e+02 2.613750e+02 1.000000e+00 + vertex -1.326184e+02 2.613750e+02 -2.000000e+00 + vertex -1.330555e+02 2.619445e+02 1.000000e+00 + endloop + endfacet + facet normal 7.933533e-01 6.087614e-01 0.000000e+00 + outer loop + vertex -1.330555e+02 2.619445e+02 1.000000e+00 + vertex -1.326184e+02 2.613750e+02 -2.000000e+00 + vertex -1.330555e+02 2.619445e+02 -2.000000e+00 + endloop + endfacet + facet normal 6.087614e-01 7.933533e-01 0.000000e+00 + outer loop + vertex -1.330555e+02 2.619445e+02 1.000000e+00 + vertex -1.330555e+02 2.619445e+02 -2.000000e+00 + vertex -1.336250e+02 2.623816e+02 1.000000e+00 + endloop + endfacet + facet normal 6.087614e-01 7.933533e-01 0.000000e+00 + outer loop + vertex -1.336250e+02 2.623816e+02 1.000000e+00 + vertex -1.330555e+02 2.619445e+02 -2.000000e+00 + vertex -1.336250e+02 2.623816e+02 -2.000000e+00 + endloop + endfacet + facet normal 3.826834e-01 9.238795e-01 0.000000e+00 + outer loop + vertex -1.336250e+02 2.623816e+02 1.000000e+00 + vertex -1.336250e+02 2.623816e+02 -2.000000e+00 + vertex -1.342882e+02 2.626563e+02 1.000000e+00 + endloop + endfacet + facet normal 3.826834e-01 9.238795e-01 0.000000e+00 + outer loop + vertex -1.342882e+02 2.626563e+02 1.000000e+00 + vertex -1.336250e+02 2.623816e+02 -2.000000e+00 + vertex -1.342882e+02 2.626563e+02 -2.000000e+00 + endloop + endfacet + facet normal 1.305262e-01 9.914449e-01 0.000000e+00 + outer loop + vertex -1.342882e+02 2.626563e+02 1.000000e+00 + vertex -1.342882e+02 2.626563e+02 -2.000000e+00 + vertex -1.350000e+02 2.627500e+02 1.000000e+00 + endloop + endfacet + facet normal 1.305262e-01 9.914449e-01 0.000000e+00 + outer loop + vertex -1.350000e+02 2.627500e+02 1.000000e+00 + vertex -1.342882e+02 2.626563e+02 -2.000000e+00 + vertex -1.350000e+02 2.627500e+02 -2.000000e+00 + endloop + endfacet + facet normal -1.305262e-01 9.914449e-01 0.000000e+00 + outer loop + vertex -1.350000e+02 2.627500e+02 1.000000e+00 + vertex -1.350000e+02 2.627500e+02 -2.000000e+00 + vertex -1.357118e+02 2.626563e+02 1.000000e+00 + endloop + endfacet + facet normal -1.305262e-01 9.914449e-01 0.000000e+00 + outer loop + vertex -1.357118e+02 2.626563e+02 1.000000e+00 + vertex -1.350000e+02 2.627500e+02 -2.000000e+00 + vertex -1.357118e+02 2.626563e+02 -2.000000e+00 + endloop + endfacet + facet normal -3.826834e-01 9.238795e-01 0.000000e+00 + outer loop + vertex -1.357118e+02 2.626563e+02 1.000000e+00 + vertex -1.357118e+02 2.626563e+02 -2.000000e+00 + vertex -1.363750e+02 2.623816e+02 1.000000e+00 + endloop + endfacet + facet normal -3.826834e-01 9.238795e-01 0.000000e+00 + outer loop + vertex -1.363750e+02 2.623816e+02 1.000000e+00 + vertex -1.357118e+02 2.626563e+02 -2.000000e+00 + vertex -1.363750e+02 2.623816e+02 -2.000000e+00 + endloop + endfacet + facet normal -6.087614e-01 7.933533e-01 0.000000e+00 + outer loop + vertex -1.363750e+02 2.623816e+02 1.000000e+00 + vertex -1.363750e+02 2.623816e+02 -2.000000e+00 + vertex -1.369445e+02 2.619445e+02 1.000000e+00 + endloop + endfacet + facet normal -6.087614e-01 7.933533e-01 0.000000e+00 + outer loop + vertex -1.369445e+02 2.619445e+02 1.000000e+00 + vertex -1.363750e+02 2.623816e+02 -2.000000e+00 + vertex -1.369445e+02 2.619445e+02 -2.000000e+00 + endloop + endfacet + facet normal -7.933533e-01 6.087614e-01 0.000000e+00 + outer loop + vertex -1.369445e+02 2.619445e+02 1.000000e+00 + vertex -1.369445e+02 2.619445e+02 -2.000000e+00 + vertex -1.373816e+02 2.613750e+02 1.000000e+00 + endloop + endfacet + facet normal -7.933533e-01 6.087614e-01 0.000000e+00 + outer loop + vertex -1.373816e+02 2.613750e+02 1.000000e+00 + vertex -1.369445e+02 2.619445e+02 -2.000000e+00 + vertex -1.373816e+02 2.613750e+02 -2.000000e+00 + endloop + endfacet + facet normal -9.238795e-01 3.826834e-01 0.000000e+00 + outer loop + vertex -1.373816e+02 2.613750e+02 1.000000e+00 + vertex -1.373816e+02 2.613750e+02 -2.000000e+00 + vertex -1.376563e+02 2.607118e+02 1.000000e+00 + endloop + endfacet + facet normal -9.238795e-01 3.826834e-01 0.000000e+00 + outer loop + vertex -1.376563e+02 2.607118e+02 1.000000e+00 + vertex -1.373816e+02 2.613750e+02 -2.000000e+00 + vertex -1.376563e+02 2.607118e+02 -2.000000e+00 + endloop + endfacet + facet normal -9.914449e-01 1.305262e-01 0.000000e+00 + outer loop + vertex -1.376563e+02 2.607118e+02 1.000000e+00 + vertex -1.376563e+02 2.607118e+02 -2.000000e+00 + vertex -1.377500e+02 2.600000e+02 1.000000e+00 + endloop + endfacet + facet normal -9.914449e-01 1.305262e-01 0.000000e+00 + outer loop + vertex -1.377500e+02 2.600000e+02 1.000000e+00 + vertex -1.376563e+02 2.607118e+02 -2.000000e+00 + vertex -1.377500e+02 2.600000e+02 -2.000000e+00 + endloop + endfacet + facet normal -9.914449e-01 -1.305262e-01 -0.000000e+00 + outer loop + vertex -1.377500e+02 2.600000e+02 1.000000e+00 + vertex -1.377500e+02 2.600000e+02 -2.000000e+00 + vertex -1.376563e+02 2.592882e+02 1.000000e+00 + endloop + endfacet + facet normal -9.914449e-01 -1.305262e-01 -0.000000e+00 + outer loop + vertex -1.376563e+02 2.592882e+02 1.000000e+00 + vertex -1.377500e+02 2.600000e+02 -2.000000e+00 + vertex -1.376563e+02 2.592882e+02 -2.000000e+00 + endloop + endfacet + facet normal -9.238795e-01 -3.826834e-01 -0.000000e+00 + outer loop + vertex -1.376563e+02 2.592882e+02 1.000000e+00 + vertex -1.376563e+02 2.592882e+02 -2.000000e+00 + vertex -1.373816e+02 2.586250e+02 1.000000e+00 + endloop + endfacet + facet normal -9.238795e-01 -3.826834e-01 -0.000000e+00 + outer loop + vertex -1.373816e+02 2.586250e+02 1.000000e+00 + vertex -1.376563e+02 2.592882e+02 -2.000000e+00 + vertex -1.373816e+02 2.586250e+02 -2.000000e+00 + endloop + endfacet + facet normal -7.933533e-01 -6.087614e-01 -0.000000e+00 + outer loop + vertex -1.373816e+02 2.586250e+02 1.000000e+00 + vertex -1.373816e+02 2.586250e+02 -2.000000e+00 + vertex -1.369445e+02 2.580555e+02 1.000000e+00 + endloop + endfacet + facet normal -7.933533e-01 -6.087614e-01 -0.000000e+00 + outer loop + vertex -1.369445e+02 2.580555e+02 1.000000e+00 + vertex -1.373816e+02 2.586250e+02 -2.000000e+00 + vertex -1.369445e+02 2.580555e+02 -2.000000e+00 + endloop + endfacet + facet normal -6.087614e-01 -7.933533e-01 -0.000000e+00 + outer loop + vertex -1.369445e+02 2.580555e+02 1.000000e+00 + vertex -1.369445e+02 2.580555e+02 -2.000000e+00 + vertex -1.363750e+02 2.576184e+02 1.000000e+00 + endloop + endfacet + facet normal -6.087614e-01 -7.933533e-01 -0.000000e+00 + outer loop + vertex -1.363750e+02 2.576184e+02 1.000000e+00 + vertex -1.369445e+02 2.580555e+02 -2.000000e+00 + vertex -1.363750e+02 2.576184e+02 -2.000000e+00 + endloop + endfacet + facet normal -3.826834e-01 -9.238795e-01 -0.000000e+00 + outer loop + vertex -1.363750e+02 2.576184e+02 1.000000e+00 + vertex -1.363750e+02 2.576184e+02 -2.000000e+00 + vertex -1.357118e+02 2.573437e+02 1.000000e+00 + endloop + endfacet + facet normal -3.826834e-01 -9.238795e-01 -0.000000e+00 + outer loop + vertex -1.357118e+02 2.573437e+02 1.000000e+00 + vertex -1.363750e+02 2.576184e+02 -2.000000e+00 + vertex -1.357118e+02 2.573437e+02 -2.000000e+00 + endloop + endfacet + facet normal -1.305262e-01 -9.914449e-01 -0.000000e+00 + outer loop + vertex -1.357118e+02 2.573437e+02 1.000000e+00 + vertex -1.357118e+02 2.573437e+02 -2.000000e+00 + vertex -1.350000e+02 2.572500e+02 1.000000e+00 + endloop + endfacet + facet normal -1.305262e-01 -9.914449e-01 -0.000000e+00 + outer loop + vertex -1.350000e+02 2.572500e+02 1.000000e+00 + vertex -1.357118e+02 2.573437e+02 -2.000000e+00 + vertex -1.350000e+02 2.572500e+02 -2.000000e+00 + endloop + endfacet + facet normal 1.305262e-01 -9.914449e-01 0.000000e+00 + outer loop + vertex -1.350000e+02 2.572500e+02 1.000000e+00 + vertex -1.350000e+02 2.572500e+02 -2.000000e+00 + vertex -1.342882e+02 2.573437e+02 1.000000e+00 + endloop + endfacet + facet normal 1.305262e-01 -9.914449e-01 0.000000e+00 + outer loop + vertex -1.342882e+02 2.573437e+02 1.000000e+00 + vertex -1.350000e+02 2.572500e+02 -2.000000e+00 + vertex -1.342882e+02 2.573437e+02 -2.000000e+00 + endloop + endfacet + facet normal 3.826834e-01 -9.238795e-01 0.000000e+00 + outer loop + vertex -1.342882e+02 2.573437e+02 1.000000e+00 + vertex -1.342882e+02 2.573437e+02 -2.000000e+00 + vertex -1.336250e+02 2.576184e+02 1.000000e+00 + endloop + endfacet + facet normal 3.826834e-01 -9.238795e-01 0.000000e+00 + outer loop + vertex -1.336250e+02 2.576184e+02 1.000000e+00 + vertex -1.342882e+02 2.573437e+02 -2.000000e+00 + vertex -1.336250e+02 2.576184e+02 -2.000000e+00 + endloop + endfacet + facet normal 6.087614e-01 -7.933533e-01 0.000000e+00 + outer loop + vertex -1.336250e+02 2.576184e+02 1.000000e+00 + vertex -1.336250e+02 2.576184e+02 -2.000000e+00 + vertex -1.330555e+02 2.580555e+02 1.000000e+00 + endloop + endfacet + facet normal 6.087614e-01 -7.933533e-01 0.000000e+00 + outer loop + vertex -1.330555e+02 2.580555e+02 1.000000e+00 + vertex -1.336250e+02 2.576184e+02 -2.000000e+00 + vertex -1.330555e+02 2.580555e+02 -2.000000e+00 + endloop + endfacet + facet normal 7.933533e-01 -6.087614e-01 0.000000e+00 + outer loop + vertex -1.330555e+02 2.580555e+02 1.000000e+00 + vertex -1.330555e+02 2.580555e+02 -2.000000e+00 + vertex -1.326184e+02 2.586250e+02 1.000000e+00 + endloop + endfacet + facet normal 7.933533e-01 -6.087614e-01 0.000000e+00 + outer loop + vertex -1.326184e+02 2.586250e+02 1.000000e+00 + vertex -1.330555e+02 2.580555e+02 -2.000000e+00 + vertex -1.326184e+02 2.586250e+02 -2.000000e+00 + endloop + endfacet + facet normal 9.238795e-01 -3.826834e-01 0.000000e+00 + outer loop + vertex -1.326184e+02 2.586250e+02 1.000000e+00 + vertex -1.326184e+02 2.586250e+02 -2.000000e+00 + vertex -1.323437e+02 2.592882e+02 1.000000e+00 + endloop + endfacet + facet normal 9.238795e-01 -3.826834e-01 0.000000e+00 + outer loop + vertex -1.323437e+02 2.592882e+02 1.000000e+00 + vertex -1.326184e+02 2.586250e+02 -2.000000e+00 + vertex -1.323437e+02 2.592882e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.360392e+02 2.618000e+02 1.000000e+00 + vertex -1.373816e+02 2.613750e+02 1.000000e+00 + vertex -1.370785e+02 2.600000e+02 1.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.370785e+02 2.600000e+02 1.000000e+00 + vertex -1.373816e+02 2.613750e+02 1.000000e+00 + vertex -1.376563e+02 2.607118e+02 1.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.370785e+02 2.600000e+02 1.000000e+00 + vertex -1.376563e+02 2.607118e+02 1.000000e+00 + vertex -1.377500e+02 2.600000e+02 1.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.339608e+02 2.618000e+02 1.000000e+00 + vertex -1.350000e+02 2.627500e+02 1.000000e+00 + vertex -1.360392e+02 2.618000e+02 1.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.360392e+02 2.618000e+02 1.000000e+00 + vertex -1.350000e+02 2.627500e+02 1.000000e+00 + vertex -1.357118e+02 2.626563e+02 1.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 -0.000000e+00 1.000000e+00 + outer loop + vertex -1.360392e+02 2.618000e+02 1.000000e+00 + vertex -1.357118e+02 2.626563e+02 1.000000e+00 + vertex -1.363750e+02 2.623816e+02 1.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 -0.000000e+00 1.000000e+00 + outer loop + vertex -1.329215e+02 2.600000e+02 1.000000e+00 + vertex -1.326184e+02 2.613750e+02 1.000000e+00 + vertex -1.339608e+02 2.618000e+02 1.000000e+00 + endloop + endfacet + facet normal -0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.339608e+02 2.618000e+02 1.000000e+00 + vertex -1.326184e+02 2.613750e+02 1.000000e+00 + vertex -1.330555e+02 2.619445e+02 1.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.339608e+02 2.618000e+02 1.000000e+00 + vertex -1.330555e+02 2.619445e+02 1.000000e+00 + vertex -1.336250e+02 2.623816e+02 1.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.339608e+02 2.582000e+02 1.000000e+00 + vertex -1.326184e+02 2.586250e+02 1.000000e+00 + vertex -1.329215e+02 2.600000e+02 1.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.329215e+02 2.600000e+02 1.000000e+00 + vertex -1.326184e+02 2.586250e+02 1.000000e+00 + vertex -1.323437e+02 2.592882e+02 1.000000e+00 + endloop + endfacet + facet normal -0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.329215e+02 2.600000e+02 1.000000e+00 + vertex -1.323437e+02 2.592882e+02 1.000000e+00 + vertex -1.322500e+02 2.600000e+02 1.000000e+00 + endloop + endfacet + facet normal -0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.360392e+02 2.582000e+02 1.000000e+00 + vertex -1.350000e+02 2.572500e+02 1.000000e+00 + vertex -1.339608e+02 2.582000e+02 1.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.339608e+02 2.582000e+02 1.000000e+00 + vertex -1.350000e+02 2.572500e+02 1.000000e+00 + vertex -1.342882e+02 2.573437e+02 1.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.339608e+02 2.582000e+02 1.000000e+00 + vertex -1.342882e+02 2.573437e+02 1.000000e+00 + vertex -1.336250e+02 2.576184e+02 1.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.370785e+02 2.600000e+02 1.000000e+00 + vertex -1.373816e+02 2.586250e+02 1.000000e+00 + vertex -1.360392e+02 2.582000e+02 1.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.360392e+02 2.582000e+02 1.000000e+00 + vertex -1.373816e+02 2.586250e+02 1.000000e+00 + vertex -1.369445e+02 2.580555e+02 1.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.360392e+02 2.582000e+02 1.000000e+00 + vertex -1.369445e+02 2.580555e+02 1.000000e+00 + vertex -1.363750e+02 2.576184e+02 1.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.322500e+02 2.600000e+02 1.000000e+00 + vertex -1.323437e+02 2.607118e+02 1.000000e+00 + vertex -1.329215e+02 2.600000e+02 1.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.329215e+02 2.600000e+02 1.000000e+00 + vertex -1.323437e+02 2.607118e+02 1.000000e+00 + vertex -1.326184e+02 2.613750e+02 1.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.336250e+02 2.623816e+02 1.000000e+00 + vertex -1.342882e+02 2.626563e+02 1.000000e+00 + vertex -1.339608e+02 2.618000e+02 1.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.339608e+02 2.618000e+02 1.000000e+00 + vertex -1.342882e+02 2.626563e+02 1.000000e+00 + vertex -1.350000e+02 2.627500e+02 1.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.363750e+02 2.623816e+02 1.000000e+00 + vertex -1.369445e+02 2.619445e+02 1.000000e+00 + vertex -1.360392e+02 2.618000e+02 1.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.360392e+02 2.618000e+02 1.000000e+00 + vertex -1.369445e+02 2.619445e+02 1.000000e+00 + vertex -1.373816e+02 2.613750e+02 1.000000e+00 + endloop + endfacet + facet normal -0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.377500e+02 2.600000e+02 1.000000e+00 + vertex -1.376563e+02 2.592882e+02 1.000000e+00 + vertex -1.370785e+02 2.600000e+02 1.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.370785e+02 2.600000e+02 1.000000e+00 + vertex -1.376563e+02 2.592882e+02 1.000000e+00 + vertex -1.373816e+02 2.586250e+02 1.000000e+00 + endloop + endfacet + facet normal -0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.363750e+02 2.576184e+02 1.000000e+00 + vertex -1.357118e+02 2.573437e+02 1.000000e+00 + vertex -1.360392e+02 2.582000e+02 1.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.360392e+02 2.582000e+02 1.000000e+00 + vertex -1.357118e+02 2.573437e+02 1.000000e+00 + vertex -1.350000e+02 2.572500e+02 1.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 -0.000000e+00 1.000000e+00 + outer loop + vertex -1.336250e+02 2.576184e+02 1.000000e+00 + vertex -1.330555e+02 2.580555e+02 1.000000e+00 + vertex -1.339608e+02 2.582000e+02 1.000000e+00 + endloop + endfacet + facet normal -0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex -1.339608e+02 2.582000e+02 1.000000e+00 + vertex -1.330555e+02 2.580555e+02 1.000000e+00 + vertex -1.326184e+02 2.586250e+02 1.000000e+00 + endloop + endfacet + facet normal -1.000000e+00 0.000000e+00 0.000000e+00 + outer loop + vertex -2.550000e+02 -2.530000e+02 -6.000000e+00 + vertex -2.550000e+02 -2.530000e+02 -2.000000e+00 + vertex -2.550000e+02 2.630000e+02 -6.000000e+00 + endloop + endfacet + facet normal -1.000000e+00 0.000000e+00 0.000000e+00 + outer loop + vertex -2.550000e+02 2.630000e+02 -6.000000e+00 + vertex -2.550000e+02 -2.530000e+02 -2.000000e+00 + vertex -2.550000e+02 2.630000e+02 0.000000e+00 + endloop + endfacet + facet normal -1.000000e+00 -0.000000e+00 0.000000e+00 + outer loop + vertex -2.550000e+02 2.630000e+02 0.000000e+00 + vertex -2.550000e+02 -2.530000e+02 -2.000000e+00 + vertex -2.550000e+02 -2.538197e+02 0.000000e+00 + endloop + endfacet + facet normal -1.000000e+00 0.000000e+00 0.000000e+00 + outer loop + vertex -2.550000e+02 -2.538197e+02 0.000000e+00 + vertex -2.550000e+02 -2.530000e+02 -2.000000e+00 + vertex -2.550000e+02 -2.538197e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 1.399309e+02 2.650000e+02 -2.000000e+00 + vertex 1.377500e+02 2.600000e+02 -2.000000e+00 + vertex 1.378823e+02 2.593714e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 1.378823e+02 2.593714e+02 -2.000000e+00 + vertex 1.377500e+02 2.600000e+02 -2.000000e+00 + vertex 1.376563e+02 2.592882e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 1.378823e+02 2.593714e+02 -2.000000e+00 + vertex 1.376563e+02 2.592882e+02 -2.000000e+00 + vertex 1.376417e+02 2.586870e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 -0.000000e+00 1.000000e+00 + outer loop + vertex 1.376417e+02 2.586870e+02 -2.000000e+00 + vertex 1.376563e+02 2.592882e+02 -2.000000e+00 + vertex 1.373816e+02 2.586250e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 1.376417e+02 2.586870e+02 -2.000000e+00 + vertex 1.373816e+02 2.586250e+02 -2.000000e+00 + vertex 1.372413e+02 2.580819e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 -0.000000e+00 1.000000e+00 + outer loop + vertex 1.372413e+02 2.580819e+02 -2.000000e+00 + vertex 1.373816e+02 2.586250e+02 -2.000000e+00 + vertex 1.369445e+02 2.580555e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 1.372413e+02 2.580819e+02 -2.000000e+00 + vertex 1.369445e+02 2.580555e+02 -2.000000e+00 + vertex 1.367054e+02 2.575929e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 -0.000000e+00 1.000000e+00 + outer loop + vertex 1.367054e+02 2.575929e+02 -2.000000e+00 + vertex 1.369445e+02 2.580555e+02 -2.000000e+00 + vertex 1.363750e+02 2.576184e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 1.367054e+02 2.575929e+02 -2.000000e+00 + vertex 1.363750e+02 2.576184e+02 -2.000000e+00 + vertex 1.360663e+02 2.572495e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 -0.000000e+00 1.000000e+00 + outer loop + vertex 1.360663e+02 2.572495e+02 -2.000000e+00 + vertex 1.363750e+02 2.576184e+02 -2.000000e+00 + vertex 1.357118e+02 2.573437e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 1.360663e+02 2.572495e+02 -2.000000e+00 + vertex 1.357118e+02 2.573437e+02 -2.000000e+00 + vertex 1.353628e+02 2.570724e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 -0.000000e+00 1.000000e+00 + outer loop + vertex 1.353628e+02 2.570724e+02 -2.000000e+00 + vertex 1.357118e+02 2.573437e+02 -2.000000e+00 + vertex 1.350000e+02 2.572500e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 1.353628e+02 2.570724e+02 -2.000000e+00 + vertex 1.350000e+02 2.572500e+02 -2.000000e+00 + vertex 1.346372e+02 2.570724e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 -0.000000e+00 1.000000e+00 + outer loop + vertex 1.346372e+02 2.570724e+02 -2.000000e+00 + vertex 1.350000e+02 2.572500e+02 -2.000000e+00 + vertex 1.342882e+02 2.573437e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 1.346372e+02 2.570724e+02 -2.000000e+00 + vertex 1.342882e+02 2.573437e+02 -2.000000e+00 + vertex 1.339337e+02 2.572495e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 -0.000000e+00 1.000000e+00 + outer loop + vertex 1.339337e+02 2.572495e+02 -2.000000e+00 + vertex 1.342882e+02 2.573437e+02 -2.000000e+00 + vertex 1.336250e+02 2.576184e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 1.339337e+02 2.572495e+02 -2.000000e+00 + vertex 1.336250e+02 2.576184e+02 -2.000000e+00 + vertex 1.332946e+02 2.575929e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 -0.000000e+00 1.000000e+00 + outer loop + vertex 1.332946e+02 2.575929e+02 -2.000000e+00 + vertex 1.336250e+02 2.576184e+02 -2.000000e+00 + vertex 1.330555e+02 2.580555e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 1.332946e+02 2.575929e+02 -2.000000e+00 + vertex 1.330555e+02 2.580555e+02 -2.000000e+00 + vertex 1.327587e+02 2.580819e+02 -2.000000e+00 + endloop + endfacet + facet normal -0.000000e+00 -0.000000e+00 1.000000e+00 + outer loop + vertex 1.327587e+02 2.580819e+02 -2.000000e+00 + vertex 1.330555e+02 2.580555e+02 -2.000000e+00 + vertex 1.326184e+02 2.586250e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 1.327587e+02 2.580819e+02 -2.000000e+00 + vertex 1.326184e+02 2.586250e+02 -2.000000e+00 + vertex 1.323583e+02 2.586870e+02 -2.000000e+00 + endloop + endfacet + facet normal -0.000000e+00 -0.000000e+00 1.000000e+00 + outer loop + vertex 1.323583e+02 2.586870e+02 -2.000000e+00 + vertex 1.326184e+02 2.586250e+02 -2.000000e+00 + vertex 1.323437e+02 2.592882e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 1.323583e+02 2.586870e+02 -2.000000e+00 + vertex 1.323437e+02 2.592882e+02 -2.000000e+00 + vertex 1.321177e+02 2.593714e+02 -2.000000e+00 + endloop + endfacet + facet normal -0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 1.321177e+02 2.593714e+02 -2.000000e+00 + vertex 1.323437e+02 2.592882e+02 -2.000000e+00 + vertex 1.322500e+02 2.600000e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 -0.000000e+00 1.000000e+00 + outer loop + vertex 1.321177e+02 2.593714e+02 -2.000000e+00 + vertex 1.322500e+02 2.600000e+02 -2.000000e+00 + vertex 1.300691e+02 2.650000e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 1.300691e+02 2.650000e+02 -2.000000e+00 + vertex 1.322500e+02 2.600000e+02 -2.000000e+00 + vertex 1.323437e+02 2.607118e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 1.300691e+02 2.650000e+02 -2.000000e+00 + vertex 1.323437e+02 2.607118e+02 -2.000000e+00 + vertex 1.326184e+02 2.613750e+02 -2.000000e+00 + endloop + endfacet + facet normal -0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 1.300691e+02 2.650000e+02 -2.000000e+00 + vertex 1.350000e+02 2.627500e+02 -2.000000e+00 + vertex 1.399309e+02 2.650000e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 1.399309e+02 2.650000e+02 -2.000000e+00 + vertex 1.350000e+02 2.627500e+02 -2.000000e+00 + vertex 1.357118e+02 2.626563e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 1.399309e+02 2.650000e+02 -2.000000e+00 + vertex 1.357118e+02 2.626563e+02 -2.000000e+00 + vertex 1.363750e+02 2.623816e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 -0.000000e+00 1.000000e+00 + outer loop + vertex 1.326184e+02 2.613750e+02 -2.000000e+00 + vertex 1.330555e+02 2.619445e+02 -2.000000e+00 + vertex 1.300691e+02 2.650000e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 1.300691e+02 2.650000e+02 -2.000000e+00 + vertex 1.330555e+02 2.619445e+02 -2.000000e+00 + vertex 1.336250e+02 2.623816e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 1.300691e+02 2.650000e+02 -2.000000e+00 + vertex 1.336250e+02 2.623816e+02 -2.000000e+00 + vertex 1.342882e+02 2.626563e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 -0.000000e+00 1.000000e+00 + outer loop + vertex 1.342882e+02 2.626563e+02 -2.000000e+00 + vertex 1.350000e+02 2.627500e+02 -2.000000e+00 + vertex 1.300691e+02 2.650000e+02 -2.000000e+00 + endloop + endfacet + facet normal -0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 1.363750e+02 2.623816e+02 -2.000000e+00 + vertex 1.369445e+02 2.619445e+02 -2.000000e+00 + vertex 1.399309e+02 2.650000e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 1.399309e+02 2.650000e+02 -2.000000e+00 + vertex 1.369445e+02 2.619445e+02 -2.000000e+00 + vertex 1.373816e+02 2.613750e+02 -2.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 1.399309e+02 2.650000e+02 -2.000000e+00 + vertex 1.373816e+02 2.613750e+02 -2.000000e+00 + vertex 1.376563e+02 2.607118e+02 -2.000000e+00 + endloop + endfacet + facet normal -0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 1.376563e+02 2.607118e+02 -2.000000e+00 + vertex 1.377500e+02 2.600000e+02 -2.000000e+00 + vertex 1.399309e+02 2.650000e+02 -2.000000e+00 + endloop + endfacet +endsolid diff --git a/resources/profiles/Sovol/sovol_sv08_max_buildplate_texture.png b/resources/profiles/Sovol/sovol_sv08_max_buildplate_texture.png new file mode 100644 index 0000000000..f4333808ed Binary files /dev/null and b/resources/profiles/Sovol/sovol_sv08_max_buildplate_texture.png differ diff --git a/resources/profiles/Sovol/sovol_zero_buildplate_model.stl b/resources/profiles/Sovol/sovol_zero_buildplate_model.stl old mode 100755 new mode 100644 diff --git a/resources/profiles/Sovol/sovol_zero_buildplate_texture.png b/resources/profiles/Sovol/sovol_zero_buildplate_texture.png old mode 100755 new mode 100644 diff --git a/resources/profiles/Tiertime.json b/resources/profiles/Tiertime.json index cb07038908..c9bf2cccc8 100644 --- a/resources/profiles/Tiertime.json +++ b/resources/profiles/Tiertime.json @@ -1,20 +1,20 @@ { "name": "Tiertime", - "version": "02.03.01.00", + "version": "02.03.01.01", "force_update": "0", "description": "Tiertime configurations", "machine_model_list": [ { - "name": "Tiertime UP300 HS", - "sub_path": "machine/Tiertime UP300 HS.json" + "name": "Tiertime UP400 Pro", + "sub_path": "machine/Tiertime UP400 Pro.json" }, { "name": "Tiertime UP310 Pro", "sub_path": "machine/Tiertime UP310 Pro.json" }, { - "name": "Tiertime UP400 Pro", - "sub_path": "machine/Tiertime UP400 Pro.json" + "name": "Tiertime UP300 HS", + "sub_path": "machine/Tiertime UP300 HS.json" }, { "name": "Tiertime UP600 HS", @@ -31,44 +31,88 @@ "sub_path": "process/fdm_process_tiertime_common.json" }, { - "name": "0.12mm Fine @Tiertime UP310 Pro", - "sub_path": "process/0.12mm Fine @Tiertime UP310 Pro.json" + "name": "fdm_process_tiertime_HS_common", + "sub_path": "process/fdm_process_tiertime_HS_common.json" }, { "name": "0.12mm Fine @Tiertime UP400 Pro", "sub_path": "process/0.12mm Fine @Tiertime UP400 Pro.json" }, - { - "name": "0.16mm Optimal @Tiertime UP310 Pro", - "sub_path": "process/0.16mm Optimal @Tiertime UP310 Pro.json" - }, { "name": "0.16mm Optimal @Tiertime UP400 Pro", "sub_path": "process/0.16mm Optimal @Tiertime UP400 Pro.json" }, - { - "name": "0.20mm Standard @Tiertime UP310 Pro", - "sub_path": "process/0.20mm Standard @Tiertime UP310 Pro.json" - }, { "name": "0.20mm Standard @Tiertime UP400 Pro", "sub_path": "process/0.20mm Standard @Tiertime UP400 Pro.json" }, - { - "name": "0.24mm Draft @Tiertime UP310 Pro", - "sub_path": "process/0.24mm Draft @Tiertime UP310 Pro.json" - }, { "name": "0.24mm Draft @Tiertime UP400 Pro", "sub_path": "process/0.24mm Draft @Tiertime UP400 Pro.json" }, + { + "name": "0.28mm Extra Draft @Tiertime UP400 Pro", + "sub_path": "process/0.28mm Extra Draft @Tiertime UP400 Pro.json" + }, + { + "name": "0.12mm Fine @Tiertime UP310 Pro", + "sub_path": "process/0.12mm Fine @Tiertime UP310 Pro.json" + }, + { + "name": "0.16mm Optimal @Tiertime UP310 Pro", + "sub_path": "process/0.16mm Optimal @Tiertime UP310 Pro.json" + }, + { + "name": "0.20mm Standard @Tiertime UP310 Pro", + "sub_path": "process/0.20mm Standard @Tiertime UP310 Pro.json" + }, + { + "name": "0.24mm Draft @Tiertime UP310 Pro", + "sub_path": "process/0.24mm Draft @Tiertime UP310 Pro.json" + }, { "name": "0.28mm Extra Draft @Tiertime UP310 Pro", "sub_path": "process/0.28mm Extra Draft @Tiertime UP310 Pro.json" }, { - "name": "0.28mm Extra Draft @Tiertime UP400 Pro", - "sub_path": "process/0.28mm Extra Draft @Tiertime UP400 Pro.json" + "name": "0.12mm Fine @Tiertime UP300 HS", + "sub_path": "process/0.12mm Fine @Tiertime UP300 HS.json" + }, + { + "name": "0.16mm Optimal @Tiertime UP300 HS", + "sub_path": "process/0.16mm Optimal @Tiertime UP300 HS.json" + }, + { + "name": "0.20mm Standard @Tiertime UP300 HS", + "sub_path": "process/0.20mm Standard @Tiertime UP300 HS.json" + }, + { + "name": "0.24mm Draft @Tiertime UP300 HS", + "sub_path": "process/0.24mm Draft @Tiertime UP300 HS.json" + }, + { + "name": "0.28mm Extra Draft @Tiertime UP300 HS", + "sub_path": "process/0.28mm Extra Draft @Tiertime UP300 HS.json" + }, + { + "name": "0.12mm Fine @Tiertime UP600 HS", + "sub_path": "process/0.12mm Fine @Tiertime UP600 HS.json" + }, + { + "name": "0.16mm Optimal @Tiertime UP600 HS", + "sub_path": "process/0.16mm Optimal @Tiertime UP600 HS.json" + }, + { + "name": "0.20mm Standard @Tiertime UP600 HS", + "sub_path": "process/0.20mm Standard @Tiertime UP600 HS.json" + }, + { + "name": "0.24mm Draft @Tiertime UP600 HS", + "sub_path": "process/0.24mm Draft @Tiertime UP600 HS.json" + }, + { + "name": "0.28mm Extra Draft @Tiertime UP600 HS", + "sub_path": "process/0.28mm Extra Draft @Tiertime UP600 HS.json" }, { "name": "fdm_process_tiertime_0.18_nozzle_0.6", @@ -78,30 +122,30 @@ "name": "fdm_process_tiertime_0.24_nozzle_0.6", "sub_path": "process/fdm_process_tiertime_0.24_nozzle_0.6.json" }, - { - "name": "fdm_process_tiertime_0.24_nozzle_0.8", - "sub_path": "process/fdm_process_tiertime_0.24_nozzle_0.8.json" - }, { "name": "fdm_process_tiertime_0.30_nozzle_0.6", "sub_path": "process/fdm_process_tiertime_0.30_nozzle_0.6.json" }, - { - "name": "fdm_process_tiertime_0.32_nozzle_0.8", - "sub_path": "process/fdm_process_tiertime_0.32_nozzle_0.8.json" - }, { "name": "fdm_process_tiertime_0.36_nozzle_0.6", "sub_path": "process/fdm_process_tiertime_0.36_nozzle_0.6.json" }, - { - "name": "fdm_process_tiertime_0.40_nozzle_0.8", - "sub_path": "process/fdm_process_tiertime_0.40_nozzle_0.8.json" - }, { "name": "fdm_process_tiertime_0.42_nozzle_0.6", "sub_path": "process/fdm_process_tiertime_0.42_nozzle_0.6.json" }, + { + "name": "fdm_process_tiertime_0.24_nozzle_0.8", + "sub_path": "process/fdm_process_tiertime_0.24_nozzle_0.8.json" + }, + { + "name": "fdm_process_tiertime_0.32_nozzle_0.8", + "sub_path": "process/fdm_process_tiertime_0.32_nozzle_0.8.json" + }, + { + "name": "fdm_process_tiertime_0.40_nozzle_0.8", + "sub_path": "process/fdm_process_tiertime_0.40_nozzle_0.8.json" + }, { "name": "fdm_process_tiertime_0.48_nozzle_0.8", "sub_path": "process/fdm_process_tiertime_0.48_nozzle_0.8.json" @@ -110,94 +154,6 @@ "name": "fdm_process_tiertime_0.56_nozzle_0.8", "sub_path": "process/fdm_process_tiertime_0.56_nozzle_0.8.json" }, - { - "name": "fdm_process_tiertime_HS_common", - "sub_path": "process/fdm_process_tiertime_HS_common.json" - }, - { - "name": "0.18mm Fine @Tiertime UP400 Pro 0.6 nozzle", - "sub_path": "process/0.18mm Fine @Tiertime UP400 Pro 0.6 nozzle.json" - }, - { - "name": "0.24mm Standard @Tiertime UP400 Pro 0.6 nozzle", - "sub_path": "process/0.24mm Standard @Tiertime UP400 Pro 0.6 nozzle.json" - }, - { - "name": "0.24mm Fine @Tiertime UP400 Pro 0.8 nozzle", - "sub_path": "process/0.24mm Fine @Tiertime UP400 Pro 0.8 nozzle.json" - }, - { - "name": "0.30mm Standard @Tiertime UP400 Pro 0.6 nozzle", - "sub_path": "process/0.30mm Standard @Tiertime UP400 Pro 0.6 nozzle.json" - }, - { - "name": "0.30mm Strength @Tiertime UP400 Pro 0.6 nozzle", - "sub_path": "process/0.30mm Strength @Tiertime UP400 Pro 0.6 nozzle.json" - }, - { - "name": "0.32mm Standard @Tiertime UP400 Pro 0.8 nozzle", - "sub_path": "process/0.32mm Standard @Tiertime UP400 Pro 0.8 nozzle.json" - }, - { - "name": "0.36mm Draft @Tiertime UP400 Pro 0.6 nozzle", - "sub_path": "process/0.36mm Draft @Tiertime UP400 Pro 0.6 nozzle.json" - }, - { - "name": "0.40mm Standard @Tiertime UP400 Pro 0.8 nozzle", - "sub_path": "process/0.40mm Standard @Tiertime UP400 Pro 0.8 nozzle.json" - }, - { - "name": "0.42mm Extra Draft @Tiertime UP400 Pro 0.6 nozzle", - "sub_path": "process/0.42mm Extra Draft @Tiertime UP400 Pro 0.6 nozzle.json" - }, - { - "name": "0.48mm Draft @Tiertime UP400 Pro 0.8 nozzle", - "sub_path": "process/0.48mm Draft @Tiertime UP400 Pro 0.8 nozzle.json" - }, - { - "name": "0.56mm Extra Draft @Tiertime UP400 Pro 0.8 nozzle", - "sub_path": "process/0.56mm Extra Draft @Tiertime UP400 Pro 0.8 nozzle.json" - }, - { - "name": "0.12mm Fine @Tiertime UP300 HS", - "sub_path": "process/0.12mm Fine @Tiertime UP300 HS.json" - }, - { - "name": "0.12mm Fine @Tiertime UP600 HS", - "sub_path": "process/0.12mm Fine @Tiertime UP600 HS.json" - }, - { - "name": "0.16mm Optimal @Tiertime UP300 HS", - "sub_path": "process/0.16mm Optimal @Tiertime UP300 HS.json" - }, - { - "name": "0.16mm Optimal @Tiertime UP600 HS", - "sub_path": "process/0.16mm Optimal @Tiertime UP600 HS.json" - }, - { - "name": "0.20mm Standard @Tiertime UP300 HS", - "sub_path": "process/0.20mm Standard @Tiertime UP300 HS.json" - }, - { - "name": "0.20mm Standard @Tiertime UP600 HS", - "sub_path": "process/0.20mm Standard @Tiertime UP600 HS.json" - }, - { - "name": "0.24mm Draft @Tiertime UP300 HS", - "sub_path": "process/0.24mm Draft @Tiertime UP300 HS.json" - }, - { - "name": "0.24mm Draft @Tiertime UP600 HS", - "sub_path": "process/0.24mm Draft @Tiertime UP600 HS.json" - }, - { - "name": "0.28mm Extra Draft @Tiertime UP300 HS", - "sub_path": "process/0.28mm Extra Draft @Tiertime UP300 HS.json" - }, - { - "name": "0.28mm Extra Draft @Tiertime UP600 HS", - "sub_path": "process/0.28mm Extra Draft @Tiertime UP600 HS.json" - }, { "name": "fdm_process_tiertime_0.18_nozzle_0.6_HS", "sub_path": "process/fdm_process_tiertime_0.18_nozzle_0.6_HS.json" @@ -206,30 +162,30 @@ "name": "fdm_process_tiertime_0.24_nozzle_0.6_HS", "sub_path": "process/fdm_process_tiertime_0.24_nozzle_0.6_HS.json" }, - { - "name": "fdm_process_tiertime_0.24_nozzle_0.8_HS", - "sub_path": "process/fdm_process_tiertime_0.24_nozzle_0.8_HS.json" - }, { "name": "fdm_process_tiertime_0.30_nozzle_0.6_HS", "sub_path": "process/fdm_process_tiertime_0.30_nozzle_0.6_HS.json" }, - { - "name": "fdm_process_tiertime_0.32_nozzle_0.8_HS", - "sub_path": "process/fdm_process_tiertime_0.32_nozzle_0.8_HS.json" - }, { "name": "fdm_process_tiertime_0.36_nozzle_0.6_HS", "sub_path": "process/fdm_process_tiertime_0.36_nozzle_0.6_HS.json" }, - { - "name": "fdm_process_tiertime_0.40_nozzle_0.8_HS", - "sub_path": "process/fdm_process_tiertime_0.40_nozzle_0.8_HS.json" - }, { "name": "fdm_process_tiertime_0.42_nozzle_0.6_HS", "sub_path": "process/fdm_process_tiertime_0.42_nozzle_0.6_HS.json" }, + { + "name": "fdm_process_tiertime_0.24_nozzle_0.8_HS", + "sub_path": "process/fdm_process_tiertime_0.24_nozzle_0.8_HS.json" + }, + { + "name": "fdm_process_tiertime_0.32_nozzle_0.8_HS", + "sub_path": "process/fdm_process_tiertime_0.32_nozzle_0.8_HS.json" + }, + { + "name": "fdm_process_tiertime_0.40_nozzle_0.8_HS", + "sub_path": "process/fdm_process_tiertime_0.40_nozzle_0.8_HS.json" + }, { "name": "fdm_process_tiertime_0.48_nozzle_0.8_HS", "sub_path": "process/fdm_process_tiertime_0.48_nozzle_0.8_HS.json" @@ -238,6 +194,30 @@ "name": "fdm_process_tiertime_0.56_nozzle_0.8_HS", "sub_path": "process/fdm_process_tiertime_0.56_nozzle_0.8_HS.json" }, + { + "name": "0.18mm Fine @Tiertime UP400 Pro 0.6 nozzle", + "sub_path": "process/0.18mm Fine @Tiertime UP400 Pro 0.6 nozzle.json" + }, + { + "name": "0.24mm Standard @Tiertime UP400 Pro 0.6 nozzle", + "sub_path": "process/0.24mm Standard @Tiertime UP400 Pro 0.6 nozzle.json" + }, + { + "name": "0.30mm Standard @Tiertime UP400 Pro 0.6 nozzle", + "sub_path": "process/0.30mm Standard @Tiertime UP400 Pro 0.6 nozzle.json" + }, + { + "name": "0.30mm Strength @Tiertime UP400 Pro 0.6 nozzle", + "sub_path": "process/0.30mm Strength @Tiertime UP400 Pro 0.6 nozzle.json" + }, + { + "name": "0.36mm Draft @Tiertime UP400 Pro 0.6 nozzle", + "sub_path": "process/0.36mm Draft @Tiertime UP400 Pro 0.6 nozzle.json" + }, + { + "name": "0.42mm Extra Draft @Tiertime UP400 Pro 0.6 nozzle", + "sub_path": "process/0.42mm Extra Draft @Tiertime UP400 Pro 0.6 nozzle.json" + }, { "name": "0.18mm Fine @Tiertime UP600 HS 0.6 nozzle", "sub_path": "process/0.18mm Fine @Tiertime UP600 HS 0.6 nozzle.json" @@ -246,10 +226,6 @@ "name": "0.24mm Standard @Tiertime UP600 HS 0.6 nozzle", "sub_path": "process/0.24mm Standard @Tiertime UP600 HS 0.6 nozzle.json" }, - { - "name": "0.24mm Fine @Tiertime UP600 HS 0.8 nozzle", - "sub_path": "process/0.24mm Fine @Tiertime UP600 HS 0.8 nozzle.json" - }, { "name": "0.30mm Standard @Tiertime UP600 HS 0.6 nozzle", "sub_path": "process/0.30mm Standard @Tiertime UP600 HS 0.6 nozzle.json" @@ -258,22 +234,46 @@ "name": "0.30mm Strength @Tiertime UP600 HS 0.6 nozzle", "sub_path": "process/0.30mm Strength @Tiertime UP600 HS 0.6 nozzle.json" }, - { - "name": "0.32mm Standard @Tiertime UP600 HS 0.8 nozzle", - "sub_path": "process/0.32mm Standard @Tiertime UP600 HS 0.8 nozzle.json" - }, { "name": "0.36mm Draft @Tiertime UP600 HS 0.6 nozzle", "sub_path": "process/0.36mm Draft @Tiertime UP600 HS 0.6 nozzle.json" }, - { - "name": "0.40mm Standard @Tiertime UP600 HS 0.8 nozzle", - "sub_path": "process/0.40mm Standard @Tiertime UP600 HS 0.8 nozzle.json" - }, { "name": "0.42mm Extra Draft @Tiertime UP600 HS 0.6 nozzle", "sub_path": "process/0.42mm Extra Draft @Tiertime UP600 HS 0.6 nozzle.json" }, + { + "name": "0.24mm Fine @Tiertime UP400 Pro 0.8 nozzle", + "sub_path": "process/0.24mm Fine @Tiertime UP400 Pro 0.8 nozzle.json" + }, + { + "name": "0.32mm Standard @Tiertime UP400 Pro 0.8 nozzle", + "sub_path": "process/0.32mm Standard @Tiertime UP400 Pro 0.8 nozzle.json" + }, + { + "name": "0.40mm Standard @Tiertime UP400 Pro 0.8 nozzle", + "sub_path": "process/0.40mm Standard @Tiertime UP400 Pro 0.8 nozzle.json" + }, + { + "name": "0.48mm Draft @Tiertime UP400 Pro 0.8 nozzle", + "sub_path": "process/0.48mm Draft @Tiertime UP400 Pro 0.8 nozzle.json" + }, + { + "name": "0.56mm Extra Draft @Tiertime UP400 Pro 0.8 nozzle", + "sub_path": "process/0.56mm Extra Draft @Tiertime UP400 Pro 0.8 nozzle.json" + }, + { + "name": "0.24mm Fine @Tiertime UP600 HS 0.8 nozzle", + "sub_path": "process/0.24mm Fine @Tiertime UP600 HS 0.8 nozzle.json" + }, + { + "name": "0.32mm Standard @Tiertime UP600 HS 0.8 nozzle", + "sub_path": "process/0.32mm Standard @Tiertime UP600 HS 0.8 nozzle.json" + }, + { + "name": "0.40mm Standard @Tiertime UP600 HS 0.8 nozzle", + "sub_path": "process/0.40mm Standard @Tiertime UP600 HS 0.8 nozzle.json" + }, { "name": "0.48mm Draft @Tiertime UP600 HS 0.8 nozzle", "sub_path": "process/0.48mm Draft @Tiertime UP600 HS 0.8 nozzle.json" @@ -288,29 +288,21 @@ "name": "fdm_filament_common", "sub_path": "filament/fdm_filament_common.json" }, + { + "name": "fdm_filament_pla", + "sub_path": "filament/fdm_filament_pla.json" + }, { "name": "fdm_filament_abs", "sub_path": "filament/fdm_filament_abs.json" }, { - "name": "fdm_filament_asa", - "sub_path": "filament/fdm_filament_asa.json" + "name": "fdm_filament_tpu", + "sub_path": "filament/fdm_filament_tpu.json" }, { - "name": "fdm_filament_bvoh", - "sub_path": "filament/fdm_filament_bvoh.json" - }, - { - "name": "fdm_filament_eva", - "sub_path": "filament/fdm_filament_eva.json" - }, - { - "name": "fdm_filament_hips", - "sub_path": "filament/fdm_filament_hips.json" - }, - { - "name": "fdm_filament_pa", - "sub_path": "filament/fdm_filament_pa.json" + "name": "fdm_filament_pet", + "sub_path": "filament/fdm_filament_pet.json" }, { "name": "fdm_filament_pc", @@ -321,164 +313,176 @@ "sub_path": "filament/fdm_filament_pctg.json" }, { - "name": "fdm_filament_pe", - "sub_path": "filament/fdm_filament_pe.json" - }, - { - "name": "fdm_filament_pet", - "sub_path": "filament/fdm_filament_pet.json" - }, - { - "name": "fdm_filament_pha", - "sub_path": "filament/fdm_filament_pha.json" - }, - { - "name": "fdm_filament_pla", - "sub_path": "filament/fdm_filament_pla.json" - }, - { - "name": "fdm_filament_pp", - "sub_path": "filament/fdm_filament_pp.json" - }, - { - "name": "fdm_filament_ppa", - "sub_path": "filament/fdm_filament_ppa.json" - }, - { - "name": "fdm_filament_pps", - "sub_path": "filament/fdm_filament_pps.json" + "name": "fdm_filament_asa", + "sub_path": "filament/fdm_filament_asa.json" }, { "name": "fdm_filament_pva", "sub_path": "filament/fdm_filament_pva.json" }, { - "name": "fdm_filament_sbs", - "sub_path": "filament/fdm_filament_sbs.json" + "name": "fdm_filament_pa", + "sub_path": "filament/fdm_filament_pa.json" }, { - "name": "fdm_filament_tpu", - "sub_path": "filament/fdm_filament_tpu.json" + "name": "fdm_filament_hips", + "sub_path": "filament/fdm_filament_hips.json" + }, + { + "name": "fdm_filament_pps", + "sub_path": "filament/fdm_filament_pps.json" + }, + { + "name": "fdm_filament_ppa", + "sub_path": "filament/fdm_filament_ppa.json" + }, + { + "name": "fdm_filament_pe", + "sub_path": "filament/fdm_filament_pe.json" + }, + { + "name": "fdm_filament_pp", + "sub_path": "filament/fdm_filament_pp.json" + }, + { + "name": "fdm_filament_eva", + "sub_path": "filament/fdm_filament_eva.json" + }, + { + "name": "fdm_filament_pha", + "sub_path": "filament/fdm_filament_pha.json" + }, + { + "name": "fdm_filament_bvoh", + "sub_path": "filament/fdm_filament_bvoh.json" + }, + { + "name": "fdm_filament_sbs", + "sub_path": "filament/fdm_filament_sbs.json" + }, + { + "name": "Tiertime PLA", + "sub_path": "filament/Tiertime PLA.json" }, { "name": "Tiertime ABS", "sub_path": "filament/Tiertime ABS.json" }, - { - "name": "Tiertime ABS@300HS", - "sub_path": "filament/Tiertime ABS@300HS.json" - }, - { - "name": "Tiertime Generic ABS", - "sub_path": "filament/Tiertime Generic ABS.json" - }, - { - "name": "Tiertime Generic ABS@300HS", - "sub_path": "filament/Tiertime Generic ABS@300HS.json" - }, { "name": "Tiertime ASA", "sub_path": "filament/Tiertime ASA.json" }, - { - "name": "Tiertime ASA@300HS", - "sub_path": "filament/Tiertime ASA@300HS.json" - }, - { - "name": "Tiertime Generic ASA", - "sub_path": "filament/Tiertime Generic ASA.json" - }, - { - "name": "Tiertime Generic ASA@300HS", - "sub_path": "filament/Tiertime Generic ASA@300HS.json" - }, - { - "name": "Tiertime Generic BVOH", - "sub_path": "filament/Tiertime Generic BVOH.json" - }, - { - "name": "Tiertime Generic BVOH@300HS", - "sub_path": "filament/Tiertime Generic BVOH@300HS.json" - }, - { - "name": "Tiertime Generic EVA", - "sub_path": "filament/Tiertime Generic EVA.json" - }, - { - "name": "Tiertime Generic EVA@300HS", - "sub_path": "filament/Tiertime Generic EVA@300HS.json" - }, - { - "name": "Tiertime Generic HIPS", - "sub_path": "filament/Tiertime Generic HIPS.json" - }, - { - "name": "Tiertime Generic HIPS@300HS", - "sub_path": "filament/Tiertime Generic HIPS@300HS.json" - }, - { - "name": "Tiertime Generic PA", - "sub_path": "filament/Tiertime Generic PA.json" - }, - { - "name": "Tiertime Generic PA-CF", - "sub_path": "filament/Tiertime Generic PA-CF.json" - }, - { - "name": "Tiertime Generic PA-CF@300HS", - "sub_path": "filament/Tiertime Generic PA-CF@300HS.json" - }, - { - "name": "Tiertime Generic PA@300HS", - "sub_path": "filament/Tiertime Generic PA@300HS.json" - }, { "name": "Tiertime PA6-CF", "sub_path": "filament/Tiertime PA6-CF.json" }, - { - "name": "Tiertime PA6-CF@300HS", - "sub_path": "filament/Tiertime PA6-CF@300HS.json" - }, - { - "name": "Tiertime Generic PC", - "sub_path": "filament/Tiertime Generic PC.json" - }, - { - "name": "Tiertime Generic PC@300HS", - "sub_path": "filament/Tiertime Generic PC@300HS.json" - }, { "name": "Tiertime PC", "sub_path": "filament/Tiertime PC.json" }, + { + "name": "Tiertime PET-CF", + "sub_path": "filament/Tiertime PET-CF.json" + }, + { + "name": "Tiertime PETG", + "sub_path": "filament/Tiertime PETG.json" + }, + { + "name": "Tiertime PLA-CF", + "sub_path": "filament/Tiertime PLA-CF.json" + }, + { + "name": "Tiertime PVA", + "sub_path": "filament/Tiertime PVA.json" + }, + { + "name": "Tiertime TPU 95A", + "sub_path": "filament/Tiertime TPU 95A.json" + }, + { + "name": "Tiertime PLA@300HS", + "sub_path": "filament/Tiertime PLA@300HS.json" + }, + { + "name": "Tiertime ABS@300HS", + "sub_path": "filament/Tiertime ABS@300HS.json" + }, + { + "name": "Tiertime ASA@300HS", + "sub_path": "filament/Tiertime ASA@300HS.json" + }, + { + "name": "Tiertime PA6-CF@300HS", + "sub_path": "filament/Tiertime PA6-CF@300HS.json" + }, { "name": "Tiertime PC@300HS", "sub_path": "filament/Tiertime PC@300HS.json" }, + { + "name": "Tiertime PET-CF@300HS", + "sub_path": "filament/Tiertime PET-CF@300HS.json" + }, + { + "name": "Tiertime PETG@300HS", + "sub_path": "filament/Tiertime PETG@300HS.json" + }, + { + "name": "Tiertime PLA-CF@300HS", + "sub_path": "filament/Tiertime PLA-CF@300HS.json" + }, + { + "name": "Tiertime PVA@300HS", + "sub_path": "filament/Tiertime PVA@300HS.json" + }, + { + "name": "Tiertime TPU 95A@300HS", + "sub_path": "filament/Tiertime TPU 95A@300HS.json" + }, + { + "name": "Tiertime Generic ABS", + "sub_path": "filament/Tiertime Generic ABS.json" + }, + { + "name": "Tiertime Generic ASA", + "sub_path": "filament/Tiertime Generic ASA.json" + }, + { + "name": "Tiertime Generic BVOH", + "sub_path": "filament/Tiertime Generic BVOH.json" + }, + { + "name": "Tiertime Generic EVA", + "sub_path": "filament/Tiertime Generic EVA.json" + }, + { + "name": "Tiertime Generic HIPS", + "sub_path": "filament/Tiertime Generic HIPS.json" + }, + { + "name": "Tiertime Generic PA-CF", + "sub_path": "filament/Tiertime Generic PA-CF.json" + }, + { + "name": "Tiertime Generic PA", + "sub_path": "filament/Tiertime Generic PA.json" + }, + { + "name": "Tiertime Generic PC", + "sub_path": "filament/Tiertime Generic PC.json" + }, { "name": "Tiertime Generic PCTG", "sub_path": "filament/Tiertime Generic PCTG.json" }, - { - "name": "Tiertime Generic PCTG@300HS", - "sub_path": "filament/Tiertime Generic PCTG@300HS.json" - }, - { - "name": "Tiertime Generic PE", - "sub_path": "filament/Tiertime Generic PE.json" - }, { "name": "Tiertime Generic PE-CF", "sub_path": "filament/Tiertime Generic PE-CF.json" }, { - "name": "Tiertime Generic PE-CF@300HS", - "sub_path": "filament/Tiertime Generic PE-CF@300HS.json" - }, - { - "name": "Tiertime Generic PE@300HS", - "sub_path": "filament/Tiertime Generic PE@300HS.json" + "name": "Tiertime Generic PE", + "sub_path": "filament/Tiertime Generic PE.json" }, { "name": "Tiertime Generic PETG", @@ -488,62 +492,131 @@ "name": "Tiertime Generic PETG-CF", "sub_path": "filament/Tiertime Generic PETG-CF.json" }, - { - "name": "Tiertime Generic PETG-CF@300HS", - "sub_path": "filament/Tiertime Generic PETG-CF@300HS.json" - }, - { - "name": "Tiertime Generic PETG@300HS", - "sub_path": "filament/Tiertime Generic PETG@300HS.json" - }, - { - "name": "Tiertime PET-CF", - "sub_path": "filament/Tiertime PET-CF.json" - }, - { - "name": "Tiertime PET-CF@300HS", - "sub_path": "filament/Tiertime PET-CF@300HS.json" - }, - { - "name": "Tiertime PETG", - "sub_path": "filament/Tiertime PETG.json" - }, - { - "name": "Tiertime PETG@300HS", - "sub_path": "filament/Tiertime PETG@300HS.json" - }, { "name": "Tiertime Generic PHA", "sub_path": "filament/Tiertime Generic PHA.json" }, - { - "name": "Tiertime Generic PHA@300HS", - "sub_path": "filament/Tiertime Generic PHA@300HS.json" - }, - { - "name": "Tiertime Generic PLA", - "sub_path": "filament/Tiertime Generic PLA.json" - }, { "name": "Tiertime Generic PLA High Speed", "sub_path": "filament/Tiertime Generic PLA High Speed.json" }, - { - "name": "Tiertime Generic PLA High Speed@300HS", - "sub_path": "filament/Tiertime Generic PLA High Speed@300HS.json" - }, { "name": "Tiertime Generic PLA Silk", "sub_path": "filament/Tiertime Generic PLA Silk.json" }, - { - "name": "Tiertime Generic PLA Silk@300HS", - "sub_path": "filament/Tiertime Generic PLA Silk@300HS.json" - }, { "name": "Tiertime Generic PLA-CF", "sub_path": "filament/Tiertime Generic PLA-CF.json" }, + { + "name": "Tiertime Generic PLA", + "sub_path": "filament/Tiertime Generic PLA.json" + }, + { + "name": "Tiertime Generic PP-CF", + "sub_path": "filament/Tiertime Generic PP-CF.json" + }, + { + "name": "Tiertime Generic PP-GF", + "sub_path": "filament/Tiertime Generic PP-GF.json" + }, + { + "name": "Tiertime Generic PP", + "sub_path": "filament/Tiertime Generic PP.json" + }, + { + "name": "Tiertime Generic PPA-CF", + "sub_path": "filament/Tiertime Generic PPA-CF.json" + }, + { + "name": "Tiertime Generic PPA-GF", + "sub_path": "filament/Tiertime Generic PPA-GF.json" + }, + { + "name": "Tiertime Generic PPS-CF", + "sub_path": "filament/Tiertime Generic PPS-CF.json" + }, + { + "name": "Tiertime Generic PPS", + "sub_path": "filament/Tiertime Generic PPS.json" + }, + { + "name": "Tiertime Generic PVA", + "sub_path": "filament/Tiertime Generic PVA.json" + }, + { + "name": "Tiertime Generic SBS", + "sub_path": "filament/Tiertime Generic SBS.json" + } + , + { + "name": "Tiertime Generic TPU", + "sub_path": "filament/Tiertime Generic TPU.json" + }, + { + "name": "Tiertime Generic ABS@300HS", + "sub_path": "filament/Tiertime Generic ABS@300HS.json" + }, + { + "name": "Tiertime Generic ASA@300HS", + "sub_path": "filament/Tiertime Generic ASA@300HS.json" + }, + { + "name": "Tiertime Generic BVOH@300HS", + "sub_path": "filament/Tiertime Generic BVOH@300HS.json" + }, + { + "name": "Tiertime Generic EVA@300HS", + "sub_path": "filament/Tiertime Generic EVA@300HS.json" + }, + { + "name": "Tiertime Generic HIPS@300HS", + "sub_path": "filament/Tiertime Generic HIPS@300HS.json" + }, + { + "name": "Tiertime Generic PA-CF@300HS", + "sub_path": "filament/Tiertime Generic PA-CF@300HS.json" + }, + { + "name": "Tiertime Generic PA@300HS", + "sub_path": "filament/Tiertime Generic PA@300HS.json" + }, + { + "name": "Tiertime Generic PC@300HS", + "sub_path": "filament/Tiertime Generic PC@300HS.json" + }, + { + "name": "Tiertime Generic PCTG@300HS", + "sub_path": "filament/Tiertime Generic PCTG@300HS.json" + }, + { + "name": "Tiertime Generic PE-CF@300HS", + "sub_path": "filament/Tiertime Generic PE-CF@300HS.json" + }, + { + "name": "Tiertime Generic PE@300HS", + "sub_path": "filament/Tiertime Generic PE@300HS.json" + }, + { + "name": "Tiertime Generic PETG@300HS", + "sub_path": "filament/Tiertime Generic PETG@300HS.json" + }, + { + "name": "Tiertime Generic PETG-CF@300HS", + "sub_path": "filament/Tiertime Generic PETG-CF@300HS.json" + }, + { + "name": "Tiertime Generic PHA@300HS", + "sub_path": "filament/Tiertime Generic PHA@300HS.json" + }, + { + "name": "Tiertime Generic PLA High Speed@300HS", + "sub_path": "filament/Tiertime Generic PLA High Speed@300HS.json" + }, + { + "name": "Tiertime Generic PLA Silk@300HS", + "sub_path": "filament/Tiertime Generic PLA Silk@300HS.json" + }, { "name": "Tiertime Generic PLA-CF@300HS", "sub_path": "filament/Tiertime Generic PLA-CF@300HS.json" @@ -552,38 +625,10 @@ "name": "Tiertime Generic PLA@300HS", "sub_path": "filament/Tiertime Generic PLA@300HS.json" }, - { - "name": "Tiertime PLA", - "sub_path": "filament/Tiertime PLA.json" - }, - { - "name": "Tiertime PLA-CF", - "sub_path": "filament/Tiertime PLA-CF.json" - }, - { - "name": "Tiertime PLA-CF@300HS", - "sub_path": "filament/Tiertime PLA-CF@300HS.json" - }, - { - "name": "Tiertime PLA@300HS", - "sub_path": "filament/Tiertime PLA@300HS.json" - }, - { - "name": "Tiertime Generic PP", - "sub_path": "filament/Tiertime Generic PP.json" - }, - { - "name": "Tiertime Generic PP-CF", - "sub_path": "filament/Tiertime Generic PP-CF.json" - }, { "name": "Tiertime Generic PP-CF@300HS", "sub_path": "filament/Tiertime Generic PP-CF@300HS.json" }, - { - "name": "Tiertime Generic PP-GF", - "sub_path": "filament/Tiertime Generic PP-GF.json" - }, { "name": "Tiertime Generic PP-GF@300HS", "sub_path": "filament/Tiertime Generic PP-GF@300HS.json" @@ -592,30 +637,14 @@ "name": "Tiertime Generic PP@300HS", "sub_path": "filament/Tiertime Generic PP@300HS.json" }, - { - "name": "Tiertime Generic PPA-CF", - "sub_path": "filament/Tiertime Generic PPA-CF.json" - }, { "name": "Tiertime Generic PPA-CF@300HS", "sub_path": "filament/Tiertime Generic PPA-CF@300HS.json" }, - { - "name": "Tiertime Generic PPA-GF", - "sub_path": "filament/Tiertime Generic PPA-GF.json" - }, { "name": "Tiertime Generic PPA-GF@300HS", "sub_path": "filament/Tiertime Generic PPA-GF@300HS.json" }, - { - "name": "Tiertime Generic PPS", - "sub_path": "filament/Tiertime Generic PPS.json" - }, - { - "name": "Tiertime Generic PPS-CF", - "sub_path": "filament/Tiertime Generic PPS-CF.json" - }, { "name": "Tiertime Generic PPS-CF@300HS", "sub_path": "filament/Tiertime Generic PPS-CF@300HS.json" @@ -624,45 +653,18 @@ "name": "Tiertime Generic PPS@300HS", "sub_path": "filament/Tiertime Generic PPS@300HS.json" }, - { - "name": "Tiertime Generic PVA", - "sub_path": "filament/Tiertime Generic PVA.json" - }, { "name": "Tiertime Generic PVA@300HS", "sub_path": "filament/Tiertime Generic PVA@300HS.json" }, - { - "name": "Tiertime PVA", - "sub_path": "filament/Tiertime PVA.json" - }, - { - "name": "Tiertime PVA@300HS", - "sub_path": "filament/Tiertime PVA@300HS.json" - }, - { - "name": "Tiertime Generic SBS", - "sub_path": "filament/Tiertime Generic SBS.json" - }, { "name": "Tiertime Generic SBS@300HS", "sub_path": "filament/Tiertime Generic SBS@300HS.json" - }, - { - "name": "Tiertime Generic TPU", - "sub_path": "filament/Tiertime Generic TPU.json" - }, + } + , { "name": "Tiertime Generic TPU@300HS", "sub_path": "filament/Tiertime Generic TPU@300HS.json" - }, - { - "name": "Tiertime TPU 95A", - "sub_path": "filament/Tiertime TPU 95A.json" - }, - { - "name": "Tiertime TPU 95A@300HS", - "sub_path": "filament/Tiertime TPU 95A@300HS.json" } ], "machine_list": [ @@ -675,16 +677,16 @@ "sub_path": "machine/fdm_tiertime_common.json" }, { - "name": "Tiertime UP300 HS 0.4 nozzle", - "sub_path": "machine/Tiertime UP300 HS 0.4 nozzle.json" + "name": "Tiertime UP400 Pro 0.4 nozzle", + "sub_path": "machine/Tiertime UP400 Pro 0.4 nozzle.json" }, { "name": "Tiertime UP310 Pro 0.4 nozzle", "sub_path": "machine/Tiertime UP310 Pro 0.4 nozzle.json" }, { - "name": "Tiertime UP400 Pro 0.4 nozzle", - "sub_path": "machine/Tiertime UP400 Pro 0.4 nozzle.json" + "name": "Tiertime UP300 HS 0.4 nozzle", + "sub_path": "machine/Tiertime UP300 HS 0.4 nozzle.json" }, { "name": "Tiertime UP600 HS 0.4 nozzle", @@ -707,4 +709,4 @@ "sub_path": "machine/Tiertime UP600 HS 0.8 nozzle.json" } ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime ABS.json b/resources/profiles/Tiertime/filament/Tiertime ABS.json index 0d1f7453ee..70b94c9aa7 100644 --- a/resources/profiles/Tiertime/filament/Tiertime ABS.json +++ b/resources/profiles/Tiertime/filament/Tiertime ABS.json @@ -1,11 +1,11 @@ { "type": "filament", - "name": "Tiertime ABS", - "inherits": "fdm_filament_abs", - "from": "system", - "setting_id": "GFSB00", "filament_id": "GFB00", + "setting_id": "GFSB00", + "name": "Tiertime ABS", + "from": "system", "instantiation": "true", + "inherits": "fdm_filament_abs", "filament_flow_ratio": [ "0.95" ], @@ -30,4 +30,4 @@ "Tiertime UP400 Pro 0.8 nozzle", "Tiertime UP310 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime ABS@300HS.json b/resources/profiles/Tiertime/filament/Tiertime ABS@300HS.json index a9a29e2591..fb743e6bff 100644 --- a/resources/profiles/Tiertime/filament/Tiertime ABS@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime ABS@300HS.json @@ -1,11 +1,11 @@ { "type": "filament", - "name": "Tiertime ABS@300HS", - "inherits": "fdm_filament_abs", - "from": "system", - "setting_id": "GFSB00", "filament_id": "GFB00_01", + "setting_id": "GFSB00", + "name": "Tiertime ABS@300HS", + "from": "system", "instantiation": "true", + "inherits": "fdm_filament_abs", "filament_flow_ratio": [ "0.95" ], @@ -30,4 +30,4 @@ "Tiertime UP600 HS 0.6 nozzle", "Tiertime UP600 HS 0.8 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime ASA.json b/resources/profiles/Tiertime/filament/Tiertime ASA.json index e483aba7d2..ae29f1ed8e 100644 --- a/resources/profiles/Tiertime/filament/Tiertime ASA.json +++ b/resources/profiles/Tiertime/filament/Tiertime ASA.json @@ -41,4 +41,4 @@ "Tiertime UP400 Pro 0.8 nozzle", "Tiertime UP310 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime ASA@300HS.json b/resources/profiles/Tiertime/filament/Tiertime ASA@300HS.json index 092151f031..f238c443c4 100644 --- a/resources/profiles/Tiertime/filament/Tiertime ASA@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime ASA@300HS.json @@ -41,4 +41,4 @@ "Tiertime UP600 HS 0.6 nozzle", "Tiertime UP600 HS 0.8 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic ABS.json b/resources/profiles/Tiertime/filament/Tiertime Generic ABS.json index c0b16c6d4a..f01903df40 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic ABS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic ABS.json @@ -35,4 +35,4 @@ "Tiertime UP400 Pro 0.8 nozzle", "Tiertime UP310 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic ABS@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic ABS@300HS.json index 463e8e8d37..7b4eb78abe 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic ABS@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic ABS@300HS.json @@ -35,4 +35,4 @@ "Tiertime UP600 HS 0.6 nozzle", "Tiertime UP600 HS 0.8 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic ASA.json b/resources/profiles/Tiertime/filament/Tiertime Generic ASA.json index e1f4a66477..41f3ab6f7d 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic ASA.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic ASA.json @@ -29,4 +29,4 @@ "Tiertime UP400 Pro 0.8 nozzle", "Tiertime UP310 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic ASA@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic ASA@300HS.json index 9b9aeb188b..5a616e10ff 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic ASA@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic ASA@300HS.json @@ -29,4 +29,4 @@ "Tiertime UP600 HS 0.6 nozzle", "Tiertime UP600 HS 0.8 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic BVOH.json b/resources/profiles/Tiertime/filament/Tiertime Generic BVOH.json index 3fd96b3326..b3193bce62 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic BVOH.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic BVOH.json @@ -11,4 +11,4 @@ "Tiertime UP400 Pro 0.8 nozzle", "Tiertime UP310 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic BVOH@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic BVOH@300HS.json index c04269f3b8..9937ba29b9 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic BVOH@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic BVOH@300HS.json @@ -11,4 +11,4 @@ "Tiertime UP600 HS 0.6 nozzle", "Tiertime UP600 HS 0.8 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic EVA.json b/resources/profiles/Tiertime/filament/Tiertime Generic EVA.json index 375ac412af..86b3c4b7e4 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic EVA.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic EVA.json @@ -89,4 +89,4 @@ "Tiertime UP400 Pro 0.8 nozzle", "Tiertime UP310 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic EVA@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic EVA@300HS.json index 87a30d57b1..a7b6895227 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic EVA@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic EVA@300HS.json @@ -89,4 +89,4 @@ "Tiertime UP600 HS 0.6 nozzle", "Tiertime UP600 HS 0.8 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic HIPS.json b/resources/profiles/Tiertime/filament/Tiertime Generic HIPS.json index 79625ac208..30e66d1c20 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic HIPS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic HIPS.json @@ -14,4 +14,4 @@ "Tiertime UP400 Pro 0.8 nozzle", "Tiertime UP310 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic HIPS@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic HIPS@300HS.json index 744206b3bc..a47793a81a 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic HIPS@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic HIPS@300HS.json @@ -14,4 +14,4 @@ "Tiertime UP600 HS 0.6 nozzle", "Tiertime UP600 HS 0.8 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PA-CF.json b/resources/profiles/Tiertime/filament/Tiertime Generic PA-CF.json index c5215c816a..2ca188ada0 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PA-CF.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PA-CF.json @@ -3,8 +3,8 @@ "name": "Tiertime Generic PA-CF", "inherits": "fdm_filament_pa", "from": "system", - "setting_id": "GFSN99", "filament_id": "GFN98", + "setting_id": "GFSN99", "instantiation": "true", "fan_cooling_layer_time": [ "5" @@ -36,4 +36,4 @@ "Tiertime UP400 Pro 0.8 nozzle", "Tiertime UP310 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PA-CF@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PA-CF@300HS.json index 558399b876..cd43e74d13 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PA-CF@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PA-CF@300HS.json @@ -3,8 +3,8 @@ "name": "Tiertime Generic PA-CF@300HS", "inherits": "fdm_filament_pa", "from": "system", - "setting_id": "GFSN99", "filament_id": "GFN98_02", + "setting_id": "GFSN99", "instantiation": "true", "fan_cooling_layer_time": [ "5" @@ -36,4 +36,4 @@ "Tiertime UP600 HS 0.6 nozzle", "Tiertime UP600 HS 0.8 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PA.json b/resources/profiles/Tiertime/filament/Tiertime Generic PA.json index 20f1b1cd45..3b73d30ef6 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PA.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PA.json @@ -3,8 +3,8 @@ "name": "Tiertime Generic PA", "inherits": "fdm_filament_pa", "from": "system", - "setting_id": "GFSN98", "filament_id": "GFN99", + "setting_id": "GFSN98", "instantiation": "true", "chamber_temperatures": [ "60" @@ -54,4 +54,4 @@ "Tiertime UP400 Pro 0.8 nozzle", "Tiertime UP310 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PA@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PA@300HS.json index 83195885de..139f935a58 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PA@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PA@300HS.json @@ -3,8 +3,8 @@ "name": "Tiertime Generic PA@300HS", "inherits": "fdm_filament_pa", "from": "system", - "setting_id": "GFSN98", "filament_id": "GFN99_01", + "setting_id": "GFSN98", "instantiation": "true", "chamber_temperatures": [ "60" @@ -54,4 +54,4 @@ "Tiertime UP600 HS 0.6 nozzle", "Tiertime UP600 HS 0.8 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PC.json b/resources/profiles/Tiertime/filament/Tiertime Generic PC.json index c44ac1ce53..28a4b501a3 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PC.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PC.json @@ -17,4 +17,4 @@ "Tiertime UP400 Pro 0.8 nozzle", "Tiertime UP310 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PC@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PC@300HS.json index 6b99e8c28b..7249c99ff8 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PC@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PC@300HS.json @@ -17,4 +17,4 @@ "Tiertime UP600 HS 0.6 nozzle", "Tiertime UP600 HS 0.8 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PCTG.json b/resources/profiles/Tiertime/filament/Tiertime Generic PCTG.json index be670f1234..a4ebf5fb4f 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PCTG.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PCTG.json @@ -77,4 +77,4 @@ "Tiertime UP400 Pro 0.8 nozzle", "Tiertime UP310 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PCTG@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PCTG@300HS.json index f4668b0e90..f5c6a5492f 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PCTG@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PCTG@300HS.json @@ -77,4 +77,4 @@ "Tiertime UP600 HS 0.6 nozzle", "Tiertime UP600 HS 0.8 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PE-CF.json b/resources/profiles/Tiertime/filament/Tiertime Generic PE-CF.json index a1f9c363b3..291aba7a9c 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PE-CF.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PE-CF.json @@ -41,4 +41,4 @@ "Tiertime UP400 Pro 0.8 nozzle", "Tiertime UP310 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PE-CF@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PE-CF@300HS.json index e328e6d2cf..cb3ab02dce 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PE-CF@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PE-CF@300HS.json @@ -41,4 +41,4 @@ "Tiertime UP600 HS 0.6 nozzle", "Tiertime UP600 HS 0.8 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PE.json b/resources/profiles/Tiertime/filament/Tiertime Generic PE.json index 5a2912f7a0..ecc9fd25e0 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PE.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PE.json @@ -38,4 +38,4 @@ "Tiertime UP400 Pro 0.8 nozzle", "Tiertime UP310 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PE@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PE@300HS.json index 0edd1dcde0..7f685e648f 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PE@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PE@300HS.json @@ -38,4 +38,4 @@ "Tiertime UP600 HS 0.6 nozzle", "Tiertime UP600 HS 0.8 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PETG-CF.json b/resources/profiles/Tiertime/filament/Tiertime Generic PETG-CF.json index 2e6c956c3e..e0e164f4f7 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PETG-CF.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PETG-CF.json @@ -83,4 +83,4 @@ "Tiertime UP400 Pro 0.8 nozzle", "Tiertime UP310 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PETG-CF@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PETG-CF@300HS.json index 16af90a8ea..31173b9ded 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PETG-CF@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PETG-CF@300HS.json @@ -83,4 +83,4 @@ "Tiertime UP600 HS 0.6 nozzle", "Tiertime UP600 HS 0.8 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PETG.json b/resources/profiles/Tiertime/filament/Tiertime Generic PETG.json index 2ffe424260..2032234129 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PETG.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PETG.json @@ -68,4 +68,4 @@ "Tiertime UP400 Pro 0.8 nozzle", "Tiertime UP310 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PETG@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PETG@300HS.json index 4f278cb47b..6cd353ffa1 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PETG@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PETG@300HS.json @@ -68,4 +68,4 @@ "Tiertime UP600 HS 0.6 nozzle", "Tiertime UP600 HS 0.8 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PHA.json b/resources/profiles/Tiertime/filament/Tiertime Generic PHA.json index e224f44dd8..1d5a367141 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PHA.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PHA.json @@ -11,4 +11,4 @@ "Tiertime UP400 Pro 0.8 nozzle", "Tiertime UP310 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PHA@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PHA@300HS.json index 5498471a7f..e1a25d2df5 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PHA@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PHA@300HS.json @@ -11,4 +11,4 @@ "Tiertime UP600 HS 0.6 nozzle", "Tiertime UP600 HS 0.8 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PLA High Speed.json b/resources/profiles/Tiertime/filament/Tiertime Generic PLA High Speed.json index 54652180a6..fac65fd7c6 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PLA High Speed.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PLA High Speed.json @@ -20,4 +20,4 @@ "Tiertime UP400 Pro 0.8 nozzle", "Tiertime UP310 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PLA High Speed@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PLA High Speed@300HS.json index 6ca59aa567..ce33779722 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PLA High Speed@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PLA High Speed@300HS.json @@ -20,4 +20,4 @@ "Tiertime UP600 HS 0.6 nozzle", "Tiertime UP600 HS 0.8 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PLA Silk.json b/resources/profiles/Tiertime/filament/Tiertime Generic PLA Silk.json index d08d8bad3f..28a68d3fec 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PLA Silk.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PLA Silk.json @@ -26,4 +26,4 @@ "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n{endif};Prevent PLA from jamming\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PLA Silk@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PLA Silk@300HS.json index 52aafebe1b..1f162fc058 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PLA Silk@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PLA Silk@300HS.json @@ -26,4 +26,4 @@ "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n{endif};Prevent PLA from jamming\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PLA-CF.json b/resources/profiles/Tiertime/filament/Tiertime Generic PLA-CF.json index d2a296d932..99532b4f11 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PLA-CF.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PLA-CF.json @@ -56,4 +56,4 @@ "Tiertime UP400 Pro 0.8 nozzle", "Tiertime UP310 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PLA-CF@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PLA-CF@300HS.json index acb3477896..dd3e9f5985 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PLA-CF@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PLA-CF@300HS.json @@ -56,4 +56,4 @@ "Tiertime UP600 HS 0.6 nozzle", "Tiertime UP600 HS 0.8 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PLA.json b/resources/profiles/Tiertime/filament/Tiertime Generic PLA.json index d6b048de43..222385001e 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PLA.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PLA.json @@ -20,4 +20,4 @@ "Tiertime UP400 Pro 0.8 nozzle", "Tiertime UP310 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PLA@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PLA@300HS.json index f5ec4c2930..ada01e9059 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PLA@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PLA@300HS.json @@ -20,4 +20,4 @@ "Tiertime UP600 HS 0.6 nozzle", "Tiertime UP600 HS 0.8 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PP-CF.json b/resources/profiles/Tiertime/filament/Tiertime Generic PP-CF.json index 74c54d5226..ed6cb19d75 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PP-CF.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PP-CF.json @@ -23,4 +23,4 @@ "Tiertime UP400 Pro 0.8 nozzle", "Tiertime UP310 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PP-CF@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PP-CF@300HS.json index c85e1d364e..aa5f757db4 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PP-CF@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PP-CF@300HS.json @@ -23,4 +23,4 @@ "Tiertime UP600 HS 0.6 nozzle", "Tiertime UP600 HS 0.8 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PP-GF.json b/resources/profiles/Tiertime/filament/Tiertime Generic PP-GF.json index e096bded4f..954b8fcb72 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PP-GF.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PP-GF.json @@ -23,4 +23,4 @@ "Tiertime UP400 Pro 0.8 nozzle", "Tiertime UP310 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PP-GF@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PP-GF@300HS.json index 74e8c9148e..0867a0f2f1 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PP-GF@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PP-GF@300HS.json @@ -23,4 +23,4 @@ "Tiertime UP600 HS 0.6 nozzle", "Tiertime UP600 HS 0.8 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PP.json b/resources/profiles/Tiertime/filament/Tiertime Generic PP.json index 5cf5251643..21a2be9083 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PP.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PP.json @@ -11,4 +11,4 @@ "Tiertime UP400 Pro 0.8 nozzle", "Tiertime UP310 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PP@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PP@300HS.json index d8a7d01582..edb94271d3 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PP@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PP@300HS.json @@ -11,4 +11,4 @@ "Tiertime UP600 HS 0.6 nozzle", "Tiertime UP600 HS 0.8 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PPA-CF.json b/resources/profiles/Tiertime/filament/Tiertime Generic PPA-CF.json index 6457434cb8..1230f920c2 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PPA-CF.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PPA-CF.json @@ -23,4 +23,4 @@ "Tiertime UP400 Pro 0.8 nozzle", "Tiertime UP310 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PPA-CF@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PPA-CF@300HS.json index c182a49c40..3e27e9b7ee 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PPA-CF@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PPA-CF@300HS.json @@ -23,4 +23,4 @@ "Tiertime UP600 HS 0.6 nozzle", "Tiertime UP600 HS 0.8 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PPA-GF.json b/resources/profiles/Tiertime/filament/Tiertime Generic PPA-GF.json index 1cff829916..43a767c865 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PPA-GF.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PPA-GF.json @@ -17,4 +17,4 @@ "Tiertime UP400 Pro 0.8 nozzle", "Tiertime UP310 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PPA-GF@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PPA-GF@300HS.json index 786241f02a..dc83f5bdae 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PPA-GF@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PPA-GF@300HS.json @@ -17,4 +17,4 @@ "Tiertime UP600 HS 0.6 nozzle", "Tiertime UP600 HS 0.8 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PPS-CF.json b/resources/profiles/Tiertime/filament/Tiertime Generic PPS-CF.json index a6a54ff66d..cc406f7537 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PPS-CF.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PPS-CF.json @@ -32,4 +32,4 @@ "Tiertime UP400 Pro 0.8 nozzle", "Tiertime UP310 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PPS-CF@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PPS-CF@300HS.json index 44912355fa..70db00a4b1 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PPS-CF@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PPS-CF@300HS.json @@ -32,4 +32,4 @@ "Tiertime UP600 HS 0.6 nozzle", "Tiertime UP600 HS 0.8 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PPS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PPS.json index 38faa40d78..83240e1929 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PPS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PPS.json @@ -11,4 +11,4 @@ "Tiertime UP400 Pro 0.8 nozzle", "Tiertime UP310 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PPS@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PPS@300HS.json index b1474b2420..f3ef115c75 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PPS@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PPS@300HS.json @@ -11,4 +11,4 @@ "Tiertime UP600 HS 0.6 nozzle", "Tiertime UP600 HS 0.8 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PVA.json b/resources/profiles/Tiertime/filament/Tiertime Generic PVA.json index 82c8766013..c551a1ccc8 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PVA.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PVA.json @@ -23,4 +23,4 @@ "Tiertime UP400 Pro 0.8 nozzle", "Tiertime UP310 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PVA@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PVA@300HS.json index d2c6d51ed5..7d8828d15d 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PVA@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PVA@300HS.json @@ -23,4 +23,4 @@ "Tiertime UP600 HS 0.6 nozzle", "Tiertime UP600 HS 0.8 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic SBS.json b/resources/profiles/Tiertime/filament/Tiertime Generic SBS.json index ec346ed02b..f3d348eb08 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic SBS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic SBS.json @@ -20,4 +20,4 @@ "Tiertime UP400 Pro 0.8 nozzle", "Tiertime UP310 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic SBS@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic SBS@300HS.json index dd9dfbe305..cc6aea2af0 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic SBS@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic SBS@300HS.json @@ -20,4 +20,4 @@ "Tiertime UP600 HS 0.6 nozzle", "Tiertime UP600 HS 0.8 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic TPU.json b/resources/profiles/Tiertime/filament/Tiertime Generic TPU.json index be7234c2aa..0fa7680147 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic TPU.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic TPU.json @@ -3,8 +3,8 @@ "name": "Tiertime Generic TPU", "inherits": "fdm_filament_tpu", "from": "system", - "setting_id": "GFSR99", "filament_id": "GFU99", + "setting_id": "GFSR99", "instantiation": "true", "filament_max_volumetric_speed": [ "3.2" @@ -18,4 +18,4 @@ "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S255\n{elsif (bed_temperature[current_extruder] >30)||(bed_temperature_initial_layer[current_extruder] >30)}M106 P3 S180\n{endif} \n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic TPU@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic TPU@300HS.json index 1caff87b0c..ab95bc93e0 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic TPU@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic TPU@300HS.json @@ -3,8 +3,8 @@ "name": "Tiertime Generic TPU@300HS", "inherits": "fdm_filament_tpu", "from": "system", - "setting_id": "GFSR99", "filament_id": "GFU99_01", + "setting_id": "GFSR99", "instantiation": "true", "filament_max_volumetric_speed": [ "3.2" @@ -18,4 +18,4 @@ "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S255\n{elsif (bed_temperature[current_extruder] >30)||(bed_temperature_initial_layer[current_extruder] >30)}M106 P3 S180\n{endif} \n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime PA6-CF.json b/resources/profiles/Tiertime/filament/Tiertime PA6-CF.json index 9b292fda34..8e43b34eb5 100644 --- a/resources/profiles/Tiertime/filament/Tiertime PA6-CF.json +++ b/resources/profiles/Tiertime/filament/Tiertime PA6-CF.json @@ -50,4 +50,4 @@ "Tiertime UP400 Pro 0.8 nozzle", "Tiertime UP310 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime PA6-CF@300HS.json b/resources/profiles/Tiertime/filament/Tiertime PA6-CF@300HS.json index cd05cca583..3212fd312f 100644 --- a/resources/profiles/Tiertime/filament/Tiertime PA6-CF@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime PA6-CF@300HS.json @@ -45,9 +45,9 @@ "170" ], "compatible_printers": [ - "Tiertime UP300 HS 0.4 nozzle", + "Tiertime UP300 HS 0.4 nozzle", "Tiertime UP600 HS 0.4 nozzle", "Tiertime UP600 HS 0.6 nozzle", "Tiertime UP600 HS 0.8 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime PC.json b/resources/profiles/Tiertime/filament/Tiertime PC.json index edb08356c1..9fa8363812 100644 --- a/resources/profiles/Tiertime/filament/Tiertime PC.json +++ b/resources/profiles/Tiertime/filament/Tiertime PC.json @@ -26,4 +26,4 @@ "Tiertime UP400 Pro 0.8 nozzle", "Tiertime UP310 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime PC@300HS.json b/resources/profiles/Tiertime/filament/Tiertime PC@300HS.json index 6d3d7a8bad..cf6557da45 100644 --- a/resources/profiles/Tiertime/filament/Tiertime PC@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime PC@300HS.json @@ -26,4 +26,4 @@ "Tiertime UP600 HS 0.6 nozzle", "Tiertime UP600 HS 0.8 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime PET-CF.json b/resources/profiles/Tiertime/filament/Tiertime PET-CF.json index 47fcb26213..a6bfd29226 100644 --- a/resources/profiles/Tiertime/filament/Tiertime PET-CF.json +++ b/resources/profiles/Tiertime/filament/Tiertime PET-CF.json @@ -95,4 +95,4 @@ "Tiertime UP400 Pro 0.8 nozzle", "Tiertime UP310 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime PET-CF@300HS.json b/resources/profiles/Tiertime/filament/Tiertime PET-CF@300HS.json index 774075b1c1..0109e4d32e 100644 --- a/resources/profiles/Tiertime/filament/Tiertime PET-CF@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime PET-CF@300HS.json @@ -95,4 +95,4 @@ "Tiertime UP600 HS 0.6 nozzle", "Tiertime UP600 HS 0.8 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime PETG.json b/resources/profiles/Tiertime/filament/Tiertime PETG.json index 14a7bddfb6..01de631e60 100644 --- a/resources/profiles/Tiertime/filament/Tiertime PETG.json +++ b/resources/profiles/Tiertime/filament/Tiertime PETG.json @@ -83,4 +83,4 @@ "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >80)||(bed_temperature_initial_layer[current_extruder] >80)}M106 P3 S255\n{elsif (bed_temperature[current_extruder] >60)||(bed_temperature_initial_layer[current_extruder] >60)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime PETG@300HS.json b/resources/profiles/Tiertime/filament/Tiertime PETG@300HS.json index a16922700a..a4c1ffb7b7 100644 --- a/resources/profiles/Tiertime/filament/Tiertime PETG@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime PETG@300HS.json @@ -83,4 +83,4 @@ "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >80)||(bed_temperature_initial_layer[current_extruder] >80)}M106 P3 S255\n{elsif (bed_temperature[current_extruder] >60)||(bed_temperature_initial_layer[current_extruder] >60)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime PLA-CF.json b/resources/profiles/Tiertime/filament/Tiertime PLA-CF.json index 8434f34187..09c2d5e179 100644 --- a/resources/profiles/Tiertime/filament/Tiertime PLA-CF.json +++ b/resources/profiles/Tiertime/filament/Tiertime PLA-CF.json @@ -59,4 +59,4 @@ "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\nM142 P1 R35 S40\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime PLA-CF@300HS.json b/resources/profiles/Tiertime/filament/Tiertime PLA-CF@300HS.json index 705abe102c..d56dd450b4 100644 --- a/resources/profiles/Tiertime/filament/Tiertime PLA-CF@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime PLA-CF@300HS.json @@ -59,4 +59,4 @@ "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\nM142 P1 R35 S40\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime PLA.json b/resources/profiles/Tiertime/filament/Tiertime PLA.json index 9089f32246..04621989ea 100644 --- a/resources/profiles/Tiertime/filament/Tiertime PLA.json +++ b/resources/profiles/Tiertime/filament/Tiertime PLA.json @@ -1,11 +1,11 @@ { "type": "filament", - "name": "Tiertime PLA", - "inherits": "fdm_filament_pla", - "from": "system", - "setting_id": "GFSA00", "filament_id": "GFA00", + "setting_id": "GFSA00", + "name": "Tiertime PLA", + "from": "system", "instantiation": "true", + "inherits": "fdm_filament_pla", "filament_cost": [ "24.99" ], @@ -33,4 +33,4 @@ "Tiertime UP400 Pro 0.8 nozzle", "Tiertime UP310 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime PLA@300HS.json b/resources/profiles/Tiertime/filament/Tiertime PLA@300HS.json index 70d6cfbb42..20361a44d3 100644 --- a/resources/profiles/Tiertime/filament/Tiertime PLA@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime PLA@300HS.json @@ -1,11 +1,11 @@ { "type": "filament", - "name": "Tiertime PLA@300HS", - "inherits": "fdm_filament_pla", - "from": "system", - "setting_id": "GFSA00", "filament_id": "GFA00_01", + "setting_id": "GFSA00", + "name": "Tiertime PLA@300HS", + "from": "system", "instantiation": "true", + "inherits": "fdm_filament_pla", "filament_cost": [ "24.99" ], @@ -33,4 +33,4 @@ "Tiertime UP600 HS 0.6 nozzle", "Tiertime UP600 HS 0.8 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime PVA.json b/resources/profiles/Tiertime/filament/Tiertime PVA.json index 05d4f33fe2..33bc46167e 100644 --- a/resources/profiles/Tiertime/filament/Tiertime PVA.json +++ b/resources/profiles/Tiertime/filament/Tiertime PVA.json @@ -41,4 +41,4 @@ "Tiertime UP400 Pro 0.8 nozzle", "Tiertime UP310 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime PVA@300HS.json b/resources/profiles/Tiertime/filament/Tiertime PVA@300HS.json index c62e163d35..46a6cddee7 100644 --- a/resources/profiles/Tiertime/filament/Tiertime PVA@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime PVA@300HS.json @@ -41,4 +41,4 @@ "Tiertime UP600 HS 0.6 nozzle", "Tiertime UP600 HS 0.8 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime TPU 95A.json b/resources/profiles/Tiertime/filament/Tiertime TPU 95A.json index 7ec3883348..aa8ae677e8 100644 --- a/resources/profiles/Tiertime/filament/Tiertime TPU 95A.json +++ b/resources/profiles/Tiertime/filament/Tiertime TPU 95A.json @@ -26,4 +26,4 @@ "Tiertime UP400 Pro 0.8 nozzle", "Tiertime UP310 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime TPU 95A@300HS.json b/resources/profiles/Tiertime/filament/Tiertime TPU 95A@300HS.json index 884fede020..717c794ade 100644 --- a/resources/profiles/Tiertime/filament/Tiertime TPU 95A@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime TPU 95A@300HS.json @@ -26,4 +26,4 @@ "Tiertime UP600 HS 0.6 nozzle", "Tiertime UP600 HS 0.8 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/fdm_filament_abs.json b/resources/profiles/Tiertime/filament/fdm_filament_abs.json index e870d17029..50dc3facf1 100644 --- a/resources/profiles/Tiertime/filament/fdm_filament_abs.json +++ b/resources/profiles/Tiertime/filament/fdm_filament_abs.json @@ -79,4 +79,4 @@ "textured_plate_temp_initial_layer": [ "90" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/fdm_filament_asa.json b/resources/profiles/Tiertime/filament/fdm_filament_asa.json index a0da767a75..62d3faef09 100644 --- a/resources/profiles/Tiertime/filament/fdm_filament_asa.json +++ b/resources/profiles/Tiertime/filament/fdm_filament_asa.json @@ -79,4 +79,4 @@ "textured_plate_temp_initial_layer": [ "90" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/fdm_filament_bvoh.json b/resources/profiles/Tiertime/filament/fdm_filament_bvoh.json index 2b481e35d8..6431a87bd2 100644 --- a/resources/profiles/Tiertime/filament/fdm_filament_bvoh.json +++ b/resources/profiles/Tiertime/filament/fdm_filament_bvoh.json @@ -82,4 +82,4 @@ "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/fdm_filament_common.json b/resources/profiles/Tiertime/filament/fdm_filament_common.json index 8ee05fd399..3fb3a8da5e 100644 --- a/resources/profiles/Tiertime/filament/fdm_filament_common.json +++ b/resources/profiles/Tiertime/filament/fdm_filament_common.json @@ -163,4 +163,4 @@ "filament_end_gcode": [ "; filament end gcode \n;M106 P3 S0\n" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/fdm_filament_eva.json b/resources/profiles/Tiertime/filament/fdm_filament_eva.json index 1b2efe2999..3ce2b1844e 100644 --- a/resources/profiles/Tiertime/filament/fdm_filament_eva.json +++ b/resources/profiles/Tiertime/filament/fdm_filament_eva.json @@ -7,4 +7,4 @@ "filament_type": [ "EVA" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/fdm_filament_hips.json b/resources/profiles/Tiertime/filament/fdm_filament_hips.json index 4d1b09d37a..50ee869f2c 100644 --- a/resources/profiles/Tiertime/filament/fdm_filament_hips.json +++ b/resources/profiles/Tiertime/filament/fdm_filament_hips.json @@ -76,4 +76,4 @@ "additional_cooling_fan_speed": [ "0" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/fdm_filament_pa.json b/resources/profiles/Tiertime/filament/fdm_filament_pa.json index 1cd78ec77f..06ddafc639 100644 --- a/resources/profiles/Tiertime/filament/fdm_filament_pa.json +++ b/resources/profiles/Tiertime/filament/fdm_filament_pa.json @@ -79,4 +79,4 @@ "textured_plate_temp_initial_layer": [ "100" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/fdm_filament_pc.json b/resources/profiles/Tiertime/filament/fdm_filament_pc.json index 03bc9e5663..6ffb3ad9ff 100644 --- a/resources/profiles/Tiertime/filament/fdm_filament_pc.json +++ b/resources/profiles/Tiertime/filament/fdm_filament_pc.json @@ -79,4 +79,4 @@ "textured_plate_temp_initial_layer": [ "110" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/fdm_filament_pctg.json b/resources/profiles/Tiertime/filament/fdm_filament_pctg.json index f31c08b83b..70b72a506b 100644 --- a/resources/profiles/Tiertime/filament/fdm_filament_pctg.json +++ b/resources/profiles/Tiertime/filament/fdm_filament_pctg.json @@ -1,64 +1,64 @@ { - "type": "filament", - "name": "fdm_filament_pctg", - "inherits": "fdm_filament_common", - "from": "system", - "instantiation": "false", - "eng_plate_temp": [ - "0" - ], - "eng_plate_temp_initial_layer": [ - "0" - ], - "fan_cooling_layer_time": [ - "20" - ], - "fan_min_speed": [ - "20" - ], - "filament_cost": [ - "30" - ], - "filament_density": [ - "1.27" - ], - "filament_max_volumetric_speed": [ - "25" - ], - "filament_type": [ - "PCTG" - ], - "hot_plate_temp": [ - "80" - ], - "hot_plate_temp_initial_layer": [ - "80" - ], - "nozzle_temperature": [ - "255" - ], - "nozzle_temperature_initial_layer": [ - "255" - ], - "nozzle_temperature_range_high": [ - "260" - ], - "nozzle_temperature_range_low": [ - "220" - ], - "reduce_fan_stop_start_freq": [ - "1" - ], - "temperature_vitrification": [ - "70" - ], - "textured_plate_temp": [ - "80" - ], - "textured_plate_temp_initial_layer": [ - "80" - ], - "filament_start_gcode": [ - "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S180\n{elsif (bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S255\n{endif};Prevent PLA from jamming\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" - ] -} \ No newline at end of file + "type": "filament", + "name": "fdm_filament_pctg", + "inherits": "fdm_filament_common", + "from": "system", + "instantiation": "false", + "eng_plate_temp": [ + "0" + ], + "eng_plate_temp_initial_layer": [ + "0" + ], + "fan_cooling_layer_time": [ + "20" + ], + "fan_min_speed": [ + "20" + ], + "filament_cost": [ + "30" + ], + "filament_density": [ + "1.27" + ], + "filament_max_volumetric_speed": [ + "25" + ], + "filament_type": [ + "PCTG" + ], + "hot_plate_temp": [ + "80" + ], + "hot_plate_temp_initial_layer": [ + "80" + ], + "nozzle_temperature": [ + "255" + ], + "nozzle_temperature_initial_layer": [ + "255" + ], + "nozzle_temperature_range_high": [ + "260" + ], + "nozzle_temperature_range_low": [ + "220" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "temperature_vitrification": [ + "70" + ], + "textured_plate_temp": [ + "80" + ], + "textured_plate_temp_initial_layer": [ + "80" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S180\n{elsif (bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S255\n{endif};Prevent PLA from jamming\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ] +} diff --git a/resources/profiles/Tiertime/filament/fdm_filament_pe.json b/resources/profiles/Tiertime/filament/fdm_filament_pe.json index 8ce20df68a..5c18673ae8 100644 --- a/resources/profiles/Tiertime/filament/fdm_filament_pe.json +++ b/resources/profiles/Tiertime/filament/fdm_filament_pe.json @@ -82,4 +82,4 @@ "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/fdm_filament_pet.json b/resources/profiles/Tiertime/filament/fdm_filament_pet.json index 4a5f6085ca..d563dd7cc4 100644 --- a/resources/profiles/Tiertime/filament/fdm_filament_pet.json +++ b/resources/profiles/Tiertime/filament/fdm_filament_pet.json @@ -61,4 +61,4 @@ "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S180\n{elsif (bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S255\n{endif};Prevent PLA from jamming\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/fdm_filament_pha.json b/resources/profiles/Tiertime/filament/fdm_filament_pha.json index 82519f1b2e..a51be2dcf7 100644 --- a/resources/profiles/Tiertime/filament/fdm_filament_pha.json +++ b/resources/profiles/Tiertime/filament/fdm_filament_pha.json @@ -82,4 +82,4 @@ "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/fdm_filament_pla.json b/resources/profiles/Tiertime/filament/fdm_filament_pla.json index ca4425056d..349acbdcc5 100644 --- a/resources/profiles/Tiertime/filament/fdm_filament_pla.json +++ b/resources/profiles/Tiertime/filament/fdm_filament_pla.json @@ -79,4 +79,4 @@ "filament_start_gcode": [ "; filament start gcode\n;{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n;{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n;{endif}\n\n;{if activate_air_filtration[current_extruder] && support_air_filtration}\n;M106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n;{endif}" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/fdm_filament_pp.json b/resources/profiles/Tiertime/filament/fdm_filament_pp.json index 83a4278250..cc4e584569 100644 --- a/resources/profiles/Tiertime/filament/fdm_filament_pp.json +++ b/resources/profiles/Tiertime/filament/fdm_filament_pp.json @@ -82,4 +82,4 @@ "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/fdm_filament_ppa.json b/resources/profiles/Tiertime/filament/fdm_filament_ppa.json index f2ea53d315..74159abeb5 100644 --- a/resources/profiles/Tiertime/filament/fdm_filament_ppa.json +++ b/resources/profiles/Tiertime/filament/fdm_filament_ppa.json @@ -85,4 +85,4 @@ "textured_plate_temp_initial_layer": [ "100" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/fdm_filament_pps.json b/resources/profiles/Tiertime/filament/fdm_filament_pps.json index a3f104b6f3..881609b890 100644 --- a/resources/profiles/Tiertime/filament/fdm_filament_pps.json +++ b/resources/profiles/Tiertime/filament/fdm_filament_pps.json @@ -76,4 +76,4 @@ "textured_plate_temp_initial_layer": [ "110" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/fdm_filament_pva.json b/resources/profiles/Tiertime/filament/fdm_filament_pva.json index 7d0bdf1b4a..4ef2acf185 100644 --- a/resources/profiles/Tiertime/filament/fdm_filament_pva.json +++ b/resources/profiles/Tiertime/filament/fdm_filament_pva.json @@ -88,4 +88,4 @@ "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/fdm_filament_sbs.json b/resources/profiles/Tiertime/filament/fdm_filament_sbs.json index e7cd5788de..5f9bdb4d2f 100644 --- a/resources/profiles/Tiertime/filament/fdm_filament_sbs.json +++ b/resources/profiles/Tiertime/filament/fdm_filament_sbs.json @@ -11,7 +11,7 @@ "23" ], "filament_type": [ - "SBS" + "SBS" ], "filament_density": [ "1.02" @@ -82,4 +82,4 @@ "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/fdm_filament_tpu.json b/resources/profiles/Tiertime/filament/fdm_filament_tpu.json index 461f76f202..1914ac3029 100644 --- a/resources/profiles/Tiertime/filament/fdm_filament_tpu.json +++ b/resources/profiles/Tiertime/filament/fdm_filament_tpu.json @@ -76,4 +76,4 @@ "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >30)||(bed_temperature_initial_layer[current_extruder] >30)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/machine/Tiertime UP300 HS 0.4 nozzle.json b/resources/profiles/Tiertime/machine/Tiertime UP300 HS 0.4 nozzle.json index be6f8e1644..f719989ecf 100644 --- a/resources/profiles/Tiertime/machine/Tiertime UP300 HS 0.4 nozzle.json +++ b/resources/profiles/Tiertime/machine/Tiertime UP300 HS 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "machine", - "name": "Tiertime UP300 HS 0.4 nozzle", - "inherits": "fdm_tiertime_common", - "from": "system", "setting_id": "GM001", + "name": "Tiertime UP300 HS 0.4 nozzle", + "from": "system", "instantiation": "true", + "inherits": "fdm_tiertime_common", "printer_model": "Tiertime UP300 HS", "nozzle_diameter": [ "0.4" @@ -16,5 +16,6 @@ "207x255", "0x255" ], + "printable_height": "230" } \ No newline at end of file diff --git a/resources/profiles/Tiertime/machine/Tiertime UP300 HS.json b/resources/profiles/Tiertime/machine/Tiertime UP300 HS.json index 3e5cae8859..0434ec601d 100644 --- a/resources/profiles/Tiertime/machine/Tiertime UP300 HS.json +++ b/resources/profiles/Tiertime/machine/Tiertime UP300 HS.json @@ -9,4 +9,4 @@ "bed_texture": "", "hotend_model": "", "default_materials": "Tiertime ABS;Tiertime PLA" -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/machine/Tiertime UP310 Pro 0.4 nozzle.json b/resources/profiles/Tiertime/machine/Tiertime UP310 Pro 0.4 nozzle.json index ea8ec79657..9824250597 100644 --- a/resources/profiles/Tiertime/machine/Tiertime UP310 Pro 0.4 nozzle.json +++ b/resources/profiles/Tiertime/machine/Tiertime UP310 Pro 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "machine", - "name": "Tiertime UP310 Pro 0.4 nozzle", - "inherits": "fdm_tiertime_common", - "from": "system", "setting_id": "GM001", + "name": "Tiertime UP310 Pro 0.4 nozzle", + "from": "system", "instantiation": "true", + "inherits": "fdm_tiertime_common", "printer_model": "Tiertime UP310 Pro", "nozzle_diameter": [ "0.4" diff --git a/resources/profiles/Tiertime/machine/Tiertime UP310 Pro.json b/resources/profiles/Tiertime/machine/Tiertime UP310 Pro.json index 4dbe0b1806..1f528a5619 100644 --- a/resources/profiles/Tiertime/machine/Tiertime UP310 Pro.json +++ b/resources/profiles/Tiertime/machine/Tiertime UP310 Pro.json @@ -9,4 +9,4 @@ "bed_texture": "", "hotend_model": "", "default_materials": "Tiertime ABS;Tiertime PLA" -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/machine/Tiertime UP400 Pro 0.4 nozzle.json b/resources/profiles/Tiertime/machine/Tiertime UP400 Pro 0.4 nozzle.json index ffe0c54e80..d64c6d7215 100644 --- a/resources/profiles/Tiertime/machine/Tiertime UP400 Pro 0.4 nozzle.json +++ b/resources/profiles/Tiertime/machine/Tiertime UP400 Pro 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "machine", - "name": "Tiertime UP400 Pro 0.4 nozzle", - "inherits": "fdm_tiertime_common", - "from": "system", "setting_id": "GM001", + "name": "Tiertime UP400 Pro 0.4 nozzle", + "from": "system", "instantiation": "true", + "inherits": "fdm_tiertime_common", "printer_model": "Tiertime UP400 Pro", "nozzle_diameter": [ "0.4" @@ -16,5 +16,6 @@ "400x350", "0x350" ], + "printable_height": "380" } \ No newline at end of file diff --git a/resources/profiles/Tiertime/machine/Tiertime UP400 Pro 0.6 nozzle.json b/resources/profiles/Tiertime/machine/Tiertime UP400 Pro 0.6 nozzle.json index a64e7d9fc7..a9b5f873b5 100644 --- a/resources/profiles/Tiertime/machine/Tiertime UP400 Pro 0.6 nozzle.json +++ b/resources/profiles/Tiertime/machine/Tiertime UP400 Pro 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "machine", - "name": "Tiertime UP400 Pro 0.6 nozzle", - "inherits": "Tiertime UP400 Pro 0.4 nozzle", - "from": "system", "setting_id": "GM007", + "name": "Tiertime UP400 Pro 0.6 nozzle", + "from": "system", "instantiation": "true", + "inherits": "Tiertime UP400 Pro 0.4 nozzle", "printer_model": "Tiertime UP400 Pro", "nozzle_diameter": [ "0.6" diff --git a/resources/profiles/Tiertime/machine/Tiertime UP400 Pro 0.8 nozzle.json b/resources/profiles/Tiertime/machine/Tiertime UP400 Pro 0.8 nozzle.json index 2f860276a7..0210838f37 100644 --- a/resources/profiles/Tiertime/machine/Tiertime UP400 Pro 0.8 nozzle.json +++ b/resources/profiles/Tiertime/machine/Tiertime UP400 Pro 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "machine", - "name": "Tiertime UP400 Pro 0.8 nozzle", - "inherits": "Tiertime UP400 Pro 0.4 nozzle", - "from": "system", "setting_id": "GM008", + "name": "Tiertime UP400 Pro 0.8 nozzle", + "from": "system", "instantiation": "true", + "inherits": "Tiertime UP400 Pro 0.4 nozzle", "printer_model": "Tiertime UP400 Pro", "nozzle_diameter": [ "0.8" diff --git a/resources/profiles/Tiertime/machine/Tiertime UP400 Pro.json b/resources/profiles/Tiertime/machine/Tiertime UP400 Pro.json index 1cfcbfef5f..74d5686112 100644 --- a/resources/profiles/Tiertime/machine/Tiertime UP400 Pro.json +++ b/resources/profiles/Tiertime/machine/Tiertime UP400 Pro.json @@ -9,4 +9,4 @@ "bed_texture": "", "hotend_model": "", "default_materials": "Tiertime ABS;Tiertime PLA" -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/machine/Tiertime UP600 HS 0.4 nozzle.json b/resources/profiles/Tiertime/machine/Tiertime UP600 HS 0.4 nozzle.json index 5f93151cf0..a1444ca656 100644 --- a/resources/profiles/Tiertime/machine/Tiertime UP600 HS 0.4 nozzle.json +++ b/resources/profiles/Tiertime/machine/Tiertime UP600 HS 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "machine", - "name": "Tiertime UP600 HS 0.4 nozzle", - "inherits": "fdm_tiertime_common", - "from": "system", "setting_id": "GM006", + "name": "Tiertime UP600 HS 0.4 nozzle", + "from": "system", "instantiation": "true", + "inherits": "fdm_tiertime_common", "printer_model": "Tiertime UP600 HS", "nozzle_diameter": [ "0.4" @@ -16,5 +16,6 @@ "500x400", "0x400" ], + "printable_height": "600" -} \ No newline at end of file +} \ No newline at end of file diff --git a/resources/profiles/Tiertime/machine/Tiertime UP600 HS 0.6 nozzle.json b/resources/profiles/Tiertime/machine/Tiertime UP600 HS 0.6 nozzle.json index f1fd8db2c1..d9099fc198 100644 --- a/resources/profiles/Tiertime/machine/Tiertime UP600 HS 0.6 nozzle.json +++ b/resources/profiles/Tiertime/machine/Tiertime UP600 HS 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "machine", - "name": "Tiertime UP600 HS 0.6 nozzle", - "inherits": "Tiertime UP600 HS 0.4 nozzle", - "from": "system", "setting_id": "GM009", + "name": "Tiertime UP600 HS 0.6 nozzle", + "from": "system", "instantiation": "true", + "inherits": "Tiertime UP600 HS 0.4 nozzle", "printer_model": "Tiertime UP600 HS", "nozzle_diameter": [ "0.6" diff --git a/resources/profiles/Tiertime/machine/Tiertime UP600 HS 0.8 nozzle.json b/resources/profiles/Tiertime/machine/Tiertime UP600 HS 0.8 nozzle.json index ea3d0a7751..3c855e3a3b 100644 --- a/resources/profiles/Tiertime/machine/Tiertime UP600 HS 0.8 nozzle.json +++ b/resources/profiles/Tiertime/machine/Tiertime UP600 HS 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "machine", - "name": "Tiertime UP600 HS 0.8 nozzle", - "inherits": "Tiertime UP600 HS 0.4 nozzle", - "from": "system", "setting_id": "GM010", + "name": "Tiertime UP600 HS 0.8 nozzle", + "from": "system", "instantiation": "true", + "inherits": "Tiertime UP600 HS 0.4 nozzle", "printer_model": "Tiertime UP600 HS", "nozzle_diameter": [ "0.8" diff --git a/resources/profiles/Tiertime/machine/fdm_machine_common.json b/resources/profiles/Tiertime/machine/fdm_machine_common.json index 01be62eb16..5785f57b19 100644 --- a/resources/profiles/Tiertime/machine/fdm_machine_common.json +++ b/resources/profiles/Tiertime/machine/fdm_machine_common.json @@ -116,4 +116,4 @@ "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]", "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n", "machine_pause_gcode": "M601" -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/machine/fdm_tiertime_common.json b/resources/profiles/Tiertime/machine/fdm_tiertime_common.json index 7a25ceb3c0..55f8ddc4d0 100644 --- a/resources/profiles/Tiertime/machine/fdm_tiertime_common.json +++ b/resources/profiles/Tiertime/machine/fdm_tiertime_common.json @@ -1,141 +1,60 @@ { - "type": "machine", - "name": "fdm_tiertime_common", - "inherits": "fdm_machine_common", - "from": "system", - "instantiation": "false", - "gcode_flavor": "klipper", - "machine_max_acceleration_e": [ - "5000", - "5000" - ], - "machine_max_acceleration_extruding": [ - "20000", - "20000" - ], - "machine_max_acceleration_retracting": [ - "5000", - "5000" - ], - "machine_max_acceleration_travel": [ - "20000", - "20000" - ], - "machine_max_acceleration_x": [ - "20000", - "20000" - ], - "machine_max_acceleration_y": [ - "20000", - "20000" - ], - "machine_max_acceleration_z": [ - "500", - "200" - ], - "machine_max_speed_e": [ - "25", - "25" - ], - "machine_max_speed_x": [ - "500", - "200" - ], - "machine_max_speed_y": [ - "500", - "200" - ], - "machine_max_speed_z": [ - "12", - "12" - ], - "machine_max_jerk_e": [ - "2.5", - "2.5" - ], - "machine_max_jerk_x": [ - "9", - "9" - ], - "machine_max_jerk_y": [ - "9", - "9" - ], - "machine_max_jerk_z": [ - "0.2", - "0.4" - ], - "machine_min_extruding_rate": [ - "0", - "0" - ], - "machine_min_travel_rate": [ - "0", - "0" - ], - "max_layer_height": [ - "0.32" - ], - "min_layer_height": [ - "0.08" - ], - "printable_height": "250", - "extruder_clearance_radius": "65", - "extruder_clearance_height_to_rod": "36", - "extruder_clearance_height_to_lid": "140", - "printer_settings_id": "", - "printer_technology": "FFF", - "printer_variant": "0.4", - "retraction_minimum_travel": [ - "1" - ], - "retract_before_wipe": [ - "70%" - ], - "retract_when_changing_layer": [ - "1" - ], - "retraction_length": [ - "0.8" - ], - "retract_length_toolchange": [ - "2" - ], - "z_hop": [ - "0.4" - ], - "retract_restart_extra": [ - "0" - ], - "retract_restart_extra_toolchange": [ - "0" - ], - "retraction_speed": [ - "30" - ], - "deretraction_speed": [ - "30" - ], - "z_hop_types": "Normal Lift", - "silent_mode": "0", - "single_extruder_multi_material": "1", - "change_filament_gcode": "", - "wipe": [ - "1" - ], - "default_filament_profile": [ - "" - ], - "default_print_profile": "0.20mm Standard @Tiertime UP400 Pro", - "bed_exclude_area": [ - "0x0" - ], - "machine_start_gcode": ";M190 S[bed_temperature_initial_layer_single]\n;M109 S[nozzle_temperature_initial_layer]\nPRINT_START EXTRUDER=[nozzle_temperature_initial_layer] BED=[bed_temperature_initial_layer_single]\n", - "machine_end_gcode": "PRINT_END", - "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]", - "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n", - "machine_pause_gcode": "PAUSE", - "scan_first_layer": "0", - "nozzle_type": "undefine", - "auxiliary_fan": "0" -} \ No newline at end of file + "type": "machine", + "name": "fdm_tiertime_common", + "from": "system", + "instantiation": "false", + "inherits": "fdm_machine_common", + "gcode_flavor": "klipper", + "machine_max_acceleration_e": ["5000", "5000"], + "machine_max_acceleration_extruding": ["20000", "20000"], + "machine_max_acceleration_retracting": ["5000", "5000"], + "machine_max_acceleration_travel": ["20000", "20000"], + "machine_max_acceleration_x": ["20000", "20000"], + "machine_max_acceleration_y": ["20000", "20000"], + "machine_max_acceleration_z": ["500", "200"], + "machine_max_speed_e": ["25", "25"], + "machine_max_speed_x": ["500", "200"], + "machine_max_speed_y": ["500", "200"], + "machine_max_speed_z": ["12", "12"], + "machine_max_jerk_e": ["2.5", "2.5"], + "machine_max_jerk_x": ["9", "9"], + "machine_max_jerk_y": ["9", "9"], + "machine_max_jerk_z": ["0.2", "0.4"], + "machine_min_extruding_rate": ["0", "0"], + "machine_min_travel_rate": ["0", "0"], + "max_layer_height": ["0.32"], + "min_layer_height": ["0.08"], + "printable_height": "250", + "extruder_clearance_radius": "65", + "extruder_clearance_height_to_rod": "36", + "extruder_clearance_height_to_lid": "140", + "printer_settings_id": "", + "printer_technology": "FFF", + "printer_variant": "0.4", + "retraction_minimum_travel": ["1"], + "retract_before_wipe": ["70%"], + "retract_when_changing_layer": ["1"], + "retraction_length": ["0.8"], + "retract_length_toolchange": ["2"], + "z_hop": ["0.4"], + "retract_restart_extra": ["0"], + "retract_restart_extra_toolchange": ["0"], + "retraction_speed": ["30"], + "deretraction_speed": ["30"], + "z_hop_types": "Normal Lift", + "silent_mode": "0", + "single_extruder_multi_material": "1", + "change_filament_gcode": "", + "wipe": ["1"], + "default_filament_profile": [""], + "default_print_profile": "0.20mm Standard @Tiertime UP400 Pro", + "bed_exclude_area": ["0x0"], + "machine_start_gcode": ";M190 S[bed_temperature_initial_layer_single]\n;M109 S[nozzle_temperature_initial_layer]\nPRINT_START EXTRUDER=[nozzle_temperature_initial_layer] BED=[bed_temperature_initial_layer_single]\n", + "machine_end_gcode": "PRINT_END", + "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]", + "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n", + "machine_pause_gcode": "PAUSE", + "scan_first_layer": "0", + "nozzle_type": "undefine", + "auxiliary_fan": "0" +} diff --git a/resources/profiles/Tiertime/process/0.12mm Fine @Tiertime UP300 HS.json b/resources/profiles/Tiertime/process/0.12mm Fine @Tiertime UP300 HS.json index 326af9a794..0b28527515 100644 --- a/resources/profiles/Tiertime/process/0.12mm Fine @Tiertime UP300 HS.json +++ b/resources/profiles/Tiertime/process/0.12mm Fine @Tiertime UP300 HS.json @@ -1,10 +1,10 @@ { "type": "process", - "name": "0.12mm Fine @Tiertime UP300 HS", - "inherits": "fdm_process_tiertime_HS_common", - "from": "system", "setting_id": "GP004", + "name": "0.12mm Fine @Tiertime UP300 HS", + "from": "system", "instantiation": "true", + "inherits": "fdm_process_tiertime_HS_common", "layer_height": "0.12", "bottom_shell_layers": "5", "elefant_foot_compensation": "0.15", diff --git a/resources/profiles/Tiertime/process/0.12mm Fine @Tiertime UP310 Pro.json b/resources/profiles/Tiertime/process/0.12mm Fine @Tiertime UP310 Pro.json index a4e64fe16c..3010fb6621 100644 --- a/resources/profiles/Tiertime/process/0.12mm Fine @Tiertime UP310 Pro.json +++ b/resources/profiles/Tiertime/process/0.12mm Fine @Tiertime UP310 Pro.json @@ -1,10 +1,10 @@ { "type": "process", - "name": "0.12mm Fine @Tiertime UP310 Pro", - "inherits": "fdm_process_tiertime_common", - "from": "system", "setting_id": "GP004", + "name": "0.12mm Fine @Tiertime UP310 Pro", + "from": "system", "instantiation": "true", + "inherits": "fdm_process_tiertime_common", "layer_height": "0.12", "bottom_shell_layers": "5", "elefant_foot_compensation": "0.15", diff --git a/resources/profiles/Tiertime/process/0.12mm Fine @Tiertime UP400 Pro.json b/resources/profiles/Tiertime/process/0.12mm Fine @Tiertime UP400 Pro.json index ce4402d958..7f816d75e1 100644 --- a/resources/profiles/Tiertime/process/0.12mm Fine @Tiertime UP400 Pro.json +++ b/resources/profiles/Tiertime/process/0.12mm Fine @Tiertime UP400 Pro.json @@ -1,10 +1,10 @@ { "type": "process", - "name": "0.12mm Fine @Tiertime UP400 Pro", - "inherits": "fdm_process_tiertime_common", - "from": "system", "setting_id": "GP004", + "name": "0.12mm Fine @Tiertime UP400 Pro", + "from": "system", "instantiation": "true", + "inherits": "fdm_process_tiertime_common", "layer_height": "0.12", "bottom_shell_layers": "5", "elefant_foot_compensation": "0.15", diff --git a/resources/profiles/Tiertime/process/0.12mm Fine @Tiertime UP600 HS.json b/resources/profiles/Tiertime/process/0.12mm Fine @Tiertime UP600 HS.json index 550d745f45..648f276690 100644 --- a/resources/profiles/Tiertime/process/0.12mm Fine @Tiertime UP600 HS.json +++ b/resources/profiles/Tiertime/process/0.12mm Fine @Tiertime UP600 HS.json @@ -1,10 +1,10 @@ { "type": "process", - "name": "0.12mm Fine @Tiertime UP600 HS", - "inherits": "fdm_process_tiertime_HS_common", - "from": "system", "setting_id": "GP026", + "name": "0.12mm Fine @Tiertime UP600 HS", + "from": "system", "instantiation": "true", + "inherits": "fdm_process_tiertime_HS_common", "layer_height": "0.12", "elefant_foot_compensation": "0.15", "bottom_shell_layers": "5", @@ -27,4 +27,4 @@ "compatible_printers": [ "Tiertime UP600 HS 0.4 nozzle" ] -} \ No newline at end of file +} \ No newline at end of file diff --git a/resources/profiles/Tiertime/process/0.16mm Optimal @Tiertime UP300 HS.json b/resources/profiles/Tiertime/process/0.16mm Optimal @Tiertime UP300 HS.json index 5ae46e69eb..d1cb291fe3 100644 --- a/resources/profiles/Tiertime/process/0.16mm Optimal @Tiertime UP300 HS.json +++ b/resources/profiles/Tiertime/process/0.16mm Optimal @Tiertime UP300 HS.json @@ -1,10 +1,10 @@ { "type": "process", - "name": "0.16mm Optimal @Tiertime UP300 HS", - "inherits": "fdm_process_tiertime_HS_common", - "from": "system", "setting_id": "GP004", + "name": "0.16mm Optimal @Tiertime UP300 HS", + "from": "system", "instantiation": "true", + "inherits": "fdm_process_tiertime_HS_common", "layer_height": "0.16", "elefant_foot_compensation": "0.15", "bottom_shell_layers": "4", diff --git a/resources/profiles/Tiertime/process/0.16mm Optimal @Tiertime UP310 Pro.json b/resources/profiles/Tiertime/process/0.16mm Optimal @Tiertime UP310 Pro.json index 71f3a2c18d..1ba9ce59de 100644 --- a/resources/profiles/Tiertime/process/0.16mm Optimal @Tiertime UP310 Pro.json +++ b/resources/profiles/Tiertime/process/0.16mm Optimal @Tiertime UP310 Pro.json @@ -1,10 +1,10 @@ { "type": "process", - "name": "0.16mm Optimal @Tiertime UP310 Pro", - "inherits": "fdm_process_tiertime_common", - "from": "system", "setting_id": "GP004", + "name": "0.16mm Optimal @Tiertime UP310 Pro", + "from": "system", "instantiation": "true", + "inherits": "fdm_process_tiertime_common", "layer_height": "0.16", "elefant_foot_compensation": "0.15", "bottom_shell_layers": "4", diff --git a/resources/profiles/Tiertime/process/0.16mm Optimal @Tiertime UP400 Pro.json b/resources/profiles/Tiertime/process/0.16mm Optimal @Tiertime UP400 Pro.json index 69be2579fc..2ed7fee647 100644 --- a/resources/profiles/Tiertime/process/0.16mm Optimal @Tiertime UP400 Pro.json +++ b/resources/profiles/Tiertime/process/0.16mm Optimal @Tiertime UP400 Pro.json @@ -1,10 +1,10 @@ { "type": "process", - "name": "0.16mm Optimal @Tiertime UP400 Pro", - "inherits": "fdm_process_tiertime_common", - "from": "system", "setting_id": "GP004", + "name": "0.16mm Optimal @Tiertime UP400 Pro", + "from": "system", "instantiation": "true", + "inherits": "fdm_process_tiertime_common", "layer_height": "0.16", "elefant_foot_compensation": "0.15", "bottom_shell_layers": "4", @@ -27,4 +27,4 @@ "compatible_printers": [ "Tiertime UP400 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/process/0.16mm Optimal @Tiertime UP600 HS.json b/resources/profiles/Tiertime/process/0.16mm Optimal @Tiertime UP600 HS.json index 7e882d8673..871a8026d0 100644 --- a/resources/profiles/Tiertime/process/0.16mm Optimal @Tiertime UP600 HS.json +++ b/resources/profiles/Tiertime/process/0.16mm Optimal @Tiertime UP600 HS.json @@ -1,10 +1,10 @@ { "type": "process", - "name": "0.16mm Optimal @Tiertime UP600 HS", - "inherits": "fdm_process_tiertime_HS_common", - "from": "system", "setting_id": "GP025", + "name": "0.16mm Optimal @Tiertime UP600 HS", + "from": "system", "instantiation": "true", + "inherits": "fdm_process_tiertime_HS_common", "layer_height": "0.16", "elefant_foot_compensation": "0.15", "bottom_shell_layers": "4", @@ -27,4 +27,4 @@ "compatible_printers": [ "Tiertime UP600 HS 0.4 nozzle" ] -} \ No newline at end of file +} \ No newline at end of file diff --git a/resources/profiles/Tiertime/process/0.20mm Standard @Tiertime UP300 HS.json b/resources/profiles/Tiertime/process/0.20mm Standard @Tiertime UP300 HS.json index 70321a808e..c0eda5e055 100644 --- a/resources/profiles/Tiertime/process/0.20mm Standard @Tiertime UP300 HS.json +++ b/resources/profiles/Tiertime/process/0.20mm Standard @Tiertime UP300 HS.json @@ -1,9 +1,9 @@ { "type": "process", - "name": "0.20mm Standard @Tiertime UP300 HS", - "inherits": "fdm_process_tiertime_HS_common", - "from": "system", "setting_id": "GP004", + "name": "0.20mm Standard @Tiertime UP300 HS", + "from": "system", + "inherits": "fdm_process_tiertime_HS_common", "instantiation": "true", "elefant_foot_compensation": "0.15", "top_shell_thickness": "1.0", @@ -19,4 +19,4 @@ "compatible_printers": [ "Tiertime UP300 HS 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/process/0.20mm Standard @Tiertime UP310 Pro.json b/resources/profiles/Tiertime/process/0.20mm Standard @Tiertime UP310 Pro.json index 9c9b5b045b..75b76f4af9 100644 --- a/resources/profiles/Tiertime/process/0.20mm Standard @Tiertime UP310 Pro.json +++ b/resources/profiles/Tiertime/process/0.20mm Standard @Tiertime UP310 Pro.json @@ -1,9 +1,9 @@ { "type": "process", - "name": "0.20mm Standard @Tiertime UP310 Pro", - "inherits": "fdm_process_tiertime_common", - "from": "system", "setting_id": "GP004", + "name": "0.20mm Standard @Tiertime UP310 Pro", + "from": "system", + "inherits": "fdm_process_tiertime_common", "instantiation": "true", "elefant_foot_compensation": "0.15", "top_shell_thickness": "1.0", @@ -19,4 +19,4 @@ "compatible_printers": [ "Tiertime UP310 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/process/0.20mm Standard @Tiertime UP400 Pro.json b/resources/profiles/Tiertime/process/0.20mm Standard @Tiertime UP400 Pro.json index ef3e54e73c..03983e92b6 100644 --- a/resources/profiles/Tiertime/process/0.20mm Standard @Tiertime UP400 Pro.json +++ b/resources/profiles/Tiertime/process/0.20mm Standard @Tiertime UP400 Pro.json @@ -1,10 +1,10 @@ { "type": "process", - "name": "0.20mm Standard @Tiertime UP400 Pro", - "inherits": "fdm_process_tiertime_common", - "from": "system", "setting_id": "GP001", + "name": "0.20mm Standard @Tiertime UP400 Pro", + "from": "system", "instantiation": "true", + "inherits": "fdm_process_tiertime_common", "layer_height": "0.2", "initial_layer_speed": "50", "initial_layer_infill_speed": "105", @@ -17,4 +17,4 @@ "compatible_printers": [ "Tiertime UP400 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/process/0.20mm Standard @Tiertime UP600 HS.json b/resources/profiles/Tiertime/process/0.20mm Standard @Tiertime UP600 HS.json index 4c6211ac25..6c91083e77 100644 --- a/resources/profiles/Tiertime/process/0.20mm Standard @Tiertime UP600 HS.json +++ b/resources/profiles/Tiertime/process/0.20mm Standard @Tiertime UP600 HS.json @@ -1,9 +1,9 @@ { "type": "process", - "name": "0.20mm Standard @Tiertime UP600 HS", - "inherits": "fdm_process_tiertime_HS_common", - "from": "system", "setting_id": "GP024", + "name": "0.20mm Standard @Tiertime UP600 HS", + "from": "system", + "inherits": "fdm_process_tiertime_HS_common", "instantiation": "true", "elefant_foot_compensation": "0.15", "top_shell_thickness": "1.0", @@ -19,4 +19,4 @@ "compatible_printers": [ "Tiertime UP600 HS 0.4 nozzle" ] -} \ No newline at end of file +} \ No newline at end of file diff --git a/resources/profiles/Tiertime/process/0.24mm Draft @Tiertime UP300 HS.json b/resources/profiles/Tiertime/process/0.24mm Draft @Tiertime UP300 HS.json index 01a55cee4e..aff711e457 100644 --- a/resources/profiles/Tiertime/process/0.24mm Draft @Tiertime UP300 HS.json +++ b/resources/profiles/Tiertime/process/0.24mm Draft @Tiertime UP300 HS.json @@ -1,10 +1,10 @@ { "type": "process", - "name": "0.24mm Draft @Tiertime UP300 HS", - "inherits": "fdm_process_tiertime_HS_common", - "from": "system", "setting_id": "GP004", + "name": "0.24mm Draft @Tiertime UP300 HS", + "from": "system", "instantiation": "true", + "inherits": "fdm_process_tiertime_HS_common", "layer_height": "0.24", "elefant_foot_compensation": "0.15", "top_surface_line_width": "0.45", diff --git a/resources/profiles/Tiertime/process/0.24mm Draft @Tiertime UP310 Pro.json b/resources/profiles/Tiertime/process/0.24mm Draft @Tiertime UP310 Pro.json index 5d62a10904..e18ab49b6f 100644 --- a/resources/profiles/Tiertime/process/0.24mm Draft @Tiertime UP310 Pro.json +++ b/resources/profiles/Tiertime/process/0.24mm Draft @Tiertime UP310 Pro.json @@ -1,10 +1,10 @@ { "type": "process", - "name": "0.24mm Draft @Tiertime UP310 Pro", - "inherits": "fdm_process_tiertime_common", - "from": "system", "setting_id": "GP004", + "name": "0.24mm Draft @Tiertime UP310 Pro", + "from": "system", "instantiation": "true", + "inherits": "fdm_process_tiertime_common", "layer_height": "0.24", "elefant_foot_compensation": "0.15", "top_surface_line_width": "0.45", diff --git a/resources/profiles/Tiertime/process/0.24mm Draft @Tiertime UP400 Pro.json b/resources/profiles/Tiertime/process/0.24mm Draft @Tiertime UP400 Pro.json index 3b26042dc7..b871e7fca2 100644 --- a/resources/profiles/Tiertime/process/0.24mm Draft @Tiertime UP400 Pro.json +++ b/resources/profiles/Tiertime/process/0.24mm Draft @Tiertime UP400 Pro.json @@ -1,10 +1,10 @@ { "type": "process", - "name": "0.24mm Draft @Tiertime UP400 Pro", - "inherits": "fdm_process_tiertime_common", - "from": "system", "setting_id": "GP004", + "name": "0.24mm Draft @Tiertime UP400 Pro", + "from": "system", "instantiation": "true", + "inherits": "fdm_process_tiertime_common", "layer_height": "0.24", "elefant_foot_compensation": "0.15", "top_surface_line_width": "0.45", @@ -22,4 +22,4 @@ "compatible_printers": [ "Tiertime UP400 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/process/0.24mm Draft @Tiertime UP600 HS.json b/resources/profiles/Tiertime/process/0.24mm Draft @Tiertime UP600 HS.json index 74f9ccc3d3..42a539e1da 100644 --- a/resources/profiles/Tiertime/process/0.24mm Draft @Tiertime UP600 HS.json +++ b/resources/profiles/Tiertime/process/0.24mm Draft @Tiertime UP600 HS.json @@ -1,10 +1,10 @@ { "type": "process", - "name": "0.24mm Draft @Tiertime UP600 HS", - "inherits": "fdm_process_tiertime_HS_common", - "from": "system", "setting_id": "GP027", + "name": "0.24mm Draft @Tiertime UP600 HS", + "from": "system", "instantiation": "true", + "inherits": "fdm_process_tiertime_HS_common", "layer_height": "0.24", "elefant_foot_compensation": "0.15", "bottom_shell_layers": "3", @@ -27,4 +27,4 @@ "compatible_printers": [ "Tiertime UP600 HS 0.4 nozzle" ] -} \ No newline at end of file +} \ No newline at end of file diff --git a/resources/profiles/Tiertime/process/0.28mm Extra Draft @Tiertime UP300 HS.json b/resources/profiles/Tiertime/process/0.28mm Extra Draft @Tiertime UP300 HS.json index 01bcedb5db..55bf4aecd5 100644 --- a/resources/profiles/Tiertime/process/0.28mm Extra Draft @Tiertime UP300 HS.json +++ b/resources/profiles/Tiertime/process/0.28mm Extra Draft @Tiertime UP300 HS.json @@ -1,10 +1,10 @@ { "type": "process", - "name": "0.28mm Extra Draft @Tiertime UP300 HS", - "inherits": "fdm_process_tiertime_HS_common", - "from": "system", "setting_id": "GP004", + "name": "0.28mm Extra Draft @Tiertime UP300 HS", + "from": "system", "instantiation": "true", + "inherits": "fdm_process_tiertime_HS_common", "layer_height": "0.28", "elefant_foot_compensation": "0.15", "top_surface_line_width": "0.45", diff --git a/resources/profiles/Tiertime/process/0.28mm Extra Draft @Tiertime UP310 Pro.json b/resources/profiles/Tiertime/process/0.28mm Extra Draft @Tiertime UP310 Pro.json index 69170d2057..e583827013 100644 --- a/resources/profiles/Tiertime/process/0.28mm Extra Draft @Tiertime UP310 Pro.json +++ b/resources/profiles/Tiertime/process/0.28mm Extra Draft @Tiertime UP310 Pro.json @@ -1,10 +1,10 @@ { "type": "process", - "name": "0.28mm Extra Draft @Tiertime UP310 Pro", - "inherits": "fdm_process_tiertime_common", - "from": "system", "setting_id": "GP004", + "name": "0.28mm Extra Draft @Tiertime UP310 Pro", + "from": "system", "instantiation": "true", + "inherits": "fdm_process_tiertime_common", "layer_height": "0.28", "elefant_foot_compensation": "0.15", "top_surface_line_width": "0.45", diff --git a/resources/profiles/Tiertime/process/0.28mm Extra Draft @Tiertime UP400 Pro.json b/resources/profiles/Tiertime/process/0.28mm Extra Draft @Tiertime UP400 Pro.json index 459e27b9ba..0d1f98665b 100644 --- a/resources/profiles/Tiertime/process/0.28mm Extra Draft @Tiertime UP400 Pro.json +++ b/resources/profiles/Tiertime/process/0.28mm Extra Draft @Tiertime UP400 Pro.json @@ -1,10 +1,10 @@ { "type": "process", - "name": "0.28mm Extra Draft @Tiertime UP400 Pro", - "inherits": "fdm_process_tiertime_common", - "from": "system", "setting_id": "GP004", + "name": "0.28mm Extra Draft @Tiertime UP400 Pro", + "from": "system", "instantiation": "true", + "inherits": "fdm_process_tiertime_common", "layer_height": "0.28", "elefant_foot_compensation": "0.15", "top_surface_line_width": "0.45", @@ -22,4 +22,4 @@ "compatible_printers": [ "Tiertime UP400 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/process/0.28mm Extra Draft @Tiertime UP600 HS.json b/resources/profiles/Tiertime/process/0.28mm Extra Draft @Tiertime UP600 HS.json index 46c6a5fb50..a0bd17c20b 100644 --- a/resources/profiles/Tiertime/process/0.28mm Extra Draft @Tiertime UP600 HS.json +++ b/resources/profiles/Tiertime/process/0.28mm Extra Draft @Tiertime UP600 HS.json @@ -1,10 +1,10 @@ { "type": "process", - "name": "0.28mm Extra Draft @Tiertime UP600 HS", - "inherits": "fdm_process_tiertime_HS_common", - "from": "system", "setting_id": "GP028", + "name": "0.28mm Extra Draft @Tiertime UP600 HS", + "from": "system", "instantiation": "true", + "inherits": "fdm_process_tiertime_HS_common", "layer_height": "0.28", "elefant_foot_compensation": "0.15", "bottom_shell_layers": "3", @@ -27,4 +27,4 @@ "compatible_printers": [ "Tiertime UP600 HS 0.4 nozzle" ] -} \ No newline at end of file +} \ No newline at end of file diff --git a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.18_nozzle_0.6.json b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.18_nozzle_0.6.json index 13961dd979..8e7f118a94 100644 --- a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.18_nozzle_0.6.json +++ b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.18_nozzle_0.6.json @@ -21,5 +21,6 @@ "sparse_infill_speed": "100", "top_surface_speed": "120", "bridge_speed": "30", - "overhang_3_4_speed": "15" + "overhang_3_4_speed": "15", + "tree_support_tip_diameter": "1.2" } \ No newline at end of file diff --git a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.18_nozzle_0.6_HS.json b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.18_nozzle_0.6_HS.json index 1eb3a4491f..6512606b9e 100644 --- a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.18_nozzle_0.6_HS.json +++ b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.18_nozzle_0.6_HS.json @@ -21,5 +21,6 @@ "sparse_infill_speed": "100", "top_surface_speed": "120", "bridge_speed": "30", - "overhang_3_4_speed": "15" + "overhang_3_4_speed": "15", + "tree_support_tip_diameter": "1.2" } \ No newline at end of file diff --git a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.24_nozzle_0.6.json b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.24_nozzle_0.6.json index 9ceb2da962..256b2e3124 100644 --- a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.24_nozzle_0.6.json +++ b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.24_nozzle_0.6.json @@ -21,5 +21,6 @@ "sparse_infill_speed": "100", "top_surface_speed": "130", "bridge_speed": "30", - "overhang_3_4_speed": "15" + "overhang_3_4_speed": "15", + "tree_support_tip_diameter": "1.2" } \ No newline at end of file diff --git a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.24_nozzle_0.6_HS.json b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.24_nozzle_0.6_HS.json index cc947e167d..a4049ab8f0 100644 --- a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.24_nozzle_0.6_HS.json +++ b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.24_nozzle_0.6_HS.json @@ -21,5 +21,6 @@ "sparse_infill_speed": "100", "top_surface_speed": "130", "bridge_speed": "30", - "overhang_3_4_speed": "15" + "overhang_3_4_speed": "15", + "tree_support_tip_diameter": "1.2" } \ No newline at end of file diff --git a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.24_nozzle_0.8.json b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.24_nozzle_0.8.json index e9ffae1651..ac2c993a6d 100644 --- a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.24_nozzle_0.8.json +++ b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.24_nozzle_0.8.json @@ -21,5 +21,6 @@ "sparse_infill_speed": "100", "top_surface_speed": "120", "bridge_speed": "30", - "overhang_3_4_speed": "20" + "overhang_3_4_speed": "20", + "tree_support_tip_diameter": "2" } \ No newline at end of file diff --git a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.24_nozzle_0.8_HS.json b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.24_nozzle_0.8_HS.json index b704c6ad40..415ee1bf21 100644 --- a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.24_nozzle_0.8_HS.json +++ b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.24_nozzle_0.8_HS.json @@ -21,5 +21,6 @@ "sparse_infill_speed": "100", "top_surface_speed": "120", "bridge_speed": "30", - "overhang_3_4_speed": "20" + "overhang_3_4_speed": "20", + "tree_support_tip_diameter": "2" } \ No newline at end of file diff --git a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.30_nozzle_0.6.json b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.30_nozzle_0.6.json index 2def5b7b96..86aa4ec504 100644 --- a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.30_nozzle_0.6.json +++ b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.30_nozzle_0.6.json @@ -21,5 +21,6 @@ "sparse_infill_speed": "100", "top_surface_speed": "150", "bridge_speed": "30", - "overhang_3_4_speed": "15" + "overhang_3_4_speed": "15", + "tree_support_tip_diameter": "1.2" } \ No newline at end of file diff --git a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.30_nozzle_0.6_HS.json b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.30_nozzle_0.6_HS.json index 5f2bf52824..dd8522a52c 100644 --- a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.30_nozzle_0.6_HS.json +++ b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.30_nozzle_0.6_HS.json @@ -21,5 +21,6 @@ "sparse_infill_speed": "100", "top_surface_speed": "150", "bridge_speed": "30", - "overhang_3_4_speed": "15" + "overhang_3_4_speed": "15", + "tree_support_tip_diameter": "1.2" } \ No newline at end of file diff --git a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.32_nozzle_0.8.json b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.32_nozzle_0.8.json index 2417c30e35..b3c7020260 100644 --- a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.32_nozzle_0.8.json +++ b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.32_nozzle_0.8.json @@ -23,5 +23,6 @@ "top_surface_speed": "140", "bridge_speed": "30", "overhang_3_4_speed": "20", - "overhang_4_4_speed": "5" + "overhang_4_4_speed": "5", + "tree_support_tip_diameter": "2" } \ No newline at end of file diff --git a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.32_nozzle_0.8_HS.json b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.32_nozzle_0.8_HS.json index 7badd7801c..296d8f7338 100644 --- a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.32_nozzle_0.8_HS.json +++ b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.32_nozzle_0.8_HS.json @@ -23,5 +23,6 @@ "top_surface_speed": "140", "bridge_speed": "30", "overhang_3_4_speed": "20", - "overhang_4_4_speed": "5" + "overhang_4_4_speed": "5", + "tree_support_tip_diameter": "2" } \ No newline at end of file diff --git a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.36_nozzle_0.6.json b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.36_nozzle_0.6.json index 85788f980c..641a49b777 100644 --- a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.36_nozzle_0.6.json +++ b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.36_nozzle_0.6.json @@ -21,5 +21,6 @@ "sparse_infill_speed": "100", "top_surface_speed": "140", "bridge_speed": "30", - "overhang_3_4_speed": "15" + "overhang_3_4_speed": "15", + "tree_support_tip_diameter": "1.2" } \ No newline at end of file diff --git a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.36_nozzle_0.6_HS.json b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.36_nozzle_0.6_HS.json index dde41c32d2..57bfafa56a 100644 --- a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.36_nozzle_0.6_HS.json +++ b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.36_nozzle_0.6_HS.json @@ -21,5 +21,6 @@ "sparse_infill_speed": "100", "top_surface_speed": "140", "bridge_speed": "30", - "overhang_3_4_speed": "15" + "overhang_3_4_speed": "15", + "tree_support_tip_diameter": "1.2" } \ No newline at end of file diff --git a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.40_nozzle_0.8.json b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.40_nozzle_0.8.json index 68349a763c..6755c7569c 100644 --- a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.40_nozzle_0.8.json +++ b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.40_nozzle_0.8.json @@ -23,5 +23,6 @@ "top_surface_speed": "150", "bridge_speed": "30", "overhang_3_4_speed": "25", - "overhang_4_4_speed": "5" + "overhang_4_4_speed": "5", + "tree_support_tip_diameter": "2" } \ No newline at end of file diff --git a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.40_nozzle_0.8_HS.json b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.40_nozzle_0.8_HS.json index 289483483b..159c20878c 100644 --- a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.40_nozzle_0.8_HS.json +++ b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.40_nozzle_0.8_HS.json @@ -23,5 +23,6 @@ "top_surface_speed": "150", "bridge_speed": "30", "overhang_3_4_speed": "25", - "overhang_4_4_speed": "5" + "overhang_4_4_speed": "5", + "tree_support_tip_diameter": "2" } \ No newline at end of file diff --git a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.42_nozzle_0.6.json b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.42_nozzle_0.6.json index 969968a6bf..884975e49c 100644 --- a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.42_nozzle_0.6.json +++ b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.42_nozzle_0.6.json @@ -21,5 +21,6 @@ "sparse_infill_speed": "100", "top_surface_speed": "130", "bridge_speed": "30", - "overhang_3_4_speed": "15" + "overhang_3_4_speed": "15", + "tree_support_tip_diameter": "1.2" } \ No newline at end of file diff --git a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.42_nozzle_0.6_HS.json b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.42_nozzle_0.6_HS.json index c12e5c1cf8..419ff22f46 100644 --- a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.42_nozzle_0.6_HS.json +++ b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.42_nozzle_0.6_HS.json @@ -21,5 +21,6 @@ "sparse_infill_speed": "100", "top_surface_speed": "130", "bridge_speed": "30", - "overhang_3_4_speed": "15" + "overhang_3_4_speed": "15", + "tree_support_tip_diameter": "1.2" } \ No newline at end of file diff --git a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.48_nozzle_0.8.json b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.48_nozzle_0.8.json index 05a58aaa18..265c418baf 100644 --- a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.48_nozzle_0.8.json +++ b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.48_nozzle_0.8.json @@ -23,5 +23,6 @@ "top_surface_speed": "140", "bridge_speed": "30", "overhang_3_4_speed": "25", - "overhang_4_4_speed": "5" + "overhang_4_4_speed": "5", + "tree_support_tip_diameter": "2" } \ No newline at end of file diff --git a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.48_nozzle_0.8_HS.json b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.48_nozzle_0.8_HS.json index 6ffa082868..f444321ccd 100644 --- a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.48_nozzle_0.8_HS.json +++ b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.48_nozzle_0.8_HS.json @@ -23,5 +23,6 @@ "top_surface_speed": "140", "bridge_speed": "30", "overhang_3_4_speed": "25", - "overhang_4_4_speed": "5" + "overhang_4_4_speed": "5", + "tree_support_tip_diameter": "2" } \ No newline at end of file diff --git a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.56_nozzle_0.8.json b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.56_nozzle_0.8.json index 33125e016a..398a51f122 100644 --- a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.56_nozzle_0.8.json +++ b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.56_nozzle_0.8.json @@ -23,5 +23,6 @@ "top_surface_speed": "130", "bridge_speed": "30", "overhang_3_4_speed": "25", - "overhang_4_4_speed": "5" + "overhang_4_4_speed": "5", + "tree_support_tip_diameter": "2" } \ No newline at end of file diff --git a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.56_nozzle_0.8_HS.json b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.56_nozzle_0.8_HS.json index 3ce5cc331d..99d3ac7b7e 100644 --- a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.56_nozzle_0.8_HS.json +++ b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.56_nozzle_0.8_HS.json @@ -23,5 +23,6 @@ "top_surface_speed": "130", "bridge_speed": "30", "overhang_3_4_speed": "25", - "overhang_4_4_speed": "5" + "overhang_4_4_speed": "5", + "tree_support_tip_diameter": "2" } \ No newline at end of file diff --git a/resources/profiles/Tiertime/process/fdm_process_tiertime_common.json b/resources/profiles/Tiertime/process/fdm_process_tiertime_common.json index deaf9a5bd7..d15757f153 100644 --- a/resources/profiles/Tiertime/process/fdm_process_tiertime_common.json +++ b/resources/profiles/Tiertime/process/fdm_process_tiertime_common.json @@ -20,7 +20,6 @@ "inner_wall_acceleration": "5000", "top_surface_acceleration": "2000", "initial_layer_acceleration": "500", - "wall_infill_order": "outer wall/inner wall/infill", "line_width": "0.42", "internal_bridge_support_thickness": "0.8", "initial_layer_line_width": "0.5", @@ -75,5 +74,6 @@ "prime_tower_width": "35", "wall_generator": "classic", "exclude_object": "1", + "wall_infill_order": "outer wall/inner wall/infill", "compatible_printers": [] } \ No newline at end of file diff --git a/scripts/orca_filament_lib.py b/scripts/orca_filament_lib.py index 869eeee302..f8f6909e14 100644 --- a/scripts/orca_filament_lib.py +++ b/scripts/orca_filament_lib.py @@ -268,5 +268,5 @@ if __name__ == '__main__': update_profile_library(args.vendor, 'process') update_profile_library(args.vendor, 'filament') update_profile_library(args.vendor, 'machine') - else: - rename_filament_system(args.vendor) \ No newline at end of file + # else: + # rename_filament_system(args.vendor) \ No newline at end of file diff --git a/src/libslic3r/GCode.cpp b/src/libslic3r/GCode.cpp index ff0631b0b2..9441aef350 100644 --- a/src/libslic3r/GCode.cpp +++ b/src/libslic3r/GCode.cpp @@ -1061,7 +1061,7 @@ static std::vector get_path_of_change_filament(const Print& print) gcodegen.m_wipe.reset_path(); // We don't want wiping on the ramming lines. toolchange_gcode_str = gcodegen.set_extruder(new_extruder_id, tcr.print_z); // TODO: toolchange_z vs print_z if (gcodegen.config().enable_prime_tower) { - deretraction_str += gcodegen.writer().travel_to_z(z, "restore layer Z"); + deretraction_str += gcodegen.writer().travel_to_z(z, "Force restore layer Z", true); Vec3d position{gcodegen.writer().get_position()}; position.z() = z; gcodegen.writer().set_position(position); @@ -5734,10 +5734,11 @@ std::string GCode::_extrude(const ExtrusionPath &path, std::string description, auto target_z = get_sloped_z(sloped->slope_begin.z_ratio); slope_need_z_travel = m_writer.will_move_z(target_z); } - // go to first point of extrusion path - //BBS: path.first_point is 2D point. But in lazy raise case, lift z is done in travel_to function. - //Add m_need_change_layer_lift_z when change_layer in case of no lift if m_last_pos is equal to path.first_point() by chance + // Move to first point of extrusion path + // path is 2D. But in slope lift case, lift z is done in travel_to function. + // Add m_need_change_layer_lift_z when change_layer in case of no lift if m_last_pos is equal to path.first_point() by chance if (!m_last_pos_defined || m_last_pos != path.first_point() || m_need_change_layer_lift_z || slope_need_z_travel) { + const bool _last_pos_undefined = !m_last_pos_defined; gcode += this->travel_to( path.first_point(), path.role(), @@ -5745,8 +5746,13 @@ std::string GCode::_extrude(const ExtrusionPath &path, std::string description, sloped == nullptr ? DBL_MAX : get_sloped_z(sloped->slope_begin.z_ratio) ); m_need_change_layer_lift_z = false; + // Orca: force restore Z after unknown last pos + if (_last_pos_undefined && !slope_need_z_travel) { + gcode += this->writer().travel_to_z(m_last_layer_z, "force restore Z after unknown last pos", true); + } } + // if needed, write the gcode_label_objects_end then gcode_label_objects_start // should be already done by travel_to, but just in case m_writer.add_object_change_labels(gcode); @@ -7182,6 +7188,8 @@ std::string GCode::set_extruder(unsigned int new_filament_id, double print_z, bo if (m_config.enable_pressure_advance.get_at(new_filament_id)) { gcode += m_writer.set_pressure_advance(m_config.pressure_advance.get_at(new_filament_id)); } + //Orca: tool changer or IDEX's firmware may change Z position, so we set it to unknown/undefined + m_last_pos_defined = false; return gcode; } diff --git a/src/libslic3r/GCode/WipeTower2.cpp b/src/libslic3r/GCode/WipeTower2.cpp index 77e5059154..cf5a68b436 100644 --- a/src/libslic3r/GCode/WipeTower2.cpp +++ b/src/libslic3r/GCode/WipeTower2.cpp @@ -1350,7 +1350,7 @@ void WipeTower2::set_extruder(size_t idx, const PrintConfig& config) // We will use the same variables internally, but the correspondence to the configuration options will be different. float vol = config.filament_multitool_ramming_volume.get_at(idx); float flow = config.filament_multitool_ramming_flow.get_at(idx); - m_filpar[idx].multitool_ramming = config.filament_multitool_ramming.get_at(idx); + m_filpar[idx].multitool_ramming = config.filament_multitool_ramming.get_at(idx) && vol > 0.f && flow > 0.f; m_filpar[idx].ramming_line_width_multiplicator = 2.; m_filpar[idx].ramming_step_multiplicator = 1.; @@ -1360,7 +1360,7 @@ void WipeTower2::set_extruder(size_t idx, const PrintConfig& config) // ramming_speed vector that would respect both the volume and flow (because of // rounding issues with small volumes and high flow). m_filpar[idx].ramming_speed.push_back(flow); - m_filpar[idx].multitool_ramming_time = vol/flow; + m_filpar[idx].multitool_ramming_time = flow > 0.f ? vol/flow : 0.f; } m_used_filament_length.resize(std::max(m_used_filament_length.size(), idx + 1)); // makes sure that the vector is big enough so we don't have to check later diff --git a/src/libslic3r/GCodeWriter.cpp b/src/libslic3r/GCodeWriter.cpp index 91115c9ed2..36639f3305 100644 --- a/src/libslic3r/GCodeWriter.cpp +++ b/src/libslic3r/GCodeWriter.cpp @@ -637,12 +637,12 @@ std::string GCodeWriter::travel_to_xyz(const Vec3d &point, const std::string &co return out_string; } -std::string GCodeWriter::travel_to_z(double z, const std::string &comment) +std::string GCodeWriter::travel_to_z(double z, const std::string &comment, bool force) { /* If target Z is lower than current Z but higher than nominal Z we don't perform the move but we only adjust the nominal Z by reducing the lift amount that will be used for unlift. */ - if (!this->will_move_z(z)) { + if (!force && !this->will_move_z(z)) { double nominal_z = m_pos(2) - m_lifted; m_lifted -= (z - nominal_z); if (std::abs(m_lifted) < EPSILON) diff --git a/src/libslic3r/GCodeWriter.hpp b/src/libslic3r/GCodeWriter.hpp index 720d89a4c1..343fa63c4b 100644 --- a/src/libslic3r/GCodeWriter.hpp +++ b/src/libslic3r/GCodeWriter.hpp @@ -74,7 +74,7 @@ public: double get_current_speed() const { return m_current_speed;} std::string travel_to_xy(const Vec2d &point, const std::string &comment = std::string()); std::string travel_to_xyz(const Vec3d &point, const std::string &comment = std::string(), bool force_z = false); - std::string travel_to_z(double z, const std::string &comment = std::string()); + std::string travel_to_z(double z, const std::string &comment = std::string(), bool force = false); bool will_move_z(double z) const; std::string extrude_to_xy(const Vec2d &point, double dE, const std::string &comment = std::string(), bool force_no_extrusion = false); //BBS: generate G2 or G3 extrude which moves by arc diff --git a/src/slic3r/GUI/IMSlider.cpp b/src/slic3r/GUI/IMSlider.cpp index d9930bd27a..78c2668fa7 100644 --- a/src/slic3r/GUI/IMSlider.cpp +++ b/src/slic3r/GUI/IMSlider.cpp @@ -191,6 +191,10 @@ void IMSlider::SetSelectionSpan(const int lower_val, const int higher_val) m_higher_value = std::max(std::min(higher_val, m_max_value), m_lower_value); if (m_lower_value < m_higher_value) m_is_one_layer = false; + // ORCA reset single layer position when min max values changed + // This will trigger when print height changed. but stays same on reslicing if layer count is same + m_one_layer_value = int((m_higher_value - m_lower_value)/2); + set_as_dirty(); } @@ -443,9 +447,20 @@ bool IMSlider::switch_one_layer_mode() return false; m_is_one_layer = !m_is_one_layer; - if (!m_is_one_layer) { + if (!m_is_one_layer) { // DEACTIVATE + m_one_layer_value = GetHigherValue(); // ORCA Backup value on deactivate SetLowerValue(m_min_value); - SetHigherValue(m_max_value); + SetHigherValue(m_max_value); // Higher value resets on toggling off one layer mode to show whole model + }else{ // ACTIVATE + // ORCA Ensure value fits range. value set in IMSlider::SetSelectionSpan but added this just in case + if(!m_one_layer_value || m_one_layer_value > m_max_value || m_one_layer_value < m_min_value){ + m_one_layer_value = int((m_max_value - m_min_value)/2); + SetHigherValue(m_one_layer_value); + } + else if(GetHigherValue() == m_max_value) // ORCA Prefer backup value if higher value reseted + SetHigherValue(m_one_layer_value); // ORCA Restore value + else // ORCA Prefer higher value if user changed higher value. so it will show section on same view + SetHigherValue(GetHigherValue()); // ORCA use same position with higher value if user changed its position. visible section stays same when switching one layer mode with this } m_selection == ssLower ? correct_lower_value() : correct_higher_value(); if (m_selection == ssUndef) m_selection = ssHigher; @@ -1487,6 +1502,7 @@ void IMSlider::on_mouse_wheel(wxMouseEvent& evt) { if (is_one_layer()) { const int new_pos = GetHigherValue() + wheel; SetHigherValue(new_pos); + m_one_layer_value = new_pos; // ORCA backup value for single layer mode } else { const int new_pos = m_selection == ssLower ? GetLowerValue() + wheel : GetHigherValue() + wheel; diff --git a/src/slic3r/GUI/IMSlider.hpp b/src/slic3r/GUI/IMSlider.hpp index 1b700d0d01..7bea2aae58 100644 --- a/src/slic3r/GUI/IMSlider.hpp +++ b/src/slic3r/GUI/IMSlider.hpp @@ -179,6 +179,7 @@ private: int m_max_value; int m_lower_value; int m_higher_value; + int m_one_layer_value; // ORCA bool m_dirty = false; bool m_render_as_disabled{ false }; diff --git a/src/slic3r/GUI/PartPlate.cpp b/src/slic3r/GUI/PartPlate.cpp index 886b35ad55..29f94f59a0 100644 --- a/src/slic3r/GUI/PartPlate.cpp +++ b/src/slic3r/GUI/PartPlate.cpp @@ -501,7 +501,7 @@ void PartPlate::calc_gridlines(const ExPolygon& poly, const BoundingBox& pp_bbox // calculate and generate grid int step = Bed_2D::calculate_grid_step(pp_bbox, scale_(1.00)); - Vec2d scaled_origin = Vec2d(scale_(m_origin.x()),scale_(m_origin.x())); + Vec2d scaled_origin = Vec2d(scale_(m_origin.x()),scale_(m_origin.y())); auto grid_lines = Bed_2D::generate_grid(poly, pp_bbox, scaled_origin, scale_(step), SCALED_EPSILON); Lines lines_thin = to_lines(grid_lines[0]); diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 83639e8167..aa7c513b3d 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -5399,7 +5399,7 @@ std::vector Plater::priv::load_files(const std::vector& input_ // } // } // Orca: check if the project is created with OrcaSlicer 2.3.1-alpha and use the sparse infill rotation template for non-safe infill patterns - else if ((file_version < app_version) && file_version == Semver("2.3.1-alpha")) { + else if (load_config && (file_version < app_version) && file_version == Semver("2.3.1-alpha")) { if (!config_loaded.opt_string("sparse_infill_rotate_template").empty()) { const auto _sparse_infill_pattern = config_loaded.option>("sparse_infill_pattern")->value; diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index d8d5ac4221..68e2ee5c7b 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -4031,6 +4031,10 @@ void TabFilament::toggle_options() "filament_cooling_initial_speed", "filament_cooling_final_speed"}) toggle_option(el, !is_BBL_printer); + bool multitool_ramming = m_config->opt_bool("filament_multitool_ramming", 0); + toggle_option("filament_multitool_ramming_volume", multitool_ramming); + toggle_option("filament_multitool_ramming_flow", multitool_ramming); + const int extruder_idx = 0; // m_variant_combo->GetSelection(); // TODO: Orca hack toggle_line("retraction_distances_when_ec", m_config->opt_bool("long_retractions_when_ec", extruder_idx), 256 + extruder_idx); }