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

5336 Commits

Author SHA1 Message Date
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
Ian Paschal
82cddf07ad Move ConfigurationChangeModel to plugin 
Contributes to CL-897
 2018-10-01 17:12:05 +02:00
Ian Paschal
ae9faadca6 Add i18nc string 
Contributes to CL-1051
 2018-10-01 16:36:22 +02:00
Ian Paschal
00ce3b0083 Review feedback 
Contributes to CL-1051
 2018-10-01 16:32:30 +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
Ian Paschal
97fa5094ce Monitor tab refactor + skeleton loading 
Contributes to CL-1051
 2018-10-01 16:24:51 +02:00
Ian Paschal
7c01e632df Rework printer cards (cont) 
Contributes to CL-1051
 2018-09-28 17:00:50 +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
Ian Paschal
b5c893c08e Rework printer cards 
Contributes to CL-1051
 2018-09-28 12:15:33 +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
Ian Paschal
fc333d53c5 Replaced print job context menu 
Contributes to CL-897, CL-1051
 2018-09-27 14:54:40 +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
Ian Paschal
302f9a95b3 Cleaned-up printe job info block 
Contributes to CL-897, CL-1051
 2018-09-27 13:40:46 +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
Ghostkeeper
1717281d2b
Always provide extruder_nr for all models 
Even if you only have one extruder in your printer. This is more consistent, and probably also faster because executing one set-addition in Python is probably still slower than sending those 20 extra bytes over the socket and parsing them in C++...

Contributes to issue CURA-4410.
 2018-09-27 11:20:24 +02:00
alekseisasin
2a201cef23 Prevent cura crash after setting Print as Support in per object setting 
menu
CURA-5766
 2018-09-26 17:06:24 +02:00
Simon Edwards
e99b376374 Merge remote-tracking branch 'origin/3.5' into cura_connect_improvements_3.5 2018-09-25 16:59:33 +02:00
Ghostkeeper
a8493ee35d
Give black materials at least some albedo 
Otherwise you can't see the diffuse reflections and the entire thing just becomes a black silhouette.
 2018-09-25 11:24:48 +02:00
Ghostkeeper
7d7227cfc8
Merge branch 'master' into refactor_singleton_settingsbase 2018-09-24 17:25:15 +02:00
Jaime van Kessel
dbe0d6d82a Add typing 2018-09-21 11:33:06 +02:00
Ian Paschal
50e07ae2a7 ...and in with the new. 
Contributes to CL-897
 2018-09-20 17:14:19 +02:00
Ian Paschal
a2f5dda564 Out with the old... 
Contributes to CL-897
 2018-09-20 17:13:45 +02:00
Lipu Fei
5fc8b95425 Better data handling 
CURA-5095

Avoid missing sections/options
 2018-09-20 12:59:27 +02:00
Lipu Fei
5a235a59dd Reset send slice info and show privacy dialog 
CURA-5095

Because the data Cura collects has been changed.
 2018-09-20 12:55:30 +02:00
Lipu Fei
6535f7890b Merge remote-tracking branch 'origin/3.5' 2018-09-20 10:26:17 +02:00
Ian Paschal
60ff8aa05f Merge remote-tracking branch 'origin/3.5' into cura_connect_improvements 2018-09-20 10:18:00 +02:00
Lipu Fei
f912630d17
Merge pull request #4391 from Ultimaker/CURA-5095_collect_user_modified_settings 
Cura 5095 collect user modified settings
 2018-09-20 10:13:27 +02:00
Ghostkeeper
f6b56a6506
Merge branch '3.5' 2018-09-19 17:16:14 +02:00
Simon Edwards
9d85f3ece6 Use the same string as the web front-end 
CL-897
 2018-09-19 17:02:46 +02:00
Simon Edwards
b7673a7438 Show Cura Connect alerts in the monitor tab 
CL-897
 2018-09-19 16:53:18 +02:00
Ian Paschal
7ad6fc4cad
Merge pull request #4385 from Ultimaker/monitor_confirmation_dialogues 
Add confirmation dialogues before making destructive changes in UM3/S5 monitor
 2018-09-19 13:14:39 +02:00
Ghostkeeper
28f743c9f4
Merge branch '3.5' 2018-09-18 17:30:08 +02:00
Ghostkeeper
44d828d137
Merge branch 'CURA-5725_simulation_stop_key_press' into 3.5 2018-09-18 17:29:35 +02:00
Diego Prado Gesto
ed9b0dd41b Add a missing bracket back. 
Contributes to CURA-5725.
 2018-09-18 17:25:35 +02:00