3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-16 19:28:07 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 7
18800 commits 305 branches 270 tags 779 MiB
Commit graph

8170 commits

Author SHA1 Message Date
Diego Prado Gesto
6abd43f690 Add Polish to the list of available languages. Forgotten by mistake. 2018-10-04 17:37:28 +02:00
fieldOfView
2c3b723070 Merge branch 'master' into feature_firmware_updater 2018-10-04 10:37:22 +02:00
Jason Scurtu
4d4f8d7358
Disable has_machine_quality for now.. 
Needs more adjustment
 2018-10-04 09:44:24 +02:00
Jason Scurtu
0f46e7d694
Add Anycubic 4Max profile 2018-10-03 22:09:13 +02:00
fieldOfView
c2558f91dd Remove UpgradeFirmware as supported machine action... 
because the plugin adds itself as a supported action
 2018-10-03 21:00:23 +02:00
fieldOfView
b7542a8ef8 Move Firmware Updater into a plugin of its own 2018-10-03 20:55:51 +02:00
Diego Prado Gesto
4ca63f84b8 Add missing quote. 
Contributes to CURA-5741.
 2018-10-03 16:57:26 +02:00
Ian Paschal
3ef6359930 Merge remote-tracking branch 'origin' into clean_print_job_info_block 2018-10-03 16:07:34 +02:00
alekseisasin
5cd4d741c9
Merge pull request #4267 from smartavionics/mb-extruder-cooling-fan-number 
Add machine_extruder_cooling_fan_number setting to specify print cooling fan for each extruder.
 2018-10-03 15:17:02 +02:00
fieldOfView
c4919d65f4 Merge branch 'master' into feature_firmware_updater 2018-10-03 14:02:24 +02:00
Jaime van Kessel
dabe747ec0 Merge branch 'CURA-5744-move-oauth-login' of github.com:Ultimaker/Cura 2018-10-03 13:25:09 +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
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
fieldOfView
718ac0a307 Create firmware update progress window from QML 2018-10-03 09:17:51 +02:00
Ian Paschal
9caeddf824 Merge branch 'master' of https://github.com/Ultimaker/Cura into clean_print_job_info_block 2018-10-03 09:08:26 +02:00
Diego Prado Gesto
c0c66649b8 Merge branch '3.5' 2018-10-02 20:27:18 +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
fieldOfView
b4e186ce78 Disable close button while updating firmware 2018-10-02 17:14:22 +02:00
Diego Prado Gesto
a99241d20b Add missing quote. 
Contributes to CURA-5741.
 2018-10-02 15:53:06 +02:00
fieldOfView
91ee691c80 Merge branch 'master' into feature_firmware_updater 2018-10-02 15:10:44 +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
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
Mark
d39f6d061b
Merge pull request #4365 from smartavionics/mb-gyroid-infill 
Add gyroid infill pattern.
 2018-10-02 10:43:41 +02:00
Diego Prado Gesto
6212bcbc33 Add traditional chinese translations to Cura. 
Contributes to CURA-5741.
 2018-10-02 10:34:37 +02:00
ValentinPitre
8994aad52d fix setting versions numbers 2018-10-01 22:42:20 +02:00
Lipu Fei
d81cdee9b9
Merge branch 'master' into top_bottom_settings_enabled_function 2018-10-01 17:07:57 +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
Jaime van Kessel
fc9f05fc8b Moved SettingVisibilityPreset loading to it's own class 
Since there was so much debate regarding the unit testing of the visiblity presets, i had another look at it.
The old version was almost untestable because all functionalities were mushed together into a single class.

CURA-5734
 2018-10-01 11:32:55 +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
Lipu Fei
6ac48a82c4
Merge pull request #4452 from Ultimaker/M&P-Setting-Optimization 
S5 profile optimizations
 2018-10-01 10:38:09 +02:00
ValentinPitre
b15b8e4394 add variants to Tizyx K25 2018-09-30 23:10:29 +02:00