GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-04 22:14:00 +08:00
Code Issues Packages Projects Releases Wiki Activity
10,083 Commits 289 Branches 260 Tags
Commit Graph

2425 Commits

Author SHA1 Message Date
Jaime van Kessel
295a4af22b Merge pull request #2380 from fieldOfView/fix_camera_leak 
Prevent a possible memory leak while showing a stuck camera stream
 2017-09-05 09:19:21 +02:00
Jaime van Kessel
bed74dab37 Merge branch 'master' of github.com:Ultimaker/Cura 2017-09-04 17:37:06 +02:00
Jaime van Kessel
08766ee66f Fix wrong indentation for camera view 2017-09-04 17:36:44 +02:00
Lipu Fei
f803e72c18 Use Screen.devicePixelRatio for plugin browser 
CURA-4279
 2017-09-04 17:25:30 +02:00
fieldOfView
7e60d459b4 Prevent a possible memory leak while showing a stuck camera stream 2017-09-04 15:47:44 +02:00
Lipu Fei
0358b1fcae Fix User-Agent header in PluginBrowser 2017-09-04 09:23:46 +02:00
Ruben D
3af37d5dbc
Fix token replacement in extruder start and end g-codes 
Don't perform the replacement in the global stack for these settings, but in the extruder stacks.

Fixes #2331.
 2017-09-03 16:41:02 +02:00
alekseisasin
24c9dc9bee Merge branch 'feature_light_colours_icons' 
CURA-4148
 2017-09-01 19:25:29 +02:00
Jaime van Kessel
a652ddbdd8 Reset lastResponseTime when trying to connect 
CURA-3869
 2017-09-01 14:54:57 +02:00
Jaime van Kessel
be1b5cd83a Cura no longer crashes when writing to full SD drive. 
It instead tells warns the user and logs the event. CURA-3909
 2017-09-01 14:43:12 +02:00
Jaime van Kessel
ce52ae81ef Merge pull request #2354 from fieldOfView/fix_machine_settings_headpolygon 
Fix setting machine head polygon in Machine Settings
 2017-09-01 13:14:54 +02:00
Lipu Fei
ceccca8244 Reduce the width of the license window 
CURA-4222
 2017-09-01 10:18:27 +02:00
fieldOfView
3c64175948 Fix setting machine head polygon in Machine Settings 
This typo was spotted by @McAJBen. Fixes #2347
 2017-08-31 22:57:50 +02:00
alekseisasin
7c637029b6 Merge pull request #2334 from fieldOfView/feature_target_hotend_temperature 
Show target hotend temperatures
 2017-08-31 13:46:55 +02:00
Ghostkeeper
3951239513
Don't emit devices changed signal if remove wasn't successful 
The same could be done for adding but let's keep it at this for now.

Hopefully fixes #2238.
 2017-08-31 13:24:40 +02:00
alekseisasin
fa61f5c2ad Merge pull request #2340 from Ultimaker/feature_license_for_plugins 
Let user accept/decline a plugin license if present
 2017-08-31 10:26:40 +02:00
alekseisasin
088092c7bc Added min and max dialog size 
CURA-4222
 2017-08-30 17:07:43 +02:00
Ghostkeeper
831a91afff
Add test for upgrading preference file 
Contributes to issue CURA-4148.
 2017-08-30 16:08:50 +02:00
Ghostkeeper
d929359d77
Implement version upgrade 2.7 to 3.0 
The theme 'cura' was renamed to 'cura-light', so that needs to be updated in the user's preferences.

Contributes to issue CURA-4148.
 2017-08-30 16:08:50 +02:00
Jaime van Kessel
053fdd679d Don't send duplicated materials to printer 
CURA-4199
 2017-08-30 15:52:31 +02:00
Jaime van Kessel
3b2c528595 If no licence text is set, use empty string 
It doesn't really matter that much, but QT complaining about it annoyed me.
CURA-4222
 2017-08-30 15:07:58 +02:00
Jaime van Kessel
6d40882bdc Ensure that installing files works on non Windows os'es as well 
CURA-4222
 2017-08-30 15:06:08 +02:00
Lipu Fei
679c7dcfda Let user accept/decline a plugin license if present 
CURA-4222

If a downloaded plugin contains a license file, a dialog which contains
the license information will pop up. The user has to accept the license
before he/she can install the plugin.

If a plugin doesn't have a license file, after it is downloaded, it will
be installed directly just like before.
 2017-08-30 14:09:51 +02:00
