GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-21 21:29:41 +08:00
Code Issues Packages Projects Releases Wiki Activity
34,169 Commits 287 Branches 260 Tags
Commit Graph

775 Commits

Author SHA1 Message Date
Lipu Fei
ee34cd522d
Merge pull request #5017 from Ultimaker/add_comment_prime_tower 
Add time prime tower into Cura.proto
 2019-01-07 13:30:32 +01:00
Jaime van Kessel
ffce9bd172 Ensure that the primetower gets drawn in the right color again 
CURA-5932
 2019-01-04 14:59:26 +01:00
Jaime van Kessel
7269065cca Only clear the stored optimized layer data if the slice started 2018-12-21 11:54:11 +01:00
Ghostkeeper
75fbdf2c94
Expand error message for cases when extruders are disabled 
It is also unable to slice models that are on extruders that are disabled.
 2018-12-21 10:40:37 +01:00
Jaime van Kessel
8bff0d17e8 Prevent the backend attempting to reslice everytime a preference changed 2018-12-20 09:43:01 +01:00
Ghostkeeper
874646a80e
Merge branch '4.0' into add_comment_prime_tower 2018-12-18 15:44:27 +01:00
Lipu Fei
e885b52737 Add time prime tower into Cura.proto 2018-12-18 13:42:23 +01:00
Lipu Fei
6992fd2991 Update plugin versions to match package versions 
CURA-6019
 2018-12-17 13:03:21 +01:00
Ghostkeeper
c235f339ae
Increment API version to 6 
All plug-ins now have to re-check whether they are still compatible with the current version of Cura.

Contributes to issue CURA-6019.
 2018-12-14 17:29:02 +01:00
Jaime van Kessel
75ff03f3c8 Use setState instead of emitting the backend state 
CURA-6016
 2018-12-11 13:13:20 +01:00
Ghostkeeper
7df4c01814
Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown 
Conflicts:
	cura/Settings/MachineManager.py -> rowCount vs. count
	resources/qml/ExtruderIcon.qml -> Someone changed stuff that I had overwritten.
	resources/qml/Menus/ConfigurationMenu/PrintCoreConfiguration.qml -> Someone changed stuff that I had removed.
	resources/qml/Toolbar.qml -> Git was wrong, not a conflict.
	resources/themes/cura-light/theme.json -> Git was wrong, not a conflict.
 2018-12-03 11:45:05 +01:00
Ghostkeeper
4e2f51e7e8
Use public activeExtruderIndex rather than internal _activeExtruderIndex 
So that this getter still does what it needs to do if we ever decide to add side-effects.

Contributes to issue CURA-5876.
 2018-11-30 11:13:04 +01:00
Lipu Fei
c545d9df77 Add key check before accessing in ƒStartSliceJob 
CURA-5901
 2018-11-29 15:17:43 +01:00
Lipu Fei
bd42136712 Fix GcodeStartEndFormatter to use fallback values 
CURA-5901

Use values from the global stack (if exist) as fallback values.
 2018-11-27 09:49:38 +01:00
Lipu Fei
1951391a23 Merge remote-tracking branch 'origin/3.5' 2018-10-09 12:04:53 +02:00
alekseisasin
0b70b9a218
Merge pull request #4521 from Ultimaker/CURA-5799_fix_extruder_settings_to_curaengine 
[3.5] CURA-5799 Fix sending extruder settings to curaengine
 2018-10-09 11:53:46 +02:00
Jaime van Kessel
d98eafe041 Merge branch '3.5' of github.com:Ultimaker/Cura 2018-10-08 17:03:25 +02:00
Lipu Fei
5ba60de209 Send extruder settings ordered by extruder position 
CURA-5799
 2018-10-08 16:01:51 +02:00
Lipu Fei
3965218501 Fix value templating for gcode 
CURA-5793

Fix GcodeStartEndFormatter to take the correct default_extruder_nr
instead of always using -1.
 2018-10-08 14:42:22 +02:00
Diego Prado Gesto
866110d70c Take into account that can be empty layers below the model when the 
setting Remove empty layers is disabled.

The empty layers are skipped if they are at the bottom. Also keeps the
models printed with raft showing correclty.

Contributes to CURA-5768.
 2018-10-04 18:03:01 +02:00
Ghostkeeper
bfc3c5d8d8
Merge branch 'feature_mesh_names' of https://github.com/paukstelis/Cura into paukstelis-feature_mesh_names 2018-09-28 13:26:15 +02:00
Ghostkeeper
1717281d2b
Always provide extruder_nr for all models 
Even if you only have one extruder in your printer. This is more consistent, and probably also faster because executing one set-addition in Python is probably still slower than sending those 20 extra bytes over the socket and parsing them in C++...

