GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-13 12:28:02 +08:00
Code Issues Packages Projects Releases Wiki Activity
26,181 Commits 290 Branches 260 Tags
Commit Graph

26181 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ghostkeeper
9f3aef02a2
Give min_bead_width a default_value 
According to our specification, every setting needs to have a default_value.

As is, this setting prevents you from using the command line debug mode.
 2021-08-27 12:10:01 +02:00
Konstantinos Karmas
ef1d1dda5b Fix skipping the 48to49 upgrade in arachne 
Currently:
* 48to49 upgrades the machine stacks from 4000016 to 50000**16**
* 49to50 upgrades the machine stacks from 4000016 to 50000**18**
As a result, the versionUpgrader in arachne skips the 48to49 because it sees that the 49to50 also increments the setting version.
This is now fixed by making sure that the 49to50 upgrades from **5**000016 to 5000018.

CURA-8468
 2021-08-18 09:47:06 +02:00
Jelle Spijker
7f79ccdf33
Merge pull request #10261 from Ultimaker/CURA-8468_fix_project_loading 
Fix project loading Arachne
 2021-08-13 09:27:28 +02:00
Jelle Spijker
4986861727
Merge branch 'master' into libArachne_rebased 2021-08-12 18:50:29 +02:00
Jaime van Kessel
44ba8e3d1f Merge branch '4.11' of github.com:Ultimaker/Cura 2021-08-12 15:49:41 +02:00
Jaime van Kessel
3dec4e228b Use leftpadding instead of binding anchors outside of siblings 2021-08-12 15:48:58 +02:00
Jaime van Kessel
4b324095ec Remove incorrect log 
There is absolutely no reason that needed to be logged, since it
happens on *every* boot. It was also not a place where an exception
even happend.
 2021-08-12 15:43:11 +02:00
Jaime van Kessel
1f523053d9 Add even more logging to authorization service 2021-08-12 15:35:14 +02:00
Jaime van Kessel
5bc6ed25da Merge branch '4.11' of github.com:Ultimaker/Cura 2021-08-12 15:28:12 +02:00
Jaime van Kessel
79ccccb1a1 Fix qml warning spam 2021-08-12 15:27:39 +02:00
Jaime van Kessel
7762def1ef Merge branch 'master' of https://github.com/heed818/Cura 2021-08-12 15:20:42 +02:00
Jaime van Kessel
9890d12c57
Merge pull request #10271 from Ultimaker/CURA-8459_middle_line_split_and_add_thresholds 
[CURA-8459] Differentiate even vs. uneven nr. of walls for add/split middle wall transitions.
 2021-08-12 13:47:21 +02:00
Jaime van Kessel
7eb0da9987 Merge branch '4.11' of github.com:Ultimaker/Cura 2021-08-12 11:18:11 +02:00
Jaime van Kessel
21a076aea4 Set type of engine crash message to Error 2021-08-12 11:17:38 +02:00
Jaime van Kessel
b60ae92d60 Merge branch '4.11' of github.com:Ultimaker/Cura 2021-08-12 11:15:38 +02:00
Jaime van Kessel
34905857ee
Merge pull request #10267 from Ultimaker/CURA-8473_backwards_compat_messages_411 
Digital Library plugin needs to be backwards compatible.
 2021-08-12 11:15:01 +02:00
Remco Burema
3061490675
Fix look for string in enum-type. 
CURA-8473
 2021-08-12 10:05:16 +02:00
Konstantinos Karmas
f5bf88e546 Fix crashing when clicking the "Manage in browser" 
The parenthesis should be placed at the end.
 2021-08-12 09:51:27 +02:00
Remco Burema
dece6ac40d
Differentiate even vs. uneven nr. of walls for add/split middle wall transitions. 
This replaces the single and confusingly named 'Line Compactness' with a set of 2 settings that give both more detailed control and will hopefully a bit easier to understand.

CURA-8459
 2021-08-12 09:06:54 +02:00
AnnaKang0219
e7e5970647 Remove the files not CZ-300 
Remove the files not CZ-300
 2021-08-12 09:35:15 +08:00
Konstantinos Karmas
7c8153eede Don't crash if the keyring password cannot be decoded 
Fixes Sentry issue CURA-2S0
 2021-08-11 17:25:45 +02:00
Konstantinos Karmas
0e26b9125a Merge branch '4.11' of https://github.com/Ultimaker/Cura into 4.11 2021-08-11 17:05:46 +02:00
Konstantinos Karmas
71748bff8d Don't crash if the reply cannot be loaded 
Fixes Sentry issue CURA-2RQ
 2021-08-11 17:05:36 +02:00
