GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-05 20:16:09 +08:00
Code Issues Packages Projects Releases Wiki Activity
10,639 Commits 295 Branches 268 Tags
Commit Graph

10639 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 Ha
0655771cb8 Removed comment. CURA-3390 2017-03-29 11:00:59 +02:00
Jack Ha
d5d265a996 Resolve mc cherry-picking CURA-3390 2017-03-29 11:00:54 +02:00
Jack Ha
02bb575ced Fixed extruder per gcode layer. Created show_caution preference for gcode reader. CURA-3390 2017-03-29 10:56:36 +02:00
Jack Ha
1e75c84662 Less yields for G-code reader and faster. CURA-3390 2017-03-29 10:56:28 +02:00
Jack Ha
ea0c55fff1 Solved merge conflict in cherry-pick CURA-3390 2017-03-29 10:56:26 +02:00
Jack Ha
fb2c318a0a Added caution message for g-code reader. CURA-3390 2017-03-29 10:53:25 +02:00
Jaime van Kessel
fbc372812c Minor refactor to improve readability 
CURA-3390
 2017-03-29 10:51:56 +02:00
jack
3a255b341f Merge pull request #1586 from fieldOfView/fix_radius0 
Fix crash when editing material diameter
 2017-03-29 10:43:41 +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
Jack Ha
099752125b Arrange all now places biggest objects first. CURA-3239 2017-03-29 10:00:21 +02:00
Jack Ha
f357dea086 Tuned arranger a bit, good enough for proof of concept. CURA-3239 2017-03-29 09:32:29 +02:00
Ghostkeeper
6bf3d084b9
Update translation templates 
These are generated from the state of the code at commit b67b41653fc7c24061103993016fb29b86a51488.

Contributes to issue CURA-3487.
 2017-03-29 09:31:01 +02:00
fieldOfView
ba06f06cd0 Optimize code 2017-03-28 20:17:51 +02:00
Filip Goc
5cf2f9b021 add jellybox variants 
there’s a one fan variant and a two fan variant. for now, both are only
0.4mm nozzle.
 2017-03-28 12:58:22 -04:00
Filip Goc
a328261456 add jellybox specific profiles 
pla and a few petg profiles to get started
 2017-03-28 12:57:43 -04:00
Filip Goc
b0627159fa rename jellybox platform mesh 
jellybox_platform -> imade3d_jellybox_platform
 2017-03-28 12:57:03 -04:00
Filip Goc
0d4a74182b update and rename jellybox definition 
- jellybox -> imade3d jellybox
- includes variants
 2017-03-28 12:56:19 -04:00
Arjen Hiemstra
d7984c888b Use a proper container mock for test user/quality changes 2017-03-28 18:20:13 +02:00
Arjen Hiemstra
30fd1ded45 Fix setPropertyOtherContainers test 
Now uses writable stack and makes sure to compare the right values
 2017-03-28 18:19:30 +02:00
Arjen Hiemstra
3c1cbd5aa9 Do not compare string to actual type 
As far as we know, Global or Container stack should not take care of
string -> value conversion
 2017-03-28 18:18:29 +02:00
Arjen Hiemstra
3620ce4c0a Fix setPropertyUser test with the right container and parameter order of setProperty 2017-03-28 18:17:12 +02:00
Arjen Hiemstra
87ce6246d8 Introduce a "writable global stack" fixture 
This one has MockContainers set for all containers that allow calling
setProperty
 2017-03-28 18:16:00 +02:00
Arjen Hiemstra
317576e983 Set container entry to empty if it was not found in the original container 2017-03-28 18:14:16 +02:00
Arjen Hiemstra
dc84141714 Implement set/getProperty for MockContainer 
Otherwise setProperty/getProperty tests will never work
 2017-03-28 17:51:46 +02:00
Arjen Hiemstra
7175ac0d20 Do not try to perform a setProperty on a definition 
That is never going to work
 2017-03-28 17:50:37 +02:00
Arjen Hiemstra
2a2df31c5b Set the User container to a writable container in testSetProperty 
Since empty container (the default) will not allow writes
 2017-03-28 17:50:09 +02:00
Arjen Hiemstra
3f1f4a172d Fix constrainContainerTypes test 
We do not allow random containers to be assigned to specific properties,
only the containers that specify they are of a certain type.
 2017-03-28 17:48:55 +02:00
Arjen Hiemstra
593c6c0c8f Set and clear ContainerStack's _containerRegistry property 2017-03-28 17:47:10 +02:00
Arjen Hiemstra
75931192f6 Allow setting Definition and setting Definition by ID 
To match the other properties
 2017-03-28 17:46:28 +02:00
Arjen Hiemstra
123c8bae45 Allow setting userChanges container 
Since that makes it possible to create an external factory method for
creating stacks and makes the properties more consistent.
 2017-03-28 17:46:00 +02:00
Arjen Hiemstra
2f6936c961 Fix type checking in GlobalStack 2017-03-28 17:45:15 +02:00
Arjen Hiemstra
4cea1b6d33 Fix error case in addExtruder 
Error out when the new size is going to be more than extruderCount
instead of whether it currently is more than extruderCount.
 2017-03-28 17:44:29 +02:00
Arjen Hiemstra
4005f5082b Allow setting of properties on GlobalStack 2017-03-28 17:43:11 +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