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

23916 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jelle Spijker
a503149452
Merge remote-tracking branch 'origin/doxygen_to_restructuredtext_comments' into doxygen_to_restructuredtext_comments 2020-05-08 19:00:47 +02:00
Jelle Spijker
120541a8db
Updated comments in Models 
Converted doxygen style comments to reStructuredText style in the files
 found in Cura/cura/Model directory recursively  using the script
dox_2_rst.py (provided in the Uranium repo). Comments were manually
 checked and changed if needed.

 Note: dox_2rst.py struggles with decorated functions.
 2020-05-08 18:59:38 +02:00
Nino van Hooff
a09cd0e63e Convert doxygen to rst for Prepare, Preview, RemovableOutputDevice 2020-05-08 17:37:49 +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
Nino van Hooff
a4fe3d7685 Convert doxygen to rst for POS, MonitorStage, PostProcessing 2020-05-08 16:28:07 +02:00
Nino van Hooff
553b09b6cf Convert doxygen to rst for GcodeWriter, LegacyProfileReader, 
MachineSettingsAction, ModelChecker
 2020-05-08 16:20:55 +02:00
Nino van Hooff
40327c4259 Convert doxygen to rst for GcodeReader, GcodeGzReader/Writer, 
GCodeProfileReader
 2020-05-08 15:58:51 +02:00
Nino van Hooff
6ca9b4678e Convert doxygen to rst for Firmware update plugins 2020-05-08 15:46:02 +02:00
Nino van Hooff
54d2fe95d1 Convert doxygen to rst for CuraProfileReader/Writer 2020-05-08 15:43:12 +02:00
Jelle Spijker
d69bf84424
Updated comments in Backup 
Converted doxygen style comments to reStructuredText style in the files
 found in Cura/cura/Backup directory recursively  using the script
dox_2_rst.py (provided in the Uranium repo). Comments were manually
 checked and changed if needed.
 2020-05-08 15:39:16 +02:00
Ghostkeeper
6478cee411
Add a page about the build volume 2020-05-08 15:35:08 +02:00
Nino van Hooff
176919eee0 Merge branch 'master' into doxygen_to_restructuredtext_comments 
# Conflicts:
#	plugins/CuraEngineBackend/CuraEngineBackend.py
#	plugins/CuraEngineBackend/StartSliceJob.py
 2020-05-08 15:31:23 +02:00
Nino van Hooff
797d6ed438 Convert doxygen to rst for CuraEngineBackend 2020-05-08 15:23:51 +02:00
Nino van Hooff
8f3827d5ae Convert doxygen to rst for 3MFReader/Writer and AMFReader 2020-05-08 15:14:39 +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
fieldOfView
cdc5c8948c Simplify single instance preference 
The Preferences have already been initialized in QTApplication.initialize to get the language to use in the splashscreen.
 2020-05-07 18:13:23 +02:00
fieldOfView
1b34449242 Add a preference to use a single instance for loading files 
Contributes to #7664
 2020-05-07 17:29:18 +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
grk3010
5c0de33e32 Add bondtech extruder definitions 2020-05-06 23:30:02 -04:00
grk3010
731455c12b Create smoothie_dual.def.json 2020-05-06 23:23:42 -04:00
grk3010
cbe87a39a8 Add "Always Write Active Tool" machine setting. 
Required for dual extruder printing with Smoothieware firmware.
 2020-05-06 22:44:39 -04: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