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

3125 Commits

Author SHA1 Message Date
Tim Kuipers
5490d9cce9 JSON fix: introduce command line settigns in machine json file (CURA-566) 2016-11-07 11:54:47 +01:00
Ghostkeeper
a4bf4b3502 Merge branch 'feature_wall_wipe' 2016-11-07 11:36:30 +01:00
Ghostkeeper
fe21dbb784
Merge remote-tracking branch 'origin/feature_extruder_temp_layer_0' 2016-11-04 16:56:24 +01:00
Ghostkeeper
070767f0db
Blur focus upon changing profiles, material, variant, etc. 
Otherwise the currently focussed setting gets taken along to after the switch.
 2016-11-04 16:02:08 +01:00
Jaime van Kessel
ed5244bcb0 Merge branch 'feature_concentric_3d_infill' of github.com:Ultimaker/Cura 2016-11-04 14:53:57 +01:00
Jaime van Kessel
642a415262 Merge branch 'master' of github.com:Ultimaker/Cura 2016-11-04 14:33:14 +01:00
Jaime van Kessel
2eb1c61033 Merge branch 'feature_drag_curaprofile' of github.com:Ultimaker/Cura 2016-11-04 14:31:58 +01:00
Ghostkeeper
ccd0daee12
Set layer start position defaults 
Originally this was only extruder_prime_pos_x and _y, but that setting is different per extruder. So now it computes the average prime position.

Contributes to issue CURA-1112.
 2016-11-04 11:36:20 +01:00
Ghostkeeper
871a19091d
Merge branch 'feature_start_layer_far_away' 2016-11-04 10:52:38 +01:00
Jaime van Kessel
3d30762c41 Improved difference between active and passive infill icons 
CURA-2768
 2016-11-04 09:53:14 +01:00
Jaime van Kessel
c769a05408 Added start & stop camera interface 
CURA-2411
 2016-11-04 09:41:26 +01:00
Tim Kuipers
1b853de981 Revert "JSON refactor: support_mesh ==> overhang_mesh (CURA-2077)" 
This reverts commit d675ffe6e9765e5118b85585502aee7a1cb3283c.
 2016-11-03 20:22:22 +01:00
Tim Kuipers
1787b1e65b JSON refactor: support_mesh ==> overhang_mesh (CURA-2077) 2016-11-03 20:22:22 +01:00
Tim Kuipers
b840711960 JSON feat: support_mesh (CURA-2077) 2016-11-03 20:22:22 +01:00
Tim Kuipers
2c87cddd3c JSON refactor: anti_support_mesh ==> anti_overhang_mesh (CURA-2077) 2016-11-03 20:22:22 +01:00
Tim Kuipers
09a64c7ba0 JSON feat: anti support meshes (CURA-2077) 2016-11-03 20:22:22 +01:00
Tim Kuipers
c430980536 JSON feat: wall_0_wipe_dist (CURA-1698) 2016-11-03 20:15:24 +01:00
Jaime van Kessel
a969b45372 Increased width of support extruder combobox 
CURA-2792
 2016-11-03 15:41:15 +01:00
Jaime van Kessel
ab06d692d7 Added showAncestor option to settingvisibility page 
CURA-2859
 2016-11-03 14:59:57 +01:00
Jaime van Kessel
450eb5443f Updated text to be more clear 
CURA-2726
 2016-11-03 14:21:13 +01:00
Ghostkeeper
0f374a2e23
Merge branch 'feature_infill_support' 2016-11-03 13:37:26 +01:00
Ghostkeeper
612ef1c0c6
Fix spelling and grammar of Remove Mesh Intersection 
'objecs' to 'objects'.
Removed superfluous 'is'.

Contributes to issue CURA-2712.
 2016-11-02 14:54:19 +01:00
Ghostkeeper
24f78a7ee6
Capitalise setting name for Hollow Objects 
This is in line with other setting names.

Contributes to issue CURA-2748.
 2016-11-01 16:31:42 +01:00
Simon Edwards
cadf2115ac Merge pull request #1058 from Ultimaker/cura-2730 
Changed MachineManager.isActiveStackValid to areStacksValid. CURA-2730
 2016-11-01 16:17:04 +01:00
Ghostkeeper
6fa36f7c09
Merge branch '2.3' 2016-11-01 16:07:18 +01:00
Ghostkeeper
32653c2df4
Blur settings upon discarding current settings 
Otherwise the currently selected setting doesn't get discarded.

