3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-29 05:41:05 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
16120 commits 344 branches 300 tags 757 MiB
Commit graph

4701 commits

Author SHA1 Message Date
fieldOfView
6a50487bf0 Catch the one that got away 2018-10-11 19:16:10 +02:00
fieldOfView
ab7fe3138d Remove unused imports 2018-10-09 17:06:20 +02:00
fieldOfView
a36deea651 Move updateFirmware to PrinterOutputDevice... 
along with codestyle and typing fixes
 2018-10-09 16:26:45 +02:00
fieldOfView
04bca109ba Fix update/upgrade consistency 2018-10-04 12:48:35 +02:00
fieldOfView
5b2dc804ca Fix a crash when adding a printer part of a cluster 2018-10-04 12:43:42 +02:00
fieldOfView
2c3b723070 Merge branch 'master' into feature_firmware_updater 2018-10-04 10:37:22 +02:00
fieldOfView
477862d779 Fix code style and unused imports 2018-10-03 23:07:37 +02:00
fieldOfView
b7542a8ef8 Move Firmware Updater into a plugin of its own 2018-10-03 20:55:51 +02:00
fieldOfView
61ffdf23d7 Fix MYPY/typing errors 2018-10-03 20:24:32 +02:00
Lipu Fei
d91d0fab10 Fix SimulationView: missing import 2018-10-03 17:27:21 +02:00
Jaime van Kessel
37eedb0256 Merge branch 'master' of github.com:Ultimaker/Cura 2018-10-03 16:37:34 +02:00
Jaime van Kessel
adf8285d20 Typing fixes 
Since I was stupid enough to touch it, I was also forced to boyscout the code.
 2018-10-03 16:36:58 +02:00
Diego Prado Gesto
a4e02a6eae Revert "Update date format" 
This reverts commit 959f698b03.
 2018-10-03 16:27:30 +02:00
Diego Prado Gesto
e3721fe539 Revert "Format date strings to ISO YYYY/MM/DD in Toolbox" 
This reverts commit 254106bb26.
 2018-10-03 16:27:13 +02:00
Jaime van Kessel
2e529452dd Moved the actual adding of containers by script to initialize 
This ensures that when loading scripts (and checking they are valid) we don't start adding unneeded containers
 2018-10-03 15:58:16 +02:00
Lipu Fei
254106bb26 Format date strings to ISO YYYY/MM/DD in Toolbox 
CURA-5762
 2018-10-03 15:39:25 +02:00
alekseisasin
742f135733
Merge pull request #4268 from smartavionics/mb-extruder-cooling-fan-number-gui 
Added extruder setting field for cooling fan number.
 2018-10-03 15:17:35 +02:00
fieldOfView
c4919d65f4 Merge branch 'master' into feature_firmware_updater 2018-10-03 14:02:24 +02:00
fieldOfView
cf3d7df8a6 Fix showing progress 2018-10-03 13:59:46 +02:00
Jaime van Kessel
9986e38dca Merge branch 'master' of github.com:Ultimaker/Cura 2018-10-03 13:25:19 +02:00
Jaime van Kessel
dabe747ec0 Merge branch 'CURA-5744-move-oauth-login' of github.com:Ultimaker/Cura 2018-10-03 13:25:09 +02:00
Aleksei S
7a87783237 Merge branch 'master' of github.com:Ultimaker/Cura 2018-10-03 13:24:20 +02:00
Aleksei S
959f698b03 Update date format 
CURA-5762
 2018-10-03 13:23:37 +02:00
Lipu Fei
b97f4ea30c Merge remote-tracking branch 'origin/3.5' 2018-10-03 11:49:38 +02:00
Diego Prado Gesto
6db1342255 Fix the layer view when there is a print job with only one layer. 
Contributes to CURA-5789.
 2018-10-03 10:44:20 +02:00
