23130 Commits

Author SHA1 Message Date
Ghostkeeper
2e12cc1dc2
Fix missing typing and use American instead of pro'er Bri'ish
American is Ultimaker's code style too.
2020-04-10 01:12:13 +02:00
Ghostkeeper
76f662fbfa
Fix preferred quality type
The quality type 'fast' doesn't exist for Deltacomb. I'm going to be choosing a quality type that is available for this printer which has the name 'Fast', which is quality type 'd'.
2020-04-10 00:34:03 +02:00
Ghostkeeper
c51647026c
Also make IDs unique
Took me a while to see why Cura was confusing the extruder stacks. It worked fine during the actual upgrade itself. Then later after the start-up sequence it suddenly re-wrote them wrongly.

Why is there an ID field in here? Shouldn't it just take the file name as the ID? Stupid!
2020-04-10 00:28:27 +02:00
Ghostkeeper
45d3f8ca6a
Fix typo
With this it's starting to look like something. It's no longer giving any corruption errors now with any of my test cases. However e1 is still being set to the definition of e3 for some reason.
2020-04-09 22:12:30 +02:00
Ghostkeeper
c8b6d7ec00
Extruder 1 got duplicated, not extruder 0 2020-04-09 21:58:14 +02:00
Ghostkeeper
851aef68bc
Don't rename empty_quality_changes
This one doesn't get duplicated since it doesn't actually list the Deltacomb printer.
2020-04-09 21:54:22 +02:00
Ghostkeeper
519d28a142
Fix upgrading user containers, which list the printer definition rather than the extruder 2020-04-09 21:52:23 +02:00
Ghostkeeper
e38b79fe35
Filenames don't include an extension
That makes this a lot easier actually.
2020-04-09 21:36:28 +02:00
Ghostkeeper
4bdea50fd5
Use deepcopies rather than copies to copy parsers
Turns out that the parsers apparently refer to a lot of subobjects which are crucial here, and they don't implement the normal copy well. Deepcopy it is then.
2020-04-09 21:26:35 +02:00
Ghostkeeper
accf080fb6
Don't use default= kwarg for dictionary .get function
It doesn't accept key word arguments.
2020-04-09 21:22:06 +02:00
Ghostkeeper
40cb3e37a9
Also actually update global stacks for Deltacomb
Really hope that this works.
2020-04-09 01:48:15 +02:00
Ghostkeeper
18ebdfafb7
Upgrade other per-extruder instance containers too
Global instance containers will also go through this function but won't get picked out by the if statement here.
2020-04-09 01:23:11 +02:00
Ghostkeeper
2410d05100
Upgrade extruder stacks
Stupid stuff. All of these containers need to be copied. It's not possible to work this out for all materials properly, since we can't read into these materials what their GUIDs and material types are.
2020-04-09 01:04:53 +02:00
Ghostkeeper
a5b4b15ae4
Add theoretical upgrade for definition changes
It's a LOT more work than I thought, because the new printer has 4 extruders instead of 2. That means that files have to be copied for the other two extruders. A big hassle.
2020-04-08 01:58:03 +02:00
Ghostkeeper
69b1c1fe74
Upgrade Deltacomb profiles to setting version 13
This would halve the maximum resolution setting, but they don't override that setting so there is no actual change to these profiles.
2020-04-07 23:55:31 +02:00
Ghostkeeper
309d3fc56f
Merge branch 'master' of https://github.com/kaleidoscopeit/Cura into kaleidoscopeit-master
Conflicts:
	resources/quality/deltacomb/deltacomb_abs_Draft_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_abs_Fast_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_abs_High_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_abs_Normal_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_abs_Verydraft_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_global_Draft_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_global_Fast_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_global_High_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_global_Normal_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_global_Verydraft_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_petg_Draft_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_petg_Fast_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_petg_High_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_petg_Normal_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_petg_Verydraft_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_pla_Verydraft_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_tpu_High_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_tpu_Verydraft_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/variants/deltacomb/deltacomb_dc20_fbe025.inst.cfg: Modified by Ultimaker to update version number, and author added by Kaleidoscopeit.
	resources/variants/deltacomb/deltacomb_dc20_fbe040.inst.cfg: Modified by Ultimaker to update version number, and author added by Kaleidoscopeit.
	resources/variants/deltacomb/deltacomb_dc20_fbe060.inst.cfg: Modified by Ultimaker to update version number, and author added by Kaleidoscopeit.
2020-04-07 23:40:10 +02:00
Ghostkeeper
be8f8a308e
Merge branch 'master' of https://github.com/PurpleHullPeas/Cura into PurpleHullPeas-master 2020-04-07 18:07:39 +02:00
Ghostkeeper
fc8cc3187d
Merge branch '4.6' 2020-04-06 17:20:34 +02:00
Ghostkeeper
95b5a176b8
Update translation file headers for Cura 4.6
Contributes to issue CURA-7344.
2020-04-06 17:19:59 +02:00
Ghostkeeper
e676308241
Update translation files with new strings in Cura 4.6
Contributes to issue CURA-7344.
2020-04-06 16:52:06 +02:00
Ghostkeeper
859adbf347
Update translation templates for Cura 4.6
These are the new translations for the next release of Cura. I generated them from my computer at home now, so all of the paths have changed... But they are just indications anyway.
2020-04-06 16:48:13 +02:00
Jaime van Kessel
02202328d8
Add Versionupgrader to bundled plugin list 2020-04-06 11:20:44 +02:00
Jaime van Kessel
82fa1823cc
Merge branch '4.6' of github.com:Ultimaker/Cura 2020-04-06 11:11:43 +02:00
Jaime van Kessel
ddc826af44
Add VersionUpgrade45 package to bundled list 2020-04-06 11:06:26 +02:00
Ghostkeeper
01ec607d40
Merge branch '4.6'
Conflicts:
	resources/texts/change_log.txt: Both modified but had different wording for the pause-at-height bugfix with motor timeout. I used the wording in 4.6 since it was more extensive.
