GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-28 00:59:02 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,268 Commits 292 Branches 265 Tags
Commit Graph

4268 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
fieldOfView
c37163059a Update wording to reflect the official HBK is also supported 2016-07-13 11:18:45 +02:00
Jaime van Kessel
726eb97d9f Machine_id instead of definition_id is now used to link extruders 
Contributes to CURA-1898
 2016-07-13 11:17:44 +02:00
Jack Ha
ecbc387020 Merge branch 'master' into cura-1811 2016-07-13 11:15:16 +02:00
Jack Ha
9eade0707b Added prime locations to machine_disallowed_areas. 
CURA-1811
 2016-07-13 11:14:15 +02:00
fieldOfView
e7f139b048 First commit 2016-07-13 11:07:48 +02:00
Jaime van Kessel
936617f2aa Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-13 09:49:20 +02:00
Jaime van Kessel
b0137016f7 Fixed formating of documentation 
CURA-1898
 2016-07-13 09:46:23 +02:00
Simon Edwards
642ea6791b When saving the quality profile data, also incorporate any user settings/changes. 
Contributes to CURA-1727 GCode Profile reading/writing: Broken and needs update
 2016-07-13 09:29:47 +02:00
fieldOfView
b622c7ecc8 Initialise variant, material and quality to empty containers of the respective type 
Before it would be impossible to switch to a valid option once a variant/material/quality had gone to an "empty" state. Now at least it is recoverable.
 2016-07-12 18:29:40 +02:00
Tim Kuipers
779f66967e JSON fix: support speed was only enabled when roofs were enabled 2016-07-12 14:48:40 +02:00
Ghostkeeper
dc7ca47be9 Fix setting enabling for support roof 
Support roof settings should not be enabled if support roof is enabled but support itself isn't enabled.
 2016-07-12 14:45:09 +02:00
Tim Kuipers
878bf35356 JSON feat: firmware acceleration and jerk settings for ultimaker printers (CURA-1646) 2016-07-12 14:43:10 +02:00
Tim Kuipers
7d2ae57f86 JSON fix: unit of jerk: mm/s³ ==> mm/s (CURA-1646) 2016-07-12 14:41:10 +02:00
Tim Kuipers
94acf810d0 JSON fix: redo all commits (squashed) which got undone in merge 
Merge branch 'feature_firmware_travel_settings'  c755479b1bc0e6c5d40a0bd0675cd04a2a1c66a2
overwrote fdmprinter.def.json with the feature branch version, rather than merging it with the master version.

This commit is just fdmprinter.def.json as it was at 2c09fc4a6723239cd744b4aa9f28007dea5852fd
 2016-07-12 14:38:39 +02:00
Ghostkeeper
f63acc98b8
Fix setting enabling for support roof 
Support roof settings should not be enabled if support roof is enabled but support itself isn't enabled.
 2016-07-12 13:47:25 +02:00
fieldOfView
f5f3f9c516 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-12 13:10:08 +02:00
fieldOfView
08213890fb Remove reliance on "_current_settings" postfix when removing user profile containers 
CURA-1896
 2016-07-12 13:09:53 +02:00
Simon Edwards
64ecb114b8 Store the Quality profile for the 'global' and extruders in the gcode. Read in all of the quality profile during import. 
Contributes to CURA-1727 GCode Profile reading/writing: Broken and needs update
 2016-07-12 12:41:49 +02:00
Tim Kuipers
26612e17b6 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-12 11:22:37 +02:00
Tim Kuipers
c755479b1b Merge branch 'feature_firmware_travel_settings' 2016-07-12 11:22:32 +02:00
fieldOfView
615cfae465 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-12 10:54:07 +02:00
fieldOfView
ae4beeb0ed Remove container stack and user profile for extruders when removing a printer 
CURA-1896
 2016-07-12 10:53:50 +02:00
Jaime van Kessel
b5aa7c3545 Remove the extruder id from settingoverride decorator if the machine does not have multi extrusion 
CURA-1876 & CURA-1768
 2016-07-12 10:34:58 +02:00
Johan K
d31516bbb1 Code cleanup 
Changed to "is None" insted of "== None" to test if numpy.array was initialized
Added extruder to PathSegment in Cura.proto
Changed index_pattern to class variable in Layer.py
 2016-07-12 01:32:46 +02:00
