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

26089 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
X40-Community
d199d2f297 USB connection and gerneric_pc removed 2021-08-18 20:13:04 +02:00
X40-Community
0b666cce20 Error in line 24 fixed 2021-08-16 18:51:39 +02:00
X40-Community
f848f1c937 Code corrected, duplicate parameters deleted 2021-08-15 19:08:32 +02:00
root
2939294018 Merge branch 'master' of https://github.com/x40-Community/Cura 
M192 removed from start code, parking position changed to X351 in start code
 2021-08-12 22:14:37 +02:00
root
742c8fed21 M192 removed from start code, parking position changed to X351 2021-08-12 22:12:49 +02:00
x40-Community
0c762dcd81
Merge branch 'Ultimaker:master' into master 2021-08-12 22:03:58 +02:00
root
9ea6dbf668 Since I can't program a phyton, the script author doesn't have time for a revision and I haven't found any in the X40 community either, I deleted the X40Snapshot.py script. 2021-08-12 22:01:48 +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
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
AnnaKang0219
e7e5970647 Remove the files not CZ-300 
Remove the files not CZ-300
 2021-08-12 09:35:15 +08:00
root
3ed8e6ee3f Quality profiles renamed 2021-08-11 19:59:16 +02: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
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
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
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
root
099645fac8 Merge branch 'master' of https://github.com/x40-Community/Cura 2021-08-07 17:14:54 +02:00
root
db16d25aa1 Suppress all new materials without color information 2021-08-07 17:14:14 +02:00
x40-Community
bb229e13c4
Merge branch 'Ultimaker:master' into master 2021-08-07 16:26:42 +02:00
root
3526d61145 Add quality profiles 2021-08-07 16:24:44 +02:00
goofoo3d
d709b86c16
add goofoo,renkforce printf (#8959) 
* add goofoo,renkforce printf

* 优化PVA打印的配置

* 修正双喷打印不能重叠的问题

* 修改配置信息

* 添加机型配置

* 新增 goofoo 2-1混色脚本，优化机型配置.

* 优化goofoo 2-1混色脚本

* 调整了机型配置

* 添加不同口径喷嘴

* 添加喷嘴口径

* 修改机器名称不对的问题

* modify setting_version = 16 to setting_version = 17

* modify renkforce & goofoo's files setting_version = 16 to 17

* modify pva support_pattern & e-one size

* modify pva support pattern to grid

Co-authored-by: laiqiqi <laiqiqi886@163.com>
 2021-08-06 15:14:24 +02:00