Contributes to issue CURA-4410.
 2018-09-27 11:20:24 +02:00
Ghostkeeper
cc77632357
Merge branch 'master' into refactor_singleton_settingsbase 2018-09-13 11:52:13 +02:00
Jaime van Kessel
a8fc6aabcc Switch incorrect usage of getMachineExtruders to getActiveExtruderStacks 2018-09-07 16:27:56 +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
Ghostkeeper
f0f33262c4
Merge branch 'master' into refactor_singleton_settingsbase 2018-08-28 10:50:25 +02:00
Aleksei S
fe9cada459 Increase plugin API version to 5 
CURA-5627
 2018-08-27 13:59:00 +02:00
Lipu Fei
22ccf074f3 Only check if printing extruder is enabled for printing meshes 
CURA-5669
 2018-08-27 13:20:21 +02:00
paukstelis
e36f78dd35 Clean up whitespace 2018-08-24 07:27:34 -04:00
Ghostkeeper
06525bed4b
Merge branch 'master' into refactor_singleton_settingsbase 
Resolved a conflict in CuraEngineBackend due to refactor removing JSON from the command while master added optional verbose mode in debug mode.

Contributes to issue CURA-4410.
 2018-08-22 17:04:55 +02:00
paukstelis
fc9c1045c9 Basic cleanup 2018-08-20 07:40:28 -04:00
paukstelis
b66558f97a Initial commit for passing mesh names to CuraEngine 2018-08-19 22:52:17 -04:00
Ian Paschal
db6d18cf2c
Merge pull request #4199 from Ultimaker/fix_gcode_formatter 
Fix the gcode start/end formatter
 2018-08-10 10:37:19 +02:00
Ghostkeeper
55cf1fa137
Turn on CuraEngine debug mode when front-end is in debug mode 
You can test this by running Cura's front-end with parameter --debug.
 2018-08-07 16:51:48 +02:00
Ghostkeeper
6c6e05bf06
Don't send JSON file to back-end any more 
They are no longer using it.

The back-end now just takes all settings that come in via setting messages. It doesn't need to set its defaults any more because all settings are set at the beginning. Only when slicing via command line does it need a JSON file.

Contributes to issue CURA-4410.
 2018-08-06 17:22:44 +02:00
Diego Prado Gesto
bfaaa4a471 Fix code-style 2018-08-06 09:32:12 +02:00
Diego Prado Gesto
4491d5164a Fix the gcode start/end formatter. 
Fixes #4181.
 2018-08-06 09:24:48 +02:00
Ian Paschal
1d0e88dc16 Fix typing issue 2018-08-03 11:00:56 +02:00
Ian Paschal
1a050968a5 Clear out old gcode 
This way if you move the model, and don't hit prepare again, you can end up exporting the old gcode again thinking its new gcode.
 2018-08-03 10:51:01 +02:00
Lipu Fei
9856ccf700
Merge pull request #4073 from Ultimaker/CURA-5572_fix_gcode_reader 
CURA-5572 Update the scene when a Gcode is loaded.
 2018-07-16 08:07:02 +02:00
Aleksei S
817a304ed1 After reconecting to another port update job status '_is_cancelled' to false 
CURA-5549
 2018-07-13 23:50:02 +02:00
Diego Prado Gesto
01a26b0360 CURA-5572 The scene was not updated when a Gcode was loaded. 
This fixes a bug that we introduced when fixing code style. This was a
bad translation.
 2018-07-13 16:05:13 +02:00
Diego Prado Gesto
e88362930d CURA-5562 Don't trigger the stop slicing if some nodes without build 
plate associated with it changes in the scene, such as the NozzleNode in
the SimulationView.
 2018-07-12 14:34:42 +02:00
Jack Ha
993dd7a90e Check for None instead of evaluating the variable as True/False. 2018-07-11 11:34:31 +02:00
Ian Paschal
6a5c0b608d Fix missing layer view 2018-07-11 11:24:16 +02:00
Ian Paschal
d709650def Try to ignore _process variable 2018-07-10 11:04:17 +02:00
Ian Paschal
8dab2a6696 Do not attempt to discard changed build plates 2018-07-09 15:33:41 +02:00
Ian Paschal
1c1b45541f
Merge branch 'master' into fix_tests_cura_engine_backend 2018-07-09 12:38:54 +02:00
Ghostkeeper
dec9d7cac6
Still store disabled extruders as a set 
They should be unique anyway.

Contributes to issue CURA-5456.
 2018-07-09 11:32:53 +02:00