3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-11 16:00:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'libArachne_rebased'

Browse source 
Conflicts:
	plugins/SimulationView/SimulationPass.py -> Reverted layer view optimisation in Master while some whitespace changed in Arachne.
	resources/definitions -> Bunch of conflicts with profile updates.
	resources/quality -> Bunch of conflicts with profile updates.
	resources/texts/change_log.txt -> Removed the Arachne change log (as they are internal versions). It'll have to be re-added when we release this version as stable.
This commit is contained in:
Ghostkeeper 2021-12-14 11:48:58 +01:00
commit 9140b71b19
No known key found for this signature in database
GPG key ID: D2A8871EE34EC59A
594 changed files with 812 additions and 1608 deletions
Download patch file Download diff file Expand all files Collapse all files

0
resources/variants/deltacomb/deltacomb_dc20_vfbe080.inst.cfg Normal file → Executable file
View file

0
resources/variants/deltacomb/deltacomb_dc20dual_dbe025.inst.cfg Normal file → Executable file
View file

0
resources/variants/deltacomb/deltacomb_dc20dual_dbe040.inst.cfg Normal file → Executable file
View file

0
resources/variants/deltacomb/deltacomb_dc20dual_dbe060.inst.cfg Normal file → Executable file
View file

0
resources/variants/deltacomb/deltacomb_dc20dual_vdbe080.inst.cfg Normal file → Executable file
View file

0
resources/variants/deltacomb/deltacomb_dc20flux_fbe025.inst.cfg Normal file → Executable file
View file

0
resources/variants/deltacomb/deltacomb_dc20flux_fbe040.inst.cfg Normal file → Executable file
View file

0
resources/variants/deltacomb/deltacomb_dc20flux_fbe060.inst.cfg Normal file → Executable file
View file

0
resources/variants/deltacomb/deltacomb_dc21_fbe025.inst.cfg Normal file → Executable file
View file

0
resources/variants/deltacomb/deltacomb_dc21_fbe040.inst.cfg Normal file → Executable file
View file

0
resources/variants/deltacomb/deltacomb_dc21_fbe060.inst.cfg Normal file → Executable file
View file

0
resources/variants/deltacomb/deltacomb_dc21_vfbe080.inst.cfg Normal file → Executable file
View file

0
resources/variants/deltacomb/deltacomb_dc21dual_dbe025.inst.cfg Normal file → Executable file
View file

0
resources/variants/deltacomb/deltacomb_dc21dual_dbe040.inst.cfg Normal file → Executable file
View file

0
resources/variants/deltacomb/deltacomb_dc21dual_dbe060.inst.cfg Normal file → Executable file
View file

0
resources/variants/deltacomb/deltacomb_dc21dual_vdbe080.inst.cfg Normal file → Executable file
View file

0
resources/variants/deltacomb/deltacomb_dc21flux_fbe025.inst.cfg Normal file → Executable file
View file

0
resources/variants/deltacomb/deltacomb_dc21flux_fbe040.inst.cfg Normal file → Executable file
View file

0
resources/variants/deltacomb/deltacomb_dc21flux_fbe060.inst.cfg Normal file → Executable file
View file

0
resources/variants/deltacomb/deltacomb_dc30_fbe025.inst.cfg Normal file → Executable file
View file

0
resources/variants/deltacomb/deltacomb_dc30_fbe040.inst.cfg Normal file → Executable file
View file

0
resources/variants/deltacomb/deltacomb_dc30_fbe060.inst.cfg Normal file → Executable file
View file

0
resources/variants/deltacomb/deltacomb_dc30_vfbe080.inst.cfg Normal file → Executable file
View file

0
resources/variants/deltacomb/deltacomb_dc30dual_dbe025.inst.cfg Normal file → Executable file
View file

0
resources/variants/deltacomb/deltacomb_dc30dual_dbe040.inst.cfg Normal file → Executable file
View file

0
resources/variants/deltacomb/deltacomb_dc30dual_dbe060.inst.cfg Normal file → Executable file
View file

0
resources/variants/deltacomb/deltacomb_dc30dual_vdbe080.inst.cfg Normal file → Executable file
View file

0
resources/variants/deltacomb/deltacomb_dc30flux_fbe025.inst.cfg Normal file → Executable file
View file

0
resources/variants/deltacomb/deltacomb_dc30flux_fbe040.inst.cfg Normal file → Executable file
View file

0
resources/variants/deltacomb/deltacomb_dc30flux_fbe060.inst.cfg Normal file → Executable file
View file