Lipu Fei
dd5c6c892c
chmod 644 for def.json files
2019-12-17 10:35:23 +01:00
Lipu Fei
3ddc2466f8
Fix typing
2019-12-17 10:27:05 +01:00
Dimitriovski
d958e74467
Use the new name of the function from Uranium's PackageManager
...
CURA-6979
2019-12-16 15:57:49 +01:00
Dimitriovski
46d3a73e7e
Some more refactoring
...
CURA-6979
2019-12-16 15:52:00 +01:00
Dimitriovski
3c2da64c94
Some refactoring done after code review
...
CURA-6979
2019-12-16 15:39:21 +01:00
ninovanhooff
ed838baafa
Merge pull request #6577 from Ultimaker/litho_alpha
...
make lithophane alpha channel control total final width multiplier.
2019-12-16 14:21:15 +01:00
Mark Burton
678ba61bca
Add brim gap setting ( #6279 )
...
Added brim_gap setting to space brim away from edge of model.
2019-12-16 13:55:08 +01:00
Tim Kuipers
a7e4d76d05
make lithophane alpha channel control total final width multiplier.
...
That way the picture is not always square. We can use the alpha channel to encode the actual shape
2019-12-16 13:31:11 +01:00
Ghostkeeper
1dc39dba71
Move prime speed override to definition file
...
To reduce the number of overrides. You'd only need to change it in one place, next time. It was being overridden in the quality profile in every supported configuration.
2019-12-16 13:15:40 +01:00
Ghostkeeper
d85dcf0d8f
Also set a limit to retraction prime speed for original Jellybox
2019-12-16 13:15:40 +01:00
Ghostkeeper
a9849be1b2
Code style: Space around binary operators
2019-12-16 13:15:40 +01:00
Ghostkeeper
eb54a62eca
Add minima for retraction prime speed
...
Otherwise the automated inheritance function makes it negative sometimes.
Contributes to issue #6806 .
2019-12-16 13:15:39 +01:00
Jaime van Kessel
4de28bed28
Merge branch 'master' of github.com:Ultimaker/Cura into sentry_crash_integration
2019-12-16 11:28:04 +01:00
Jaime van Kessel
c15599f1c4
Add some extra info to crash handler screen
2019-12-16 11:23:12 +01:00
Lipu Fei
8b9e5c5154
Merge pull request #6594 from fieldOfView/fix_jobname_editing
...
Make jobname less sensitive to being touched
2019-12-16 11:20:36 +01:00
Jaime van Kessel
ffccca257f
Add some documentation to SentryLogger
2019-12-16 11:15:25 +01:00
Jaime van Kessel
62ea766880
Rename <censored_path> to <user_home>
2019-12-16 11:12:19 +01:00
Jaime van Kessel
7c9d7a3aef
Clean up the _translateLogType
...
This makes it a bit easier to read
2019-12-16 11:11:28 +01:00
Jaime van Kessel
8fa6239365
Fix spelling mistake
2019-12-16 11:08:09 +01:00
Jaime van Kessel
157a25a992
Fix minor codestyle issues
2019-12-16 11:06:48 +01:00
Dimitriovski
ebc0813603
Refactored 'installed_plugins' to 'installed_packages' for brevity
...
CURA-6979
2019-12-16 10:53:56 +01:00
Lipu Fei
20971cecc9
Merge branch 'master' into master
2019-12-16 10:47:29 +01:00
Dimitriovski
1f5df8fe79
Restore wrongly deleted code
...
CURA-6979
2019-12-16 10:43:55 +01:00
Lipu Fei
dd9395792f
Merge branch 'master' into fix_jobname_editing
2019-12-16 10:40:03 +01:00
ninovanhooff
51de4173e7
Merge pull request #6802 from Ultimaker/CURA-6127_settings_lost_when_sync_to_diff_printer_type
...
Cura 6127 settings lost when sync to diff printer type
2019-12-16 09:57:13 +01:00
Dimitriovski
dae626375d
Merge branch 'master' of github.com:Ultimaker/Cura into CURA-6979
2019-12-16 09:54:58 +01:00
Dimitriovski
b048c27238
Added check for discrepancies between Cloud subscribed packages and Cura installed packages
...
CURA-69679
2019-12-16 09:54:49 +01:00
ninovanhooff
f77832315a
Merge branch 'master' into CURA-6127_settings_lost_when_sync_to_diff_printer_type
2019-12-16 09:48:32 +01:00
Remco Burema
76401d78a9
Sentry: Add locale (both cura and os) to tags.
2019-12-13 16:53:17 +01:00
Jaime van Kessel
6a36a71c2c
Prune user paths from the sentry logs
2019-12-13 16:25:58 +01:00
Jaime van Kessel
93ee111566
Add missing typing
2019-12-13 15:20:43 +01:00
Kostas Karmas
409dc98299
Keep global settings on sync to diff printer type
...
In addition to the per-extruder user changes, copy the global user
changes to the new_machine.
CURA-6127
2019-12-13 15:00:22 +01:00
Jaime van Kessel
9d62a281f7
Remove unused imports
2019-12-13 14:56:02 +01:00
Remco Burema
44e7cb7108
Replace deprecated code.
2019-12-13 13:52:24 +01:00
ninovanhooff
e2e9d2a307
Merge pull request #6787 from Ultimaker/CURA-7011_enterprise_visual_cues
...
CURA-7011_enterprise_visual_cues
2019-12-13 11:53:28 +01:00
ninovanhooff
a6946fa3d9
Merge branch 'master' into CURA-7011_enterprise_visual_cues
2019-12-13 11:44:34 +01:00
Kostas Karmas
2b6b7a1f81
Fix lost settings on sync to diff printer type
...
When syncing to a different printer type only the global user changes
where kept, while the per-extruder user changes were not copied at all,
since the extruder list is empty before the new machine becomes active.
This commit fixes this problem by keeping a copy of the per-extruder
user changes before the new machine (of different type) is activated.
The copied user changes are then transfered to the new global stack
after the new machine is set as active.
CURA-6127
2019-12-13 11:30:34 +01:00
Ghostkeeper
5ea60823f5
Don't crash if address is still none after getting info
...
This can happen (starting somewhere between zeroconf version 21.0 and 24.0).
Contributes to issue CURA-7032.
2019-12-13 10:54:27 +01:00
Ghostkeeper
e54ce8643b
Don't wrap str unnecessarily
...
Just an inefficiency that I found.
2019-12-13 10:44:48 +01:00
Benoit Miller
9b583be6ef
Upgrade metadata version numbers to match master
2019-12-12 17:05:35 -05:00
Benoit Miller
44ffa97ade
Fixed issues raised in #6666
2019-12-12 17:04:01 -05:00
Benoit Miller
9700b9986b
Merge branch 'voron2-support' of https://github.com/Fulg/Cura into voron2-support
2019-12-12 16:41:07 -05:00
Benoit Miller
9259cea2dc
Merge branch 'master' of https://github.com/Ultimaker/Cura into voron2-support
2019-12-12 16:40:35 -05:00
Remco Burema
ef4ee5d6b6
Merge pull request #5335 from Hrybmo/master-1
...
PostProcessingPlugin Script for 2-1 Dual Extruders - ColorMix 2-1
2019-12-12 17:14:59 +01:00
Remco Burema
002aaacf0e
Merge branch 'master' into master-1
2019-12-12 17:10:24 +01:00
Remco Burema
4d8c19ccc8
Always add Enterprise to name if Enterprise version.
...
part of CURA-7011
2019-12-12 14:37:18 +01:00
Remco Burema
7f1b1384e6
Merge pull request #6798 from Ultimaker/CURA-7012_manage_materials_third_party_printers
...
[CURA-7012] Fix duplicated materials don't show for 3rd-party printers
2019-12-12 14:11:51 +01:00
Remco Burema
8cc054cecc
Add missing 'material break preparation temperature'.
...
part of CURA-6971
(cherry picked from commit 25f0460231fd970b73744fb3fe1c004dc68a5dc9)
2019-12-12 14:09:46 +01:00
Remco Burema
382d177a3b
Merge branch 'master' into CURA-7012_manage_materials_third_party_printers
2019-12-12 14:06:39 +01:00
Lipu Fei
e1e65b43b3
Remove gitlab-ci.yml
2019-12-12 14:06:23 +01:00