Contributes to issue CURA-2866.
 2016-11-01 16:06:56 +01:00
Ghostkeeper
073c219233
Use spaces instead of tabs 
As per our code standards.
 2016-11-01 12:50:06 +01:00
Ghostkeeper
d889c8370f
Improve Italian translations 
These improvements have been suggested by Nina, who checked this together with a native Italian speaker.
 2016-11-01 12:49:41 +01:00
Tim Kuipers
bce6a6fed4 refactor: move infill_hollow to experimental category (CURA-2748) 2016-11-01 11:06:56 +01:00
Tim Kuipers
06d2f01075 Merge branch 'master' into feature_infill_support 2016-11-01 11:04:05 +01:00
Ghostkeeper
0db7cf2453
Revert 'Added a comment' and 'Set horizontal expansion' 
This horizontal expansion messes prints with very thin parts. It was probably the wrong solution for the problem. We'll revert the change until we hear more from tests at the materials team.

Contributes to issue CURA-2845.
 2016-11-01 10:28:09 +01:00
Ghostkeeper
0fa93f2214 Merge branch '2.3' 2016-10-31 17:26:51 +01:00
Ghostkeeper
48b57de6df
Filter materials on compatibility for non-machine-specific materials 
This only listens to whether the 'base' XML profile is marked as compatible in its metadata, but since the machine doesn't have its own materials, the base is the only one that exists. This needs to be changed when we change the filtering on fdmprinter, hence the comment in the code.

Contributes to issue CURA-2837.
 2016-10-31 17:26:36 +01:00
Simon Edwards
1fbd179aaa Merge branch '2.3' 2016-10-31 13:30:20 +01:00
Simon Edwards
8c25a91e02 Added a comment to help provide some kind of explaination for this magic value. 
CURA-2845 Prints are slightly oversized
 2016-10-31 11:45:59 +01:00
Ghostkeeper
6999a14821
Merge branch '2.3' 2016-10-31 10:55:54 +01:00
Ghostkeeper
00890abe30
Set horizontal expansion to -0.14mm 
The material team observed that the size of prints was slightly too big. They decided that this adjustment was the best solution.

Contributes to issue CURA-2845.
 2016-10-31 10:55:08 +01:00
Jaime van Kessel
78ab1f1a71 Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-10-28 14:50:07 +02:00
Jaime van Kessel
af10438277 Fixed blurSetting 
CURA-2835
 2016-10-28 14:49:42 +02:00
Ghostkeeper
9f43a740a6
Also validate machine name in rename dialogue 
Otherwise you could still circumvent the length limitation.

Contributes to issue CURA-2692.
 2016-10-28 13:33:37 +02:00
Jaime van Kessel
28eb4297c6 Merge branch '2.3' of github.com:Ultimaker/Cura 2016-10-28 11:38:13 +02:00
Jaime van Kessel
fcf3caba5a Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-10-28 10:46:37 +02:00
Jaime van Kessel
74d8148e0c The right stack is now used for limit to extruder setting property provider for single extrusion machine 
This was mostly an issue when switching between printers, where some ids were set to undefined. CURA-2835
 2016-10-28 10:44:57 +02:00
fieldOfView
6e683dffc5 Fix printrbot simple mesh alignment to buildplate grid 2016-10-27 23:35:29 +02:00
Ghostkeeper
717248bd78
Limit number of special characters 
There is also a more advanced attempt that allows more, but I've commented it out because it doesn't quite work yet. Special characters now always count for 12.

Contributes to issue CURA-2652.
 2016-10-27 21:55:58 +02:00
Jaime van Kessel
999380cf1b Merge branch '2.3' of github.com:Ultimaker/Cura 2016-10-27 17:15:58 +02:00
Jaime van Kessel
1aa71d6171 Profiles model is now a singleton, to prevent the agressive garbage collecting to break stuff 
CURA-2826
 2016-10-27 14:26:43 +02:00
Jaime van Kessel
4a5d7cbc73 Bindings of inheritance icon now correctly update when switching between machines 
CURA-2752
 2016-10-27 13:08:10 +02:00
Jaime van Kessel
b381186331 Set um2+ height to same as um2 2016-10-27 13:02:38 +02:00
Ghostkeeper
4759bccdb8
Update translation templates after merging secret plug-ins 
The UM3 Network Printing plug-in was secret because the UM3 wasn't released yet. This update contains all texts to be translated as of this writing.
 2016-10-27 11:31:07 +02:00