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

20317 commits

This branch
This branch
All branches
Author SHA1 Message Date
ChrisTerBeke
4b71b45aa3 Fix for initial connection 2019-07-29 21:27:28 +02:00
ChrisTerBeke
8360b5b448 Simply manual device checking 2019-07-29 19:48:57 +02:00
ChrisTerBeke
5b206496d0 Formatting new line 2019-07-29 17:41:27 +02:00
ChrisTerBeke
67045b34b5 Add some more explanation 2019-07-29 17:39:27 +02:00
ChrisTerBeke
6d9b6668e2 Add TODO 2019-07-29 17:38:07 +02:00
ChrisTerBeke
14808c5de1 Don't cache application instance 2019-07-29 17:34:31 +02:00
ChrisTerBeke
93146610f7 Fix local pause, resume and abort 2019-07-29 17:31:05 +02:00
ChrisTerBeke
1aa70748af Consistent naming, some bug fixes 2019-07-29 17:24:10 +02:00
ChrisTerBeke
ddd282eef3 Remove absolute plugin imports, some fixes 2019-07-29 16:11:01 +02:00
ChrisTerBeke
7d69b1727d Simplify code 2019-07-29 14:56:21 +02:00
ChrisTerBeke
4b212d6c05 Merge more stuff, re-use models for local networking as well 2019-07-29 14:53:50 +02:00
ChrisTerBeke
8f37c83b9c Merge branch 'master' into CS-234_network_plugin_code_quality 2019-07-29 08:47:13 +02:00
Ghostkeeper
7883cf1807
Remove start_layers_at_same_position from user profiles 
There shouldn't be any since the setting was invisible, but just to be sure.
 2019-07-26 17:28:44 +02:00
Ghostkeeper
ce01f960b5
Remove references to start_layers_at_same_position 2019-07-26 17:26:40 +02:00
Ghostkeeper
aeabddb54a
Remove start_layers_at_same_position setting 
This setting is no longer configurable since we now slice multi-threadedly.
 2019-07-26 17:25:21 +02:00
ChrisTerBeke
4268c011a7 Start inheriting both output devices from a base device 2019-07-26 17:05:39 +02:00
Ghostkeeper
de7bf3da02
Merge branch '4.2' 2019-07-26 15:55:27 +02:00
Ghostkeeper
b1cbaaef72
Fix warning message appearing for plural forms 
There is no msgstr then so it thinks it's empty.

Contributes to issue CURA-6663.
 2019-07-26 15:53:42 +02:00
Ghostkeeper
79d57ec10a
Fix comparisons when source is single-line but dest is multi-line 
Or vice-versa. It's now agnostic to number of lines.

Contributes to issue CURA-6663.
 2019-07-26 15:43:19 +02:00
ChrisTerBeke
bd4f0c4e25 Extract API calls to separate class 2019-07-26 15:34:37 +02:00
Ghostkeeper
9e059b7a1a
Fix writing files with plural forms 
Contributes to issue CURA-6663.
 2019-07-26 15:31:42 +02:00
ChrisTerBeke
fb434ec81a Remove unneeded import 2019-07-26 15:08:49 +02:00
ChrisTerBeke
3c1b377308 Restructure codebase - part 1 2019-07-26 15:07:52 +02:00
Ghostkeeper
23826d3404
Write resulting file 
It seems to fail now for plurals. I didn't think of that yet.

Contributes to issue CURA-6663.
 2019-07-26 15:07:26 +02:00
Ghostkeeper
58c32f97a1
Add documentation 
Contributes to issue CURA-6663.
 2019-07-26 14:23:04 +02:00
Ghostkeeper
a3611404d6
Find translations in source file 
So it can add the translations to the destination file.

Contributes to issue CURA-6663.
 2019-07-26 14:20:06 +02:00
Ghostkeeper
3f7bd2ac23
Handle iterating over source files and finding correct destination file 
Contributes to issue CURA-6663.
 2019-07-26 13:48:10 +02:00
Ghostkeeper
5a03ace239
Also discover Uranium translation directory 
Contributes to issue CURA-6663.
 2019-07-26 13:18:47 +02:00
