3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-07 14:04:03 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8
6222 commits 313 branches 275 tags 718 MiB
Commit graph

2502 commits

Author SHA1 Message Date
Ghostkeeper
4b68f7141f Merge branch 'fix_toggle_filter_oopsies' of https://github.com/fieldOfView/Cura into fieldOfView-fix_toggle_filter_oopsies 2016-11-29 10:25:34 +01:00
Tim Kuipers
6b56d472e0 JSON fix: made retraction_combing not editable per mesh any more (CURA-1134) 
Whether combing is no_skin now actually is retrieved globally
 2016-11-28 18:00:27 +01:00
Ghostkeeper
f7380abafe
Merge branch 'IMADE3D-add_jellybox_printer' 2016-11-28 11:11:42 +01:00
Ghostkeeper
23adafc686 Merge branch 'add_jellybox_printer' of https://github.com/IMADE3D/Cura into IMADE3D-add_jellybox_printer 2016-11-28 11:11:06 +01:00
fieldOfView
9c604bb674 Fixes two minor issues introduced in the feature_find_settings merge 2016-11-26 22:46:21 +01:00
Jaime van Kessel
a6ea4edfb4 Prime tower for UMODE won't block by default if using both extruders 
CURA-3032
 2016-11-25 11:51:43 +01:00
Ghostkeeper
dcb7e2abaf
Fix capitalisation of setting names 
Saw a few inconsistencies.
 2016-11-25 11:36:24 +01:00
Ghostkeeper
2835ae8b07
Improve defaults for pre-cooling 
This is a profile update from the materials team. Micro-profile-update. This should make prints much better with high temperature materials such as CPE+.
 2016-11-25 11:36:23 +01:00
Jaime van Kessel
6d66ea51ad Setting the support extruder in recommended mode now correctly updates them in custom 
CURA-3033
 2016-11-25 11:28:38 +01:00
Jaime van Kessel
510c988c43 Moved some setting functions back to definitions 
CURA-3018
 2016-11-25 09:39:19 +01:00
Tim Kuipers
2df6de1814 JSON fix: layer_start_x and y description update for better understanding (CURA-1112) 2016-11-24 17:28:34 +01:00
Tim Kuipers
de8e49b247 JSON language fix: start_layers_at_same_position is now Start Layers With The Same Part (CURA-1112) 2016-11-24 17:25:38 +01:00
Jack Ha
be2a802aa2 Changed ultimaker3 def so relations are retained. 2016-11-24 17:05:06 +01:00
jack
84759e5808 Merge pull request #1176 from Ultimaker/rework_file_handler 
Rework file handler CURA-1263
 2016-11-24 14:56:05 +01:00
Jaime van Kessel
f3d0ad2292 Merge branch 'master' of github.com:Ultimaker/Cura 2016-11-24 14:52:10 +01:00
Jaime van Kessel
9a81a24512 Merge branch 'feature_find_settings' of https://github.com/fieldOfView/Cura 2016-11-24 14:47:02 +01:00
Jack Ha
b88ed76b7c Solve merge conflict PrinterOutputDevice. CURA-1263 2016-11-24 13:55:22 +01:00
Jack Ha
072d33ec68 Fixed profiles by removing double entries and changing math.round to round. 2016-11-24 12:58:33 +01:00
fieldOfView
d045738dc8 Simplify button width logic 2016-11-24 11:51:35 +01:00
Ghostkeeper
44f309226a
Make initial layer speed scale with normal speed 
All profiles that set the print speed are edited as well to make sure that the initial layer speed is still the same.

Contributes to issue #1170.
 2016-11-24 10:19:49 +01:00
fieldOfView
9dd8a88602 Fix review issues 2016-11-24 10:12:11 +01:00
Ghostkeeper
29e04bb825
Don't change the prime tower size based on prime tower enable 
The prime tower is properly disabled in the engine nowadays if prime_tower_enable is false.
 2016-11-23 17:35:17 +01:00
Jack Ha
c3320bb1a4 Change settings to settings/overrides in selected messages. CURA-2898 2016-11-23 13:33:12 +01:00
Ghostkeeper
54df4c17e1
Add Dutch translation for 'Information' title 
This is to make it easier to test whether this title can be translated, both for me and for our QA team.

Contributes to issue CURA-2808.
 2016-11-23 12:45:12 +01:00
