Ghostkeeper
f6dd3f922d
Merge branch 'shorter_ops_logs'
2019-03-26 15:34:26 +01:00
Ghostkeeper
ea48e6ded1
Merge branch 'master' of ssh://github.com/Ultimaker/Cura
2019-03-26 15:13:00 +01:00
Ghostkeeper
377c7f1438
Merge branch 'patch-4' of https://github.com/thopiekar/Cura into thopiekar-patch-4
2019-03-26 15:00:31 +01:00
Simon Edwards
eed810af35
Merge pull request #5479 from Ultimaker/CL-1287_improved_cloud_pop_up
...
CL-1287 Improved Cloud pop-up
2019-03-26 12:17:35 +01:00
Ghostkeeper
07ea8221c1
Merge branch 'thopiekar-patch-1'
2019-03-26 10:42:58 +01:00
Ghostkeeper
ff99c4e45f
Don't include group nodes in AABB
...
In fact, don't include any node that would just have a position rather than actual data.
The rest of the code is robust anyway against there being no AABB.
Contributes to issue CURA-6416.
2019-03-26 10:00:10 +01:00
Ghostkeeper
f3d75fa1ef
Merge branch 'lithophane_defaults' of https://github.com/BagelOrb/Cura into BagelOrb-lithophane_defaults
2019-03-26 09:33:10 +01:00
Satish
85a7d814d8
Added id to machine selector for integration tests
2019-03-25 14:34:00 +01:00
Diego Prado Gesto
7958f99152
Update the list of check urls for UM3 Extended
2019-03-25 11:59:28 +01:00
Thomas Karl Pietrowski
8b0e1e9f5d
PrintSetupSelector: "G code" -> "G-code"
...
Noticed that "g-code" is written at some places with and without a hyphen.
Since it think it should be written with, I'm correcting it at this point.
2019-03-22 19:42:01 +01:00
Diego Prado Gesto
ac5428a2e4
Merge branch 'master' of github.com:Ultimaker/Cura
2019-03-22 18:03:32 +01:00
Diego Prado Gesto
74ffee7810
Fix typo in a previous commit
2019-03-22 18:03:01 +01:00
Ian Paschal
fc650865d6
Improved cloud pop-up
...
Contributes to CL-1287
2019-03-22 15:24:12 +01:00
Remco Burema
794d13969a
Shorter log messages for operations.
2019-03-22 12:06:04 +01:00
Tim Kuipers
32d79451cc
fix color inversion and make variable naming descriptive
2019-03-22 11:42:31 +01:00
Tim Kuipers
bdf102ea64
make description of color invert explanatory, rather than purely descriptive.
2019-03-22 11:30:58 +01:00
Tim Kuipers
709321fc0c
Change image import options for standard lithophanes
2019-03-22 11:22:30 +01:00
Jaime van Kessel
9a5b7e7925
Set min value for adaptive_layer_height_variation_step
...
This is to prevent using 0, since that crashes the engine
2019-03-22 10:44:47 +01:00
Ghostkeeper
294b61937a
Re-enable Polish
2019-03-21 21:14:11 +01:00
Diego Prado Gesto
6611ab7d17
Merge branch 'master' of github.com:Ultimaker/Cura
2019-03-21 16:10:09 +01:00
Diego Prado Gesto
6ad6115327
Modify the firmware checker url to use the new file location
2019-03-21 16:07:26 +01:00
Ghostkeeper
20a4d89847
Merge branch 'drzejkopf-patch-5'
2019-03-21 14:43:37 +01:00
Ghostkeeper
07010c7cec
Merge branch 'patch-5' of https://github.com/drzejkopf/Cura into drzejkopf-patch-5
2019-03-21 14:42:09 +01:00
Jaime van Kessel
a5ce34f548
Merge branch 'master' of github.com:Ultimaker/Cura
2019-03-21 14:32:59 +01:00
Jaime van Kessel
620cd9c45d
Change the comment of the UFP mimetype to the correct description
2019-03-21 14:32:27 +01:00
Diego Prado Gesto
0eb295be16
Add the new TPU 1.75mm filament to the list of excluded materials for some printers
...
Contributes to CURA-6121.
2019-03-21 14:29:23 +01:00
Jaime van Kessel
3f02ad7619
Merge branch 'feature_ufp_reader' of github.com:Ultimaker/Cura
2019-03-21 14:27:51 +01:00
Diego Prado Gesto
fceffce56e
Show the slider in the middle when there is only one quality profile available.
...
Contributes to CURA-6121.
2019-03-21 14:18:07 +01:00
Diego Prado Gesto
a58c3997d4
Merge branch '4.0'
2019-03-21 09:36:52 +01:00
Diego Prado Gesto
59b3046c0f
Remove duplicate shortcut in Polish
...
Contributes to CURA-6257.
2019-03-21 09:35:51 +01:00
drzejkopf
f03e5c28d7
Update creality_ender3.def.json
2019-03-20 16:00:40 +01:00
Ghostkeeper
74bfd52c36
Fix default layer height
...
The 0.1mm profile doesn't overwrite it. Maybe it should to prevent this mistake in the future?
Contributes to issue CURA-6391.
2019-03-20 09:21:42 +01:00
Ghostkeeper
35fcdf3978
Merge branch '4.0'
2019-03-20 09:12:39 +01:00
drzejkopf
36a395ee91
Update creality_ender3.def.json
...
Changed override of "default_value" to "value" of acceleration_travel and jerk_travel to make slicer keep those values, as they were overrided by conditional in fdmprinter.def.json, and also removed layer height as it does nothing because it's overriden by preffered quality (draft) settings
2019-03-19 22:51:50 +01:00
Diego Prado Gesto
00e22d6c11
Remove short description of bug fixes in the changelog
...
In order to keep consistency with previous entries, the bug fixes only show the full description but not a short description.
Contributes to CURA-6386.
2019-03-19 10:54:01 +01:00
Diego Prado Gesto
a083590121
Add change log for 4.0
...
Contributes to CURA-6386.
2019-03-19 10:29:13 +01:00
pinchies
6ebc08420a
Add profile for JGAurora JGMaker Magic ( #5430 )
...
Add a basic profile for JGAurora JGMaker Magic
2019-03-18 16:42:43 +01:00
Jaime van Kessel
02f4cf8c46
Merge pull request #5179 from nbennett1978/master
...
integration of printer profiles for ALYA 3DP and ALYA NX 3DP
2019-03-18 16:39:39 +01:00
Jaime van Kessel
72a0d8b739
Merge pull request #5436 from NicolasNSSM/patch-1
...
Fix Alfawise U30 to get more realistic print times
2019-03-18 16:37:07 +01:00
Ghostkeeper
731cbc9e95
Make 'All jobs are printed.' translatable
2019-03-18 15:16:50 +01:00
Ghostkeeper
cb44223eca
Consistent capitalisation
2019-03-18 15:16:49 +01:00
Jaime van Kessel
c1ed8ba9d0
Merge branch '4.0' of github.com:Ultimaker/Cura
2019-03-18 14:56:49 +01:00
Jaime van Kessel
61e031bf1a
Fix format for two of the translated messages.
...
The format needs to be done on the result of whatever the translate spits out instead of
the string that is passed to the translate.
2019-03-18 13:45:31 +01:00
Ghostkeeper
9176240798
Fix replacement keys
...
Translators translated '%1' to '1%' apparently.
Contributes to issue CURA-6257.
2019-03-18 13:45:05 +01:00
Ghostkeeper
f09f267962
Merge branch '4.0'
2019-03-18 11:52:57 +01:00
Ghostkeeper
8336a3977e
Merge branch 'update_translations_4.0' into 4.0
2019-03-18 11:52:38 +01:00
Ghostkeeper
53f826c5a5
Merge branch '4.0'
2019-03-18 11:28:29 +01:00
Ghostkeeper
87c3fec9ec
Correct interpunction for consistency with English version
...
Contributes to issue CURA-6257.
2019-03-18 11:28:18 +01:00
Ghostkeeper
c79ffab9fb
Merge branch '4.0'
2019-03-18 11:24:23 +01:00
Ghostkeeper
12b58feb51
Minor corrections to Brazilian translations
...
Contributes to issue CURA-6257.
2019-03-18 11:24:08 +01:00
