GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-02 12:55:32 +08:00
Code Issues Packages Projects Releases Wiki Activity
16,109 Commits 295 Branches 267 Tags
Commit Graph

4680 Commits

Author SHA1 Message Date
Lipu Fei
1951391a23 Merge remote-tracking branch 'origin/3.5' 2018-10-09 12:04:53 +02:00
alekseisasin
0b70b9a218
Merge pull request #4521 from Ultimaker/CURA-5799_fix_extruder_settings_to_curaengine 
[3.5] CURA-5799 Fix sending extruder settings to curaengine
 2018-10-09 11:53:46 +02:00
Jaime van Kessel
d98eafe041 Merge branch '3.5' of github.com:Ultimaker/Cura 2018-10-08 17:03:25 +02:00
Jaime van Kessel
9e5b72c5b6 Merge branch 'fix_unnecessary_imports' of https://github.com/fieldOfView/Cura 2018-10-08 16:41:29 +02:00
Lipu Fei
5ba60de209 Send extruder settings ordered by extruder position 
CURA-5799
 2018-10-08 16:01:51 +02:00
Ghostkeeper
314b966cc9
Improvements to translated strings 
These strings were recently found to have been confusing to the translators. Improvements are:
- Pulling the (untranslated) error message out of the message sentence. We really want the error message to be at the end so we'll force the translators to translate it as a prefix.
- Remove extra spaces at the end.
- Remove Python logic from within the i18nc call, since gettext doesn't understand that.

Contributes to issue CURA-5741.
 2018-10-08 15:03:21 +02:00
Lipu Fei
3965218501 Fix value templating for gcode 
CURA-5793

Fix GcodeStartEndFormatter to take the correct default_extruder_nr
instead of always using -1.
 2018-10-08 14:42:22 +02:00
alekseisasin
c947e4f432
Merge pull request #4485 from Ultimaker/CURA-5768_layer_view_skip_empty_layers 
Don't skip empty first layers in the layer view
 2018-10-08 11:56:35 +02:00
Diego Prado Gesto
866110d70c Take into account that can be empty layers below the model when the 
setting Remove empty layers is disabled.

The empty layers are skipped if they are at the bottom. Also keeps the
models printed with raft showing correclty.

Contributes to CURA-5768.
 2018-10-04 18:03:01 +02:00
Remco Burema
110d2daa81 [CURA-5775] The snaphot-creation of the UFP-writer should only be called when writing to UFP-files. 2018-10-04 15:54:22 +02:00
fieldOfView
9ac744b9ba Remove unnecessary import and declaration of i18n in plugins 2018-10-03 22:00:24 +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 959f698b038a189238c59eff69035a446382d74a.
 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 254106bb264699174a8edcfc20e50e22c455ef32.
 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
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
Diego Prado Gesto
c0c66649b8 Merge branch '3.5' 2018-10-02 20:27:18 +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
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
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
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
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
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
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