Prepare for merge

CURA-11622

.github/workflows/conan-package.yml

@@ -22,9 +22,8 @@ on:
       - '[0-9]+.[0-9]+.[0-9]'
 
 jobs:
-# FIXME: Use main once merged
   conan-package:
-    uses: ultimaker/cura-workflows/.github/workflows/conan-package.yml@CURA-11622_conan_v2
+    uses: ultimaker/cura-workflows/.github/workflows/conan-package.yml@main
     with:
       platform_mac: false
       install_system_dependencies: false

conanfile.py

@@ -31,10 +31,6 @@ def export_sources(self):
         copy(self, "*", os.path.join(self.recipe_folder, "uranium"), os.path.join(self.export_sources_folder, "uranium"))
         copy(self, "*", os.path.join(self.recipe_folder, "windows"), os.path.join(self.export_sources_folder, "windows"))
 
-    def validate(self):
-        if (self.version != None) and (Version(self.version) <= Version("4")):
-            raise ConanInvalidConfiguration("Only versions 5+ are supported!")
-
     def layout(self):
         self.cpp.package.resdirs = [os.path.join("resources", "cura"), os.path.join("resources", "uranium"), "windows"]