3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-22 06:03:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 17
21201 commits 305 branches 272 tags 787 MiB
Commit graph

21201 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jaime van Kessel
e9d4eb741a Merge branch '4.0' of github.com:Ultimaker/Cura 2019-03-11 10:52:14 +01:00
Jaime van Kessel
50999a075e Fix stupid mistake (signals need an emit, not a direct call) 
CURA-6278
 2019-03-11 10:46:41 +01:00
Jaime van Kessel
0616601250 Merge branch '4.0' of github.com:Ultimaker/Cura 2019-03-11 10:39:23 +01:00
Lipu Fei
6f6e54fb06 WIP: Add comments 2019-03-11 09:22:41 +01:00
Lipu Fei
6b2642ee9a Merge remote-tracking branch 'origin/master' into WIP_onboarding 2019-03-11 09:05:43 +01:00
Lipu Fei
69ca6f02a3 WIP: Add bottom buttons for add network printer dropdown 2019-03-11 09:04:38 +01:00
Lipu Fei
e821179d7f WIP: Fix binding loops 2019-03-11 08:33:37 +01:00
ValentinPitre
da044daaeb
Remove 2.85 diameter filaments from "exclude_materials" 2019-03-10 15:26:18 +01:00
Diego Prado Gesto
2b0109fbaa Read the gcode data from the UFP file 
Open the file, extract the gcode, get the data and use the GCodeReader to parse the results.

Contributes to CURA-5155.
 2019-03-08 22:48:31 +01:00
Diego Prado Gesto
3a9219be0c Add UFP to the list of recent files 
Contributes to CURA-5155.
 2019-03-08 22:46:33 +01:00
Nureddin Bennett
55b9018a7c removed alya_flex printing profile as it is not existing in the material database yet. 2019-03-09 00:37:58 +03:00
Diego Prado Gesto
412bcc9b90 Add the skeleton of the plugin 
Contributes to CURA-5155.
 2019-03-08 21:57:07 +01:00
Diego Prado Gesto
8c41bc86d2
Merge pull request #5259 from fieldOfView/fix_travel_speed 
Add {travel_speed} as an alias to {speed_travel}
 2019-03-08 17:26:18 +01:00
Diego Prado Gesto
f47bc21204 Merge branch 'BluefireXD-4.0' 2019-03-08 17:02:10 +01:00
Diego Prado Gesto
0286c701fd Change setting_version to be the same as in current master 
Also change the profiles to act as global profiles and fix indentation.

Contributes to CURA-6080.
 2019-03-08 17:00:17 +01:00
Diego Prado Gesto
c62bfc8ece Merge branch '4.0' of https://github.com/BluefireXD/Cura into BluefireXD-4.0 2019-03-08 16:48:56 +01:00
Diego Prado Gesto
757224c187 Merge branch 'wporter82-master' 2019-03-08 15:47:37 +01:00
Diego Prado Gesto
9396628170 Make suggested changes to post processing scripts 
Contributes to CURA-5713.
 2019-03-08 15:46:21 +01:00
Diego Prado Gesto
b913dd9702 Merge branch 'master' of https://github.com/wporter82/Cura into wporter82-master 2019-03-08 15:37:41 +01:00
Diego Prado Gesto
d53c8b1162 Change text to singular mode 
It makes more sense.
 2019-03-08 15:27:17 +01:00
Ghostkeeper
e53eb70cad
Add tests for validating metadata before loading 
Contributes to issue CURA-6270.
 2019-03-08 14:07:10 +01:00
Lipu Fei
940a833e73 WIP: Add printers via network 2019-03-08 13:43:58 +01:00
Ghostkeeper
3c779b58de
Specialise _isMetadataValid for Cura to check setting_version 
Because we need to reject loading metadata for containers whose setting_version is incorrect.

Contributes to issue CURA-6270.
 2019-03-08 13:34:16 +01:00
Ghostkeeper
20fc26b8ba
Correct setting version for definition files 
Otherwise the container provider actually rejects loading it completely.

Contributes to issue CURA-6270.
 2019-03-08 13:32:36 +01:00
Remco Burema
6d34a2abd0 Start to connect/handle new signals for manual device addition. [CURA-6294] 2019-03-08 13:08:44 +01:00
Diego Prado Gesto
55e27f6e21
Merge pull request #5402 from lucik/patch-1 
monitor does not show "Build Plate"
 2019-03-08 11:46:52 +01:00
