GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 22:55:53 +08:00
Code Issues Packages Projects Releases Wiki Activity
15,880 Commits 295 Branches 268 Tags
Commit Graph

15880 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Diego Prado Gesto
fe256b3562 Fix some issues in the material preference page. 
Now the generic section collapses and expands correctly. Some qml error
was also fixed.

Contributes to CURA-5682.
 2018-09-10 15:57:19 +02:00
Ian Paschal
333cea4e6d Some tweaks were not really improvements 
Contributes to CL-1048
 2018-09-10 15:06:19 +02:00
Lipu Fei
d8421105d4 Fix quality lookup 
CURA-5694

For a machine, if it has extruder-specific qualities, when we look up
extruder qualities, we should NOT fall back to use the global qualities.
 2018-09-10 14:39:10 +02:00
Ian Paschal
1c8b086403 Improve inactive coloring 
Contributes to CL-1048
 2018-09-10 14:35:05 +02:00
Diego Prado Gesto
51b0497f84 Fix the collapsable panel of the Generic materials. 
Contributes to CURA-5682.
 2018-09-10 14:28:41 +02:00
Ian Paschal
0d67420601 Monitor Tab - Accordion-style printer blocks 
Includes some unsuccessful attempts at scaling the outer-shadow

Contributes to CL-1048
 2018-09-10 13:38:26 +02:00
Ian Paschal
0ecac9f01e Merge remote-tracking branch 'origin/master' into cura_connect_improvements 2018-09-10 11:46:44 +02:00
Ian Paschal
90426749a2 Change deactiveStates to inactiveStates 
Contributes to CL-1047
 2018-09-10 11:35:58 +02:00
Thomas Karl Pietrowski
5139e61475 Found the dead line while reading some code 2018-09-10 09:42:47 +02:00
Jaime van Kessel
67bc45e37d Added 3MF writer as required plugin 2018-09-10 09:40:53 +02:00
Ian Paschal
2bc1e4b397 Fix bug where disovery window does not appear 2018-09-10 09:27:59 +02:00
Jaime van Kessel
5c6c299b27 Cleanup extruder manager 
Few more unused functions removed & simplified.
It also fixes a few more typing issues that I encountered.
 2018-09-07 17:06:18 +02:00
Ian Paschal
79aeca9663 Monitor Tab - Grey progress bar for pause/abort 
Contributes to CL-1047
 2018-09-07 16:46:11 +02:00
Ian Paschal
97e8db577a Monitor Tab - Add grey monitor tab text 
Contributes to CL-1047
 2018-09-07 16:45:30 +02:00
Jaime van Kessel
e6d0a9cc6a Add missing typing 2018-09-07 16:33:44 +02:00
Jaime van Kessel
a8fc6aabcc Switch incorrect usage of getMachineExtruders to getActiveExtruderStacks 2018-09-07 16:27:56 +02:00
Ian Paschal
90e8c41fa2 Show time remaining instead of "Paused" 
Contributes to CL-1047
 2018-09-07 16:09:25 +02:00
Ian Paschal
13717d3ce6 Monitor Tab - Fix -1h -1m bug 
Contributes to CL-1047
 2018-09-07 16:05:24 +02:00
Jaime van Kessel
638f9fb941 Remove unused functions 2018-09-07 16:02:54 +02:00
Remco Burema
c8eeb737bb Automatically stop simulation when the user manually changes the layer (as opposed to the sim. itself). [CURA-5677] 2018-09-07 15:45:31 +02:00
Jaime van Kessel
20ec8828ed Fix incorrect type hinting 
The type hinting indicated that the property was a dict, but it could also be None.
In cases where it was None, it would cause an exception, which was also fixed (since
unpacking None will break)
 2018-09-07 15:32:07 +02:00
Ian Paschal
28324ff2f6 Monitor Tab - Font improvements 
Contributes to CL-1046
 2018-09-07 15:28:35 +02:00
