3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-06 13:34:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10
6205 commits 313 branches 275 tags 718 MiB
Commit graph

6205 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jack Ha
124e2b47ea Fix display issue layer view reset positions, center point in select all. CURA-2925 CURA-3012 2016-11-23 11:56:27 +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
e17eda9a33 Removed debug prints 
CURA-2860
 2016-11-22 15:25:54 +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
fa174763cf The 3mf workspace reader no longer locks application if it is accedently called from main 
CURA-1263
 2016-11-22 14:57:44 +01:00
Jaime van Kessel
60d2d0d092 Workspace reader is now a lot more transactional; 
Instead of adding the instance containers on the go, we add them right before serializing the stack.
This enables us to remove them if the stack serialization goes wrong

CURA-1263
 2016-11-22 14:15:12 +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
Jaime van Kessel
8a67f44cf0 We now also write with the preferedSuffix 
CURA-1263
 2016-11-22 13:38:06 +01:00
Jaime van Kessel
e3eb75ab6e We now get material container by mimetype 
CURA-1263
 2016-11-22 13:37:11 +01:00
Jaime van Kessel
cba31d95ec Workspace reader now loads from prefered suffix 
CURA-1263
 2016-11-22 13:33:10 +01:00
Jaime van Kessel
42caf57993 Added "material" to default resolve strategies 
CURA-1263
 2016-11-22 13:31:58 +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
Jaime van Kessel
f3bb45da50 Merge branch 'master' of github.com:Ultimaker/Cura 2016-11-22 13:13:57 +01:00
Jaime van Kessel
174990ba9d Set the depends_on property for resolve to value 
CURA-2900
 2016-11-22 13:13:30 +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
Jack Ha
4a249dea62 Merge now works for all combinations of transforms. CURA-2932 2016-11-22 11:06: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
Thomas Karl Pietrowski
a0ba393673 Merge remote-tracking branch 'upstream/master' into UM3NPP_merge 2016-11-21 14:44:19 +01:00
Thomas Karl Pietrowski
65add78401 Merge remote-tracking branch 'UM3NetworkPrintingPlugin/master' into UM3NPP_merge 2016-11-21 14:44:10 +01:00
Jack Ha
3c1194e847 Aligh zero positions of objects when merging, not center. CURA-2932 2016-11-21 13:54:53 +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
Ghostkeeper
50609bfe7e
Make support line distance only give warning if actually less than line width 
Otherwise you get a warning with the default settings.
 2016-11-21 13:28:40 +01:00
Jaime van Kessel
aceff72c34 PerObject tool is now disabled when switching to a group as well 
CURA-2287
 2016-11-21 11:49:50 +01:00
Jaime van Kessel
1a2138de5a Moved warning to VersionUpgradeManager 
CURA-2883
 2016-11-21 11:21:20 +01:00
Jaime van Kessel
9057174691 Resolve is now updated from the base property 
The resolve doesn't update always update well for single extrusion machines, so the wrong value gets used.
There is however, no need for a resolve with a single extrusion machine, so we can disable the resolve for those alltogether.

CURA-2939
 2016-11-21 11:10:23 +01:00
Jaime van Kessel
8765d1980e Merge pull request #6 from thopiekar/master-add-log-about-correct-auth 
Adding debug message about correct authentication
 2016-11-21 09:25:44 +01:00
Thomas Karl Pietrowski
6dc194d8de Revert "PrinterOutputDevice: Adding isConnectionState" 
1. Shouldn't go directly to upstream's master
2. GitHub still loves to kill the last line

This reverts commit bafaf16fcb.
 2016-11-20 15:09:20 +01:00
Thomas Karl Pietrowski
bafaf16fcb PrinterOutputDevice: Adding isConnectionState 
Adding isConnectionState here to make direct comparisons, whether the current state is the correct one.
Looks better than `self._connection_state == <my_connection_state>`  in my point of view.
 2016-11-20 14:59:35 +01:00
Thomas-Karl Pietrowski
657c93fff1 Adding debug message about correct authentication 
Might be useful when going through the logs and looking for
authentication problems.
 2016-11-19 23:17:31 +01:00
Jaime van Kessel
ac708d54b6 Importing invalid filetypes now gives proper error messages 
CURA-2883
 2016-11-18 16:46:54 +01:00
Jaime van Kessel
1b01455c36 Increased tolerance around prime area 
CURA-2934
 2016-11-18 16:15:53 +01:00
Jaime van Kessel
c1650125e9 The compatible setting is now serialized correctly 
CURA-2940
 2016-11-18 15:43:32 +01:00
Jaime van Kessel
a9169a4d6b Merge branch 'master' of github.com:Ultimaker/Cura 2016-11-18 15:19:33 +01:00