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

27073 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ghostkeeper
cb47c88b2d
Don't override the setting version 
It should get inherited from fdmprinter or fdmextruder.

Found during work on CURA-8510.
 2021-09-14 16:27:17 +02:00
Ghostkeeper
7521e174b0
Add version upgrade for Cura 4.12 
Yep, there's gonna be a 4.12.

Contributes to issue CURA-8510.
 2021-09-14 16:23:38 +02:00
Konstantinos Karmas
395aa58a3f Revert "Merge branch 'master' of https://github.com/Ultimaker/Cura" 
This reverts commit 6caa6576106878e9983b48266201d2e32f40ef18, reversing
changes made to 4e89ee0cccabdef3c0ec8209ad9208466eef0633.
 2021-09-14 16:07:23 +02:00
Konstantinos Karmas
6caa657610 Merge branch 'master' of https://github.com/Ultimaker/Cura 2021-09-14 16:06:42 +02:00
Konstantinos Karmas
4e89ee0ccc Check against the correct SDK version 
Since the `self.setLastOutputName` is available in 4.12 (SDK 7.8.0) onwards.

CURA-8566
 2021-09-14 16:05:04 +02:00
Ghostkeeper
c5ca4850f1
Ignore CuraRemoteSupport 
It's something that all Cura developers should be maintaining.
 2021-09-14 15:42:34 +02:00
Jaime van Kessel
c593f62271 Only set the lastOutputName if the SDK is high enough 
This ensures that the DF plugin is backwards compatible

CURA-8358
 2021-09-14 14:43:10 +02:00
Jaime van Kessel
cfb147853e Merge branch 'master' of github.com:Ultimaker/Cura into libArachne_rebased 2021-09-13 14:57:40 +02:00
Ghostkeeper
8ed2e7bd44
Increment version number of Digital Library plug-in to 1.1 
Contributes to issue CURA-8551.
 2021-09-10 16:49:14 +02:00
Ghostkeeper
a6a69c249c
Revert "Set the job name whenever the workspaceLoaded is called" 
This reverts commit 6ad358a55db7dfc4825233a7e453bab31931fba0.
 2021-09-10 16:47:20 +02:00
Ghostkeeper
24ff3692bd
Revert "Use optional last output (file) name from output-dev to set project name." 
This reverts commit c2c53d51c1954315324982bd916b8aad5c19946d.
 2021-09-10 16:46:53 +02:00
Ghostkeeper
9e2b556ce8
Revert "Only change project name when saving to project files." 
This reverts commit b97920e5b155caaab6a8b3bb167853a00ae4b604.
 2021-09-10 16:46:39 +02:00
Ghostkeeper
daac6faaba
Also use a themeable distance for pop-ups, not just for sticky components 2021-09-10 12:15:18 +02:00
Ghostkeeper
25e2828ed0
Don't hard-code the distance between pop-up and header 
By default in all of our themes this ends up being the same distance at 100% pixel scale, but it now scales according to the pixel scale of the user's screen while still being properly rounded to integer coordinates.
 2021-09-10 12:12:20 +02:00
Remco Burema
b2eae08cc7
Merge pull request #10327 from Ultimaker/CURA-6096_profile_database 
Store metadata in database
 2021-09-09 17:29:40 +02:00
Ghostkeeper
034f62ea2c
Match table name with container type 
The table name is used as the container type in the resulting metadata, so we need to use the container type string as table name correctly, or none of the profiles can be found.

Contributes to issue CURA-6096.
 2021-09-08 16:40:22 +02:00
Ghostkeeper
5d40e8d7cc
Don't use stylised caps 
Contributes to issue CURA-8545.
 2021-09-08 16:20:00 +02:00
Ghostkeeper
9344f88c21
Canonical indentation 
Contributes to issue CURA-8545.
 2021-09-08 16:19:48 +02:00
