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

11187 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ChrisTerBeke
c0903f539e Merge branch 'master' into CURA-4248_psp 2017-10-17 13:07:22 +02:00
ChrisTerBeke
276232dae5 Merge pull request #2613 from Ultimaker/CURA-4333_Notification_icon_for_recommended_mode 
Cura 4333 notification icon for recommended mode
 2017-10-17 13:05:45 +02:00
ChrisTerBeke
91589ed29d Add surface energy property to get correct behaviour - CURA-4248 2017-10-17 13:03:29 +02:00
Diego Prado Gesto
40f548ba99 Merge branch 'CURA-4252_improve_zeroconf_service' 2017-10-17 13:02:58 +02:00
ChrisTerBeke
c553834a82 Merge branch 'master' into CURA-4248_psp 2017-10-17 12:45:28 +02:00
ChrisTerBeke
d426c259d0 Add material adhesion tendency setting, update support top and bottom distance values - CURA-4248 2017-10-17 12:39:26 +02:00
Diego Prado Gesto
b9a9ef8823 CURA-4457 Add parenthesis in conditional statement 2017-10-17 10:12:29 +02:00
Lipu Fei
44d5323779 Run crash dialog on Qt thread so the GUI gets updated correctly 
CURA-4195
 2017-10-17 09:38:43 +02:00
Lipu Fei
396d960f4a Fix code style 
CURA-4195
 2017-10-17 09:30:49 +02:00
ChrisTerBeke
04bef8473b Merge branch 'master' into CURA-4248_psp 2017-10-17 09:25:50 +02:00
Diego Prado Gesto
ac2484ea87 CURA-4457 Add parenthesis in conditional statement 2017-10-16 20:21:42 +02:00
ChrisTerBeke
205ac7c50c Merge branch 'master' into CURA-4253_psp 2017-10-16 17:16:00 +02:00
ChrisTerBeke
5f12b5ac6a set support interface pattern depending on density - CURA-4248 2017-10-16 17:13:29 +02:00
ChrisTerBeke
69d6ca986d Update FDM printer definition to calculate PSP - CURA-4248 2017-10-16 16:48:49 +02:00
ChrisTerBeke
a444e5c883 update material xml parser to support psp values - CURA-4253 2017-10-16 15:55:46 +02:00
Buco
6fae0a3e09 Add Premium 
Changed "setting_version" to 3
 2017-10-16 15:43:35 +02:00
Jaime van Kessel
70f0e8752b Add extra --headless flag to commandline 2017-10-16 15:05:51 +02:00
Lipu Fei
f4718162d3 Merge remote-tracking branch 'upstream/3.0' 2017-10-16 15:01:15 +02:00
Lipu Fei
8ef918829f Fix quality profile upgrade for UM2 family 2017-10-16 15:00:29 +02:00
Lipu Fei
38b9df80f3 Merge remote-tracking branch 'upstream/3.0' 2017-10-16 14:54:40 +02:00
fieldOfView
ad8af82a58 Fix size of "beta" classifier on splash screen for HiDPI (windows) screens 2017-10-16 14:51:59 +02:00
Lipu Fei
aa7b456594 Fix custom quality profile upgrade for UM2 family 
The custom quality profiles for the UM2 family used to be saved as
profiles for "fdmprinter". They now should be updated to set for
"ultimaker2".
 2017-10-16 13:59:22 +02:00
A.Sasin
65eac37f30 Merge branch 'send_crashes' 
CURA-4195
 2017-10-16 13:48:26 +02:00
alekseisasin
eebe4028ff Merge pull request #2610 from fieldOfView/fix_machinesettings_backend_crash 
Fix crash when exiting Machine Settings
 2017-10-16 13:46:03 +02:00
A.Sasin
b32f3f9f77 Adjusted Crash report message title 
CURA-4195
 2017-10-16 13:42:29 +02:00
Lipu Fei
fae65d7b83 Minor fixes for customized profile in simple mode 
CURA-4333

- Update comments
- Disable the quality slider when there is a customized profile
 2017-10-16 13:26:28 +02:00
