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

5199 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
fieldOfView
fc6e92e10f Fix uploading custom firmware on windows 
The simple string replacement left an extraneous "/" in front of the path, which Windows can't handle. QUrl.toLocalFile() does a proper conversion.

CURA-955
 2016-09-06 13:07:15 +02:00
Jaime van Kessel
1999e587b6 Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-09-06 11:43:27 +02:00
Jaime van Kessel
75c1f12d33 If a group node is outside build area, all it's children are also marked as such 
CURA-403
 2016-09-06 11:42:46 +02:00
fieldOfView
dc01cdbc88 Fix displaying support interface in layerview 
CURA-2049
 2016-09-06 11:30:38 +02:00
fieldOfView
eb3cfd47cd Merge branch '2.3' of https://github.com/Ultimaker/Cura into 2.3 2016-09-06 11:22:20 +02:00
Ghostkeeper
7c8e80b751
Properly hide moves and retractions in lower layers 
Not the neatest solution. We might want to make a preference for this? I sorta like to see those travel moves, actually.

Contributes to issue CURA-2049.
 2016-09-06 11:21:48 +02:00
fieldOfView
edd9643703 Merge branch '2.3' of https://github.com/Ultimaker/Cura into 2.3 2016-09-06 10:56:38 +02:00
Ghostkeeper
c7514dfab9
Fix merge mistake 
I hadn't really figured out PyCharm's merge tool yet.
 2016-09-06 10:47:36 +02:00
Ghostkeeper
fcbf4a93f3
Merge branch '2.3' 
Conflicts:
	resources/qml/MonitorButton.qml
 2016-09-06 10:43:54 +02:00
Ghostkeeper
635f26da8e
Lower warning values for retraction speeds 
As discussed with David, the warning should really be quite a bit lower. No printers actually reach 100.

Contributes to issue CURA-2284.
 2016-09-06 10:30:28 +02:00