fieldOfView
85b20ab16b Get UM3 target hotend temperatures 2017-08-29 11:05:36 +02:00
Lipu Fei
0eb63637d4 Merge branch 'master' into feature_dark_colours_icons 2017-08-28 16:54:36 +02:00
Ghostkeeper
a29c9307de
Merge branch '2.7' 2017-08-28 16:46:42 +02:00
Ghostkeeper
08f69d168d
Add Chinese language entry to change log 
Contributes to issue CURA-4000.
 2017-08-28 16:46:26 +02:00
Ghostkeeper
7a8956fd0e
Merge branch '2.7' 2017-08-28 16:21:40 +02:00
Jaime van Kessel
8a0f6d969e Merge branch '2.7_stack_context' of github.com:Ultimaker/Cura into 2.7 2017-08-28 16:05:59 +02:00
alekseisasin
6c280fff9a Merge pull request #2271 from Ultimaker/thopiekar-plugin-browser-send-more-info 
PluginBrowser: Send also OS and architecture
 2017-08-28 15:30:49 +02:00
Lipu Fei
3fbdb27e8e Merge branch 'master' into feature_dark_colours_icons 
CURA-4148

Resolve merge conflicts.
 2017-08-28 11:13:38 +02:00
fieldOfView
61442e512f Fix setting the Gantry height setting in Machine Settings 2017-08-28 10:13:06 +02:00
fieldOfView
2ac67a7d34 Fix setting the Gantry height setting in Machine Settings 2017-08-27 22:04:46 +02:00
Lipu Fei
414901ae84 Force update the provider when the setting's limit_to_extruder gets changed 
CURA-4186

In the per-object settings, when a setting's limit_to_extruder gets
changed, its value should be updated too.
 2017-08-25 11:58:40 +02:00
Lipu Fei
f85a76b4bd Fix per-object settings qml 2017-08-24 17:38:16 +02:00
Lipu Fei
2ec7c14422 Fix PerObjectSettingsPanel.qml 
CURA-4186

- The UI shouldn't be bound to the limit_to_extruder stack, it should
  always be bound to the per-object stack.
- The ActiveTool.getValue() calls cannot be bound in QML, so use a
  Connections to update the values based on signals.
 2017-08-24 16:57:12 +02:00
Ghostkeeper
557173e799
Merge branch '2.7' 2017-08-24 15:33:01 +02:00
Lipu Fei
3d44d3c4ca Add logging and minor fix for project loading 
CURA-4204
 2017-08-23 17:42:40 +02:00
Lipu Fei
3805d2ff9e Add comments for HACK in project loading 
CURA-4204
 2017-08-23 17:37:59 +02:00
Lipu Fei
c37782d544 Stop slicing when a new slice is needed 
CURA-4206
 2017-08-23 17:19:48 +02:00
Lipu Fei
d662770b22 Fix setting new material for stacks 
CURA-4204

When a new material is created during project file loading, the material
for each stack is set according to the parent material ID, but actually
the child material should be used. This fix uses a hack to find the
corresponding child material for a stack so when a user chooses to
create a new material during project file loading, the material can be
correctly set.
 2017-08-23 16:27:28 +02:00
Jaime van Kessel
b1160c2c37 Labels in layerview now correctly use font 
Fixes #2309
 2017-08-23 14:02:02 +02:00
Lipu Fei
5564d80950 Merge branch '2.7' 2017-08-23 13:02:05 +02:00
Lipu Fei
7a2493dd2f Use per-object stack instead of the active extruder 
CURA-4186
 2017-08-23 12:32:20 +02:00
Ghostkeeper
b58fb0d05d
Merge branch '2.7' 2017-08-23 09:23:29 +02:00
Ghostkeeper
90860c67c2
Minor tweaks suggested by fieldOfView 
See the comments in this commit: c4d23437f2
 2017-08-23 09:23:04 +02:00
Lipu Fei
16764f4750 Create user containers for newly created custom FDM printer extruders 
CURA-4188

The newly created extruder stacks don't have user containers, so the
user changes cannot be saved. This fix makes sure that in the upgrade,
user containers will be created.
 2017-08-22 17:37:25 +02:00
Lipu Fei
e17a88fe11 Merge branch '2.7' 2017-08-22 16:06:36 +02:00
Lipu Fei
39ab740adb Adding binding for per-object settings to update stack ID 
CURA-4186

The stack ID to use for a setting in per-object settings is not updated
when it is set to limit to extruder.
 2017-08-22 13:35:51 +02:00
Lipu Fei
812e262f39 When deserialising a material, also update the material derived from it 
CURA-4204
 2017-08-22 11:29:35 +02:00