355 Commits

Author	SHA1	Message	Date
Jelle Spijker	fca8d2a751	Revert "override Protobuf requirement deps" ... This reverts commit ec138516eb1f46d9bb1d7aaa01394d55542c67ba.	2024-02-26 06:54:20 +01:00
Jelle Spijker	ec138516eb	override Protobuf requirement deps ... Fix versions conflict	2024-02-26 06:53:39 +01:00
Remco Burema	5f884c737b	Fix build, prevent protobuf version mismatch.	2024-02-21 16:39:50 +01:00
Jelle Spijker	20becc1700	Fix Python Installs about dialog ... It will now use the Python Virtual env	2024-01-26 12:49:37 +01:00
Jelle Spijker	b8d1c885c7	Remove comment ... Mostly to force a build from a push action	2024-01-19 08:31:49 +01:00
Erwan MATHIEU	1514d755b0	Set proper dependancies versions	2024-01-17 11:03:32 +01:00
Jelle Spijker	e91322d070	ALso enable Sentry for Clipper ... Contributes to CURA-11482	2024-01-15 09:57:04 +01:00
Jelle Spijker	34e7ea8185	Use clipper with Sentry support ... Contributes to CURA-11482	2024-01-12 14:28:01 +01:00
Jelle Spijker	0661fe5dcb	Enable Sentry for Arcus ... Contributes to CURA-11482	2024-01-12 11:04:31 +01:00
Jelle Spijker	ec1c825352	Don't package pdb ... Contributes to CURA-11482	2024-01-12 11:00:18 +01:00
Jelle Spijker	8f29e8d77b	Fix wrongful removal of i18n option ... This caused the option to be always be removed, while we only needed the info of the option to be removed Contributes to CURA-11497	2024-01-11 09:00:19 +01:00
HellAholic	bb0c17b2fd	Revert "qt6.6 scroll issues"	2024-01-10 15:41:20 +01:00
saumya.jain	2fbdb633e1	qt6.6 scroll issues ... CURA-11468	2024-01-03 12:23:40 +01:00
Jelle Spijker	3da4fb2d26	Install pdb files ... Contribute to CURA-11443	2023-12-11 09:13:36 +01:00
Jelle Spijker	9bb065a294	make sure fdm_materials is installed for internals ... Contributes to CURA-10831	2023-12-08 07:40:30 +01:00
Jelle Spijker	f94198c108	Fix behaviour of internal property ... The attribute 'enterprise' in conanfile.py was incorrectly named and has been renamed to 'internal'. This revision ensures that options are accessed correctly to avoid potential issues in usage. Contributes to CURA-10831	2023-12-07 14:41:44 +01:00
Jelle Spijker	1156ad7f56	Merge branch 'main' into CURA-10831 ... # Conflicts: # conanfile.py	2023-12-05 10:24:50 +01:00
Jelle Spijker	ee1f1a1a82	Merge remote-tracking branch 'origin/CURA-11364_add_sentry_engine' ... # Conflicts: # conanfile.py	2023-12-05 10:22:46 +01:00
Jelle Spijker	8aa6d2c5b6	Update conan_data with actual version ... Contributes to CURA-10831	2023-12-05 07:44:04 +01:00
Jelle Spijker	b678951759	Applied work-around for GH true/false instead of True/False ... Contributes to CURA-10831	2023-12-04 18:15:50 +01:00
c.lamboo	58c174ff68	pin dulcificum to 0.1.0-beta.2	2023-12-04 13:49:02 +01:00
c.lamboo	89be765841	Revert "unpin dulcificum" ... This reverts commit ba9e122f6add419824e6fc03d55df40766d4e71d.	2023-12-04 13:48:05 +01:00
c.lamboo	ba9e122f6a	unpin dulcificum	2023-12-04 11:45:12 +01:00
Jelle Spijker	a0f161cd18	Merge branch 'main' into CURA-10831 ... # Conflicts: # conanfile.py	2023-12-04 11:05:10 +01:00
Erwan MATHIEU	7d04a988b1	Merge branch 'main' into CURA-11080_use_openssl_3	2023-12-04 10:09:56 +01:00
jellespijker	bffbded591	Override spdlog version	2023-12-01 17:42:27 +01:00
jellespijker	806eba0c6b	Merge remote-tracking branch 'origin/CURA-11080_use_openssl_3' into CURA-10831 ... # Conflicts: # conanfile.py	2023-12-01 11:27:05 +01:00
Jelle Spijker	10b69e801e	Openssl shared on Linux static for the rest ... Contribute to CURA-11080	2023-12-01 07:51:31 +01:00
c.lamboo	d93d66dd8a	Use sentry cura engine version ... CURA-11364	2023-11-30 13:45:21 +01:00
c.lamboo	1e190ebcb9	Format file ... CURA-1364	2023-11-30 13:16:25 +01:00
Jelle Spijker	ef5bc6d3d5	Use custom CPython 3.10.4 and OpenSSL 3.2.0 ... Due to changes made to the recipes up stream, and some tweaks to our own cpython recipe. We can now build cpython with the newest OpenSSL version Contribute to CURA-11080	2023-11-30 12:57:14 +01:00
Casper Lamboo	1dc350012d	Merge branch 'main' into CURA-11364_add_sentry_engine	2023-11-30 09:29:47 +01:00
Jelle Spijker	ac55306d0b	Use Dulcificum 0.1.0-beta.1	2023-11-29 18:44:11 +01:00
Jelle Spijker	37a4c5d19a	Merge branch 'main' into CURA-10831 ... # Conflicts: # .github/workflows/conan-package-create.yml # .github/workflows/conan-package.yml	2023-11-29 15:18:39 +01:00
Jelle Spijker	50fe469122	Use CCI gettext ... Contributes to CURA-10831	2023-11-28 17:30:15 +01:00
Jaime van Kessel	344d648445	Merge branch '5.6' of github.com:Ultimaker/Cura	2023-11-27 12:40:56 +01:00
Jelle Spijker	1f6edc42c9	Merge branch 'main' into CURA-10831 ... # Conflicts: # conanfile.py	2023-11-27 08:03:07 +01:00
Jelle Spijker	3811e37c73	Use updated translation tools ... These also take bundled plugin settings into account Contribute to CURA-11300	2023-11-24 12:59:46 +01:00
c.lamboo	4ce092837e	Merge branch '5.6' ... # Conflicts: # conanfile.py	2023-11-24 10:24:52 +01:00
Jelle Spijker	b7c1022ed1	Use conf to get Cura version	2023-11-24 10:20:46 +01:00
Jelle Spijker	1d8918f30d	Use conf to get i18n options ... This will give us more finegrained control if we want the pot files extracted or build the mo files Contributes to CURA-11300	2023-11-24 10:18:23 +01:00
Jelle Spijker	f22d82c1e0	Use CURA-11634 for CuraEngine ... Contributes to CURA-11364	2023-11-21 13:27:26 +01:00
Jelle Spijker	3bd2ea4296	Pin dulcificum version ... Contributes to CURA-11364	2023-11-21 13:22:18 +01:00
Jelle Spijker	3052c6be3b	Enable Sentry for the engine if the conan con sentry_url is set ... If you want to test this locally do a conan install with: ``` -c user.curaengine:sentry_url=<sentry_url> ``` The URL is stored in the CuraEngine repository variables Contributes to CURA-11364	2023-11-21 13:21:25 +01:00
Casper Lamboo	9144c1d178	Merge pull request #17264 from Ultimaker/CURA-11300_translations_v5p6 ... [CURA-11300] Officially supported languages' translations for v5.6.x	2023-11-17 10:33:10 +01:00
Jelle Spijker	78cafeca4b	Only check internal requirements when building internal ... Contributes to CURA-10831	2023-11-16 13:30:26 +01:00
c.lamboo	1950cc65aa	Pin dulcificum at beta.1 release	2023-11-16 11:13:14 +01:00
Remco Burema	278206d456	Merge remote-tracking branch 'origin/5.6' into CURA-11300_translations_v5p6	2023-11-15 14:40:32 +01:00
Jelle Spijker	a7d4ba0528	use testing for fdm_material and curaengine ... Contributes to CURA-11269	2023-11-15 13:54:40 +01:00
Jelle Spijker	4656873e9d	Set working versions to 5.6.0-beta.2 ... Contributes to CURA-11269	2023-11-15 13:46:04 +01:00