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 |
|
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 |
|
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 |
|
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 |
|
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
|
25a46557d1
|
merge with upstream
|
2018-09-10 22:11:32 +02:00 |
|
PavelSindler
|
8a9f066c1b
|
choose_extruder_menu: extruder -> filament
|
2018-09-10 22:09:37 +02:00 |
|
MRprusa3d
|
6804f54094
|
Merge pull request #1124 from PavelSindler/fix_wizard
wizard hotfix
|
2018-09-10 20:02:36 +00:00 |
|
PavelSindler
|
1bb9e9ed92
|
MMU_DEBUG
|
2018-09-10 20:39:28 +02:00 |
|
PavelSindler
|
6fa798aa83
|
init
|
2018-09-10 20:08:13 +02:00 |
|
PavelSindler
|
1253fb338a
|
wizard hotfix
|
2018-09-10 18:02:54 +02:00 |
|
PavelSindler
|
bad112c8e1
|
Merge pull request #1116 from mkbel/pick_mmu_1stLay_unload
Do not unload filament from nozzle when touching bed in the end of fi…
|
2018-09-07 11:34:21 +02:00 |
|
Marek Bel
|
5a6ef00cfc
|
Do not unload filament from nozzle when touching bed in the end of first layer calibration. Unload it after reaching home position.
|
2018-09-07 10:50:23 +02:00 |
|
mkbel
|
cbc506c379
|
Merge pull request #1110 from PavelSindler/lcd_clicked_error_fix
lcd_clicked() fix (PFW-534 and PFW-546)
|
2018-09-07 09:07:03 +02:00 |
|
mkbel
|
00225bafdc
|
Merge pull request #1113 from PavelSindler/time_remaining_fix
time remaining fix (PFW-554)
|
2018-09-07 09:03:56 +02:00 |
|
Marek Bel
|
001680bbdc
|
Merge branch 'MK3' into time_remaining_fix
# Conflicts:
# Firmware/Marlin_main.cpp
|
2018-09-07 08:21:36 +02:00 |
|
mkbel
|
801f8e93e8
|
Merge pull request #1112 from PavelSindler/MK25_time_remaining
MK25: always show "normal mode" remaining time (PFW-553)
|
2018-09-07 08:05:16 +02:00 |
|
PavelSindler
|
2f02828273
|
time remaining fix
|
2018-09-07 02:02:35 +02:00 |
|
PavelSindler
|
66305b3e04
|
MK25: always show "normal mode" remaining time
|
2018-09-06 23:05:36 +02:00 |
|
PavelSindler
|
e2d92a8c4e
|
Merge pull request #1109 from mkbel/pick_ramming
Add filament ramming when unloading filament with MMU.
|
2018-09-06 21:01:54 +02:00 |
|
PavelSindler
|
48f5da9cb8
|
lcd_clicked fix
|
2018-09-06 20:54:51 +02:00 |
|
Marek Bel
|
0e50c388af
|
Save 1K flash memory.
|
2018-09-06 15:06:46 +02:00 |
|
Marek Bel
|
0d99dc0a3f
|
PFW-543 Add filament ramming when unloading filament with MMU.
|
2018-09-06 15:06:33 +02:00 |
|
PavelSindler
|
1543a1b45a
|
Merge pull request #1057 from MRprusa3d/MK3
ShippingPrepare & M600
|
2018-09-05 00:06:58 +02:00 |
|