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

16117 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aleksei S
7a87783237 Merge branch 'master' of github.com:Ultimaker/Cura 2018-10-03 13:24:20 +02:00
Aleksei S
959f698b03 Update date format 
CURA-5762
 2018-10-03 13:23:37 +02:00
Lipu Fei
b97f4ea30c Merge remote-tracking branch 'origin/3.5' 2018-10-03 11:49:38 +02:00
Lipu Fei
c3e7e426ff Fix getDefaultVariantNode for UM2 
CURA-5790

UM2 has optional variant which depends on whether Olsson Block is
enabled. getDefaultVariantNode() should take that into account.
 2018-10-03 11:24:27 +02:00
Diego Prado Gesto
6db1342255 Fix the layer view when there is a print job with only one layer. 
Contributes to CURA-5789.
 2018-10-03 10:44:20 +02:00
alekseisasin
5456637e4a
Merge pull request #4369 from fieldOfView/fix_usb_temperature_while_heating 
Fix updating temperature while preheating bed or extruder
 2018-10-03 10:35:30 +02:00
Aleksei S
0edcd316d3 Merge branch 'master' of github.com:Ultimaker/Cura 2018-10-03 10:33:06 +02:00
Aleksei S
51e7b6c388 Change font style for active material in preferences 
CURA-5747
 2018-10-03 10:30:48 +02:00
Diego Prado Gesto
c0c66649b8 Merge branch '3.5' 2018-10-02 20:27:18 +02:00
Diego Prado Gesto
46e0a39c15 Merge branch 'Patola-3.5' into 3.5 2018-10-02 17:48:56 +02:00
Diego Prado Gesto
afccd38a5d Add preposition to be consistent with other strings. 
Contributes to CURA-5741.
 2018-10-02 17:48:25 +02:00
Diego Prado Gesto
04c72c0875 Merge branch '3.5' of git://github.com/Patola/Cura into Patola-3.5 2018-10-02 17:26:14 +02:00
Diego Prado Gesto
a99241d20b Add missing quote. 
Contributes to CURA-5741.
 2018-10-02 15:53:06 +02:00
Diego Prado Gesto
19b76d0c27 Merge branch '3.5' of github.com:Ultimaker/Cura into 3.5 2018-10-02 15:45:25 +02:00
Jaime van Kessel
13ab9ba384 Merge branch 'patch-1' of https://github.com/adecastilho/Cura 2018-10-02 13:15:48 +02:00
Jaime van Kessel
9970f0e752 Merge branch 'fix_polygon_connector_setting' of https://github.com/BagelOrb/Cura 2018-10-02 13:12:21 +02:00
Cláudio 'Patola' Sampaio
e457b2e67c Merge branch '3.5' of https://github.com/Ultimaker/Cura into 3.5 
Updated to push to upstream
 2018-10-02 07:01:39 -03:00
Cláudio 'Patola' Sampaio
6d17144766 Updated strings to Cura 3.5 2018-10-02 07:00:14 -03:00
Jaime van Kessel
13eaa14752 Set preference for sending info to default state instead of removing them 
CURA-5095
 2018-10-02 11:37:04 +02:00
alekseisasin
84c667265d
Merge pull request #4200 from BagelOrb/top_bottom_settings_enabled_function 
JSON fix: only enable skin settings when there is skin
 2018-10-02 11:21:15 +02:00
Jaime van Kessel
7ffcfa25e9 Merge branch 'CURA-5095_reset_slice_info_collection' of github.com:Ultimaker/Cura into 3.5 2018-10-02 11:17:39 +02:00
Mark
d39f6d061b
Merge pull request #4365 from smartavionics/mb-gyroid-infill 
Add gyroid infill pattern.
 2018-10-02 10:43:41 +02:00
Jaime van Kessel
18361b9434 Ensure that CuraAPI can be called in the same way as before 
This should prevent another API break.

CURA-5744
 2018-10-02 10:42:15 +02:00
Diego Prado Gesto
4f9661b7f5 Merge branch 'traditional_chinese_3.5' into 3.5 2018-10-02 10:35:59 +02:00
Diego Prado Gesto
6212bcbc33 Add traditional chinese translations to Cura. 
Contributes to CURA-5741.
 2018-10-02 10:34:37 +02:00
