Code

CURA-10831#274

Code

Merged

jellespijker merged 13 commits intomasterUltimaker/fdm_materials:masterfrom CURA-10831Ultimaker/fdm_materials:CURA-10831Copy head branch name to clipboardDec 8, 2023

+39-63

Commits

Commits on Nov 11, 2023

• Set requirements and version with conandata

  Show description for 3062a0b
  jellespijker

  committed
  3062a0b

  Copy full SHA for 3062a0b

• Use cura-workflows to determine version

  Show description for b8acd1c
  jellespijker

  committed
  b8acd1c

  Copy full SHA for b8acd1c

• add release tagging info to conandata

  Show description for d7bc33c
  jellespijker

  committed
  d7bc33c

  Copy full SHA for d7bc33c

• don't set release from conandata.yml

  Show description for 45b57fb
  jellespijker

  committed
  45b57fb

  Copy full SHA for 45b57fb

• Update conanfile.py and streamline GitHub workflow

  Show description for 39893a0
  jellespijker

  committed
  39893a0

  Copy full SHA for 39893a0

Commits on Nov 15, 2023

• Remove export binaries option

  Show description for 404e042
  jellespijker

  committed
  404e042

  Copy full SHA for 404e042

• also run on PP branches

  Show description for 32dd656
  jellespijker

  committed
  32dd656

  Copy full SHA for 32dd656

Commits on Nov 27, 2023

• Merge branch 'master' into CURA-10831

  jellespijker

  committed
  37eaa2b

  Copy full SHA for 37eaa2b

• Merge main and update versions

  Show description for b31b728
  jellespijker

  committed
  b31b728

  Copy full SHA for b31b728

Commits on Dec 1, 2023

• Use process-pull-request workflow

  Show description for fcd9c03
  jellespijker

  committed
  fcd9c03

  Copy full SHA for fcd9c03

Commits on Dec 4, 2023

• Merge remote-tracking branch 'origin/5.6' into CURA-10831

  jellespijker

  committed
  54e75ad

  Copy full SHA for 54e75ad

• Merge remote-tracking branch 'origin/master' into CURA-10831

  jellespijker

  committed
  0bcbfcc

  Copy full SHA for 0bcbfcc

Commits on Dec 8, 2023

• Apply suggestions from code review

  Show description for 5f03d65
  

  jellespijker

  and

  casperlamboo

  authored
  5f03d65

  Copy full SHA for 5f03d65