Ghostkeeper
d1c4b63971
Add empty script to perform imports from Lionbridge 
I want to automate this or it'll be a lot of work.

Contributes to issue CURA-6663.
 2019-07-26 13:18:47 +02:00
Jaime van Kessel
e0c2611a0a Merge branch '4.2' of github.com:Ultimaker/Cura 2019-07-26 12:47:13 +02:00
Jaime van Kessel
55af42bb46 Merge branch '4.2' of github.com:Ultimaker/Cura into 4.2 2019-07-26 11:38:08 +02:00
Ghostkeeper
9185022295
Merge branch 'master' of https://github.com/eMotion-Tech/Cura into eMotion-Tech-master 2019-07-26 11:16:18 +02:00
Ellecross
b30dbdd9ed Updated change_log for 4.2 (contributed by Matt) [CURA-6677] 
Updated with the release notes from Matt
 2019-07-26 11:08:41 +02:00
Jaime van Kessel
a3dad0fa09 Fix issue with deprecation and pyqtSlot 2019-07-26 10:55:55 +02:00
KOUBeMT
485845acdd Add_preferred_material_to_definition 2019-07-26 10:42:03 +02:00
KOUBeMT
25de7fc037 Add_preferred_material 2019-07-26 10:38:14 +02:00
Ghostkeeper
67167ca250
Increment version number to Cura 4.2 
Contributes to issue CURA-6663.
 2019-07-25 16:39:35 +02:00
Zhang Heh Ji
8c04d85bde
Add translated strings for Cura 4.2 
These are the translations made by Zhang. Thank you Zhang!
 2019-07-25 16:36:44 +02:00
ChrisTerBeke
87517a77c2
Merge pull request #6057 from Ultimaker/network-plugin-remove-hardcoded-references 
Get rid of any hard-coded references to machines
 2019-07-25 16:02:29 +02:00
Lipu Fei
2054f507a4
Merge pull request #6046 from Ultimaker/add_42_43_version_upgrader 
Add 42 - 43 version upgrader
 2019-07-25 15:46:06 +02:00
Ghostkeeper
d353776fe8
Fix showing extruder names in USB printing monitor 
It was using a deprecated function. Apparently deprectated pyqtSlots don't work because it breaks the PyQt binding for some reason. That has to be fixed. But for now I'll make this use the non-deprecated function.
 2019-07-25 15:17:13 +02:00
ChrisTerBeke
96cf235d8c Get rid of any hardcoded references to machines 2019-07-25 14:56:46 +02:00
Lipu Fei
9f18ceda51 Merge remote-tracking branch 'origin/master' into add_42_43_version_upgrader 2019-07-25 14:56:27 +02:00
Jaime van Kessel
8311a39f08 Fix case where an error in the stack would not prevent slicing 
CURA-6680
 2019-07-25 09:42:00 +02:00
Mark Burton
cfea12ab25 Fix dimensions of print job information popup when using Qt 5.13. 
Remains compatible with Qt 5.10.
 2019-07-24 20:35:39 +01:00
Jaime van Kessel
004297b936
Merge pull request #6028 from sgtnoodle/stretch_retract 
Preserve extruder-only moves in post stretch script
 2019-07-24 17:05:41 +02:00
Ghostkeeper
18d1148c78
Don't reset selected material upon container changed 
The onActiveMaterialChanged signal is triggered upon loading a material for the first time. This is hard to fix without breaking stuff, so we will revert this part.

This re-introduces a bug where if you change a material diameter such that the material disappears from the list, it is still selected and you can change its properties in the details panel.

Contributes to issue CURA-6679.
 2019-07-24 17:01:37 +02:00
Ghostkeeper
be4e754984
Remove cache of material manager 
It doesn't make the code much simpler because the cache is also not a local variable.

Contributes to issue CURA-6679.
 2019-07-24 16:04:40 +02:00
Lipu Fei
73b7bc3172 Remove verobse flags for pytest 2019-07-24 11:38:10 +02:00
Lipu Fei
80bf8c22ee Merge remote-tracking branch 'origin/4.2' 2019-07-24 10:56:48 +02:00