Ghostkeeper
6909f88ce6
Increase default limit on feed rate 
There is no real limit by default now. Only light speed (and the limit on the input element's length). The feed rate limit should be set by a machine definition. If there is no limit set, let there be no limit to what the user can input.

Contributes to issue CURA-2284.
 2016-09-06 10:30:27 +02:00
Jaime van Kessel
6db03538a1 Removed capital letter 
CURA-955
 2016-09-06 09:23:20 +02:00
Jaime van Kessel
d1eb8231a1 Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-09-06 09:09:20 +02:00
Jaime van Kessel
71e6733c8e Firmware update logging now uses correct path 
CURA-955
 2016-09-06 09:08:46 +02:00
fieldOfView
fcf89b79c6 Update wording of error messages 2016-09-06 08:55:32 +02:00
fieldOfView
2380614bd8 Update wording of error messages 
Clearly list problem first, followed by possible resolvement.
 2016-09-06 08:43:00 +02:00
fieldOfView
46acc4d351 Update wording 
CURA-2236
 2016-09-06 08:32:51 +02:00
Thomas Karl Pietrowski
3c5d797179 Merge pull request #923 from thopiekar/master-CURA-1696 
[CURA-1696] Using Uranium's translation tools
 2016-09-05 22:48:54 +02:00
Thomas Karl Pietrowski
aa2ba26a82 Merge remote-tracking branch 'upstream/master' into master-CURA-1696 2016-09-05 22:15:18 +02:00
fieldOfView
b735d46e90 Show sidebar tooltips above messagestack 2016-09-05 20:35:20 +02:00
Thomas Karl Pietrowski
cf55178a11 Removing unused code 
We are collecting here a lot of data, which doesn't get submitted.
 2016-09-05 19:05:26 +02:00
Thomas Karl Pietrowski
dd02243790 SliceInfo: Adding log message and pass exception 
* removes unused "e"
* Using logException correctly

Conflicts:
	plugins/SliceInfoPlugin/SliceInfo.py
 2016-09-05 18:54:52 +02:00
fieldOfView
287cbcbb16 Properly fix LayerPolygon.__jump_map 
CURA-2049
 2016-09-05 18:15:02 +02:00
fieldOfView
b1d2c412e8 Merge branch '2.3' of https://github.com/Ultimaker/Cura into 2.3 2016-09-05 18:11:15 +02:00
fieldOfView
60568a3070 Fix size of LayerPolygon.__jump_map 
CURA-2049
 2016-09-05 18:10:35 +02:00
Jaime van Kessel
bb7f6f87c7 Platfom physics now actually checks max_overlap_checks instead of max_overlap_checks +1 
CURA-2156
 2016-09-05 17:41:52 +02:00
Jaime van Kessel
5293f3abcb Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-09-05 17:01:50 +02:00
Jaime van Kessel
4817dbe62f Platform physics now checks if the found result actually is a solution 
If not, it keeps checking a bit more to see if it can find another solution

CURA-2156
 2016-09-05 17:00:37 +02:00
fieldOfView
b7605aecc2 Update wording 
The options listed under "Experimental" aren't all modes.
 2016-09-05 16:51:13 +02:00
fieldOfView
5f3ec7c910 Merge branch '2.3' of https://github.com/Ultimaker/Cura into 2.3 2016-09-05 16:29:27 +02:00
fieldOfView
bd8db49a95 Add layer data type and color for Support Interface 
CURA-2049
 2016-09-05 16:29:15 +02:00
Jaime van Kessel
9a28b0d433 Previously active tool is now set correctly once something is selected again 
CURA-1481
 2016-09-05 16:20:12 +02:00
Jaime van Kessel
122d117ef6 Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-09-05 15:51:49 +02:00
Jaime van Kessel
de8785da37 All machines that suport USB connection now get the upgrade firmware action for free! 
CURA-955
 2016-09-05 15:48:31 +02:00
Jaime van Kessel
66f773434f UpgradeFirmwareAction now supports custom firmware uploading 
CURA-955
 2016-09-05 15:42:09 +02:00
fieldOfView
938a2fc691 Update wording 
CURA-2157
 2016-09-05 15:38:56 +02:00
Thomas Karl Pietrowski
df519ed00a CURA-2157: Adding an confirmation dialog 
Tested while starting two prints and aborting them. The buttons for
"Yes" and "No" are translated by Qt5.
 2016-09-05 15:36:28 +02:00
Aldo Hoeben
56f81043ec Merge pull request #966 from thopiekar/master-CURA-2157 
CURA-2157: Adding an confirmation dialog
 2016-09-05 15:33:17 +02:00
Tim Kuipers
99a44fa1d2 Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-09-05 14:39:11 +02:00
Tim Kuipers
c268fcd8c6 fix: wire printing height depends on nozzle head dist (CURA-1555) 2016-09-05 14:38:24 +02:00
Jaime van Kessel
1b1be13818 Added normal quality_type to empty container so switching quality_changes works again 
CURA-2236
 2016-09-05 13:47:19 +02:00
Jaime van Kessel
3227507297 An empty quality container will now give a "not supported" warning 
CURA-2236
 2016-09-05 13:31:36 +02:00
Jaime van Kessel
51d653beba Added logging if material container was not found 
CURA-2236
 2016-09-05 12:40:38 +02:00
Jaime van Kessel
67636d6f3c _updateMaterial container now correctly returns generic material 
CURA-2236
 2016-09-05 12:01:05 +02:00
Simon Edwards
825283d7c6 Merge branch '2.3' 
Conflicts:
	resources/qml/Preferences/ProfilesPage.qml
 2016-09-05 11:26:29 +02:00
Thomas Karl Pietrowski
6688b99cae CURA-1445: Adding md5 hashes 
... for every model placed on the build plate.
 2016-09-03 14:03:18 +02:00
Thomas Karl Pietrowski
48fd46d049 CURA-2157: Adding an confirmation dialog 
Tested while starting two prints and aborting them. The buttons for
"Yes" and "No" are translated by Qt5.
 2016-09-03 13:16:15 +02:00
Jaime van Kessel
2c82f5a177 Instead of writing quality + user to g-code, we now write quality_changes + user 2016-09-02 16:36:49 +02:00
Jaime van Kessel
dd1effdb81 Reset all transformations now also resets object above buildplate 
CURA-2233
 2016-09-02 14:27:18 +02:00
Jaime van Kessel
bbcd43ef01 Reset all translations now ensures that model is right on top of buildplate 
CURA-2233
 2016-09-02 14:23:05 +02:00