Andrew
70e640be22
Change regexp for greater compatibility 
Change regexp in bed_temperature_matches  and extruder_temperature_matches for greater compatibility with different printers.
 2019-03-08 11:25:49 +06:00
kaleidoscopeit
7f3abbd717 Deltacomb 3D - Updated profile 2019-03-07 17:17:02 +01:00
kaleidoscopeit
473e8efac0 Deltacomb 3D - Updated profile 2019-03-07 17:06:49 +01:00
Amanda de Castilho
82466785ad
Update and rename UsePrevProbeMeasure.py to UsePreviousProbeMeasurements.py 
Applied suggested changes
 2019-03-06 12:54:57 -08:00
Diego Prado Gesto
a0888ccc0c
Update plugins/PostProcessingPlugin/scripts/UsePrevProbeMeasure.py 
Co-Authored-By: adecastilho <familydecastilho@gmail.com>
 2019-03-06 12:33:36 -08:00
Diego Prado Gesto
6e011352af
Update plugins/PostProcessingPlugin/scripts/UsePrevProbeMeasure.py 
Co-Authored-By: adecastilho <familydecastilho@gmail.com>
 2019-03-06 12:33:25 -08:00
Diego Prado Gesto
8a45a4e06f
Update plugins/PostProcessingPlugin/scripts/UsePrevProbeMeasure.py 
Co-Authored-By: adecastilho <familydecastilho@gmail.com>
 2019-03-06 12:33:09 -08:00
Diego Prado Gesto
8f2a2f3ae9
Update plugins/PostProcessingPlugin/scripts/UsePrevProbeMeasure.py 
Co-Authored-By: adecastilho <familydecastilho@gmail.com>
 2019-03-06 12:30:14 -08:00
Remco Burema
7a7e710b2a Support for manual device addition for plugins (WIP). [CURA-6294] 2019-03-06 17:50:40 +01:00
Ghostkeeper
1d25f52df6
Merge branch '4.0' 2019-03-06 15:23:55 +01:00
Ghostkeeper
d72a8581bf
Merge branch 'CURA-6252_Fix_crash_single_extrusion_upgrade_and_project' into 4.0 2019-03-06 15:23:33 +01:00
Lipu Fei
a55808b24a WIP: Rename files 2019-03-06 15:15:21 +01:00
Lipu Fei
c1960109f8 Merge remote-tracking branch 'origin/WIP_onboarding_by_ip' into WIP_onboarding 2019-03-06 15:12:30 +01:00
Lipu Fei
28eaea8426 WIP: Make dropdown exclusive from each other 2019-03-06 15:12:05 +01:00
ValentinPitre
f4a20b35a6
Update tizyx_evy_dual.def.json 2019-03-06 14:43:07 +01:00
Ghostkeeper
380d8ce0c2
Merge branch 'afinkle-master' 2019-03-06 14:23:15 +01:00
Remco Burema
48cc9b3c1d Merge branch 'WIP_onboarding' into WIP_onboarding_by_ip 2019-03-06 14:08:41 +01:00
Remco Burema
5f335b4401 Merge branch 'WIP_onboarding' of https://github.com/Ultimaker/Cura into WIP_onboarding 2019-03-06 14:07:44 +01:00
Remco Burema
3c0583bef0 [AddPrinterByIp] Finish GUI as a facade first for review. [CURA-6057] 2019-03-06 14:05:42 +01:00
Ian Paschal
c9d99e0149 Revert "Adapt tests to manual IP connection" 
This reverts commit d758189aaf.
 2019-03-06 13:11:43 +01:00
Andrew
e56a97bfa2
monitor does not show "Build Plate" 
bed_temperature_matches : error in temperature search expression
 2019-03-06 17:28:22 +06:00
Ian Paschal
9c3f67a9ed Code style 
Contributes to CL-1272
 2019-03-06 12:26:38 +01:00
Lipu Fei
ffb8aed4c3 Merge CURA-6179 2019-03-06 11:32:52 +01:00
Lipu Fei
9968a79863 Merge remote-tracking branch 'origin/master' into WIP_onboarding 2019-03-06 11:29:56 +01:00