GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-10-09 22:26:32 +08:00
Code Issues Packages Projects Releases Wiki Activity
Cura/resources
History
Ghostkeeper efcd00e2f3
Merge branch 'master' into marketplace_redesign 
Conflicts:
	plugins/DigitalLibrary/resources/qml/SelectProjectPage.qml -> Some things were probably accidentally committed here and then later also changed in master.
2022-01-20 15:57:28 +01:00
..
bundled_packages
Merge branch 'marketplace_redesign' of github.com:Ultimaker/Cura into CURA-8588_replace_toolbox_with_marketplace
2022-01-03 11:32:06 +01:00
definitions
Merge pull request #11251 from Ultimaker/CURA-8868_raft_interface_extruder
2022-01-14 09:11:07 +01:00
extruders
Merge branch 'master' of https://github.com/mixware011/Cura into mixware011-master
2021-12-17 15:27:02 +01:00
i18n
Shorten translation for 'sync materials with printers'
2022-01-10 17:11:31 +01:00
images
Remove what's new images again
2022-01-19 16:34:14 +01:00
intent
Remove Cura 4 settings
2021-12-15 10:09:42 +01:00
meshes
Merge branch 'master' of https://github.com/mixware011/Cura into mixware011-master
2021-12-17 15:27:02 +01:00
qml
Merge branch 'master' into marketplace_redesign
2022-01-20 15:57:28 +01:00
quality
Merge branch '4.13'
2021-12-31 15:01:30 +01:00
setting_visibility
Add raft top extruder to expert settings
2022-01-12 14:12:06 +01:00
shaders
Add missing type to lowestPrintableHeight variable
2021-05-12 13:26:10 +02:00
texts
More consistent header for change log
2022-01-11 13:24:29 +01:00
themes
Merge branch 'marketplace_redesign' of github.com:Ultimaker/Cura into CURA-8588_replace_toolbox_with_marketplace
2022-01-03 11:32:06 +01:00
variants
Add 0.4mm nozzle for CR100
2021-12-21 13:59:04 +01:00
public_key.pem
…
README_resources.txt
Fix various typos
2021-09-07 11:33:54 -04:00