Merge branch 'main' into PurgeLines

This commit is contained in:
GregValiant 2024-12-21 06:09:06 -05:00 committed by GitHub
commit bfc0139766
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
137 changed files with 216 additions and 210 deletions

View file

@ -6,10 +6,14 @@ on:
inputs:
cura_conan_version:
description: 'Cura Conan Version'
default: 'cura/[*]@ultimaker/testing'
default: ''
type: string
package_overrides:
description: 'List of specific packages to be used (space-separated)'
default: ''
type: string
conan_args:
description: 'Conan args, e.g. --requires'
description: 'Conan args'
default: ''
type: string
enterprise:
@ -28,6 +32,7 @@ jobs:
uses: ultimaker/cura-workflows/.github/workflows/cura-installers.yml@main
with:
cura_conan_version: ${{ inputs.cura_conan_version }}
package_overrides: ${{ inputs.package_overrides }}
conan_args: ${{ inputs.conan_args }}
enterprise: ${{ inputs.enterprise }}
staging: ${{ inputs.staging }}

View file

@ -6,11 +6,14 @@ on:
inputs:
cura_conan_version:
description: 'Cura Conan Version'
default: 'cura/latest@ultimaker/testing'
required: true
default: ''
type: string
package_overrides:
description: 'List of specific packages to be used (space-separated)'
default: ''
type: string
conan_args:
description: 'Conan args, e.g. --requires'
description: 'Conan args'
default: ''
required: false
type: string
@ -38,6 +41,7 @@ jobs:
uses: ultimaker/cura-workflows/.github/workflows/cura-installer-linux.yml@main
with:
cura_conan_version: ${{ inputs.cura_conan_version }}
package_overrides: ${{ inputs.package_overrides }}
conan_args: ${{ inputs.conan_args }}
enterprise: ${{ inputs.enterprise }}
staging: ${{ inputs.staging }}

View file

@ -6,11 +6,14 @@ on:
inputs:
cura_conan_version:
description: 'Cura Conan Version'
default: 'cura/latest@ultimaker/testing'
required: true
default: ''
type: string
package_overrides:
description: 'List of specific packages to be used (space-separated)'
default: ''
type: string
conan_args:
description: 'Conan args: eq.: --require-override'
description: 'Conan args'
default: ''
required: false
type: string
@ -47,6 +50,7 @@ jobs:
uses: ultimaker/cura-workflows/.github/workflows/cura-installer-macos.yml@main
with:
cura_conan_version: ${{ inputs.cura_conan_version }}
package_overrides: ${{ inputs.package_overrides }}
conan_args: ${{ inputs.conan_args }}
enterprise: ${{ inputs.enterprise }}
staging: ${{ inputs.staging }}

View file

@ -11,6 +11,6 @@ jobs:
uses: ./.github/workflows/nightly.yml
with:
cura_conan_version: "cura/[*]@ultimaker/stable"
release_tag: "nightly"
release_tag: "nightly-stable"
caller_workflow: "nightly-stable.yml"
secrets: inherit

View file

@ -11,6 +11,6 @@ jobs:
uses: ./.github/workflows/nightly.yml
with:
cura_conan_version: "cura/[*]@ultimaker/testing"
release_tag: "nightly-stable" # Fixed version, we reuse the same tag forever
release_tag: "nightly-testing" # Fixed version, we reuse the same tag forever
caller_workflow: "nightly-testing.yml"
secrets: inherit

View file