zhpt
6e2f7845c9
Add AtomStack printer definitions (#10121) 
* Add files via upload

add AtomStack machine definitions

* Add files via upload

add AtomStack machine extruders

* Update resources/definitions/cambiran_maxe175.def.json

Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>

* Update resources/definitions/cambiran_maxe285.def.json

Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>

* Update resources/definitions/cambiran_proe175.def.json

Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>

* Update resources/definitions/cambiran_proe285.def.json

Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>

* Add files via upload

* Add files via upload

* Update atomstack_cambrianmaxe175.def.json

* Update atomstack_cambrianmaxe285.def.json

* Update atomstack_cambrianproe175.def.json

* Update atomstack_cambrianproe285.def.json

* Delete cambiran_maxe175.def.json

* Delete cambiran_maxe285.def.json

* Delete cambiran_proe175.def.json

* Delete cambiran_proe285.def.json

* Delete cambrianmaxe175_extruder_1.def.json

* Delete cambrianmaxe285_extruder_1.def.json

* Delete cambrianproe175_extruder_1.def.json

* Delete cambrianproe285_extruder_1.def.json

* Update atomstack_cambrianmaxe175_extruder_0.def.json

* Update atomstack_cambrianmaxe285_extruder_0.def.json

* Update atomstack_cambrianproe175_extruder_0.def.json

* Update atomstack_cambrianproe285_extruder_0.def.json

* Update atomstack_cambrianmaxe175_extruder_0.def.json

* Create atomstack_cambrianmaxe175.def.json

* Update atomstack_cambrianmaxe285.def.json

* Update atomstack_cambrianproe175.def.json

* Update atomstack_cambrianproe285.def.json

* add file atomstack_cambrian_base.def.json

* Update atomstack_cambrianmaxe175.def.json

* Update atomstack_cambrianmaxe285.def.json

* Update atomstack_cambrianproe175.def.json

* Update atomstack_cambrianproe285.def.json

Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>
 2021-09-08 16:18:55 +02:00
Ghostkeeper
057ba8cdeb
Fix setting container type of subclasses 
This mistake caused all of the container types to end up as either None or the actual instance itself, which was causing crashes.

Contributes to issue CURA-6096.
 2021-09-08 15:46:25 +02:00
Ghostkeeper
adac0af1ec
Revert "Use SQLQueryFactory for container DB" 
This reverts commit 571a051041b7c126ca942055961c7714312a967f.
 2021-09-08 15:10:32 +02:00
Jaime van Kessel
5ea0d927ca Fix typo in file name 
CURA-8544
 2021-09-08 09:39:38 +02:00
luz paz
9b203c834a Fix source typos 2021-09-07 11:34:22 -04:00
luz paz
d68f375e38 Fix various typos 
Found via `codespell -q 3 -S *.po,*.pot -L childs,initialy,lod,ned,te,slicable,sur,tutoriels,wont`
 2021-09-07 11:33:54 -04:00
p.kuiper
4d121aa74d Minimal jerk of 20mm/s for all profiles. 2021-09-07 16:55:22 +02:00
Remco Burema
7eeae4db87
Enable infill pattern via infill line distance instead. 
Fixes an issue where, when the global infill density was 0, and the settings for a mesh overlap changed the infill line distance (but not outright the density),  the infill pattern would be disabled in the mesh overlap settings. (You still will need to select both the density and line width to actually change the line width though.)

Relates to github issue Cura/10349 (not explicity linking it here, as it might close that issue then, while it shouldn't as most sub-issues in there are still unresolved one way or the other.
 2021-09-07 14:56:02 +02:00
Ghostkeeper
30b8293c51
Merge branch '4.11' 2021-09-07 14:28:52 +02:00
Ghostkeeper
534e119e72
Fix translations of log-in page and sync message 
The French and Italian translations didn't have proper newlines there.
The message for the sync progress wasn't translated because it didn't properly get the catalog.

Contributes to issue CURA-8472.
4.11.0 		2021-09-07 14:26:43 +02:00
fvrmr
5678b1907a Update change log 
Fixed a typo
 2021-09-07 11:06:52 +02:00
fvrmr
33ebd288a9 Update whats new pages and change log 
Updated whats new pages with two new pages and two images. Changed the images for the monotonic ordering
Updated the change log with new bug fixes.
 2021-09-07 10:37:09 +02:00
AnnaKang0219
32137f1e56 modify definition & quality 
1.move cool_fan to definition from quality
2.use parameter to replace actual value when value equal
 2021-09-07 16:25:50 +08:00
Jelle Spijker
dff131cac9
Merge pull request #10396 from Ultimaker/CURA-8472_4.11_translations 
Update 4.11 translations from Lionbridge
 2021-09-07 08:22:50 +02:00
jelle Spijker
25cc9a2556
Fixed translation with poedit 
various small adjustments
 2021-09-07 08:14:50 +02:00
Ghostkeeper
8c005616a3
Don't add English translations for missing translations 
This is really bad. I wonder what caused that. Must've been me that committed it. Is the script broken to import from Lionbridge? Did I make a mistake somewhere?

Contributes to issue CURA-8472.
 2021-09-06 17:37:13 +02:00
Ghostkeeper
098add5190
Remove forgotten broken plural 
Contributes to issue CURA-8472.
 2021-09-06 17:28:47 +02:00
Ghostkeeper
81eb09966d
Fix forgotten merge conflicts 
I forgot to save this file.

Contributes to issue CURA-8472.
 2021-09-06 17:26:29 +02:00
Ghostkeeper
8209bdd866
Merge branch '4.11' into CURA-8472_4.11_translations 
Conflicts:
	resources/i18n/zh_TW/cura.po -> Merged to 4.11 after I split off this branch.
	resources/i18n/zh_TW/fdmprinter.def.json.po -> Merged to 4.11 after I split off this branch.
 2021-09-06 17:23:55 +02:00
Ghostkeeper
2e6d09c574
Fix remaining plural cases going wrong 
I think the import script does this wrong.

Contributes to issue CURA-8472.
 2021-09-06 17:20:29 +02:00
jelle Spijker
94465b1de7
Fixed plural 2021-09-06 14:37:42 +02:00
Ghostkeeper
0e11c2e086
Translate plug-in as plug-in, not invoegtoepassing 
This is to be more consistent, and more realistic with our target audience.

Contributes to issue CURA-8472.
 2021-09-06 14:15:53 +02:00
Jelle Spijker
fac7583f6b
Merge pull request #10397 from Ultimaker/traditional_chinese 
Traditional Chinese
 2021-09-06 14:15:20 +02:00
jelle Spijker
b85dcfc177
Traditional Chinese 
Thank you for your contribution Valen Chang
 2021-09-06 14:08:29 +02:00
Jelle Spijker
0802610cc9
Merge pull request #10312 from Patola/4.11 
Updated pt_BR strings for 4.11
 2021-09-06 13:56:32 +02:00
Ghostkeeper
3fd03cf508
Translate top/bottom consistently as dessus/dessous in French 
The translator used haut/bas while in most cases we used dessus/dessous for that.

Contributes to issue CURA-8472.
 2021-09-06 13:45:24 +02:00
Ghostkeeper
e705bbea4b
Add usage instructions for the next time 
We keep forgetting.

Contributes to issue CURA-8472.
 2021-09-06 13:37:12 +02:00
Jelle Spijker
d595ca06e3
Merge pull request #10388 from sustmi/czech-translations-v4.11 
Add Czech translations for v4.11
 2021-09-06 13:31:46 +02:00
Ghostkeeper
ce134812f1
Update translations from Lionbridge for 4.11 
These are the new translations we received from the professional translation service.

Contributes to issue CURA-8472.
 2021-09-06 13:30:45 +02:00
Miroslav Sustek
abb3ce936c Add Czech translations for v4.11 2021-09-04 17:34:48 +02:00
Ghostkeeper
d5481e4ce8
Merge branch 'CURA-8401_use_secrets_instead_of_random' 2021-09-03 16:06:23 +02:00
Evangelos Trantos
e8be611a0d
Merge pull request #10360 from Ultimaker/CURA-8509_add_extruder_to_current_version 
Add extruder to current version for version upgrade script
 2021-09-03 15:30:50 +02:00