3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-18 04:07:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 7
25122 commits 305 branches 270 tags 779 MiB
Commit graph

25122 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ghostkeeper
8714ff9edb
Add more explanations for HWID being None 2020-07-21 17:32:59 +02:00
Jaime van Kessel
2e32ac8465
Merge branch 'master' of github.com:Ultimaker/Cura 2020-07-21 10:47:03 +02:00
Jaime van Kessel
f591fa79bf
Move all tree support settings to support category 
CURA-6425
 2020-07-21 10:46:30 +02:00
Ghostkeeper
c7b960edfa
Don't send -1 as profile count 
The server gives an error about this and we got complaints about it. As far as we know this can only happen when users mess with their profile folders. Still, it's good to not send -1. The original implementation of this is indeed very naive, but we don't have the resources to refactor that now.
 2020-07-21 10:42:24 +02:00
Jaime van Kessel
f948b7c4fc
Add bit more logging around MachineNode loading 2020-07-20 16:03:06 +02:00
Jaime van Kessel
527e5775a7
Also set clipping for string 2020-07-20 15:25:55 +02:00
Jaime van Kessel
1d1f10f853
Merge branch 'master' of github.com:Ultimaker/Cura 2020-07-20 15:25:37 +02:00
Jaime van Kessel
4bb9cf29d0
Merge branch 'CURA-6980_tower_brim_disallowed_areas' of github.com:Ultimaker/Cura 2020-07-20 15:08:38 +02:00
Ghostkeeper
db15bc84cf
Correct and consistent spelling of g-code 
This spelling is in Ultimaker's style guide.
We use g-code, and capitalise the G if it's at the start of a sentence or header.
Pretty good score, considering there are literally thousands of user- or log-visible strings mentioning g-code across Cura.
 2020-07-20 13:36:49 +02:00
Ghostkeeper
e6c305de40
Merge branch 'master' of github.com:Ultimaker/Cura 2020-07-20 13:27:41 +02:00
Ghostkeeper
a84598a8c9
Remove default value for g-code before pause 
It's best to just leave it as is. Not everyone appreciates bleeps.

Contributes to issue CURA-7599.
 2020-07-20 13:24:18 +02:00
Jaime van Kessel
6a1d7bc996
Merge branch 'CURA-6711_Fix_preferences_not_updating_in_project_files' of github.com:Ultimaker/Cura 2020-07-20 13:24:09 +02:00
Jaime van Kessel
1dae415a31
Merge branch 'master' of github.com:Ultimaker/Cura 2020-07-20 13:23:34 +02:00
Ghostkeeper
13ff186c8e
Correct spelling of 'g-code' 
This is the convention we're holding in this application.
 2020-07-20 13:23:24 +02:00
Ghostkeeper
ededb2a8d2
Merge branch 'master' of https://github.com/rodrigosclosa/Cura into rodrigosclosa-master 
Conflicts:
	plugins/PostProcessingPlugin/scripts/PauseAtHeight.py -> Merging other pausing scripts into this one
	plugins/PostProcessingPlugin/scripts/PauseAtHeightforRepetier.py -> Has been removed upstream
 2020-07-20 13:17:27 +02:00
Kostas Karmas
94d1e1d77b Fix preferences.cfg not being updated in project files 
Since the metadata/setting_version field was not written in project files from the 3MF writer,
the preferences were never really updated, because their preferences version was marked as 6000000
(basically omitting the setting_version). Now, if any project file is found without a metadata
setting_version tag, it will default to preference version 6000000 and thus it will start calling
the updatedPreferences() functions starting from VersionUpgrade34to35, properly updating the
preferences and adding the metadata/setting_version field in the preferences.cfg of the project
file.

CURA-6711
 2020-07-20 12:23:52 +02:00
Ghostkeeper
8c4533a2c3
Fix crash when port gets disconnected while iterating 
Fixes Sentry issue CURA-11T.
 2020-07-20 12:10:08 +02:00
Ghostkeeper
528c8e2226
Also store setting_version in preferences file for project files 
This allows the version upgrade system to update these preferences in order to display the correct list of visible settings.
 2020-07-20 11:48:29 +02:00
maht
f3103e5808
Update FileMenu.qml 2020-07-17 12:01:49 +02:00
maht
2cdec12a2e
Merge pull request #1 from mahtDFR/mahtDFR-Cura 
Update FileMenu.qml
 2020-07-17 11:31:27 +02:00
