Lipu Fei 4e5d08f320 Fix merge conflicts with master 6 years ago
..
bundled_packages 4e5d08f320 Fix merge conflicts with master 6 years ago
definitions 20a4d89847 Merge branch 'drzejkopf-patch-5' 6 years ago
extruders 6ebc08420a Add profile for JGAurora JGMaker Magic (#5430) 6 years ago
i18n 59b3046c0f Remove duplicate shortcut in Polish 6 years ago
images c62bfc8ece Merge branch '4.0' of https://github.com/BluefireXD/Cura into BluefireXD-4.0 6 years ago
meshes 02f4cf8c46 Merge pull request #5179 from nbennett1978/master 6 years ago
qml 4e5d08f320 Fix merge conflicts with master 6 years ago
quality 02f4cf8c46 Merge pull request #5179 from nbennett1978/master 6 years ago
setting_visibility a601e0878c Explicitly also check for Raft when checking for prime-tower=brim. [CURA-5864] 6 years ago
shaders 7a25841816 Fix support blocker on older (legacy) opengl 6 years ago
themes 95a0a5fb24 Theme window_disabled_background 6 years ago
variants 208e5d3616 Fixed incorrect version numbers 6 years ago