Marek Bel
8235f0f869
Merge branch 'MK3_dev' into add_cancel
2018-09-12 19:38:26 +02:00
mkbel
eb63319b88
Merge pull request #1145 from mkbel/MK3_dev
...
Merge MK3 into MK3_dev and update documentation
2018-09-12 19:03:09 +02:00
Marek Bel
7bc46323e2
Update pause print documentation.
2018-09-12 18:35:26 +02:00
Marek Bel
de2100ac7b
Merge branch 'MK3' into MK3_dev
2018-09-12 15:22:12 +02:00
PavelSindler
0d4f4fe933
Merge pull request #1143 from PavelSindler/lang2
...
lang fix
2018-09-12 09:38:18 +02:00
PavelSindler
45066ebddc
lang fix
2018-09-12 09:37:16 +02:00
PavelSindler
30d54be9de
Merge pull request #1142 from PavelSindler/lang2
...
changed version
2018-09-12 09:20:32 +02:00
PavelSindler
298950e601
changed version
2018-09-12 09:19:23 +02:00
PavelSindler
a0f1bebadb
Merge pull request #1140 from XPila/MK3
...
Lang update (translation + increased reserved space)
2018-09-12 09:09:56 +02:00
Robert Pelnar
3e84bf6341
Lang update (translation + increased reserved space)
2018-09-12 02:45:13 +02:00
PavelSindler
991c37f206
Merge pull request #1137 from PavelSindler/lang2
...
messages correction
2018-09-11 22:43:09 +02:00
Marek Bel
13b67f0e0a
Add Cancel item into PLA filament selection menu initiated by first layer calibration with MMU.
2018-09-11 22:33:13 +02:00
PavelSindler
36dd8eee6c
space
2018-09-11 21:38:59 +02:00
PavelSindler
941e8b62f6
Merge pull request #1136 from XPila/MK3
...
Lang update
2018-09-11 21:22:27 +02:00
Robert Pelnar
17090f0280
Lang update - cz fixed
2018-09-11 21:19:35 +02:00
Robert Pelnar
1b6035d075
Lang update - cz fixed
2018-09-11 21:07:38 +02:00
Robert Pelnar
594908adc2
Lang update
2018-09-11 20:47:11 +02:00
Marek Bel
ada7cffd32
Open menu to select filament before first layer calibration if MMU unit is present.
2018-09-11 19:53:29 +02:00
PavelSindler
531dee20ae
Merge pull request #1134 from PavelSindler/lang2
...
cz language missing strings
2018-09-11 19:38:42 +02:00
PavelSindler
55542e9389
cz language missing strings
2018-09-11 19:36:44 +02:00
PavelSindler
21f83f5ce8
Merge pull request #1133 from PavelSindler/lang2
...
msg off
2018-09-11 19:05:19 +02:00
PavelSindler
d0829a0e9c
msg off
2018-09-11 19:04:37 +02:00
PavelSindler
509bc8da0a
Merge pull request #1132 from PavelSindler/lang2
...
print time
2018-09-11 18:55:34 +02:00
PavelSindler
60a370eaaf
print time
2018-09-11 18:41:48 +02:00
PavelSindler
f4af5af190
Merge pull request #1131 from PavelSindler/lang2
...
translations
2018-09-11 18:30:31 +02:00
PavelSindler
96aada9061
load filament messages, czech language missing translation readded
2018-09-11 18:25:38 +02:00
Marek Bel
5649d6c3c0
Precede active filament on status screen with letter F.
2018-09-11 17:27:10 +02:00
Marek Bel
98264808dc
Change gcode "T?" question from "Choose extruder:" to "Choose filament" and answers from "Extruder 1" .. "Extruder 5" to "Filament 1" .. "Filament 5".
2018-09-11 17:16:13 +02:00
Marek Bel
46df46f482
Add possibility to use other filaments in LCD_COMMAND_V2_CAL.
2018-09-11 17:03:20 +02:00
Marek Bel
19a1ccdc76
Rename choose_extruder_menu() to choose_menu_P(), add parameters to make it reusable.
2018-09-11 16:51:00 +02:00
PavelSindler
bb7110febd
some messages in czech language fixed
2018-09-11 16:47:58 +02:00
PavelSindler
3395213dd1
french language xyz cal. messages
2018-09-11 16:33:33 +02:00
PavelSindler
b45eb05970
xyz cal. messages
2018-09-11 16:31:42 +02:00
Marek Bel
6c6354b2cb
Do not preheat nozzle before loading filament to MMU in first layer calibration wizard.
...
Show insert PLA filament to the first tube of MMU instead of "to the extruder".
First layer calibration wizard with MMU is now functional. But there is no option to unload filament from wizard.
2018-09-11 16:03:46 +02:00
Marek Bel
0fcd2cf2a1
Merge branch 'MK3_dev' into fix_mmu_1st_lay_cal
2018-09-11 15:26:35 +02:00
PavelSindler
fa6676b734
Merge pull request #1130 from PavelSindler/lang2
...
translations
2018-09-11 14:24:32 +02:00
PavelSindler
f7baee1f56
lang_en update
2018-09-11 14:21:15 +02:00
PavelSindler
5c1a3f7fe8
eject filament translations
2018-09-11 13:15:52 +02:00
PavelSindler
c7f3b7a174
Merge pull request #1129 from PavelSindler/MK3_for_merging
...
missing declaration fix
2018-09-11 11:07:20 +02:00
PavelSindler
d9a2fe70ec
missing declaration fix
2018-09-11 11:06:37 +02:00
PavelSindler
5d4bb10d27
Merge pull request #1128 from PavelSindler/MK3_for_merging
...
translations
2018-09-11 10:53:06 +02:00
PavelSindler
d6a7c3d061
corrections
2018-09-11 10:51:21 +02:00
PavelSindler
b963d4bf79
translation of new messages
2018-09-11 10:47:31 +02:00
PavelSindler
c023fb12d5
add choose filament messages
2018-09-11 09:50:50 +02:00
PavelSindler
90e3ae5464
Merge pull request #1127 from XPila/MK3
...
Lang update, french translation
2018-09-11 09:44:02 +02:00
PavelSindler
dad8017ae6
Merge pull request #1125 from PavelSindler/messages_corrections
...
MM messages corrections; no debug messages when printer communicates with MMU2
2018-09-11 09:43:52 +02:00
Robert Pelnar
4ca300bc39
Lang update, french translation
...
+resized reserved space
2018-09-11 03:43:05 +02:00
PavelSindler
edca3e7e45
Merge pull request #1126 from mkbel/MK3_dev
...
Merge branch MK3 into MK3_dev
2018-09-11 01:05:11 +02:00
Marek Bel
b3bc71b45b
Merge remote-tracking branch 'prusa3d/MK3' into MK3_dev
2018-09-10 23:52:51 +02:00
PavelSindler
25a46557d1
merge with upstream
2018-09-10 22:11:32 +02:00
