GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-07-10 17:01:48 +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
Jack Ha
ef6e90283e Added color to recommended view support extruder by adding combobox_color style. CURA-2767 2016-12-01 11:34:37 +01:00
Ghostkeeper
1035526185
Merge branch 'samirabaza-master' 2016-12-01 10:56:03 +01:00
Ghostkeeper
b94027ffef Merge branch 'master' of https://github.com/samirabaza/Cura into samirabaza-master 2016-12-01 10:55:44 +01:00
SAMSECTOR
1ea4441148 Update printrbot_simple_extended.def.json 
added platform offset 
"platform_offset": [0, -0.3, 0],
 2016-12-01 08:22:31 +03:00
Ghostkeeper
f6422769b5
Merge branch 'feature_z_seam_location' 2016-11-30 16:34:50 +01:00
Tim Kuipers
1305b51806 JSON fix: multiple_mesh_overlap description was clumsy (CURA-2444) 2016-11-30 16:29:06 +01:00
Tim Kuipers
8da058d95d JSON fix: description of z_seam_type still mentioned 'Back' (CURA-1461) 2016-11-30 16:25:40 +01:00
Jaime van Kessel
e941d417f1 Added CuraVersion to 3mf metadata 2016-11-30 14:15:19 +01:00
Jaime van Kessel
d08c1b73bf Fixed export profile derp 
CURA-1263
 2016-11-30 13:13:47 +01:00
Jaime van Kessel
86019c2df0 Renamed load&save workspace to import&export project 
CURA-1263
 2016-11-30 12:59:09 +01:00
Jaime van Kessel
61db5b42b7 Moved loading of meshdata in workspace to after machine has changed 
This fixes the issue where the location of the objects was not correct.
CURA-1263
 2016-11-30 12:57:10 +01:00
Jack Ha
c27219b1c4 Merge branch 'master' into recommended_sidebar 2016-11-30 12:36:46 +01:00
Jaime van Kessel
dcdfe612e7 Added more robust fault handling for preferences while loading workspace 
CURA-1263
 2016-11-30 12:04:30 +01:00
Ghostkeeper
db2ee920ce Merge branch 'master' of https://github.com/samirabaza/Cura into samirabaza-master 2016-11-30 11:09:56 +01:00
Tim Kuipers
b8ff7acb68 JSON fix: initial fan speed zero by default (CURA-3068) 2016-11-30 10:27:53 +01:00
Tim Kuipers
09e884fd92 JSON refactor: moved Initial Fan Speed out of the children of Fan Speed (CURA-3068) 
we don't want it to inherit from Fan Speed, but children must always inherit from their parent.
 2016-11-30 10:27:53 +01:00
Jaime van Kessel
477ffe12aa Merge branch 'feature_polar' of https://github.com/fieldOfView/Cura 2016-11-30 09:13:05 +01:00
Jaime van Kessel
e6d280ee47 Merge pull request #1196 from fieldOfView/fix_um3_postprocessing 
Allow postprocessing before sending data to the printer
 2016-11-30 09:12:06 +01:00
SAMSECTOR
edd76cd9ab Update printrbot_simple_extended.def.json 2016-11-30 10:27:31 +03:00
Thomas Karl Pietrowski
415b761c58 Merge pull request #1197 from fieldOfView/add_octoprint_readme 
Add link to OctoPrintPlugin
 2016-11-29 18:00:42 +01:00
Tim Kuipers
e60f05c2fd JSON fix: limit_to_extruder for support_conical_enabled (CURA-2896) 2016-11-29 17:54:01 +01:00
Tim Kuipers
383eba9930 JSON refactor: multiple_mesh_overlap: Objects ==> Meshes (CURA-2444) 2016-11-29 17:50:01 +01:00
Tim Kuipers
32a102a9e7 JSON refactor: move multiple_mesh_overlap to meshfixes category (CURA-2444) 2016-11-29 17:50:01 +01:00
Tim Kuipers
50a61e56f7 JSON refactor: Dual Extrusion Overlap => Merged Objects Overlap (CURA-2444) 2016-11-29 17:50:01 +01:00
fieldOfView
df7d685ef7 Add link to OctoPrintPlugin 2016-11-29 17:49:54 +01:00
fieldOfView
91e8ac6868 Allow postprocessing before sending data to the printer 
From OutputDevice.py:
"output device subclasses are completely free to implement writing however they want, though you should emit writeStarted and related signals whenever certain events happen related to the write process."
 2016-11-29 17:20:10 +01:00
