GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-02 16:54:23 +08:00
Code Issues Packages Projects Releases Wiki Activity
18,863 Commits 291 Branches 260 Tags
Commit Graph

5896 Commits

Author SHA1 Message Date
Ghostkeeper
35fcdf3978
Merge branch '4.0' 2019-03-20 09:12:39 +01:00
Diego Prado Gesto
00e22d6c11 Remove short description of bug fixes in the changelog 
In order to keep consistency with previous entries, the bug fixes only show the full description but not a short description.

Contributes to CURA-6386.
 2019-03-19 10:54:01 +01:00
Diego Prado Gesto
a083590121 Add change log for 4.0 
Contributes to CURA-6386.
 2019-03-19 10:29:13 +01:00
Ghostkeeper
731cbc9e95
Make 'All jobs are printed.' translatable 2019-03-18 15:16:50 +01:00
Jaime van Kessel
c1ed8ba9d0 Merge branch '4.0' of github.com:Ultimaker/Cura 2019-03-18 14:56:49 +01:00
Jaime van Kessel
61e031bf1a Fix format for two of the translated messages. 
The format needs to be done on the result of whatever the translate spits out instead of
the string that is passed to the translate.
 2019-03-18 13:45:31 +01:00
Ghostkeeper
3e9ed0fbfa
Add translation hint for untranslatable Ultimaker Cloud brand 
So that the translators next time hopefully won't translate this.

Contributes to issue CURA-6257.
 2019-03-18 10:36:23 +01:00
Jaime van Kessel
bcf6a21bc8 Merge branch 'patch-3' of https://github.com/adecastilho/Cura 2019-03-14 14:50:34 +01:00
Jaime van Kessel
31a8421fd4 Remove : from display script as it breaks on some machines 2019-03-13 17:06:47 +01:00
Jaime van Kessel
0c57aa5054 Merge branch 'fix_usb_print_postprocessing' of github.com:Ultimaker/Cura 2019-03-13 16:44:12 +01:00
Jaime van Kessel
0fbfe9e6c9 Merge branch '4.0' of github.com:Ultimaker/Cura 2019-03-13 15:42:21 +01:00
Jaime van Kessel
72eb90c7c1 Fix the insert & timelapse script so that you can use both at the same time 
CURA-5713
 2019-03-13 13:28:10 +01:00
Simon Edwards
c07b0cdd00
Merge pull request #5418 from Ultimaker/CL-1281_improve_idle_printer_empty_queue 
CL-1281 Make sure to show printers even if queue is empty
 2019-03-11 17:20:39 +01:00
Simon Edwards
3489a5c64e
Merge pull request #5397 from Ultimaker/CL-1272_prevent_multiple_cloud_pop-ups 
Prevent multiple cloud-flow pop-ups
 2019-03-11 15:37:00 +01:00
Ian Paschal
ec203da1cd Make sure to show printers even if queue is empty 
Contributes to CL-1281
 2019-03-11 13:54:49 +01:00
Ghostkeeper
2d9910d3f0
Fix post-processing scripts when printing via USB 
The g-code writer processes the post-processing scripts properly, so get the g-code from that plug-in.
 2019-03-11 11:59:23 +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
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
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
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
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
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
Ian Paschal
99fe8ec7aa Improve cloud flow pop up logic 
Contributes to CL-CL-1272
 2019-03-06 10:56:31 +01:00
Ghostkeeper
943503cac7
Fix iterating over 'hardware compatible' keys 
This is both faster and actually functions properly.

Contributes to issue CURA-6272.
 2019-03-05 15:25:39 +01:00
Jaime van Kessel
6157cb6f91 Merge branch '4.0' of github.com:Ultimaker/Cura 2019-03-04 16:00:56 +01:00
Ian Paschal
88fc7d0fba Don't try to get the plugin path when there's no plugin registry 
i.e. in tests
Contributes to CL-1274
 2019-03-04 14:27:35 +01:00
Ian Paschal
a74717ca3c Get plugin path like most other plugins do 
Contributes to CL-1274
 2019-03-04 12:42:48 +01:00
Ian Paschal
87d4a68c0e Merge remote-tracking branch 'origin/4.0' into CL-1274_dont_use___file__ 2019-03-04 12:11:57 +01:00
Ian Paschal
3889570697 K.I.S.S. 
Contributes to CL-1274
 2019-03-04 12:04:34 +01:00
Ian Paschal
c8580cf417 Prevent circular dependencies 
Contributes to CL-1274
 2019-03-04 11:27:52 +01:00
Ian Paschal
a1e0ddd9df Don't hardcode plugin directory 
Contributes to CL-1274
 2019-03-04 10:19:33 +01:00
Diego Prado Gesto
0e7127f80b Merge branch 'master' of github.com:Ultimaker/Cura 2019-03-01 14:54:10 +01:00
Satish
c98a73f8fd Added id's to printer button, installed plugins, material fields and profile tab for integration tests 2019-03-01 12:47:29 +01:00
Diego Prado Gesto
3f8f363836 Fix the installed checkmark in Marketplace 
Show a package as completelly installed if the user has more or the same number of packages than in the list. Otherwise if the contributor removes one of the packages from the list, it seems that I don't have all the packages installed when in fact I do.
 2019-03-01 10:57:39 +01:00
Ian
cac8c85489 Don't use __file__ 
Contributes to CL-1274
 2019-03-01 10:46:41 +01:00
Ian
cf9a1c0248 Sort UM imports alphabetically for easy scanning 
Contributes to CL-1274
 2019-03-01 10:46:27 +01:00
Simon Edwards
4590fae9b2 Hide the "View print history" button when connecting via cloud 
CL-1247
 2019-02-28 17:08:28 +01:00
Jaime van Kessel
91cceea6e0 Fix the situation where an upgraded single extrusion machine and loading project caused issues 
If the upgraded single extrusion machine was never activated, it would not have it's extruders set.

CURA-6252
 2019-02-28 16:17:34 +01:00
Jaime van Kessel
3de9cab1e2
Merge pull request #5363 from Ultimaker/backup-list-response-error-handling 
Add extra validation to backup list response
 2019-02-26 11:16:40 +01:00
ChrisTerBeke
53cc9cd188 Add extra validation to backup list response 2019-02-26 11:09:57 +01:00
Lipu Fei
4d3211e651 Merge remote-tracking branch 'origin/4.0' 2019-02-22 13:38:29 +01:00
Diego Prado Gesto
271573d0ae Fix typo... again 2019-02-22 13:19:04 +01:00