GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-31 10:35:31 +08:00
Code Issues Packages Projects Releases Wiki Activity
7,708 Commits 294 Branches 267 Tags
Commit Graph

7708 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jack Ha
2d6df1ae4a Fix workspacedialog booboo typo. 2017-04-05 10:18:36 +02:00
Arjen Hiemstra
43c7373368 Ignore any files not ending in .qml when adding QML resources 
Qt 5.8 includes compiled QML caching, which creates .qmlc files on disk.
These shouldn't be added as actual QML objects. In addition, anything
that does not end in .qml is probably not something that can actually be
parsed as QML, so ignore those too.
 2017-04-04 17:35:32 +02:00
Ghostkeeper
0dfe3f4109 Merge branch '2.5' 2017-04-04 17:25:50 +02:00
Ghostkeeper
81e639522d
Streamline headers of translation files 
They now show correct attribution and sort of correct times, and they are consistent. Only ptbr isn't updated yet, because I expect an update soon from our translator.

Contributes to issue CURA-3487.
 2017-04-04 17:24:33 +02:00
Lipu Fei
3f82eae73c Use layer_id to determine total layer count 
CURA-3615
 2017-04-04 16:52:53 +02:00
Ghostkeeper
20ca0720ea
Merge branch '2.5' of github.com:Ultimaker/Cura into 2.5 2017-04-04 16:51:32 +02:00
jack
38fe709736 Merge pull request #1648 from Ultimaker/bugfix_CURA-3615_fix_raft_layer_count 
CURA-3615 Fix total layer count when raft is enabled
 2017-04-04 16:47:07 +02:00
Lipu Fei
6b9d3e8041 Merge pull request #1636 from fieldOfView/fix_recent_dialogs 
Fix issues with Workspace and Profile Changes dialogs
 2017-04-04 14:35:12 +02:00
Lipu Fei
db1c6e4163 Merge pull request #1649 from Ultimaker/fix_setting_speed 
Fix delays when settings change from error to valid
 2017-04-04 14:33:44 +02:00
Ghostkeeper
6366d303f0
Update translations for 2.5 
These are the translation files we received from Bothof. They have not been checked or corrected yet.

Contributes to issue CURA-3487.
 2017-04-04 14:33:42 +02:00
Arjen Hiemstra
7015702832 Add a change timer to perform the error state checking 
This pulls the checkStackHaveErrors code out of the critical path when
editing settings, instead moving it to be handled later. This greatly
reduces the delay that happens when editing settings.

Fixes CURA-3653
Contributes to #1631
 2017-04-04 13:39:18 +02:00
Jaime van Kessel
a69bf967e5 Merge branch 'master' of github.com:Ultimaker/Cura 2017-04-04 13:31:02 +02:00
Jaime van Kessel
d5382c7924 Merge branch 'revise_jellybox_support' of git://github.com/IMADE3D/cura 2017-04-04 13:28:53 +02:00
Jaime van Kessel
7e201439d3 Merge branch 'feature_spaghetti_infill' of github.com:Ultimaker/Cura 2017-04-04 13:03:34 +02:00
Jaime van Kessel
68f536dc5f Merge pull request #1538 from Ultimaker/feature_mold 
Mould
 2017-04-04 12:53:33 +02:00
Lipu Fei
9f5a1b3695 Merge pull request #1564 from nallath/usb_fixes 
Usb fixes
 2017-04-04 12:05:49 +02:00
Lipu Fei
7315a09c7d Use layer_id to determine total layer count 
CURA-3615
 2017-04-04 11:45:30 +02:00
Ghostkeeper
6f2efbee61
Merge branch '2.5' 2017-04-04 11:24:12 +02:00
Ghostkeeper
28555c685f
Add profiles for 0.8mm ABS and CPE 
These profiles are not optimised yet. I'm not allowed to optimise them since there seem to be bugs in the optimisation.
 2017-04-04 11:23:46 +02:00
jack
0ad344f91d Merge pull request #1640 from Ultimaker/bugfix_CURA-3421_per_model_combobox 
CURA-3421 Set SettingsComboBox value if we get undefined from resolve
 2017-04-04 10:57:42 +02:00
Ghostkeeper
db4854702b
Add Japanese and Hangul to the language drop-down 
These are partial translations at the moment, and normally we don't allow them in the drop-down then. But this is an exception, orders from higher up.

Contributes to issue CURA-3487.
 2017-04-04 09:05:12 +02:00
Ghostkeeper
6a8bcd4da6
Add Japanese and Korean partial translations 
Normally we don't allow partial translations in here, but this came from higher up: Ultimaker's distributors in Korea and Japan. We're making an exception for those.

Contributes to issue CURA-3487.
 2017-04-04 09:05:12 +02:00