Lipu Fei
729f9a69ba
Merge pull request #4455 from Ultimaker/fix_toolbox_download 
Fix toolbox download
 2018-10-02 10:27:00 +02:00
Mark
b412a259af
Merge pull request #4410 from Ghostkeeper/fix_initial_startup_model_argument 
Fix initial start-up when providing model parameter
 2018-10-02 10:14:07 +02:00
Diego Prado Gesto
77fd05ac70 Disable other buttons while toolbox is downloading to avoid crashes. 
I did it that way to not be risky because we're close to the release.

Contributes to CURA-5778.
 2018-10-01 17:21:34 +02:00
Lipu Fei
d81cdee9b9
Merge branch 'master' into top_bottom_settings_enabled_function 2018-10-01 17:07:57 +02:00
Lipu Fei
d1fce50f60 Add Preferences upgrade 34 to 35 unit test 2018-10-01 16:30:27 +02:00
Lipu Fei
7d537f2c6f Fix data collection message at app start 2018-10-01 16:27:27 +02:00
ChrisTerBeke
acb7df710c Fix getting cura application instance 2018-10-01 15:37:28 +02:00
Diego Prado Gesto
a6e98f344e
Merge pull request #4443 from Ultimaker/bothof_update_3.5 
Update translations by Bothof for Cura 3.5
 2018-10-01 15:30:46 +02:00
Jaime van Kessel
feaa10094e
Merge pull request #4441 from Ultimaker/resolve_dependencies_oauth 
Resolve circular imports for CuraAPI
 2018-10-01 15:15:14 +02:00
drzejkopf
8fa73fc1fb Update fdmprinter.def.json.po 2018-10-01 14:48:31 +02:00
drzejkopf
cc7d64b4f1 Complete Polish translation for version 3.5 2018-10-01 14:48:16 +02:00
Diego Prado Gesto
93061d67eb
Merge pull request #4414 from drzejkopf/patch-3 
Complete Polish translation for version 3.5
 2018-10-01 14:46:13 +02:00
Diego Prado Gesto
ee5d647b6d Review the fdmprinter.def.json for Korean, Dutch, Portuguese, Russian, 
Turkish and Simplified Chinese.

Contributes to CURA-5741.
 2018-10-01 14:42:25 +02:00
Diego Prado Gesto
5da1b71e94 Review Simplified Chinese translations. 
Contributes to CURA-5741.
 2018-10-01 13:54:02 +02:00
Diego Prado Gesto
00f1f69e4d Review Turkish translations. 
Contributes to CURA-5741.
 2018-10-01 13:45:55 +02:00
Diego Prado Gesto
c474ceff8f Review Russian translations. 
Contributes to CURA-5741.
 2018-10-01 13:37:26 +02:00
Diego Prado Gesto
638c6facc7 Review portuguese translations. 
Contributes to CURA-5741.
 2018-10-01 13:23:43 +02:00
Diego Prado Gesto
d5ea92059a Fix Dutch translations. 
Contributes to CURA-5741.
 2018-10-01 13:03:00 +02:00
Diego Prado Gesto
f785f888ae Translate the per-model-setting options in Spanish to better explain 
what each item does.

Contributes to CURA-5741.
 2018-10-01 11:55:27 +02:00
Aleksei S
98c3f497d8 Merge branch 'master' of github.com:Ultimaker/Cura 2018-10-01 11:32:39 +02:00
Aleksei S
3f8b7fb6af Fix: Switches to 'Prepare' always go through 'Recomended' mode 
CURA-5731
 2018-10-01 11:30:21 +02:00
Diego Prado Gesto
c2e69dc7b2 Fix Korean translations. 
Contributes to CURA-5741.
 2018-10-01 11:28:37 +02:00
Diego Prado Gesto
91e6897bc7 Fix conficts in French with a couple of keyboard shortcuts. 
Contributes to CURA-5741.
 2018-10-01 11:13:10 +02:00
Diego Prado Gesto
a320720f86 Remove duplicate shortcut in French, so the CI won't fail on it. 
Contributes to CURA-5741.
 2018-10-01 10:57:33 +02:00
Diego Prado Gesto
046fca5d0f Align the "Enable Gradual" text with the corresponding checkbox. 2018-10-01 10:46:45 +02:00