Jaime van Kessel
c69ffd5b32 Merge branch 'master' of github.com:Ultimaker/Cura 2016-11-23 12:42:17 +01:00
Jaime van Kessel
716ffe94ff Don't show inheritance icon for resovled values 
CURA-2860
 2016-11-23 12:41:53 +01:00
Simon Edwards
89d6101bfc Merge pull request #1157 from Ultimaker/thopiekar-i18n-de-update 
Correcting German translation
 2016-11-23 11:00:22 +01:00
Ghostkeeper
4954e9643a
Merge branch 'feature_anti_support' 2016-11-22 16:37:17 +01:00
Jaime van Kessel
75e067cab7 No longer select last_entry that isn't in the list 
CURA-2860
 2016-11-22 15:24:01 +01:00
Jaime van Kessel
88588454c8 Merge branch 'master' of github.com:Ultimaker/Cura into rework_file_handler 2016-11-22 13:58:41 +01:00
fieldOfView
933ed5177f Toggle visibility of filter field when pressing the "search" icon 2016-11-22 13:44:41 +01:00
Tim Kuipers
1bc0fdebc9
JSON fix: disable post-wipe on prime tower for UM3 (CURA-2325) 
it has nozzle lifting so it's impossible!
 2016-11-22 13:23:53 +01:00
Tim Kuipers
e0b4246336
JSON fix: use exponent function ** 2 rather than x * x (CURA-2325) 2016-11-22 13:23:53 +01:00
Tim Kuipers
1e343c26eb
JSON fix: better description dual_pre_wipe (CURA-2325) 2016-11-22 13:23:53 +01:00
Tim Kuipers
61780b4980
make prime_tower_min_volume settable per extruder (CURA-2325) 2016-11-22 13:23:52 +01:00
Tim Kuipers
5e2f055cfe
JSON fix: better defaults hollow prime tower settings (CURA-2325) 2016-11-22 13:23:52 +01:00
Tim Kuipers
8016cb648b
JSOn fix: better language hollow wipe tower settings (CURA-2325) 2016-11-22 13:23:52 +01:00
Tim Kuipers
c95f983b9b
JSON feat: prime_tower_min_volume and prime_tower_wall_thickness (CURA-2325) 2016-11-22 13:23:52 +01:00
Tim Kuipers
64aafcc858
JSON fix: make wiping settable per extruder (CURA-2325) 2016-11-22 13:23:51 +01:00
Tim Kuipers
2c3f891885
fix: make wipe settings settable per extruder (CURA-2325) 2016-11-22 13:23:51 +01:00
Tim Kuipers
c1d600dfa7
JSON fix: rename Wipe Nozzle on Prime Tower to Wipe Inactive Nozzle on Prime Tower (CURA-2325) 
This way it's better distinguished from dual_pre_wipe
 2016-11-22 13:23:51 +01:00
Tim Kuipers
3a7370a09e
JSON feat: dual_pre_wipe as separate from prime_tower_wipe_enabled (CURA-2325) 2016-11-22 13:23:51 +01:00
Jaime van Kessel
c5d41aa9b0 Merge branch 'master' of github.com:Ultimaker/Cura into rework_file_handler 2016-11-22 13:14:49 +01:00
Tim Kuipers
c20a2a0a17 JSON language fix: clarify difference between Union Overlapping Volumes and Remove Mesh Intersection (CURA-2992) 2016-11-22 12:23:00 +01:00
fieldOfView
7e4f1dce7b Add button for toggling the find settings textbox 
The toggle is only shown when advanced mode is selected.
 2016-11-21 23:29:18 +01:00
Ghostkeeper
ad95d57f48
Merge branch 'feature_precool' 2016-11-21 17:35:32 +01:00
Tim Kuipers
baa481ed68 JSON fix: better description alternate_carve_order (CURA-2992) 2016-11-21 17:03:15 +01:00
Jaime van Kessel
aca8110edd Merge branch 'master' of github.com:Ultimaker/Cura into rework_file_handler 2016-11-21 13:45:04 +01:00
Jaime van Kessel
381589a927 Merge branch 'master' of github.com:Ultimaker/Cura 2016-11-21 13:42:48 +01:00
Jaime van Kessel
d09c2d2fa5 No longer cast ObjectId to int 
Fixes CURA-148
 2016-11-21 13:42:08 +01:00