Ghostkeeper
d7f603517d
Add Uranium CMake dir if it is set 
Contributes to issue CURA-3487.
 2017-04-04 09:05:12 +02:00
Ghostkeeper
a127d463bc
Add Japanese and Hangul to the language drop-down 
These are partial translations at the moment, and normally we don't allow them in the drop-down then. But this is an exception, orders from higher up.

Contributes to issue CURA-3487.
 2017-04-04 09:04:45 +02:00
Ghostkeeper
eab7741711
Add Japanese and Korean partial translations 
Normally we don't allow partial translations in here, but this came from higher up: Ultimaker's distributors in Korea and Japan. We're making an exception for those.

Contributes to issue CURA-3487.
 2017-04-04 09:02:53 +02:00
Ghostkeeper
1bcc19987d
Add Uranium CMake dir if it is set 
Contributes to issue CURA-3487.
 2017-04-03 17:17:04 +02:00
Jack Ha
892140150a Fix group models bounds check. CURA-3640 2017-04-03 15:06:40 +02:00
Lipu Fei
5de3a614ea Merge pull request #1578 from fieldOfView/fix_savitar_gracefull_degradation 
Fail gracefully when libSavitar is not found
 2017-04-03 12:53:35 +02:00
Ghostkeeper
2e790852ce
Merge branch '2.5' 2017-04-03 11:38:28 +02:00
Ghostkeeper
b0ecb3ecdf
Unoptimize CPE+, PC and TPU profiles 
There have been some problems in the optimization of these profiles, so we undo this for now, preventing people from editing these materials and risking some warnings in Cura's interface, but providing the correct experience for people trying the new materials.
 2017-04-03 11:37:48 +02:00
Lipu Fei
6153fd70a8 Set SettingsComboBox value if we get undefined from resolve 
CURA-3421
 2017-04-03 11:10:05 +02:00
Lipu Fei
f57e866119 Move custom functions into FileDialog 
CURA-3495
 2017-04-03 10:58:26 +02:00
Ghostkeeper
1968f5e1e0
Disable bed temperature instead of making it invisible 
The visible property doesn't exist any more in favour of the enabled property.
 2017-04-03 10:34:34 +02:00
fieldOfView
fd09a1959b Simplify margins and make them DPI aware 2017-04-02 15:54:06 +02:00
fieldOfView
ed8954c1db Replace font.pixelSize with DPI-aware font.pointSize 
This also uses the same pointSize as eg the PreferencesPage.qml uses
 2017-04-02 15:31:35 +02:00
fieldOfView
2e1dd46ea4 Replace hardcoded color with system-theme color 2017-04-02 14:38:11 +02:00
fieldOfView
c3e19b5ecb Add missing import for Screen.devicePixelRatio to work 2017-04-02 14:36:40 +02:00
fieldOfView
d536bbd6b9 Fix Hi DPI issues with Workspace and Profile Changes dialogs 2017-04-02 12:38:41 +02:00
Lipu Fei
c5bf107be6 Merge branch '2.5' 2017-03-31 12:12:29 +02:00
Lipu Fei
08071c3aa5 Fix batched GCode compression 
CURA-3604
 2017-03-31 12:11:11 +02:00
Jaime van Kessel
786a4565b7 Added a few plugins to required list 2017-03-31 10:30:13 +02:00
Jaime van Kessel
4fe80218bc Merge pull request #1609 from Ultimaker/bugfix_CURA-3604 
CURA-3604 Fix batched gcode compression for "print over network"
 2017-03-31 09:32:16 +02:00
Jaime van Kessel
832d693da3 Merge branch 'master' of github.com:Ultimaker/Cura 2017-03-30 21:36:12 +02:00
Jaime van Kessel
f5590a98ed Added missing close for USB programmer. Thanks to legoabram for the fix 2017-03-30 21:35:26 +02:00
Ghostkeeper
dd2c25868b
Allow strings with actual text 
Previously string fields would only accept numbers, which is ridiculous.
 2017-03-30 20:57:23 +02:00
Jaime van Kessel
f82aecb7ca Refactoring; no longer use "Printer" to identify CuraApplication 2017-03-30 20:19:05 +02:00
Jaime van Kessel
e0c77231e0 Merge branch 'master' of github.com:Ultimaker/Cura 2017-03-30 20:04:18 +02:00
Jaime van Kessel
891aebc366 Removed getBackend from Cura (and onto Uranium) 2017-03-30 20:03:21 +02:00
Lipu Fei
c74ff4b204 Catch exceptions when checking if a file is a project 2017-03-30 19:08:19 +02:00
Lipu Fei
74e9ee0ab7 Fix batched gcode compression for "print over network" 
CURA-3604
 2017-03-30 19:00:41 +02:00