GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-15 20:55:53 +08:00
Code Issues Packages Projects Releases Wiki Activity
23,634 Commits 295 Branches 268 Tags
Commit Graph

23634 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Konstantinos Karmas
ff8e037f4c
Merge pull request #7704 from Ultimaker/CURA-7429_fix_image_reader_peak_height 
CURA-7429_fix_image_reader_peak_height
 2020-05-11 13:58:11 +02:00
Ghostkeeper
40056c9a04
Update to setting_version 15 
Due to a merge conflict that Git couldn't detect, these are immediately outdated. Let's update them to 15.

Since I knew this would be coming, I didn't change the maximum deviation last time, so now I also don't need to change it back.

Contributes to issue CURA-7384.
 2020-05-11 11:43:37 +02:00
Ghostkeeper
a2946b057a
Merge branch 'master' of github.com:Ultimaker/Cura 2020-05-11 11:41:30 +02:00
Ghostkeeper
f6ad144add
Merge branch '64bittuning-master' 
Fixes CURA-7384.
 2020-05-11 11:40:47 +02:00
Ghostkeeper
0bb65c86ec
Fix default quality level 
Standard doesn't exist for this printer. It's 'normal'. I'm guessing this was a leftover from when this was copied from the Creality printers.
 2020-05-11 11:40:14 +02:00
Ghostkeeper
7210dd308c
Rename Tronxy quality profiles to something more specific to Tronxy 
To Cura the folder doesn't matter. It only reads the filenames and uses those as unique IDs. So for these filenames we'd like to have an ID that is more speciic to this printer to prevent people from crashing.
I'm guessing that the author here already encountered that problem. He copied the files from Creality which has the same problem. However Creality profiles are already published and will be much harder to change the names since they would need to be changed in a version upgrade.

Contributes to issue CURA-7384.
 2020-05-11 11:39:26 +02:00
Konstantinos Karmas
6ea37603f2
Merge pull request #7715 from Ultimaker/CURA-7420_fix_version_upgrader 
New version upgrade for 4.7
 2020-05-11 11:07:44 +02:00
Ghostkeeper
a0f4305420
Remove warnings that will never be visible 
This was copied from the error state, where it does matter, but the warning state is not shown if the setting is not enabled.

Contributes to issue CURA-7384.
 2020-05-11 11:02:37 +02:00
Ghostkeeper
156925d48e
Update to setting_version 14 
This is necessary before merging since these profiles would otherwise still need to be updated during runtime.

Contributes to issue CURA-7384.
 2020-05-11 10:51:44 +02:00
Ghostkeeper
454bff174c
Add correct name of settings guide to ignore list 2020-05-11 09:58:19 +02:00
Ghostkeeper
c79123e6fa
Use spaces to indent 2020-05-11 09:51:20 +02:00
Konstantinos Karmas
0bcb3348da
Merge pull request #7707 from Ultimaker/CURA-7245_fix_bundled_package_sync 
CURA-7245_fix_bundled_package_sync
 2020-05-11 09:49:19 +02:00
Ghostkeeper
c9a9579d8b
Merge branch 'master' of https://github.com/64bittuning/Cura into 64bittuning-master 2020-05-11 09:16:01 +02:00
Peter Felecan
5f08fbd83a Addition of the I3 Metal Motion printer by eMotionTech and the afferent extruder. 2020-05-08 17:11:28 +02:00
Kostas Karmas
1e2764278e Remove unnecessary os.path.basename call 2020-05-08 16:58:33 +02:00
Kostas Karmas
856bd86cd1 Add test for platform mesh sizes <=1MB 
As a result of Cura and Cookies discussion, we decided to limit the
sizes of platform meshes to less than 1MB. This test checks that
during the CI/CD process and displays an assertion error when a
mesh excludes this limit.
 2020-05-08 16:51:13 +02:00
Ghostkeeper
6478cee411
Add a page about the build volume 2020-05-08 15:35:08 +02:00
Ghostkeeper
62b49e2459
Add category about the 3D scene 2020-05-08 14:46:32 +02:00
Ghostkeeper
17af83bc19
Also test for the normal Version number 
It rarely changes so it's less of a problem, but you never know.
 2020-05-08 12:18:48 +02:00
Ghostkeeper
6baca9eaa2
Also test intent profiles 
Contributes to issue CURA-7420.
 2020-05-08 12:13:06 +02:00
Ghostkeeper
e16dac0708
Update profile that was outdated since Cura 4.0 
Contributes to issue CURA-7420.
 2020-05-08 11:34:10 +02:00
Ghostkeeper
c61f3b04ba
Add test for all built-in profiles being up to date 
So we had several hundred files outdated already. It's happened before. It shaln't happen again.

This test fails right now because there is one file still on setting_version 6.

Contributes to issue CURA-7420.
 2020-05-08 11:26:37 +02:00
Ghostkeeper
8f9408a76f
Apply version upgrade maximum deviation change to built-in profiles 
For some this is not exactly restored as their original since this setting is limited to micron precision as well.

Contributes to issue CURA-7420.
 2020-05-08 11:15:55 +02:00
Ghostkeeper
3527c16716
Upgrade containers that were forgotten to upgrade from setting_version 13 
This is why it was upgrading them as if from the profile importer...

Contributes to issue CURA-7420.
 2020-05-08 11:13:15 +02:00
