~ultimaker/uranium/+git/Uranium:CURA_9565_compile_for_m1_native

Last commit made on 2023-02-08
Get this branch:
git clone -b CURA_9565_compile_for_m1_native https://git.launchpad.net/~ultimaker/uranium/+git/Uranium

Branch merges

Branch information

Name:
CURA_9565_compile_for_m1_native
Repository:
lp:~ultimaker/uranium/+git/Uranium

Recent commits

c507f70... by Remco Burema <email address hidden>

Merge branch '5.3'

f7a5637... by Casper Lamboo <email address hidden>

Merge pull request #865 from Ultimaker/CURA-9814_automate_extracting_strings

[CURA-9814] Automate extracting strings

84904e6... by Jelle Spijker <email address hidden>

Add 5.4.0-alpha to conandata main

2023f1a... by jspijker <email address hidden>

Trigger on release branch

83fc9ad... by Joey de l'Arago

sort the translations

CURA-10077

e97adc3... by jspijker <email address hidden>

Merge remote-tracking branch 'origin/5.2'

# Conflicts:
# conandata.yml

e1bd564... by "c.lamboo" <email address hidden>

Remove devtools options from test_package

CURA-9814

744f11d... by jspijker <email address hidden>

Add 5.3.0 and 5.3.0-beta to conandata

Contributes to CURA-10209

a3be5dd... by Joey de l'Arago

Remove source path from extract tool creation. This can be derived from "self" that is being passed in.

CURA-9814

89b3645... by Joey de l'Arago

Rename extract function to generate to match better with conan style.

CURA-9814