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

9150 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ghostkeeper
739fd2bbcb
Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-17 16:33:37 +02:00
Ghostkeeper
bf432dee34
Merge branch 'fieldOfView-fix_create_material' 2017-05-17 16:33:22 +02:00
Ghostkeeper
e64e7daec5
Merge branch 'fix_create_material' of https://github.com/fieldOfView/Cura into fieldOfView-fix_create_material 2017-05-17 16:28:17 +02:00
Jaime van Kessel
ff2478ff51 Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-17 16:25:02 +02:00
Jaime van Kessel
428d063044 Added missing variants for um2_extended if you have olson block 
CURA-3742
 2017-05-17 16:24:13 +02:00
Ghostkeeper
f65043ecc8
Add spaces around binary operators and after comma 
Just a little code style thing.

Contributes to issue CURA-3828.
 2017-05-17 16:17:48 +02:00
Lipu Fei
e1455a4551 Fix deserializing ExtruderStacks in project loading 
CURA-3756
 2017-05-17 15:57:13 +02:00
Lipu Fei
b027437ef3 Activate a new machine (if any) before removing a machine 
CURA-3756
 2017-05-17 15:57:12 +02:00
Lipu Fei
386e5db489 When removing a machine's extruders, also clean up _extruder_trains 
CURA-3756
 2017-05-17 15:57:12 +02:00
Lipu Fei
3b3d9c4dae Minor code refactoring in ExtruderManager 
CURA-3756
 2017-05-17 15:57:12 +02:00
Ghostkeeper
012be3c6c7
Merge branch 'fieldOfView-fix_machinesettings_negative_offsets' 2017-05-17 15:44:37 +02:00
Ghostkeeper
937207a0eb
Merge branch 'fix_machinesettings_negative_offsets' of https://github.com/fieldOfView/Cura into fieldOfView-fix_machinesettings_negative_offsets 2017-05-17 15:42:43 +02:00
Ghostkeeper
2ad7152994
Merge branch 'maukcc-Cura/master' 2017-05-17 15:36:30 +02:00
Ghostkeeper
236b1dc0ca
Merge branch 'Cura/master' of https://github.com/maukcc/Cura into maukcc-Cura/master 2017-05-17 15:35:05 +02:00
Ghostkeeper
28dc8091e4
Merge branch 'fieldOfView-feature_extend_zoomrange' 2017-05-17 15:31:37 +02:00
Ghostkeeper
7827222aa2
Merge branch 'feature_extend_zoomrange' of https://github.com/fieldOfView/Cura into fieldOfView-feature_extend_zoomrange 2017-05-17 15:27:18 +02:00
Ghostkeeper
9450453b42
Merge branch 'master' into feature_extruder_per_feature 
Conflict in FDMPrinter: The Cubic Subdivision Radius setting was removed. No need to limit that setting any more.
 2017-05-17 14:24:00 +02:00
Arjen Hiemstra
be08fab97c Fix the addExtruder unit test 
Extruders now need to provide a "position" entry.

Contributes to CURA-3738
 2017-05-17 13:47:14 +02:00
Arjen Hiemstra
3b73979a2c Do not add an extruder if it has no position set 
Otherwise we get very weird values in the extruders dict

Contributes to CURA-3738
 2017-05-17 13:47:14 +02:00
Arjen Hiemstra
63e586ab5b Ensure the value of limit_to_extruder is an extruder before accessing it 
Contributes to CURA-3738
 2017-05-17 13:47:14 +02:00
Lipu Fei
d02d004986 Correct profile_translations in VersionUpgrade21to22 
CURA-3777
 2017-05-17 13:44:34 +02:00
maukcc
aabf26009f added new platform 2017-05-17 13:44:33 +02:00
Jaime van Kessel
e608252151 Fixed missing namechanges for global profiles 
CURA-3777
 2017-05-17 13:21:11 +02:00
Jaime van Kessel
5ddaa92944 Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-17 12:59:36 +02:00
fieldOfView
7b393064aa Fix creating materials for 1.75mm machines that have machine/variant materials 
Instead of cloning the 2.85 mm generic PLA material and setting its diameter, we now clone the generic PLA with the same diameter as the current machine. This will also clone all the machine-specific settings included in that base file.
 2017-05-17 12:20:00 +02:00