Nino van Hooff
1ae050bbc5 Expose Account.SyncState as an Enum to QML 
Provides a single source of truth

CURA-7290
 2020-05-08 11:09:48 +02:00
Ghostkeeper
9d178f26a7
Increment setting version to 15 
Once more into the fray.

Contributes to issue CURA-7420.
 2020-05-08 09:43:02 +02:00
Ghostkeeper
c3c144345b
Add version upgrade to halve the maximum deviation once again 
As explained in the comment. We reverted a change in 4.6, so we must unrevert it in master again.

Contributes to issue CURA-7420.
 2020-05-08 09:30:54 +02:00
Ghostkeeper
b02354b209
Merge branch '4.6' 
Conflicts:
	plugins/VersionUpgrade/VersionUpgrade460to462/VersionUpgrade460to462.py -> On master we removed the getCfgVersion function, while we moved the entire plug-in to a different folder in 4.6.
	resources/definitions/skriware_2.def.json -> On master we merged a PR that changes more or less all settings, while on 4.6 we doubled the maximum deviation.
 2020-05-08 09:10:02 +02:00
Remco Burema
23cdf871c1
Add comments: Why a matrix4x4 and not a sampler1d? 
part of CURA-7426
 2020-05-07 18:55:55 +02:00
Ghostkeeper
47bf094c52
Fix internal conflicts within the Anycubic Mega Zero printer 
This definition specified that the maximum E speed is 25mm/s but then said that the retraction speed is 30mm/s. I've changed the maximum E speed to 30mm/s then because apparently that's what the definition author was testing with.
This definition specified that the maximum Z speed is 5mm/s but the default Z hop speed is 10mm/s. I've set the Z hop speed to 5mm/s because it was not initially overridden by the definition author, but apparently 5mm/s is the limit.

Contributes to issue CURA-7431.
 2020-05-07 16:50:04 +02:00
Mark Burton
f02ac17a30 GL ES compatibility fixes. 2020-05-07 13:38:09 +01:00
Nino van Hooff
5a3bcb6161 Fix image reader peak height 
CURA-7429
 2020-05-07 14:29:30 +02:00
Konstantinos Karmas
b5edbf737d
Merge pull request #7693 from Ultimaker/CURA-7426_fix_extruders_lt_4 
CURA-7426 Layerview can now deal with visibility extruder nrs. > 4
 2020-05-07 14:17:10 +02:00
Kostas Karmas
6ffd250965 Format spacing 
CURA-7426
 2020-05-07 14:10:45 +02:00
Ghostkeeper
58a7f54fbd
Merge branch 'kad-anycubic_mega_zero' 2020-05-07 13:58:48 +02:00
Ghostkeeper
1aec5d3452
Merge branch 'anycubic_mega_zero' of https://github.com/kad/Cura into kad-anycubic_mega_zero 2020-05-07 13:55:43 +02:00
Ghostkeeper
88bf80c424
Don't provide setVariant with None as variant 
That is not allowed as per the type. This could happen if the preferred variant of a printer also doesn't exist.

Fixes Sentry issue CURA-NP.
 2020-05-07 08:53:52 +02:00
Remco Burema
99e99e4650
Layerview can now deal with visibility extruder nrs. 4+ 
part of CURA-7426
 2020-05-06 18:03:32 +02:00
Nino van Hooff
8937c63219 Finish merge of auto sync packages 
CURA-7290
 2020-05-06 16:08:47 +02:00
Nino van Hooff
9b79b70f2b Merge branch 'CURA-7290_auto_sync_packages' into CURA-7290_manual_account_sync 
# Conflicts:
#	cura/API/Account.py
#	plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py
 2020-05-06 16:03:37 +02:00
Nino van Hooff
3ac0e7bed9 Consider all packages when calculating account discrepancies 
Not just the user-subscribed ones

CURA-7245
 2020-05-06 16:01:36 +02:00
maukcc
157c2d562e HMS434 update 
added generic pla to the material list
 2020-05-06 15:56:00 +02:00
Nino van Hooff
2ecd30d6a9 Merge branch 'master' of https://github.com/Ultimaker/Cura 2020-05-06 15:08:09 +02:00
Nino van Hooff
bfae7e9fb1 Replace some hard-coded sync states 
CURA-7290
 2020-05-06 12:54:07 +02:00
Nino van Hooff
ef6cf8d5cc Remove unused pyqtProperty 
CURA-7290
 2020-05-06 12:08:55 +02:00
Nino van Hooff
50ae2064b5 Refactor SyncState logic to SyncState.qml 
CURA-7290
 2020-05-06 11:47:38 +02:00
Remco Burema
2687578a86
Merge pull request #7624 from Ultimaker/CURA-7022_Add_cloud_printer_within_add_a_connected_printer 
Cura 7022 add cloud printer within add a connected printer
 2020-05-06 11:13:27 +02:00
konskarm
a2737ea47d
Merge pull request #7663 from Evg33/UNI_3D_codes 
UNI 3D tuning.
 2020-05-06 09:49:35 +02:00
Nino van Hooff
5b245434d0 Add _last_check_packages type hint 
CURA-7290
 2020-05-04 17:32:54 +02:00
Nino van Hooff
7322526791 Fix typing warning 
CURA-7290
 2020-05-04 17:30:32 +02:00