Merge branch 'main' into CURA-8415_self_hosted_runner

This commit is contained in:
Jelle Spijker 2023-08-18 11:33:07 +02:00
commit 1d101a256e
No known key found for this signature in database
GPG Key ID: 034D1C0527888B65
2 changed files with 2 additions and 2 deletions

View File

@ -160,7 +160,7 @@ jobs:
sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-10 10
- name: Create the default Conan profile
run: conan profile new default --detect
run: conan profile new default --detect --force
- name: Configure GPG Key Linux (Bash)
if: ${{ runner.os == 'Linux' }}

View File

@ -59,7 +59,7 @@
"machine_width": { "default_value": 280 },
"material_diameter": { "default_value": 1.75 },
"material_initial_print_temperature": { "value": "material_print_temperature" },
"prime_tower_min_volume": { "value": "((reveOrValue('layer_height'))/2" },
"prime_tower_min_volume": { "value": "((resolveOrValue('layer_height'))/2" },
"prime_tower_position_x": { "value": "240" },
"prime_tower_position_y": { "value": "190" },
"prime_tower_size": { "value": "30" },