GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-08 14:19:00 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,199 Commits 290 Branches 260 Tags
Commit Graph

5199 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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 17b12b904809cae093aa59cfdd2e5958978eb6e0 and 66f8a62e6c1cf376ab6fb089a8d4911fc311e4b0.

# 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
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
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
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
Thomas Karl Pietrowski
8366cb8c9b CURA-1852: Removing TODO 
Removed the TODO tag, but left a little comment about what is happening in the following section.
 2016-09-19 09:50:09 +02:00
Ghostkeeper
1f8f7ea22d Merge pull request #1003 from Patola/master 
Added kossel platform based on jrocholl (GPLv3)
 2016-09-19 09:49:38 +02:00
Patola
73facab8a8 Add Kossel Mini printer definition 
Added Kossel Mini Printer definition. It is the first delta printer working on Cura; I tested it before uploading this .def.json file and its accompanying .stl file. Works but there is some mysterious padding at the sides of the "square" (?) heated bed that disallow the part but these are not areas I configured. I approximated the round shape of the bed with 8 polygons for disallowed areas. However the square checkerboard pattern appears on top of it and it is kind of annoying, hope someone would fix this.
 2016-09-16 15:51:21 -03:00
Patola
2826c3ff7a shifted platform 52mm down 
Shifted platform 52mm down so that its top is at Z=0
 2016-09-16 15:46:41 -03:00
Patola
61c1b87b53 Added kossel platform based on jrocholl (GPLv3) 
Added a stl file for the kossel heatbed. Created from jrocholl's original STL files for kossel plastic parts (all GPLv3) and the public domain geometry from the mk_visual_calc repository.
 2016-09-16 12:57:20 -03:00
Ghostkeeper
d391639b48
Translate Fan Speed Full At Layer to one-based counting 
All layer counts should increment by 1.

Contributes to issue CURA-2314.
 2016-09-16 16:50:27 +02:00
TotalRetribution
ea093cfca7 Changed outer_inset_first description to use the word Walls instead of Inset. Shrunk length of Label name further. 2016-09-16 15:47:40 +01:00
Ghostkeeper
628aa70e12
Make Regular Fan Speed At Layer one-based 
This coincides with the layer view, which starts counting layers at 1, not 0.

Contributes to issue CURA-2314.
 2016-09-16 16:45:34 +02:00
TotalRetribution
5c75b5f370 Removed Print from outer_inset_first Label name. 2016-09-16 15:44:25 +01:00
TotalRetribution
6e041af2b1 Fixed some Grammer mistakes and changed settable_per_mesh to true. 2016-09-16 15:40:45 +01:00
Ghostkeeper
b9d7c02175
Requirement change: Layer numbers must count from 1 
We now send layer numbers one higher than before, also to the back-end, and the back-end must interpret the layer number differently.

Contributes to issue CURA-2314.
 2016-09-16 16:20:52 +02:00
Ghostkeeper
fd181ca0c3
Fix display of extruder values for enums 
It wasn't always a list of ints. For enums, it's a list of strings. We have several other types. Just use variant.

Contributes to issue CURA-2232.
 2016-09-16 15:56:22 +02:00
Ghostkeeper
c461482765
Use any for boolean-or over list instead of max 
Max also works because it first casts every boolean to an int and then casts the result back to boolean, but any is neater.

Contributes to issue CURA-2232.
 2016-09-16 15:56:22 +02:00
Jaime van Kessel
482ea83284 Hiding a setting forces settingInheritance manager to re-evaluate 
CURA-2361
 2016-09-16 15:32:16 +02:00
Thomas Karl Pietrowski
755b2e61e4 CURA-1852: Sending material volumina per extruder 2016-09-16 15:16:34 +02:00