3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-21 21:58:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 16
7337 commits 306 branches 270 tags 786 MiB
Commit graph

7337 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jaime van Kessel
df9f940ff4 Added cancel button to upload print 
CURA-2384
 2016-09-20 17:46:46 +02:00
Jaime van Kessel
52b65009d1 Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-20 15:11:49 +02:00
Jaime van Kessel
0cfa8c0205 Fixed check for has_variant_materials 
CURA-2271
 2016-09-20 15:11:20 +02:00
Arjen Hiemstra
b972d26b67 Remove old fdmprinter pot and add new fdmprinter and fdmextruder pot files 
Contributes to CURA-2412
 2016-09-20 15:01:25 +02:00
Jack Ha
2b4377b509 Fixed update resolvements by moving signal emits. CURA-2232 2016-09-20 14:03:55 +02:00
Jaime van Kessel
a52417f420 Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-20 13:59:29 +02:00
Jaime van Kessel
9ba78dec54 After deletion of material the slection is refreshed 
CURA-2388
 2016-09-20 13:58:44 +02:00
Tim Kuipers
b47bf3be4f Merge branch 'totalretribution-outer_inset_first' 2016-09-20 13:43:08 +02:00
Tim Kuipers
1eabf85eb0 JSON fix: accidental comma 2016-09-20 13:43:02 +02:00
Tim Kuipers
6c6c1c25fd Merge branch 'outer_inset_first' of https://github.com/totalretribution/Cura into totalretribution-outer_inset_first 2016-09-20 13:35:10 +02:00
Jaime van Kessel
426b48323f Merge branch 'feature_layerview_ghosts' of github.com:Ultimaker/Cura 2016-09-20 13:32:58 +02:00
Jaime van Kessel
a684e4def9 Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-20 13:12:59 +02:00
Jaime van Kessel
cf06a918a8 Per object tool now also triggers recenter 
CURA-2401
 2016-09-20 13:12:27 +02:00
fieldOfView
f75e8c9537 Add version number 2016-09-20 11:53:14 +02:00
Ghostkeeper
bc6e7dd24e
Merge branch 'sevaa-feature_x3d_file_format' 2016-09-20 11:49:39 +02:00
Ghostkeeper
839be8d3f8 Merge branch 'feature_x3d_file_format' of https://github.com/sevaa/Cura into sevaa-feature_x3d_file_format 2016-09-20 11:34:59 +02:00
Ghostkeeper
5f023d1efa
Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-20 11:00:57 +02:00
Ghostkeeper
d3a9b349d1 Merge pull request #999 from Ultimaker/thopiekar-CURA-1445-use-HTTPS-again 
[CURA-1445] SliceInfo: Using HTTPS again
 2016-09-20 10:44:34 +02:00
Jaime van Kessel
789db04d03 Inheritance manager now also listens to global property changed 
CURA-2361
 2016-09-20 09:41:04 +02:00
fieldOfView
4911eaed00 Fix merge mistakes 
CURA-2299
 2016-09-19 18:30:23 +02:00
fieldOfView
087ad6f472 Move layerdata and busy handling back into LayerView 
This reverts commits 17b12b9048 and 66f8a62e6c.

# Conflicts:
#	plugins/LayerView/LayerPass.py
#	plugins/LayerView/LayerView.py
 2016-09-19 17:59:24 +02:00
fieldOfView
155fe326b7 Remove unnecessary bools 
CURA-2199
 2016-09-19 17:17:03 +02:00
fieldOfView
b05caa8bdc Remove unused uniforms from composite shaders 
CURA-2299
 2016-09-19 17:15:22 +02:00
Ghostkeeper
0b0e6ed118
Hide infill settings if infill density is 0 
Mostly to test, but this relation was missing anyway.

Contributes to issue CURA-2361.
 2016-09-19 16:52:36 +02:00
fieldOfView
7bca6a648a Merge branch 'feature_layerview_ghosts' into ghosts 
# Conflicts:
#	plugins/LayerView/LayerView.py
 2016-09-19 16:43:17 +02:00
Jaime van Kessel
3c0971c375 Legacy profile reader no longer creates profiles for multi-extrusion machines 
CURA-2421
 2016-09-19 16:22:47 +02:00
Jaime van Kessel
f4cfe75ab1 Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-19 15:33:30 +02:00
Jaime van Kessel
fa97295481 Using wall_thickness of 0 now results in wall_line_count of 0 2016-09-19 15:28:13 +02:00
fieldOfView
400360cb34 Add check if additional components were successfully created 2016-09-19 15:05:33 +02:00
fieldOfView
a62b0587ad Show correct selected gcode flavor now there are more than 2 options 
CURA-2304
 2016-09-19 14:35:54 +02:00
fieldOfView
2e7dbea559 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-09-19 14:34:50 +02:00
fieldOfView
e4cfbc8fdf Only update camera source if the camera view is showing 2016-09-19 14:34:35 +02:00
Jaime van Kessel
87a9555719 Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-19 14:34:04 +02:00
Jaime van Kessel
799e66c3ac Legacy profiles are now loaded as quality_changes 
CURA-2344
 2016-09-19 14:33:38 +02:00
Tim Kuipers
530d582c6c Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-19 13:44:00 +02:00
Tim Kuipers
14cd1395eb JSON fix: gcode favlour became an enum (CURA-2304) 2016-09-19 13:41:23 +02:00
Jaime van Kessel
7da05e0f36 Post reply is now set to None after abort 
CURA-2295
 2016-09-19 13:38:52 +02:00
Jaime van Kessel
850a83fd8d We now use correct size of disallowed area for prime tower 
CURA-2394
 2016-09-19 13:18:38 +02:00
Jaime van Kessel
909a021dfc Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-19 13:02:22 +02:00
Jaime van Kessel
aac395cb79 Settings that are not settable per extruder but used by settings who are are now also copied 
CURA-2409
 2016-09-19 13:01:31 +02:00
Aldo Hoeben
9fb4fc3e65 Merge pull request #1000 from thopiekar/master-CURA-1852 
[CURA-1852] Sending material volumina per extruder
 2016-09-19 12:42:56 +02:00
Jaime van Kessel
ddd4a46e76 Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-19 12:42:21 +02:00
Jaime van Kessel
75c788c31a Moved check for top container setting function up in the code 
Should improve performance a bit. CURA-2361
 2016-09-19 12:40:05 +02:00
Jaime van Kessel
642b6b1ca3 Updated documentation 
CURA-2361
 2016-09-19 12:37:13 +02:00
Jaime van Kessel
66b22134ba Always hide progress message if connection is lost 2016-09-19 11:31:20 +02:00
Jaime van Kessel
27d017b29e Merge branch 'master' of github.com:Ultimaker/JediWifiPrintingPlugin 2016-09-19 11:30:30 +02:00
Jaime van Kessel
e388b8126b No longer re-create zeroConf object, as this crashes 
CURA-2393
 2016-09-19 11:29:57 +02:00
fieldOfView
52b8901b66 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-09-19 11:23:57 +02:00
fieldOfView
538a35f81c Add "Repetier" as a GCode flavor option 
The "UltiGCode" and "Reprap (Marlin/Sprinter)" options are not translated, to "Repetier" does not need translation either (?).

CURA-2304
 2016-09-19 11:23:40 +02:00
fieldOfView
d980f6b792 Code style 
CURA-2277/CURA-2276
 2016-09-19 10:26:25 +02:00