Jaime van Kessel
fb18b278bf
Merge pull request #10245 from Ultimaker/CURA-7279_back_pressure_compensation 
[CURA-7279] Back-Pressure Compensation
 2021-08-11 15:52:32 +02:00
Jelle Spijker
fd79192055
Merge pull request #10266 from Ultimaker/CURA-8472_4.11_translations 
CURA-8472: Prepare for the 4.11 translations
 2021-08-11 13:19:58 +02:00
Remco Burema
ecf820f3db
Fix tests. 
CURA-8473
 2021-08-11 12:35:54 +02:00
Remco Burema
5d7804deae
Digital Library plugin needs to be backwards compatible. 
Message-types are a new parameter to Messages, so they can't be used in SDK/API versions smaller than 7.7.0.

CURA-8473
 2021-08-11 12:14:02 +02:00
Konstantinos Karmas
d36435db5f Update po files for 4.11 translations 
CURA-8472
 2021-08-11 11:12:25 +02:00
Konstantinos Karmas
df5dad3066 Update pot files for 4.11 translations 
CURA-8472
 2021-08-11 11:05:20 +02:00
Jaime van Kessel
2c2e7f2c16 Add even more logging to authorization service 2021-08-11 10:19:27 +02:00
Remco Burema
f019ad16ef
Merge pull request #10244 from Ultimaker/CURA-8458_Expose_distribution_radius 
Expose distribution radius
 2021-08-11 09:18:19 +02:00
Jaime van Kessel
317794920f Merge branch 'master' of github.com:Ultimaker/Cura 2021-08-09 17:43:55 +02:00
Jaime van Kessel
33b1d71183 Add definitions to known current versions 
CURA-8468
 2021-08-09 17:43:30 +02:00
Jaime van Kessel
a5d998224f Add definitions to known current versions 
CURA-8468
 2021-08-09 17:41:54 +02:00
Jaime van Kessel
988de58c4e Fix version upgrader for arachne 
CURA-8468
 2021-08-09 17:13:40 +02:00
Jaime van Kessel
5ea0344a65 Remove duplicated code from versionupgrader 2021-08-09 16:43:23 +02:00
Konstantinos Karmas
fc40ebd8a5 Fix unsupported operand types for QUrl + str 
The parenthesis should be at the end.

CURA-8441
 2021-08-09 16:39:04 +02:00
Jaime van Kessel
8b2904ee3b Merge branch 'CURA-8441_campaign_links' of github.com:Ultimaker/Cura 2021-08-09 14:09:27 +02:00
Konstantinos Karmas
e18a840c43 Change troubleshooting link 
CURA-8441
 2021-08-09 13:00:25 +02:00
Konstantinos Karmas
332475562b Change account signup link 
CURA-8441
 2021-08-09 13:00:03 +02:00
Konstantinos Karmas
b37716de58 Add missing campaign tags 
CURA-8441
 2021-08-09 12:59:29 +02:00
Konstantinos Karmas
5a8167cbff Fix unescaped & 
CURa-8441
 2021-08-09 12:48:07 +02:00
Konstantinos Karmas
3be4b1a441 Fix failing test 
CURA-8441
 2021-08-09 12:42:11 +02:00
Konstantinos Karmas
5bf24ed678 Add campaign tags to the logoff link 
CURA-8441
 2021-08-09 11:56:41 +02:00
AnnaKang0219
c86d1638e2 Fix bugs for definition 
modify Infill_pattern value setting
 2021-08-09 17:20:18 +08:00
Jaime van Kessel
f8df3facc5 Merge branch 'CURA-8444_Digital_Library_does_not_work_on_earlier_Cura_versions' of github.com:Ultimaker/Cura 2021-08-09 11:03:24 +02:00
Jaime van Kessel
176077c910 Merge branch 'CURA-8436_Inform_user_that_the_webcam_is_disabled_for_cloud_printers' of github.com:Ultimaker/Cura 2021-08-09 11:00:58 +02:00
AnnaKang0219
6a2120dbd3 update CrazyPrinter CZ-300 definitions 
update CrazyPrinter CZ-300 definitions
 2021-08-09 11:51:53 +08:00
Remco Burema
694d9987d3
Correct superfluous commas, 
Why does JSON not allow trailing comma's, Ugh,

CURA-7279
 2021-08-06 18:31:04 +02:00
Remco Burema
562be41bd0
Also remove not-existing-anymore settings from definitions and the like. 
CURA-7279
 2021-08-06 18:23:10 +02:00