GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 03:49:00 +08:00
Code Issues Packages Projects Releases Wiki Activity
7,630 Commits 295 Branches 268 Tags
Commit Graph

7630 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
MaukCC
cb943cba98 Update cartesio_0.4.inst.cfg 2017-04-05 16:07:13 +02:00
MaukCC
513ede0fda Update cartesio.def.json 2017-04-05 09:07:14 +02:00
MaukCC
8ff057d483 Update cartesio.def.json 2017-04-05 09:05:29 +02:00
MaukCC
e6bdf8c8f6 Update cartesio.def.json 2017-04-05 09:04:16 +02:00
MaukCC
edbfd4343a Update cartesio.def.json 2017-04-04 20:46:37 +02:00
MaukCC
21c14f58aa Update cartesio.def.json 2017-04-04 18:05:27 +02:00
MaukCC
bb200fa9e8 Update cartesio.def.json 2017-04-04 18:04:25 +02:00
MaukCC
c9397fd986 Update cartesio.def.json 2017-04-04 18:01:52 +02:00
MaukCC
4fb3513a7e Update cartesio_0.25.inst.cfg 2017-03-30 10:29:08 +02:00
MaukCC
c09c044210 Update cartesio_0.4.inst.cfg 2017-03-30 10:27:46 +02:00
MaukCC
05cbd4ad7b Update cartesio_0.4.inst.cfg 2017-03-30 10:26:13 +02:00
MaukCC
13d11b6cbc Update cartesio_0.4.inst.cfg 2017-03-30 10:25:34 +02:00
MaukCC
a3be68eb3c Update cartesio_0.8.inst.cfg 2017-03-30 10:24:33 +02:00
MaukCC
9abb721981 Update cartesio_0.8.inst.cfg 2017-03-30 10:23:51 +02:00
MaukCC
b154a40e54 Update cartesio_0.4.inst.cfg 2017-03-30 10:23:24 +02:00
MaukCC
2c58fd9ac6 Update cartesio_0.25.inst.cfg 2017-03-30 10:22:54 +02:00
MaukCC
ad00e01855 Update XmlMaterialProfile.py 2017-03-30 10:19:26 +02:00
MaukCC
4f1641f7b7 Update cartesio_0.8.inst.cfg 2017-03-29 16:36:24 +02:00
MaukCC
731da24788 Update cartesio_0.4.inst.cfg 2017-03-29 16:35:47 +02:00
MaukCC
7bc83a55cd Update cartesio_0.8.inst.cfg 2017-03-29 16:23:03 +02:00
MaukCC
d8ba5d71ee Update cartesio_0.4.inst.cfg 2017-03-29 16:22:25 +02:00
MaukCC
21c607c88b Update cartesio_0.25.inst.cfg 2017-03-29 16:22:07 +02:00
MaukCC
242fa53668 Update cartesio_0.8.inst.cfg 2017-03-29 16:21:14 +02:00
MaukCC
454ce53957 Update cartesio_0.4.inst.cfg 2017-03-29 16:19:54 +02:00
MaukCC
92af9caadd Update XmlMaterialProfile.py 
added retraction_prime_speed  as a material specific value.
This way, if a material needs a specific setting, the value set in the material xml file will be used. 
Probably a good idea to have this value added in the front end as well, but for now this will do.
 2017-03-29 15:24:40 +02:00
MaukCC
1055259b52 Merge pull request #1 from Ultimaker/master 
update
 2017-03-29 14:06:36 +02:00
Ghostkeeper
6eeb61c6ff
Merge branch 'maukcc-master' 2017-03-29 13:26:14 +02:00
Ghostkeeper
23a09f7f3c
Merge branch 'master' of https://github.com/maukcc/Cura into maukcc-master 2017-03-29 13:25:34 +02:00
jack
a8be748df7 Merge pull request #1599 from Ultimaker/feature_CURA-3495_open_menu 
CURA-3495 Open project/files menu
 2017-03-29 12:58:24 +02:00
Lipu Fei
e92c21af28 Remove FIXME 
CURA-3495
 2017-03-29 12:53:19 +02:00
Lipu Fei
42b8f06e99 Ignore gcode when selected multiple files 
CURA-3495
 2017-03-29 12:52:56 +02:00
jack
f50c3f430a Merge pull request #1586 from fieldOfView/fix_radius0 
Fix crash when editing material diameter
 2017-03-29 10:37:13 +02:00
Ghostkeeper
f62488fd11
Catch JSONDecodeErrors on decoding messages from the network 
The network can corrupt packages or the printer can only send partial messages. Cura shouldn't break on that. It's just a warning. This warning says more than the original stack trace does, because the stack trace only said like 'unexpected comma there and there' while this message actually says what message contained the error.
 2017-03-29 10:34:27 +02:00
fieldOfView
ba06f06cd0 Optimize code 2017-03-28 20:17:51 +02:00
Lipu Fei
208935960f Add comments for putting open file logic in qml 
CURA-3495
 2017-03-28 15:02:50 +02:00
Lipu Fei
e4af8e36bb Fix dialog text for opening multiple files with project(s) 
CURA-3495
 2017-03-28 14:38:26 +02:00
Lipu Fei
1fc7120fff Fix dialog text "file(s)" -> "files" 
CURA-3495
 2017-03-28 14:27:40 +02:00
Lipu Fei
5bec46a29c Drag-and-drop files behave the same as open file menu 
CURA-3495
 2017-03-28 14:27:40 +02:00
Jaime van Kessel
38a07d75c7 Merge branch 'master' of github.com:Ultimaker/Cura 2017-03-28 13:16:00 +02:00
Jaime van Kessel
db1fb8e692 Moved authentication request state change 2017-03-28 13:14:47 +02:00
Tim Kuipers
7a67ab4e66 Merge branch '2.5' 2017-03-28 12:55:18 +02:00
Tim Kuipers
db2766aba1 fix: move prime positions to the sides (CURA-3605) 2017-03-28 12:53:46 +02:00
Jaime van Kessel
910ff7acea No longer check printer state when no material lengths are known 
This fixes issues with g-code from g-code reader not having material lengths set.

CURA-3604
 2017-03-28 11:59:07 +02:00
Jaime van Kessel
6367755875 Disabled center_on_select for windows, as pyqt has a bug with it 2017-03-28 10:21:52 +02:00
Ghostkeeper
2810054f8e
Fix spelling of maximum skin angle expansion description 2017-03-27 16:00:09 +02:00
Lipu Fei
50266f760b
Revert "Prevent MachineSettings dialog go beyond the top of screen" 
This reverts commit a0f841e8eb2e3fc41a5d053232ea29cf538e30be.
 2017-03-27 16:00:08 +02:00
Jack Ha
efa1513e4c
Changed all Not Supported Draft quality profiles to Not Supported Superdraft to prevent double Not Supported entries. CURA-3555 2017-03-27 16:00:08 +02:00
Ghostkeeper
b67b41653f
Fix spelling of maximum skin angle expansion description 2017-03-27 15:59:27 +02:00
Jaime van Kessel
88704051d1 Filter bar is now always visible 
CURA-3574
 2017-03-27 15:47:30 +02:00
Lipu Fei
6644a4d386 Revert "Prevent MachineSettings dialog go beyond the top of screen" 
This reverts commit a0f841e8eb2e3fc41a5d053232ea29cf538e30be.
 2017-03-27 11:09:40 +02:00