Lipu Fei
e2e208261e Fix renaming quality_changes and definition containers in project loading 
CURA-3756
 2017-05-17 11:53:13 +02:00
fieldOfView
75519d754b Fix creating materials for 1.75mm machines 2017-05-17 11:49:13 +02:00
Jaime van Kessel
d49dd735bc Merge branch 'transparent_limit_to_extruder' of github.com:Ultimaker/Cura 2017-05-17 11:31:18 +02:00
Arjen Hiemstra
20e46f4d8b Make Extruder setting type update its color properly 
The binding for the material color would not get updated properly when
the model changes. This fixes that.

Contributes to CURA-3804
 2017-05-17 11:30:48 +02:00
Lipu Fei
a9ec3f2712 Add docs to project loading code 
CURA-3756
 2017-05-17 11:25:48 +02:00
Lipu Fei
8c2fe0951d Refactor project loading 
CURA-3756
 2017-05-17 11:03:52 +02:00
Jaime van Kessel
61faaf4776 Removed unneeded calls to extruder value 
CURA-3738
 2017-05-17 11:02:16 +02:00
Arjen Hiemstra
a7bf205dbc Turn GlobalStack's extruders property into a dict 
We do not load the extruders in a fixed order, thus we cannot assume
that addExtruder is called in the right order. This means that index 0
of the extruders is not necessarily the extruder with position 0. So
instead, use the extruder position as a dict key.

Contributes to CURA-3738
 2017-05-17 10:58:28 +02:00
Arjen Hiemstra
9686df285d Merge branch 'master' of github.com:Ultimaker/Cura into transparent_limit_to_extruder 2017-05-17 10:26:48 +02:00
Lipu Fei
ee831928ba Fix overriding extruder stacks for project loading 
CURA-3756
 2017-05-17 10:20:14 +02:00
Jaime van Kessel
a1457fa890 Merge branch 'feature_CURA-3822_save_version_to_project' of https://github.com/LipuFei/Cura 2017-05-17 09:26:57 +02:00
Lipu Fei
191dfdcb33 Save Cura version to project files 
CURA-3822
 2017-05-17 09:23:43 +02:00
Tim Kuipers
32c2418957 cleanup: remove raft height stuff from ConvexHullDecorator (CURA-3819) 2017-05-16 17:45:19 +02:00
Tim Kuipers
69e4afffc8 fix: heightening of shadow for raft didn't take layer_0_z_overlap into account (CURA-3819) 2017-05-16 17:45:19 +02:00
Arjen Hiemstra
616ee34be5 Simplify SettingExtruder setting item 
This way it properly updates when a parent setting changes.

Contributes to CURA-3804
 2017-05-16 17:43:24 +02:00
Jaime van Kessel
7d5c2a9b6a Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-16 17:19:58 +02:00
Jaime van Kessel
f8b29c4d1f Delete the right not supported profiles 2017-05-16 17:19:41 +02:00
Jaime van Kessel
77843107f6 Revert "Removed no longer used profiles" 
This reverts commit 704c6e5d8fefcd50815d339843f9c9f9521fee23.
 2017-05-16 17:18:57 +02:00
Lipu Fei
121ebd79cf Fix circular import problem caused by moving SettingVersion into CuraApplication 
CURA-3756
 2017-05-16 14:55:34 +02:00
Ghostkeeper
50bda1c9dd
Remove overrides of support interface speed/accel/jerk 
This is a settings updates from the Materials team.
 2017-05-16 14:40:42 +02:00
Ghostkeeper
93c249280e
Copy UM3 variants to UM3E 
They should be kept in sync for now.
 2017-05-16 14:40:42 +02:00
Ghostkeeper
8e3dff76ab
Set support X/Y distance for all PVA profiles 
This is an update from the materials team for our settings.
 2017-05-16 14:40:42 +02:00
Ghostkeeper
9b3568acae
Sort other PVA profiles as well 
Makes it easier to compare profiles and to find setting values by key.
 2017-05-16 14:40:42 +02:00
Ghostkeeper
a02ff8df5f
Sort settings alphabetically 
Makes it easier to compare profiles.
 2017-05-16 14:40:42 +02:00
Ghostkeeper
1ad9ba6c95
Remove lower warnings from Jerk settings 
It's sometimes required to be extra careful, and the difference between 0 and 5 isn't that big that it would cause a great increase in print time.
 2017-05-16 14:40:42 +02:00