Jaime van Kessel
c7350ff579 Merge branch 'master' of github.com:Ultimaker/Cura 2018-09-07 15:24:09 +02:00
Jaime van Kessel
4cde6c05ae Switch most usages of containerStackId to containerStack for settingPropertyProvider 
This mostly makes the code a bit more logic and also decreases the number of searches in the registry
 2018-09-07 15:23:09 +02:00
Diego Prado Gesto
244876b5f1
Merge pull request #4337 from Ultimaker/cura_connect_improvements 
Organize files better before 3.5
 2018-09-07 14:37:54 +02:00
Diego Prado Gesto
a9f151670e Remove unused components. They are no longer used. 2018-09-07 14:31:53 +02:00
Ian Paschal
4c6d101d70
Merge pull request #4338 from Ultimaker/cleanup_um3network_plugin 
Remove unused files in the network plugin
 2018-09-07 14:18:56 +02:00
Diego Prado Gesto
d53e9f9263 Remove not used files. 
After the refactor, these files are no longer used.
 2018-09-07 14:12:19 +02:00
Ian Paschal
18e0dacda4 Organize files better 
First things first... organize!
 2018-09-07 14:11:37 +02:00
Ian Paschal
49d72f5855
Merge pull request #4301 from Ultimaker/cura_connect_UI_rework 
CL-893 CL-894 Cura connect ui rework
 2018-09-07 12:45:56 +02:00
Ghostkeeper
b0e7562579
Rename VersionUpgrade plug-in from 40 to 35 
Because the next version is going to be called 3.5, not 4.0.
 2018-09-07 10:59:45 +02:00
Lipu Fei
d6046c725a Fix Toolbox QML null object warnings 
CURA-5670
 2018-09-07 09:29:31 +02:00
Ghostkeeper
c1ef9abf1d
Fix code style 
These changed in the same pull request so I'll remove them here.

Contributes to issue CURA-5682.
 2018-09-06 17:23:16 +02:00
Ian Paschal
4cc1b6ce02 Add typings and fix code style 2018-09-06 16:57:45 +02:00
Lipu Fei
5a36bc963c Fix shortcut conflict in French 2018-09-06 16:06:45 +02:00
Lipu Fei
29ef964ba7 Add shortcut key check script into Jenkinsfile 2018-09-06 16:06:45 +02:00
Lipu Fei
15f5e9ff01 Remove TestShortcutKeys 2018-09-06 16:06:45 +02:00
Lipu Fei
784f7cca76 Move shortcut key check into a separate script 2018-09-06 16:06:45 +02:00
Lipu Fei
a8a88e5ccb Remove mistake changes in CuraEngineBackend 2018-09-06 16:06:45 +02:00
Lipu Fei
c36434ebdd Fix TestShortcutKeys 2018-09-06 16:06:45 +02:00
Aleksei S
27c112d4db Fix duplicated shortcut keys in all languages 
CURA-5642
 2018-09-06 16:06:45 +02:00
Aleksei S
0f655553bb Removed shortcut keys from general cura.pot 
CURA-5642
 2018-09-06 16:06:45 +02:00
Aleksei S
e853cdc04d Removed shortcut from Reset All Model &Transformations 
CURA-5642
 2018-09-06 16:06:45 +02:00
Aleksei S
944b937036 Simplified unit test, make code clear 
CURA-5642
 2018-09-06 16:06:45 +02:00
Aleksei S
17d2316da3 Validate shortcut keys in all languages(except default) 
CURA-5642
 2018-09-06 16:06:45 +02:00
Aleksei S
3a8d023371 Addded test for checking shortcut keys 
CURA-5642
 2018-09-06 16:06:45 +02:00
Lipu Fei
0b6574e715 Rename script to check_gcode_buffer.py 
CURA-5561
 2018-09-06 15:36:13 +02:00
Lipu Fei
32a49bf8fa Make annotated output gcode optional 2018-09-06 14:39:52 +02:00
Lipu Fei
053613ad97 Merge remote-tracking branch 'origin/master' into CURA-5561_gcode_analysis 2018-09-06 14:34:30 +02:00
Lipu Fei
bb578be066 Move the script to scripts dir 2018-09-06 14:22:36 +02:00