Commit graph

10165 commits

Author SHA1 Message Date
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
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
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
c79123e6fa
Use spaces to indent 2020-05-11 09:51:20 +02:00
Ghostkeeper
c9a9579d8b
Merge branch 'master' of https://github.com/64bittuning/Cura into 64bittuning-master 2020-05-11 09:16:01 +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
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
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
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
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
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
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
Evg33
d28a88f90c UNI 3D bugfix layer_0 temperatures 2020-05-04 14:42:14 +03:00
Kostas Karmas
f25547d394 Double the meshfix_maximum_deviation
CURA-7421
2020-05-04 13:19:35 +02:00
Kostas Karmas
9bf0255046 Up the setting version to 14 in all the resourses
CURA-7421
2020-05-04 13:13:07 +02:00
Evgeny Z
82717845bf
UNI 3D startup code 2020-05-03 22:39:28 +03:00
Evg33
ffc97c3d5b UNI 3D Start/stop codes tuning. 2020-05-03 19:12:19 +03:00
Gerard Rubio
bba0a96576
Fixed bed dimensions 2020-05-03 11:54:45 +02:00
Alexander D. Kanevskiy
d62e7be193 Adding profile for Anycubic Mega Zero
Dimensions: 220x220x250
Nozzle: 0.4
Print speed: 20-100 (40 for normal quality)
2020-05-02 21:49:48 +03:00
64bittuning
2ab2a204a8 Update tronxy_x.def.json 2020-05-01 10:33:24 -04:00
64bittuning
5a0eda9cfe fixed indentation 2020-05-01 10:22:37 -04:00
64bittuning
6c9e414e8a removed obsolete variants
X5SA Pro was condensed down into X5SA/X5ST/Pro model
2020-04-30 14:33:57 -04:00
64bittuning
b96383770b Update tronxy_x.def.json
Fixed error in speed_travel_layer_0. calculation was incorrect.
2020-04-30 14:33:19 -04:00
64bittuning
12ccd8298c Machine profile update
Updated and condensed machine profiles. Edited formatting to make more sense and be consistent across all files. I3 printers present print to the front, CoreXY move to 0. Speeds are set per machine based orr factory firmware, which should provide more accurate "Estimated time" values "out of the box".
2020-04-30 14:18:14 -04:00
64bittuning
d08d8a26ed Update tronxy_x.def.json
replacing incorrectly uploaded file that was used during troubleshooting
2020-04-30 11:30:40 -04:00
64bittuning
90637fa451 Overhauled all quality profiles
Overhauled all quality profiles to give a more fluid interface while choosing between 0.2 through 0.8 nozzles. Added a larger layer choice and rescaled the options per nozzle. Also included some small overrides based on material choice.
2020-04-30 11:28:44 -04:00
Jaime van Kessel
b7081f9c68
Merge branch 'master' of github.com:Ultimaker/Cura into 3mf_platform_meshes 2020-04-30 13:47:28 +02:00
Jaime van Kessel
2147b2064c
Merge branch '4.6' of github.com:Ultimaker/Cura 2020-04-30 10:37:28 +02:00
konskarm
98eda12f60
Merge pull request #7418 from Evg33/UNI_3D_profiles
Adding profiles for UNI 3D Series printers
2020-04-29 17:24:24 +02:00
Evg33
436d36ae90 UNI3D: fix startup code and machine_extruder_count=2 2020-04-29 18:10:43 +03:00
Remco Burema
4b4864485c
CURA-7409 Update keep/discard dialog more. 2020-04-29 16:23:06 +02:00
Kostas Karmas
b008f1e823 Merge branch 'master' into CURA-7022_Add_cloud_printer_within_add_a_connected_printer 2020-04-29 15:37:53 +02:00
Jaime van Kessel
1775903335
Merge branch 'CURA-7404_fix_xray_green' of github.com:Ultimaker/Cura 2020-04-29 14:59:53 +02:00
Kostas Karmas
b459895589 Add comments
CURA-7022
2020-04-29 14:19:28 +02:00
Kostas Karmas
4a49c1cc8d Fix bottom margin of the discoveredCloudPrintersScrollView
CURA-7022
2020-04-29 14:14:01 +02:00
Kostas Karmas
eda868f938 Make the discovered cloud printers model generic
Removed the dependency of the DiscoveredCloudPrintersModel on CloudOutputDevice,
which is Ultimaker specific. This can allow even external plugins to add to this
model in the future.

CURA-7022
2020-04-29 13:31:45 +02:00
Remco Burema
476262acc7
Merge branch 'master' of https://github.com/Ultimaker/Cura 2020-04-29 13:03:25 +02:00
Remco Burema
3604e75cce
CURA-7409 Update keep/discard dialog. 2020-04-29 13:02:48 +02:00
Kostas Karmas
fb328bd307 Display a summary of the Cloud printers added after login in WelcomeWizard
If the user has cloud printers linked to his/her account, then the welcome
wizard will display a summary of the cloud printers that were found in the account
and added in Cura.

CURA-7022
2020-04-29 12:11:05 +02:00
Remco Burema
4c4e611629
Fix x-ray error color.
X-ray errors showed as green and translucent instead of read and solid. Now fixed.
CURA-7407
2020-04-29 12:06:20 +02:00
Kostas Karmas
c7cf0fab2f Merge branch 'master' into CURA-7022_Add_cloud_printer_within_add_a_connected_printer 2020-04-29 12:04:04 +02:00
Kostas Karmas
64cfe423fe Fix moving to next page when no printers in account
Fixed a bug where the welcome wizard was not moving to the next page
if the account had no printers connected to it.

CURA-7019
2020-04-29 11:49:45 +02:00
Kostas Karmas
411a02a827 Simplify the DiscoveredUltimakerCloudPrintersModel reference calls
CURA-7022
2020-04-29 11:40:47 +02:00
maht
c29ebc8a77
Updated change log for 4.6.1 2020-04-29 10:58:11 +02:00
64bittuning
fe90632a38 Update tronxy_d01.def.json 2020-04-28 23:37:25 -04:00