Johan K
bbd49cee85 Merge branch 'master' of https://github.com/Ultimaker/Cura into layerview_dev 2016-07-12 00:37:27 +02:00
fieldOfView
a7cfe1b5af Emphasize settings that have a value in the user or quality profile 
(in a subtle way)
 2016-07-11 21:15:09 +02:00
fieldOfView
1b2514ae2e Fix setting the active container stack on start 
When starting Cura, no nozzle, material or quality would seem to be selected. This commit makes sure _active_container_stack gets properly initialised.

I'll hijack CURA-1844 for this.
 2016-07-11 18:10:25 +02:00
fieldOfView
cd09017328 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-11 17:26:19 +02:00
fieldOfView
151bf1f8de Make style of sections on the Materials page match sections on the profiles page 
CURA-342
 2016-07-11 17:25:59 +02:00
Tim Kuipers
5d256e5e59 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-11 16:44:04 +02:00
Tim Kuipers
2c09fc4a67 JSON fix: infill mesh order defaults to higher than for normal meshes (CURA-833) 2016-07-11 16:43:55 +02:00
Arjen Hiemstra
5393beb8de Fix binding loop warnings that would sometimes occur when editing Brand entry 
Contributes to CURA-342
 2016-07-11 16:41:57 +02:00
Arjen Hiemstra
a7585a4b9a Ignore default container types when creating name filters for containers 
Contributes to CURA-342
 2016-07-11 16:41:57 +02:00
Aldo Hoeben
946aac5e32 Merge pull request #869 from Ultimaker/cura-1787 
CURA-1787 Added message when switching to one_at_a_time.
 2016-07-11 16:39:41 +02:00
Ghostkeeper
c3d395b71d
Define extruder_prime_pos_* in fdmextruder too 
We need to have it in both, because it needs to be changed by the inheriting definitions (so it needs to be defined in fdmextruder) but it also needs to be defined for single-extrusion printers (so it needs to be in fdmprinter). I copied these definitions from fdmprinter.

Contributes to issue CURA-1816.
 2016-07-11 16:29:39 +02:00
fieldOfView
b243dd5aec Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-11 15:48:51 +02:00
fieldOfView
7a63f957cb More gracefully handle cases where no profile is selected in the profiles list 2016-07-11 15:48:41 +02:00
Arjen Hiemstra
99c2e3b1d1 Ensure machine, material and quality name changes are properly handled 
Contributes to CURA-342
Fixes CURA-1669
 2016-07-11 15:36:26 +02:00
Jack Ha
2798b73d32 Also display build volume message _onGlobalContainerStackChanged 
CURA-1787
 2016-07-11 15:12:08 +02:00
Arjen Hiemstra
4d2d889604 Do not complain when currentItem is null 
Contributes to CURA-342
 2016-07-11 14:57:28 +02:00
Arjen Hiemstra
d6ba70c552 Do not try to set a material's metadata when we know it has not changed 
Contributes to CURA-342
 2016-07-11 14:57:28 +02:00
Arjen Hiemstra
57f63bfc73 Update material container's name when its "material" metadata key changes 
Contributes to CURA-342
 2016-07-11 14:57:28 +02:00
Arjen Hiemstra
f49528b71f Do not try to set base_file metadata if it was never set before 
Contributes to CURA-341
 2016-07-11 14:57:28 +02:00
fieldOfView
3bdffd83cd Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-11 14:54:19 +02:00
fieldOfView
4aa95ab317 Prevent showing custom profiles twice and fix separator in the profiles dropdown 
CURA-1887
 2016-07-11 14:54:08 +02:00
Jaime van Kessel
5638246fa2 Merge branch 'feature_cubic_isometric_infill' of github.com:Ultimaker/Cura 2016-07-11 14:40:54 +02:00
Ghostkeeper
f424097387
Improve defaults for raft settings 
These better defaults and formulas are coming from Paul, one of our material testers.
 2016-07-11 14:01:45 +02:00
Jack Ha
9efc2ee973 Added message when switching to one_at_a_time. 
CURA-1787
 2016-07-11 13:36:23 +02:00
fieldOfView
2a949237c1 Do not ask the user about keeping current settings when creating a profile from the current changes. 
CURA-1885
 2016-07-11 12:49:32 +02:00
Thomas-Karl Pietrowski
bea67f0536 CURA-1445: Using getDurationInISOFormat in SliceInfo 
I think this is the way YouMagine expects the data to be sent.
 2016-07-11 12:10:03 +02:00