maht
1ce7f1838f
Update FileMenu.qml 2020-07-17 11:29:18 +02:00
maukcc
6514c9d11d HMS434 update 
materials exlusion
infill standard to 100%
 2020-07-17 10:29:18 +02:00
Nino van Hooff
59df16cbad Add support structure to advanced and expert visibility presets 
CURA-6711
 2020-07-17 09:56:20 +02:00
Nino van Hooff
242caca0de Move support structure (normal, tree) out of experimental 
CURA-6711
 2020-07-17 09:55:44 +02:00
Jaime van Kessel
0d4ed17ad3
Merge branch 'CURA-6711_support_structure_dropdown' of github.com:Ultimaker/Cura 2020-07-16 13:40:57 +02:00
Nino van Hooff
8464121001 Fix prime tower adhesion size 
CURA-6980
 2020-07-16 13:04:06 +02:00
Kostas Karmas
bacd68021f Merge branch 'master' of https://github.com/Ultimaker/Cura 2020-07-16 09:35:42 +02:00
Kostas Karmas
e9da3b7e9a Revert "Make all settingitems async" 
This reverts commit d1afc63902.
It creates a problem in Windows where settings with dropdown menus
do no load anymore.
 2020-07-16 09:34:36 +02:00
Nino van Hooff
18cdce6ef0 Add support_structure to custom visible settings if support_tree_enable 
is in that list

CURA-6711
 2020-07-15 16:08:18 +02:00
Nino van Hooff
bc51db321f Merge branch 'master' into CURA-6711_support_structure_dropdown 2020-07-15 11:57:34 +02:00
Nino van Hooff
ad5eff4bc1
Merge pull request #8045 from Ultimaker/CURA-6684_Ignore_extra_skin_wall_count_in_concentric 
CURA-6684: Hide Extra Skin Wall Count in concentric
 2020-07-14 15:41:02 +02:00
Ghostkeeper
5bc6f5510f
Merge branch 'patch-2' of https://github.com/Sophist-UK/Cura into Sophist-UK-patch-2 2020-07-14 13:48:17 +02:00
Nino van Hooff
617b07061d Take support_enable into account when evaluating support_structure. 
Unsure whether this is necessary, but we decided to do this to make
the evaluation logically equivalent to the existing code currently
in master.

CURA-6711
 2020-07-14 09:44:40 +02:00
nani
8de7fd3ed5 just 220 2020-07-14 02:05:27 +05:30
nani
e87794fa66 k 2020-07-14 02:00:19 +05:30
nani
38f47e1092 test 2020-07-14 01:54:02 +05:30
nani
4fae4748fb only dual mode definition 2020-07-14 01:47:49 +05:30
nani
f3cd96d64d bed 2020-07-14 01:38:09 +05:30
nani
762d0c9c90 Definitions for Arjun300 2020-07-14 01:08:21 +05:30
nani
cd2650b1c6 Settings version 2020-07-14 00:57:52 +05:30
nani
8f2dc6266e Added Definitions for SVT FDM printer 2020-07-14 00:44:31 +05:30
nani
2ddaf5d7ca Revert "Added Definitions for all SVT FDM printers" 
This reverts commit adc78e3024.
 2020-07-14 00:42:02 +05:30
nani
adc78e3024 Added Definitions for all SVT FDM printers 
New brand
 2020-07-13 23:56:23 +05:30
maht
da265fccb6
Updated change_log.txt for 4.6.2 2020-07-13 16:45:04 +02:00
Nino van Hooff
3ceb9da27c Merge remote-tracking branch 'origin/master' 2020-07-13 16:42:11 +02:00
maht
bbcd37e5bc
Updated change_log.txt for 4.6.2 2020-07-13 16:42:00 +02:00
Nino van Hooff
bc34c8dd0b Version upgrade support_tree_enable -> support_structure 
CURA-6711
 2020-07-13 15:51:14 +02:00
Jaime van Kessel
ce53e56967
Merge branch 'master' of github.com:Ultimaker/Cura 2020-07-13 14:12:30 +02:00
Jaime van Kessel
efe261c040
Add resolve for bridge_settings_enabled 
CURA-7247
 2020-07-13 14:12:03 +02:00
Nino van Hooff
ac2ef48d46 Merge remote-tracking branch 'origin/master' 2020-07-13 14:05:01 +02:00