PavelSindler
|
839de141a3
|
resolving conflicts
|
2018-11-29 16:26:49 +01:00 |
|
PavelSindler
|
abf20ef6a2
|
merged changes from public upstream (Prusa-Firmware repository)
|
2018-11-29 13:46:58 +01:00 |
|
PavelSindler
|
90876453a7
|
Merge pull request #1357 from PavelSindler/MK3_for_merging
version change
|
2018-11-22 23:32:37 +01:00 |
|
PavelSindler
|
47d3535012
|
version change
|
2018-11-22 23:30:01 +01:00 |
|
PavelSindler
|
c1773c1aa4
|
Merge pull request #1356 from PavelSindler/MK3_for_merging
process serial line during pause
|
2018-11-22 23:07:07 +01:00 |
|
PavelSindler
|
85b23d1db6
|
process serial line during pause
|
2018-11-22 21:41:22 +01:00 |
|
PavelSindler
|
b3ab9d0ee0
|
Merge pull request #1354 from XPila/V3_5
Lang - final corrections
|
2018-11-22 19:03:30 +01:00 |
|
Robert Pelnar
|
e229f3343e
|
Lang - text "volume.init failed" removed from dictionary
|
2018-11-22 18:48:22 +01:00 |
|
Robert Pelnar
|
42f2a61416
|
Lang - text "TRIGGERED" removed from dictionary
|
2018-11-22 18:46:02 +01:00 |
|
Robert Pelnar
|
e9131542ca
|
Lang - text "Sleep..." removed from dictionary
|
2018-11-22 18:43:21 +01:00 |
|
Robert Pelnar
|
ddf898cb41
|
Lang - text "SD init fail" removed from dictionary
|
2018-11-22 18:41:00 +01:00 |
|
Robert Pelnar
|
3384dd8487
|
Lang - text "SD card ok" removed from dictionary
|
2018-11-22 18:39:35 +01:00 |
|
Robert Pelnar
|
72c7810641
|
Lang - text "Resend" removed from dictionary
|
2018-11-22 18:38:20 +01:00 |
|
Robert Pelnar
|
7426efac9b
|
Lang - text "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)" removed from dictionary
|
2018-11-22 18:36:38 +01:00 |
|
Robert Pelnar
|
123bef636a
|
Lang - text "Printer halted. kill() called!" removed from dictionary
|
2018-11-22 18:33:15 +01:00 |
|
Robert Pelnar
|
123725edd1
|
Lang - duplicate text "Some problem encountered, Z-levelling enforced ..." removed
|
2018-11-22 18:30:53 +01:00 |
|
Robert Pelnar
|
0fceade481
|
Lang - text "PowerUp" removed from dictionary
|
2018-11-22 18:24:21 +01:00 |
|
Robert Pelnar
|
f0e3021d33
|
Lang - text "openRoot failed" removed from dictionary
|
2018-11-22 18:20:24 +01:00 |
|
Robert Pelnar
|
1cbb261707
|
Lang - text "open" removed from dictionary
|
2018-11-22 18:18:25 +01:00 |
|
Robert Pelnar
|
f4bbce4142
|
Lang - text "open failed, File: " removed from dictionary
|
2018-11-22 18:15:22 +01:00 |
|
Robert Pelnar
|
72d47eaeba
|
Lang - text "ok" removed from dictionary
|
2018-11-22 18:12:19 +01:00 |
|
Robert Pelnar
|
1568b94e87
|
Lang - text "No Checksum with line number, Last Line: " removed from dictionary
|
2018-11-22 18:09:07 +01:00 |
|
Robert Pelnar
|
fd3cd9b551
|
Lang - texts "Mxxx Invalid extruder " removed from dictionary
|
2018-11-22 18:06:10 +01:00 |
|
Robert Pelnar
|
fdf9734161
|
Lang - text "checksum mismatch, Last Line: " removed from dictionary
|
2018-11-22 17:59:43 +01:00 |
|
Robert Pelnar
|
9c964277ac
|
Lang - text "error writing to file" removed from dictionary
|
2018-11-22 17:57:52 +01:00 |
|
Robert Pelnar
|
9f86a334c6
|
Lang - text "endstops hit: " removed from dictionary
|
2018-11-22 17:53:51 +01:00 |
|
Robert Pelnar
|
0baa6412fc
|
Lang - text "Cannot enter subdir: " removed from dictionary
|
2018-11-22 17:49:28 +01:00 |
|
Robert Pelnar
|
60e567b660
|
Lang - text " Last Updated: " removed from dictionary
|
2018-11-22 17:48:12 +01:00 |
|
Robert Pelnar
|
a1f03e9531
|
Lang - text " Free Memory: " removed from dictionary
|
2018-11-22 17:46:44 +01:00 |
|
Robert Pelnar
|
283e33dd69
|
Lang - text " cold extrusion prevented" removed from dictionary
|
2018-11-22 17:44:53 +01:00 |
|
Robert Pelnar
|
104353c0c5
|
Lang - text " PlannerBufferBytes: " removed from dictionary
|
2018-11-22 17:43:11 +01:00 |
|
Robert Pelnar
|
46fba48173
|
Lang - text "enqueing \"" removed from dictionary
|
2018-11-22 17:38:52 +01:00 |
|
Robert Pelnar
|
0ceeba38cb
|
Lang - text "Copy selected language from XFLASH?" shorted to "Copy selected language?"
|
2018-11-22 17:32:53 +01:00 |
|
Robert Pelnar
|
099fe216b6
|
Lang - text "KILLED. " removed from dictionaries
|
2018-11-22 17:26:01 +01:00 |
|
Robert Pelnar
|
37273d9fca
|
Lang - 'Auto Deplete' changed to 'SpoolJoin'
|
2018-11-22 17:19:38 +01:00 |
|
PavelSindler
|
49367c0b09
|
Merge pull request #1353 from XPila/V3_5
Lang - french translation
|
2018-11-22 17:18:42 +01:00 |
|
Robert Pelnar
|
f0624a9e97
|
Lang - some not localized texts marked as localized, formating fixed
|
2018-11-22 14:37:29 +01:00 |
|
XPila
|
3d76081c79
|
Merge pull request #1351 from PavelSindler/MK3_for_merging
mmu: FINDA disabled by damaged/disconnected PAT9125 hotfix
|
2018-11-21 20:03:07 +01:00 |
|
PavelSindler
|
0e65790218
|
removed redundant code
|
2018-11-21 19:49:19 +01:00 |
|
PavelSindler
|
74a7341005
|
mmu: FINDA disabled by damaged/disconnected PAT9125 hotfix
|
2018-11-21 19:27:55 +01:00 |
|
PavelSindler
|
9fa587b206
|
Merge pull request #1350 from XPila/V3_5
V 3.5 - new translation
|
2018-11-21 15:23:41 +01:00 |
|
Robert Pelnar
|
2dc5439069
|
Lang - reserved space increased to 0x2f00 (12032 bytes)
|
2018-11-21 14:57:20 +01:00 |
|
Robert Pelnar
|
1bff138b50
|
Lang - sec.lang. reserved space increased to 0x2e00 (11776 bytes)
|
2018-11-21 14:52:14 +01:00 |
|
PavelSindler
|
18eb9ad69e
|
Merge pull request #1344 from PavelSindler/progress_bar_fix
progress bar fix
|
2018-11-20 14:50:04 +01:00 |
|
Marek Bel
|
ab5b57df11
|
Style.
|
2018-11-19 20:41:14 +01:00 |
|
PavelSindler
|
cb7c701791
|
whitespace
|
2018-11-19 20:09:03 +01:00 |
|
PavelSindler
|
7d538cde6c
|
Retrieve settings (M501): initialize each item in feedrate and acceleration arrays separately
|
2018-11-19 20:05:58 +01:00 |
|
PavelSindler
|
e5dd4d757a
|
progress bar fix
|
2018-11-16 15:45:55 +01:00 |
|
MRprusa3d
|
ffe906c733
|
MeshBed Levelling Fail V
|
2018-11-14 16:45:49 +01:00 |
|
PavelSindler
|
0398c3c26b
|
Merge pull request #1335 from PavelSindler/T_codes
version change
|
2018-11-13 17:49:26 +01:00 |
|