Buco
95f018530f Add Builder Premium 
Tabs became spaces
 2017-10-16 13:21:46 +02:00
Lipu Fei
9b8dc9bf55 Move simple-mode settings customization check into a separate file 
CURA-4333

Simple-mode is a special mode so it makes more sense to put those code
in a separate file instead of in the more generic MachineManager.
 2017-10-16 13:18:11 +02:00
Lipu Fei
e1234a09aa Add the missing parseInt()s back 
CURA-4333
 2017-10-16 11:42:13 +02:00
Lipu Fei
94a624e105 Merge branch 'master' into CURA-4333_Notification_icon_for_recommended_mode 2017-10-16 11:37:55 +02:00
Ghostkeeper
58562d59a0
Remove unused import 2017-10-16 11:17:50 +02:00
Ghostkeeper
997be09493
Ignore Siemens NX plug-in 2017-10-16 11:16:53 +02:00
Ghostkeeper
dea230ed6a
Make generated extruder options translateable 
These do appear in the actual interface.
 2017-10-16 11:13:55 +02:00
Ghostkeeper
a10390dbf1
Fix ANOTHER broken string freeze with plugin browser menu item 
This is annoying.

Contributes to issue CURA-4341.
 2017-10-16 11:01:01 +02:00
Ghostkeeper
fb5aa97641
Forgot ellipses 
Contributes to issue CURA-4341.
 2017-10-16 11:01:01 +02:00
Ghostkeeper
5a221a31d9
Fix another broken string freeze with plugin browser menu item 
This is getting annoying.

Contributes to issue CURA-4341.
 2017-10-16 11:01:00 +02:00
Ghostkeeper
639f22a986
Fix broken string freeze with plugin browser menu item 
This is getting annoying.

Contributes to issue CURA-4341.
 2017-10-16 11:01:00 +02:00
fieldOfView
d4e83ceba8 Fix one more fractional pixel offset affecting text placement 2017-10-16 10:39:02 +02:00
fieldOfView
464cf139a8 Change renderType for TextInput elements 
Unlike Label elements, which are defined to use Text.NativeRendering, TextInput uses Qt text rendering by default. This can lead to differences in font rendering between input fields and other texts.
 2017-10-16 10:38:51 +02:00
Lipu Fei
b55efdd70e Remove timeout = 0 for get_service_info 
CURA-4252
 2017-10-16 10:36:14 +02:00
ChrisTerBeke
5c0488c182 Merge pull request #2603 from fieldOfView/fix_textinput_rendertype 
Change renderType for TextInput elements
 2017-10-16 10:33:05 +02:00
Lipu Fei
7e0014eadd Create machine name-to-id map at runtime instead of using a hard-coded map 
CURA-4223
 2017-10-16 10:28:06 +02:00
Jaime van Kessel
c9ba269084 Merge branch 'master' of github.com:Ultimaker/Cura 2017-10-16 09:42:43 +02:00
fieldOfView
ad1c0046d9 Fix crash when exiting Machine Settings 
fixes #2609
 2017-10-15 11:54:49 +02:00
fieldOfView
f9ca353f6a Fix one more fractional pixel offset affecting text placement 2017-10-14 11:49:27 +02:00
fieldOfView
29729d2a23 Change renderType for TextInput elements 
Unlike Label elements, which are defined to use Text.NativeRendering, TextInput uses Qt text rendering by default. This can lead to differences in font rendering between input fields and other texts.
 2017-10-14 11:43:18 +02:00
A.Sasin
61cdfcd3e8 Added coments and simplified "user" metadata check 
CURA-4333
 2017-10-13 16:59:29 +02:00
A.Sasin
7f5aed7ead User pyqtProperty instead of puqtSlot 
CURA-4333
 2017-10-13 16:34:49 +02:00
Diego Prado Gesto
74c37dfc65 CURA-4195 Add strings for I18N 2017-10-13 16:32:01 +02:00
Mark
c2515ca7a9 Merge branch '3.0' 2017-10-13 16:21:54 +02:00