2020-04-06 09:20:18 +02:00
Ghostkeeper
7be6412ef3
Correct heating up nozzle instead of build plate
Otherwise this print won't work at all. It'll just keep waiting forever until the build plate has reached a temperature that is way out of spec.

Applied at request of MaximeGL in #7280.
2020-04-06 09:19:08 +02:00
Ghostkeeper
de220a74bc
Don't update build volume when prime Z position is changed
It doesn't affect the build volume, since we don't need to move the prime blob disallowed area. It is projected onto the build plate after all.
Most likely this won't affect anyone since the prime Z position is a machine setting that can't normally be modified. But hey, it's a bit more precise anyway.

Found during work on the Settings Guide.
2020-04-06 00:29:48 +02:00
PurpleHullPeas
3cc6b0cb9a
Simplifying mp_mini_delta.def.json
Removing minimum/maximum nozzle size, minimum layer_height, and minimum layer_height_0.
2020-04-04 23:22:17 -05:00
PurpleHullPeas
a1a7d48e46
Merge pull request #1 from Ultimaker/master
Update to master
2020-04-04 22:42:50 -05:00
Matt Jani
20e58d7d54
Updated "What's New?"change log for 4.6
CURA-7299
4.6-beta
2020-04-03 16:02:00 +02:00
Nino van Hooff
4f55c8d832 Revert "Merge pull request #7384 from Ultimaker/CURA-7333_Fix_reloading_3mf_files_with_many_objects"
This reverts commit 3e46489b6ba3ae0baab347b26ceb036c1a47007d, reversing
changes made to f5669a5a277042266f9b92314948a5cfb75f58ea.
2020-04-03 15:31:08 +02:00
Jaime van Kessel
ecd24cb446
Merge branch 'simplify_test_v2' of github.com:Ultimaker/Cura 2020-04-03 13:25:01 +02:00
Kostas Karmas
ef4921b72c Merge branch '4.6' 2020-04-03 13:12:07 +02:00
maht
58d7eea7bb
Update change_log.txt 2020-04-03 12:45:09 +02:00
Nino van Hooff
3e46489b6b
Merge pull request #7384 from Ultimaker/CURA-7333_Fix_reloading_3mf_files_with_many_objects
Cura 7333 fix reloading 3mf files with many objects
2020-04-03 12:41:22 +02:00
maht
48849a3ccd
Update change_log.txt 2020-04-03 12:41:09 +02:00
Kostas Karmas
4495cea8a4 Remove type of job to avoid type error
If the type of the job is mentioned, the CI/CD system complains about
reading the "private" variable _node of the job.

CURA-7333
2020-04-03 11:20:09 +02:00
Remco Burema
9d19f4f2db
Merge pull request #7398 from Ultimaker/matt-staging
Updated "What's New?"change log for 4.6
2020-04-03 11:07:44 +02:00
Kostas Karmas
8eb48672e1 Use the node id as identifier
Now that libSavitar allows us to read the object id from the 3mf file,
this id will be propagated as an id inside CuraSceneNodes and it will
be used as an identifier to find the object that has to be refreshed.

CURA-7333
2020-04-03 11:05:38 +02:00
Matt Jani
fd9bd3c123 Updated "What's New?"change log for 4.6
CURA-7299
2020-04-03 10:58:57 +02:00
Ghostkeeper
4f50f42796
Merge branch '4.6' 2020-04-02 17:21:03 +02:00
Ghostkeeper
f5669a5a27
Merge branch 'CURA-7340_fix_simulation_slider_layout' into 4.6 2020-04-02 17:20:45 +02:00
Ghostkeeper
97324be971
Merge branch 'fieldOfView-fix_jogging_layout' 2020-04-02 17:10:01 +02:00
Ghostkeeper
b86b6a9449
Merge branch 'fix_jogging_layout' of https://github.com/fieldOfView/Cura into fieldOfView-fix_jogging_layout 2020-04-02 17:07:42 +02:00
Jaime van Kessel
6df2f84c07
Prevent crash when releasing released lock
CURA-C2
2020-04-02 16:51:32 +02:00
Jaime van Kessel
c6dfb6e4cf
Set FirmwareUpdater in error state if file is empty
CURA-6Q
2020-04-02 16:44:18 +02:00
Nino van Hooff
9d9753cb45 Fix: Using onCompleted would break the binding. So Use a Binding instead 2020-04-02 16:31:29 +02:00
Nino van Hooff
6d56b52913 Revert "Fix binding loop in action panel widget"
Fix improper player slider layout which was introduced in 5cfe71e5
2020-04-02 15:15:05 +02:00
Jaime van Kessel
8ba71fde44
Merge branch 'split_bundled_unbundled_option_2' of github.com:Ultimaker/Cura 2020-04-02 14:34:17 +02:00
Tom Hofman
f3927115d6
Infill wipe distance reduced
Since it was protruding the shell
2020-04-02 09:45:11 +02:00