alekseisasin
5456637e4a
Merge pull request #4369 from fieldOfView/fix_usb_temperature_while_heating 
Fix updating temperature while preheating bed or extruder
 2018-10-03 10:35:30 +02:00
fieldOfView
718ac0a307 Create firmware update progress window from QML 2018-10-03 09:17:51 +02:00
Diego Prado Gesto
c0c66649b8 Merge branch '3.5' 2018-10-02 20:27:18 +02:00
fieldOfView
3908781f6f Fix this sh*t 
Sorry, I kind of dropped the ball before.
 2018-10-02 17:08:39 +02:00
fieldOfView
91ee691c80 Merge branch 'master' into feature_firmware_updater 2018-10-02 15:10:44 +02:00
Jaime van Kessel
13ab9ba384 Merge branch 'patch-1' of https://github.com/adecastilho/Cura 2018-10-02 13:15:48 +02:00
Jaime van Kessel
13eaa14752 Set preference for sending info to default state instead of removing them 
CURA-5095
 2018-10-02 11:37:04 +02:00
Jaime van Kessel
7ffcfa25e9 Merge branch 'CURA-5095_reset_slice_info_collection' of github.com:Ultimaker/Cura into 3.5 2018-10-02 11:17:39 +02:00
Diego Prado Gesto
77fd05ac70 Disable other buttons while toolbox is downloading to avoid crashes. 
I did it that way to not be risky because we're close to the release.

Contributes to CURA-5778.
 2018-10-01 17:21:34 +02:00
Lipu Fei
d1fce50f60 Add Preferences upgrade 34 to 35 unit test 2018-10-01 16:30:27 +02:00
Lipu Fei
7d537f2c6f Fix data collection message at app start 2018-10-01 16:27:27 +02:00
fieldOfView
fa5ee4c5a2 Fix typo 2018-09-28 13:44:18 +02:00
fieldOfView
9af71f2888 Fix incorrect typing and issues caused by typing 2018-09-28 13:40:39 +02:00
Ghostkeeper
bfc3c5d8d8
Merge branch 'feature_mesh_names' of https://github.com/paukstelis/Cura into paukstelis-feature_mesh_names 2018-09-28 13:26:15 +02:00
fieldOfView
b73a71746e Fix missing imports 2018-09-28 13:06:36 +02:00
fieldOfView
6be6d6cfc3 Fixed missing typing import 2018-09-28 12:49:53 +02:00
fieldOfView
a573a598b0 Add typing and appease MYPY 2018-09-28 12:40:44 +02:00
Ghostkeeper
ef5f9bb0d4
Improve warning when saving g-code before slicing 
This terminology is more consistent with what the rest of the interface uses.

Discovered during work on #4112.
 2018-09-28 12:01:20 +02:00
fieldOfView
bc52830c89 Move getDefaultFirmwareName() into GlobalStack 2018-09-28 11:49:00 +02:00
fieldOfView
7c23a4e187 Merge branch 'master' into feature_firmware_updater 2018-09-28 11:32:28 +02:00
Jaime van Kessel
3b70e5eb6b Fix typing 
For some reason, my MyPy started acting up once I started using the PythonPath while calling it.
 2018-09-27 20:01:55 +02:00
Jaime van Kessel
c15f8aa693 Move printer type checking to where it belongs; inside the UM3 plugin. 2018-09-27 15:54:23 +02:00
Ghostkeeper
0ce9bf61be
Move MIME type declarations into constructors of readers 
So that if you disable the plug-in, the MIME type declaration is also not added.

Fixes #4151.
 2018-09-27 13:58:06 +02:00
Ghostkeeper
88ba2ac345
Define gcode.gz extension in GCodeGzReader 
So if you were to disable the GCodeGzReader plug-in, you will now no longer see the extension in the files you can read.

Fixes #4151.
 2018-09-27 13:27:42 +02:00
Ghostkeeper
80804b232f
Merge branch 'refactor_singleton_settingsbase' 2018-09-27 11:53:11 +02:00