GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-07-11 04:21:47 +08:00
Code Issues Packages Projects Releases Wiki Activity
6,996 Commits 295 Branches 268 Tags
Commit Graph

6996 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Simon Edwards
5884509af1 More type checking fixes after the merge. 
CURA-2917
 2016-11-22 11:51:18 +01:00
Simon Edwards
98a6568313 Merge branch 'master' into python_type_hinting 2016-11-22 11:15:04 +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
Simon Edwards
14afd9eab7 Heaps to changes to get the Cura code through the type checker (with minimal checking). 
CURA-2917
 2016-11-21 21:36:08 +01:00
Ghostkeeper
ad95d57f48
Merge branch 'feature_precool' 2016-11-21 17:35:32 +01:00
Tim Kuipers
b441b1afb0 JSON fix: add a min value warning for cubicsubdiv radius < 100% (CURA-2602) 2016-11-21 17:18:22 +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 bafaf16fcbba5867353d012509f27c1c3f1a8d8f.
 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
Jaime van Kessel
2a4a42a186 Merge branch 'feature_alternate_carving' of github.com:Ultimaker/Cura 2016-11-18 15:14:21 +01:00
Tim Kuipers
8dbe018a5b
JSON removal: removed the gap filling option 'skin' (CURA-2306) 2016-11-18 15:06:44 +01:00
Tim Kuipers
cc7b2a4901
JSON feat: perimeter_gaps as it was in e57ca0aa53def8342cfc18971cafbe4b39caffec (CURA-2306) 2016-11-18 15:06:44 +01:00
Jaime van Kessel
782a02661c If prime tower or prime position has an invalid position, we now give a specifc error message to indicate this 
CURA-2481
 2016-11-18 14:24:32 +01:00
Jaime van Kessel
c007c1fc4c Fixed global error keys always overriding the extruder error keys 
CURA-2481
 2016-11-18 14:17:46 +01:00
Jaime van Kessel
312bd2a963 Resetting now simply resets everything to 0 if there is no bounding box 
For the current usage, this won't change anything, but it's more future proof

CURA-2925
 2016-11-18 13:28:14 +01:00
Jaime van Kessel
d2a50cada1 Only reset transformation/ position if there is a bounding box. 
If a node has no bounding box, it's because it has no data to change.

CURA-2925
 2016-11-18 12:56:07 +01:00
Jaime van Kessel
a71bb63318 Resetting transformation now works again for ungrouped nodes 
CURA-2925
 2016-11-18 12:50:51 +01:00
Jaime van Kessel
2e1f4e3740 Serialize now uses base_file as well instead of only GUID to find containers to use 
CURA-2467
 2016-11-18 12:39:19 +01:00
Jaime van Kessel
298710532b Merge branch 'feature_fan_speed_0' of github.com:Ultimaker/Cura 2016-11-18 10:44:09 +01:00
Jaime van Kessel
850fcac9c2 Build plate extruder now hides itself if the adhesion type is none 
CURA-759
 2016-11-18 10:41:07 +01:00
Jaime van Kessel
d0bae5acd7 Merge branch 'feature_bed_adhesion_none' of github.com:Ultimaker/Cura 2016-11-18 10:35:06 +01:00
Thomas Karl Pietrowski
9f468b8fcf Correcting German translation 
Contributes to CURA-2862
 2016-11-18 10:28:44 +01:00
Thomas Karl Pietrowski
860ae66ce6 Cleanup again 2016-11-17 23:10:42 +01:00
Thomas Karl Pietrowski
8c4932f837 Cleanup 2016-11-17 23:09:51 +01:00
Thomas Karl Pietrowski
dfd512b637 UM3NetworkPrintingPlugin: Moving plugin files 2016-11-17 21:12:28 +01:00
Thomas Karl Pietrowski
c48d064eca Merge remote-tracking branch 'UM3NPP/master' into UM3NPP_merge 
Contributes to CURA-2862
 2016-11-17 21:10:29 +01:00