@ -41,7 +41,7 @@ jobs:
- name: Rename the installers
id: rename-installers
working-directory: installers
run: python ./Cura-workflows/runner_scripts/rename_installers.py --tag "nightly" >> $GITHUB_OUTPUT
run: python ../Cura-workflows/runner_scripts/rename_installers.py --tag "nightly" >> $GITHUB_OUTPUT
- name: create the release notes
shell: python
@ -61,16 +61,14 @@ jobs:
f.write(release_notes.render(
timestamp=str(datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")),
caller_workflow=caller_workflow,
branch="" if is_main else short_version,
branch_specific="" is_main else f"?branch={short_version}",
branch_specific="" if is_main else f"?branch={short_version}",
))
- name: Update nightly release description and binaries
working-directory: installers
run: |
gh release edit ${{ inputs.release_tag }} --title "${{ steps.rename-installers.outputs.cura_version }}" --notes-file release-notes.md
for file in "*"; do
for file in "installers/*"; do
gh release upload ${{ inputs.release_tag }} $file --clobber
done
env:

View file

@ -4,18 +4,17 @@
| | |
|--------------:|--------------------------------------------------------------------------------------------|
| **Nightlies** | [![nightly {{ branch }}](https://github.com/Ultimaker/Cura/actions/workflows/{{ caller_workflow }}/badge.svg{{ branch_specific }}
?event=schedule)](https://github.com/Ultimaker/Cura/actions/workflows/installers.yml) |
| **Nightlies** | [![nightly](https://github.com/Ultimaker/Cura/actions/workflows/{{ caller_workflow }}/badge.svg{{ branch_specific }}?event=schedule)](https://github.com/Ultimaker/Cura/actions/workflows/installers.yml) |
# Unit Test results
| | |
|-------------------------------:|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| **Cura {{ branch }}** | [![unit-test](https://github.com/Ultimaker/Cura/actions/workflows/unit-test.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/Cura/actions/workflows/unit-test.yml) |
| **CuraEngine {{ branch }}** | [![unit-test](https://github.com/Ultimaker/CuraEngine/actions/workflows/unit-test.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/CuraEngine/actions/workflows/unit-test.yml) |
| **Uranium {{ branch }}** | [![unit-test](https://github.com/Ultimaker/Uranium/actions/workflows/unit-test.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/Uranium/actions/workflows/unit-test.yml) |
| **CuraEngine GradualFlow 0.1** | [![unit-test](https://github.com/Ultimaker/CuraEngine_plugin_gradual_flow/actions/workflows/unit-test.yml/badge.svg?branch=0.1)](https://github.com/Ultimaker/CuraEngine_plugin_gradual_flow/actions/workflows/unit-test.yml) |
| **synsepalum-dulcificum 0.1** | [![unit-test](https://github.com/Ultimaker/synsepalum-dulcificum/actions/workflows/unit-test.yml/badge.svg?branch=0.1)](https://github.com/Ultimaker/synsepalum-dulcificum/actions/workflows/unit-test.yml) |
| **Cura** | [![unit-test](https://github.com/Ultimaker/Cura/actions/workflows/unit-test.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/Cura/actions/workflows/unit-test.yml) |
| **CuraEngine** | [![unit-test](https://github.com/Ultimaker/CuraEngine/actions/workflows/unit-test.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/CuraEngine/actions/workflows/unit-test.yml) |
| **Uranium** | [![unit-test](https://github.com/Ultimaker/Uranium/actions/workflows/unit-test.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/Uranium/actions/workflows/unit-test.yml) |
| **CuraEngine GradualFlow** | [![unit-test](https://github.com/Ultimaker/CuraEngine_plugin_gradual_flow/actions/workflows/unit-test.yml/badge.svg)](https://github.com/Ultimaker/CuraEngine_plugin_gradual_flow/actions/workflows/unit-test.yml) |
| **synsepalum-dulcificum** | [![unit-test](https://github.com/Ultimaker/synsepalum-dulcificum/actions/workflows/unit-test.yml/badge.svg)](https://github.com/Ultimaker/synsepalum-dulcificum/actions/workflows/unit-test.yml) |
| **libSavitar** | [![unit-test](https://github.com/Ultimaker/libSavitar/actions/workflows/unit-test.yml/badge.svg)](https://github.com/Ultimaker/libSavitar/actions/workflows/unit-test.yml) |
| **libnest2d** | [![unit-test](https://github.com/Ultimaker/libnest2d/actions/workflows/unit-test.yml/badge.svg)](https://github.com/Ultimaker/libnest2d/actions/workflows/unit-test.yml) |
@ -23,14 +22,14 @@
| | |
|------------------------------------:|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| **Cura {{ branch }}** | [![conan-package](https://github.com/Ultimaker/Cura/actions/workflows/conan-package.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/Cura/actions/workflows/conan-package.yml) |
| **CuraEngine {{ branch }}** | [![conan-package](https://github.com/Ultimaker/CuraEngine/actions/workflows/conan-package.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/CuraEngine/actions/workflows/conan-package.yml) |
| **Uranium {{ branch }}** | [![conan-package](https://github.com/Ultimaker/Uranium/actions/workflows/conan-package.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/Uranium/actions/workflows/conan-package.yml) |
| **fdm_materials {{ branch }}** | [![conan-package](https://github.com/Ultimaker/fdm_materials/actions/workflows/conan-package.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/fdm_materials/actions/workflows/conan-package.yml) |
| **cura-binary-data {{ branch }}** | [![conan-package](https://github.com/Ultimaker/cura-binary-data/actions/workflows/conan-package.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/cura-binary-data/actions/workflows/conan-package.yml) |
| **CuraEngine GradualFlow 0.1** | [![conan-package](https://github.com/Ultimaker/CuraEngine_plugin_gradual_flow/actions/workflows/conan-package.yml/badge.svg?branch=0.1)](https://github.com/Ultimaker/CuraEngine_plugin_gradual_flow/actions/workflows/conan-package.yml) |
| **synsepalum-dulcificum 0.1** | [![conan-package](https://github.com/Ultimaker/synsepalum-dulcificum/actions/workflows/conan-package.yml/badge.svg?branch=0.1)](https://github.com/Ultimaker/synsepalum-dulcificum/actions/workflows/conan-package.yml) |
| **CuraEngine gRPC definitions 0.1** | [![conan-package](https://github.com/Ultimaker/CuraEngine_grpc_definitions/actions/workflows/conan-package.yml/badge.svg?branch=0.1)](https://github.com/Ultimaker/CuraEngine_grpc_definitions/actions/workflows/conan-package.yml) |
| **Cura** | [![conan-package](https://github.com/Ultimaker/Cura/actions/workflows/conan-package.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/Cura/actions/workflows/conan-package.yml) |
| **CuraEngine** | [![conan-package](https://github.com/Ultimaker/CuraEngine/actions/workflows/package.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/CuraEngine/actions/workflows/package.yml) |
| **Uranium** | [![conan-package](https://github.com/Ultimaker/Uranium/actions/workflows/conan-package.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/Uranium/actions/workflows/conan-package.yml) |
| **fdm_materials** | [![conan-package](https://github.com/Ultimaker/fdm_materials/actions/workflows/conan-package.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/fdm_materials/actions/workflows/conan-package.yml) |
| **cura-binary-data** | [![conan-package](https://github.com/Ultimaker/cura-binary-data/actions/workflows/conan-package.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/cura-binary-data/actions/workflows/conan-package.yml) |
| **CuraEngine GradualFlow** | [![conan-package](https://github.com/Ultimaker/CuraEngine_plugin_gradual_flow/actions/workflows/conan-package.yml/badge.svg)](https://github.com/Ultimaker/CuraEngine_plugin_gradual_flow/actions/workflows/conan-package.yml) |
| **synsepalum-dulcificum** | [![conan-package](https://github.com/Ultimaker/synsepalum-dulcificum/actions/workflows/conan-package.yml/badge.svg)](https://github.com/Ultimaker/synsepalum-dulcificum/actions/workflows/conan-package.yml) |
| **CuraEngine gRPC definitions** | [![conan-package](https://github.com/Ultimaker/CuraEngine_grpc_definitions/actions/workflows/conan-package.yml/badge.svg)](https://github.com/Ultimaker/CuraEngine_grpc_definitions/actions/workflows/conan-package.yml) |
| **libArcus** | [![conan-package](https://github.com/Ultimaker/libArcus/actions/workflows/conan-package.yml/badge.svg)](https://github.com/Ultimaker/libArcus/actions/workflows/conan-package.yml) |
| **pyArcus** | [![conan-package](https://github.com/Ultimaker/pyArcus/actions/workflows/conan-package.yml/badge.svg)](https://github.com/Ultimaker/pyArcus/actions/workflows/conan-package.yml) |
| **libSavitar** | [![conan-package](https://github.com/Ultimaker/libSavitar/actions/workflows/conan-package.yml/badge.svg)](https://github.com/Ultimaker/libSavitar/actions/workflows/conan-package.yml) |

View file

@ -1,34 +1,21 @@
name: printer-linter-format
on:
push:
paths:
- 'resources/definitions/**'
- 'resources/extruders/**'
- 'resources/intent/**'
- 'resources/quality/**'
- 'resources/variants/**'
push:
paths:
- 'resources/definitions/**'
- 'resources/extruders/**'
- 'resources/intent/**'
- 'resources/quality/**'
- 'resources/variants/**'
jobs:
printer-linter-format:
name: Printer linter auto format
runs-on: ubuntu-latest
steps:
- name: Setup the build environment
uses: ultimaker/cura-workflows/.github/actions/setup-build-environment@main
- uses: greguintow/get-diff-action@v7
with:
PATTERNS: |
resources/+(definitions|extruders)/*.def.json
resources/+(intent|quality|variants)/**/*.inst.cfg
- name: Format file
if: env.GIT_DIFF && !env.MATCHED_FILES
run: python printer-linter/src/terminal.py --format ${{ env.GIT_DIFF_FILTERED }}
- uses: stefanzweifel/git-auto-commit-action@v4
if: env.GIT_DIFF && !env.MATCHED_FILES
with:
commit_message: "Applied printer-linter format"
printer-linter-format:
name: Printer linter auto format
uses: ultimaker/cura-workflows/.github/workflows/lint-formatter.yml@main
with:
file_patterns: |
resources/+(definitions|extruders)/*.def.json
resources/+(intent|quality|variants)/**/*.inst.cfg
command: python printer-linter/src/terminal.py --format
commit_message: "Apply printer-linter format"

View file

@ -6,11 +6,14 @@ on:
inputs:
cura_conan_version:
description: 'Cura Conan Version'
default: 'cura/latest@ultimaker/testing'
required: true
default: ''
type: string
package_overrides:
description: 'List of specific packages to be used (space-separated)'
default: ''
type: string
conan_args:
description: 'Conan args: eq.: --requires'
description: 'Conan args'
default: ''
required: false
type: string
@ -38,6 +41,7 @@ jobs:
uses: ultimaker/cura-workflows/.github/workflows/cura-installer-windows.yml@main
with:
cura_conan_version: ${{ inputs.cura_conan_version }}
package_overrides: ${{ inputs.package_overrides }}
conan_args: ${{ inputs.conan_args }}
enterprise: ${{ inputs.enterprise }}
staging: ${{ inputs.staging }}

View file

@ -2,8 +2,6 @@
<div align = center>
# ⚠️ ⚠️ On 03-12-2024, we will start merging branches on all the Cura-related repositories, that contain a migration of our Conan recipes to use Conan 2, and also a huge rework on many GitHub workflows. Unfortunately, we cannot test everything until it is merged, so it is very likely that some existing workflows will stop working. If you are a developer, you may also encounter troubles when updating your branches or updating your Conan dependencies. This message will be removed when the situation is stable enough. After that, please open new issues if you are still in trouble with the new recipes/workflows. Sorry for the inconvenience. ⚠️ ⚠️
[![Badge Issues]][Issues]
[![Badge PullRequests]][PullRequests]
[![Badge Closed]][Closed]

View file

@ -28,7 +28,7 @@ a = Analysis(
binaries=binaries,
datas=datas,
hiddenimports=hiddenimports,
hookspath=[],
hookspath=["Cura-workflows/runner_scripts/pyinstaller_hooks"],
hooksconfig={},
runtime_hooks=[],
excludes=[],

View file

@ -9,7 +9,7 @@ requirements:
- "pysavitar/5.4.0-alpha.0@ultimaker/stable"
- "pynest2d/5.4.0-alpha.0@ultimaker/stable"
requirements_internal:
- "fdm_materials/5.8.1"
- "fdm_materials/5.10.0-alpha.0@internal/testing"
- "cura_private_data/5.10.0-alpha.0@internal/testing"
requirements_enterprise:
- "native_cad_plugin/2.0.0"
@ -107,7 +107,12 @@ pyinstaller:
- "fcntl"
- "stl"
- "serial"
- "win32cred"
- "win32timezone"
- "pkgutil"
hiddenimports_WINDOWS_ONLY:
- "PyQt6.Qt"
- "PyQt6.Qt6"
collect_all:
- "cura"
- "UM"
@ -119,6 +124,10 @@ pyinstaller:
- "PyQt6.QtNetwork"
- "PyQt6.sip"
- "stl"
- "keyrings.alt"
collect_all_WINDOWS_ONLY:
- "PyQt6.Qt"
- "PyQt6.Qt6"
icon:
Windows: "./icons/Cura.ico"
Macos: "./icons/cura.icns"
@ -131,7 +140,7 @@ pyinstaller:
- [ "qt", "lab", "animat" ]
- [ "qt", "mqtt" ]
- [ "qt", "net", "auth" ]
- [ "qt", "quick3d" ]
- [ "quick3d" ]
- [ "qt", "timeline" ]
- [ "qt", "virt", "key" ]
- [ "qt", "wayland", "compos" ]
@ -275,11 +284,6 @@ pip_requirements_core:
hashes:
- sha256:b7cf7d3fef75f1e4c80a96ca660efbd51473d7e8f39b5ab9210febc7809012a4
- sha256:92a8b58ce734b2a4494878e0ecf7d79ccd7a128b5fc6014c401e0b61f006f0f6
keyring:
version: "23.0.1"
hashes:
- sha256:8f607d7d1cc502c43a932a275a56fe47db50271904513a379d39df1af277ac48
- sha256:045703609dd3fccfcdb27da201684278823b72af515aedec1a8515719a038cb8
trimesh:
version: "3.9.36"
hashes:

View file

@ -179,6 +179,7 @@ class CuraConan(ConanFile):
"qtmqtt",
"qtnetworkauth",
"qtquick3d",
"quick3d",
"qtquick3dphysics",
"qtquicktimeline",
"qtvirtualkeyboard",
@ -207,7 +208,7 @@ class CuraConan(ConanFile):
to_remove_files.append(pathname)
for dirname in dir_:
for forbidden in prohibited:
if forbidden.lower() == str(dirname).lower():
if forbidden.lower() in str(dirname).lower():
pathname = os.path.join(root, dirname)
to_remove_dirs.append(pathname)
break
@ -309,6 +310,12 @@ class CuraConan(ConanFile):
except Exception as ex:
print(f"WARNING: Attempt to delete binary {unwanted_path} results in: {str(ex)}")
hiddenimports = pyinstaller_metadata["hiddenimports"]
collect_all = pyinstaller_metadata["collect_all"]
if self.settings.os == "Windows":
hiddenimports += pyinstaller_metadata["hiddenimports_WINDOWS_ONLY"]
collect_all += pyinstaller_metadata["collect_all_WINDOWS_ONLY"]
# Write the actual file:
with open(os.path.join(location, "UltiMaker-Cura.spec"), "w") as f:
f.write(pyinstaller.render(
@ -318,8 +325,8 @@ class CuraConan(ConanFile):
datas = datas,
binaries = filtered_binaries,
venv_script_path = str(self._script_dir),
hiddenimports = pyinstaller_metadata["hiddenimports"],
collect_all = pyinstaller_metadata["collect_all"],
hiddenimports = hiddenimports,
collect_all = collect_all,
icon = icon_path,
entitlements_file = entitlements_file,
osx_bundle_identifier = "'nl.ultimaker.cura'" if self.settings.os == "Macos" else "None",

View file

@ -16,8 +16,6 @@ if TYPE_CHECKING:
import sys
from UM.Platform import Platform
if Platform.isWindows():
if hasattr(sys, "frozen"):
import win32timezone
from keyring.backends.Windows import WinVaultKeyring
keyring.set_keyring(WinVaultKeyring())
if Platform.isOSX():

View file

@ -298,8 +298,14 @@ class FlavorParser:
position.e.extend([0] * (self._extruder_number - len(position.e) + 1))
return position
def processMCode(self, M: int, line: str, position: Position, path: List[List[Union[float, int]]]) -> Position:
pass
def processMCode(self, M: int, line: str, position: Position, path: List[List[Union[float, int]]]) -> None:
# Set extrusion mode
if M == 82:
# Set absolute extrusion mode
self._is_absolute_extrusion = True
elif M == 83:
# Set relative extrusion mode
self._is_absolute_extrusion = False
_type_keyword = ";TYPE:"
_layer_keyword = ";LAYER:"

View file

@ -11,14 +11,6 @@ class RepRapFlavorParser(FlavorParser.FlavorParser):
def __init__(self):
super().__init__()
def processMCode(self, M, line, position, path):
if M == 82:
# Set absolute extrusion mode
self._is_absolute_extrusion = True
elif M == 83:
# Set relative extrusion mode
self._is_absolute_extrusion = False
def _gCode90(self, position, params, path):
"""Set the absolute positioning

View file

@ -46,9 +46,9 @@ class CuraResource(ConanFile):
def package_info(self):
self.cpp_info.includedirs = []
self.runenv_info.append_path("CURA_RESOURCES", os.path.join(self.package_folder, "res"))
self.runenv_info.append_path("CURA_ENGINE_SEARCH_PATH", os.path.join(self.package_folder, "res", "definitions"))
self.runenv_info.append_path("CURA_ENGINE_SEARCH_PATH", os.path.join(self.package_folder, "res", "extruders"))
self.runenv_info.define("CURA_RESOURCES", os.path.join(self.package_folder, "res"))
self.runenv_info.define("CURA_ENGINE_SEARCH_PATH", os.path.join(self.package_folder, "res", "definitions"))
self.runenv_info.define("CURA_ENGINE_SEARCH_PATH", os.path.join(self.package_folder, "res", "extruders"))
def package_id(self):
self.info.clear()

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_asa
quality_type = extrafine
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.25mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_asa
quality_type = fast
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.25mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_asa
quality_type = fine
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.25mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_asa
quality_type = normal
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.25mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_pva
quality_type = extrafine
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.25mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_pva
quality_type = fast
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.25mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_pva
quality_type = fine
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.25mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_pva
quality_type = normal
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.25mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_tpu
quality_type = extrafine
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.25mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_tpu
quality_type = fast
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.25mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_tpu
quality_type = fine
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.25mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_tpu
quality_type = normal
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.25mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_asa
quality_type = extrafine
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.30mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_asa
quality_type = fast
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.30mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_asa
quality_type = fine
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.30mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_asa
quality_type = normal
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.30mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_pva
quality_type = extrafine
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.30mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_pva
quality_type = fast
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.30mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_pva
quality_type = fine
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.30mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_pva
quality_type = normal
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.30mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_tpu
quality_type = extrafine
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.30mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_tpu
quality_type = fast
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.30mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_tpu
quality_type = fine
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.30mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_tpu
quality_type = normal
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.30mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_asa
quality_type = fast
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.35mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_asa
quality_type = fine
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.35mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_asa
quality_type = normal
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.35mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_pva
quality_type = fast
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.35mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_pva
quality_type = fine
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.35mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_pva
quality_type = normal
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.35mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_tpu
quality_type = fast
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.35mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_tpu
quality_type = fine
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.35mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_tpu
quality_type = normal
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.35mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_asa
quality_type = extrafast
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.40mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_asa
quality_type = fast
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.40mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_asa
quality_type = fine
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.40mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_asa
quality_type = normal
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.40mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_pva
quality_type = extrafast
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.40mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_pva
quality_type = fast
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.40mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_pva
quality_type = fine
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.40mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_pva
quality_type = normal
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.40mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_tpu
quality_type = extrafast
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.40mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_tpu
quality_type = fast
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.40mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_tpu
quality_type = fine
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.40mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_tpu
quality_type = normal
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.40mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_asa
quality_type = extrafast
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.50mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_asa
quality_type = fast
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.50mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_asa
quality_type = normal
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.50mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_asa
quality_type = sprint
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.50mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_pva
quality_type = extrafast
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.50mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_pva
quality_type = fast
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.50mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_pva
quality_type = normal
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.50mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_pva
quality_type = sprint
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.50mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_tpu
quality_type = extrafast
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.50mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_tpu
quality_type = fast
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.50mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_tpu
quality_type = normal
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.50mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_tpu
quality_type = sprint
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.50mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_asa
quality_type = extrafast
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.60mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_asa
quality_type = fast
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.60mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_asa
quality_type = sprint
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.60mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_pva
quality_type = extrafast
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.60mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_pva
quality_type = fast
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.60mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_pva
quality_type = sprint
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.60mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_tpu
quality_type = extrafast
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.60mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_tpu
quality_type = fast
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.60mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_tpu
quality_type = sprint
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.60mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_asa
quality_type = extrafast
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.80mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_asa
quality_type = sprint
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.80mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_asa
quality_type = supersprint
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.80mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_pva
quality_type = extrafast
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.80mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_pva
quality_type = sprint
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.80mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_pva
quality_type = supersprint
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.80mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_tpu
quality_type = extrafast
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.80mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_tpu
quality_type = sprint
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.80mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_tpu
quality_type = supersprint
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.80mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_asa
quality_type = extrafast
setting_version = 23
setting_version = 24
type = quality
variant = Volcano 0.40mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_asa
quality_type = fast
setting_version = 23
setting_version = 24
type = quality
variant = Volcano 0.40mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_asa
quality_type = normal
setting_version = 23
setting_version = 24
type = quality
variant = Volcano 0.40mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_pva
quality_type = extrafast
setting_version = 23
setting_version = 24
type = quality
variant = Volcano 0.40mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_pva
quality_type = fast
setting_version = 23
setting_version = 24
type = quality
variant = Volcano 0.40mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_pva
quality_type = normal
setting_version = 23
setting_version = 24
type = quality
variant = Volcano 0.40mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_tpu
quality_type = extrafast
setting_version = 23
setting_version = 24
type = quality
variant = Volcano 0.40mm

View file

@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_tpu
quality_type = fast
setting_version = 23
setting_version = 24
type = quality
variant = Volcano 0.40mm

Some files were not shown because too many files have changed in this diff Show more