Simon Edwards
5ff891496f Merge pull request #1038 from Ultimaker/feature_config_dir_lock 
Moved lockfile functions to better place. CURA-2449 CURA-2589
 2016-11-29 16:30:34 +01:00
Jack Ha
4d9416aae8 Merge branch 'master' into feature_config_dir_lock 2016-11-29 16:12:56 +01:00
Jaime van Kessel
292d075a03 Merge branch 'master' of github.com:Ultimaker/Cura 2016-11-29 15:41:46 +01:00
Simon Edwards
b9dd2ef6f9 Numpy magic to speed up the expansion of indices-to-vectors to just vectors. CURA-2548 
Sending models to engine that have indices is slow
 2016-11-29 15:16:55 +01:00
Jaime van Kessel
06a9b69dc9 Merge branch 'feature_recursive_cubic' of github.com:Ultimaker/Cura 2016-11-29 15:16:25 +01:00
fieldOfView
f7ebed945e Fix creation of indices on elliptic build plate 2016-11-29 14:39:23 +01:00
SAMSECTOR
1462054054 Update printrbot_simple_extended.def.json 
Update
stl file renamed
 2016-11-29 15:57:04 +03:00
SAMSECTOR
8fadc83f10 PrinterBot Simple Metal heated bed upgraded X&Z 
PrinterBot Simple Metal heated bed upgraded X&Z
volume
x=250mm
y=150mm
z=235mm(due to handle conflict with z- axis)
Updates:
1-vertex budget minimized to 0.5MB
2- file renamed
 2016-11-29 15:54:49 +03:00
SAMSECTOR
6d8bec59dc Delete Pbheatedbed.STL 2016-11-29 15:52:03 +03:00
SAMSECTOR
1261693ec9 Delete printrbot_simple_metal_platform_extend.STL 2016-11-29 15:27:43 +03:00
Ghostkeeper
7082ff7d68
Don't hide the dual extrusion category for single extrusion 
The category gets hidden automatically if all of its child settings are disabled.
 2016-11-29 13:11:27 +01:00
Ghostkeeper
aeedd47753 Merge branch 'master' of https://github.com/samirabaza/Cura into samirabaza-master 2016-11-29 12:46:24 +01:00
fieldOfView
68fd0814e5 Minor code-style-related fixes 2016-11-29 12:33:35 +01:00
Ghostkeeper
d99fdb5c23
Merge branch 'vincentmarchetti-fix_x3dimport' 2016-11-29 11:37:43 +01:00
SAMSECTOR
f3f038086c Add files via upload 2016-11-29 13:19:05 +03:00
fieldOfView
86383b2be0 Get build plate shape options from the fdmprinter definition 2016-11-29 10:54:48 +01:00
Ghostkeeper
24c0b7c736 Merge branch 'fix_x3dimport' of https://github.com/vincentmarchetti/Cura into vincentmarchetti-fix_x3dimport 2016-11-29 10:50:36 +01:00
fieldOfView
ff0f63eb94 Document z fighting hack 2016-11-29 10:44:10 +01:00
fieldOfView
dc33d96e8c Make build plate shapes translatable 2016-11-29 10:42:24 +01:00
Ghostkeeper
c86d867adf
Merge branch 'fieldOfView-fix_toggle_filter_oopsies' 2016-11-29 10:35:29 +01:00
SAMSECTOR
a44a4ef19d Update printrbot_simple_extended.def.json 2016-11-29 12:32:36 +03:00
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
fieldOfView
4756168178 Fix elliptic bedshapes (vs circular) 
MeshBuilder.addArc only supports circular arcs, not elliptic arcs. To work around this, the resulting MeshData is scaled.
 2016-11-29 10:04:53 +01:00
Ghostkeeper
e4d3c7873b
Merge branch 'master' of github.com:Ultimaker/Cura 2016-11-29 09:54:01 +01:00