3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-06 21:44:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10
16108 commits 313 branches 275 tags 718 MiB
Commit graph

16108 commits

This branch
This branch
All branches
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
Lipu Fei
18821b6527 Add missing extruder def for Creality Ender 3 
CURA-5806
 2018-10-09 11:43:42 +02:00
Jaime van Kessel
937c2dfa8c Merge branch 'WIP_kill_extruder_manager' of github.com:Ultimaker/Cura 2018-10-09 11:05:21 +02:00
Jaime van Kessel
d1a51b26f7 Simplified QML expression 2018-10-08 17:22:04 +02:00
Jaime van Kessel
5f6b267c77 Merge branch 'fix_credits' of https://github.com/fieldOfView/Cura 2018-10-08 17:07:05 +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
Jaime van Kessel
d24437e60c
Merge pull request #4520 from Ultimaker/CURA-5793_fix_setting_value_templates 
[3.5] CURA-5793 fix setting value templates
 2018-10-08 16:04:51 +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
fieldOfView
94164c5865 Add Charon, Shapely, Trimesh and NetworkX to credits 2018-10-05 15:29:52 +02:00
Lipu Fei
88c19aa11d
Merge pull request #4478 from Ultimaker/CURA-5775_fix_crash_on_save_to_3mf 
[CURA-5775] Fix crash on save to 3MF
 2018-10-05 12:08:21 +02:00
Diego Prado Gesto
fc7c3390be Merge branch 'master' into CURA-5768_layer_view_skip_empty_layers 2018-10-05 10:52:23 +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
Diego Prado Gesto
6abd43f690 Add Polish to the list of available languages. Forgotten by mistake. 2018-10-04 17:37:28 +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
Aleksei S
436860f841 Don't show prime tower shadow if only one extruder is enabled 
CURA-5740
 2018-10-04 11:36:02 +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
Diego Prado Gesto
4ca63f84b8 Add missing quote. 
Contributes to CURA-5741.
 2018-10-03 16:57:26 +02:00
Lipu Fei
7d7de32dbd Add ExtruderStack to GlobalStack in single extrusion machine fix 2018-10-03 16:53:07 +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
18cb21186c Merge remote-tracking branch 'origin/master' into WIP_kill_extruder_manager 2018-10-03 15:45:18 +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
alekseisasin
5cd4d741c9
Merge pull request #4267 from smartavionics/mb-extruder-cooling-fan-number 
Add machine_extruder_cooling_fan_number setting to specify print cooling fan for each extruder.
 2018-10-03 15:17:02 +02:00
Jaime van Kessel
f3fdb46dba Add missing types 2018-10-03 13:33:30 +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
Lipu Fei
c3e7e426ff Fix getDefaultVariantNode for UM2 
CURA-5790

UM2 has optional variant which depends on whether Olsson Block is
enabled. getDefaultVariantNode() should take that into account.
 2018-10-03 11:24:27 +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
Aleksei S
0edcd316d3 Merge branch 'master' of github.com:Ultimaker/Cura 2018-10-03 10:33:06 +02:00
Aleksei S
51e7b6c388 Change font style for active material in preferences 
CURA-5747
 2018-10-03 10:30:48 +02:00
Diego Prado Gesto
c0c66649b8 Merge branch '3.5' 2018-10-02 20:27:18 +02:00
Diego Prado Gesto
46e0a39c15 Merge branch 'Patola-3.5' into 3.5 2018-10-02 17:48:56 +02:00
Diego Prado Gesto
afccd38a5d Add preposition to be consistent with other strings. 
Contributes to CURA-5741.
 2018-10-02 17:48:25 +02:00
Diego Prado Gesto
04c72c0875 Merge branch '3.5' of git://github.com/Patola/Cura into Patola-3.5 2018-10-02 17:26:14 +02:00
Diego Prado Gesto
a99241d20b Add missing quote. 
Contributes to CURA-5741.
 2018-10-02 15:53:06 +02:00
Diego Prado Gesto
19b76d0c27 Merge branch '3.5' of github.com:Ultimaker/Cura into 3.5 2018-10-02 15:45:25 +02:00