Commit Graph
17 Commits
Author SHA1 Message Date
nothinman abba7a0003 Merge pull request #782 from marcovannoord/Marlin_v1
Added dutch to language.h
2014-02-18 16:19:50 +00:00
nothinman fd42f0d226 Merge pull request #783 from MissionSt/fix/syntax-error
Fix compile error
2014-02-17 20:59:43 +00:00
nothinman 96217bf36a Merge pull request #777 from PxT/M114
Add whitespace to M114 output
2014-02-17 18:07:47 +00:00
nothinman 3f455889d0 Merge pull request #769 from Cylindric3D/typofixes_1
Various typo fixes - only in comments, no code changes.
2014-02-17 11:30:01 +00:00
nothinman 4ddedb3b27 Merge pull request #780 from Cylindric3D/typofixes_2
Various typo fixes #2 - only in comments, no code changes.
2014-02-17 11:29:18 +00:00
nothinman d4ba23bc28 Merge pull request #770 from josefpavlik/Marlin_v1
Marlin v1
2014-02-17 11:27:05 +00:00
nothinman bbb424bd2f Merge pull request #779 from MissionSt/makefile-fix-abl
Makefile fixes
2014-02-17 11:22:34 +00:00
nothinman 3b193d1b5f Merge pull request #775 from MissionSt/lang-fix/bed
Use language.h for "bed"
2014-02-17 10:26:23 +00:00
nothinman a466c8ef68 Merge pull request #774 from MissionSt/cleanup/probe_pt
Refactor of z probing for auto bed leveling
2014-02-17 01:08:58 +00:00
nothinman 7dcd350941 A few changes to Russian, changed LCD strings to be <=17 characters. 2014-02-13 11:58:14 +00:00
nothinman 15d6116188 Merge pull request #689 from cajun-rat/tidy
Use C++ initialization list
2014-02-12 16:38:11 +00:00
nothinman 5f797ca29f Updated Polish, changed default firmware URL to Marlin. 2014-02-11 22:38:01 +00:00
nothinman 1a6d21bb60 Merge pull request #761 from Cylindric3D/localisation
Move strings in ultralcd.cpp into language.h.
2014-02-11 15:39:18 +00:00
nothinman b18b40feff Merge pull request #760 from danielmartinez/aragonese_trans
Aragonese translation
2014-02-11 14:28:03 +00:00
nothinman 19530c9945 Revert "Merge pull request #756 from danielmartinez/aragones"
This reverts commit 6f76066ab3, reversing
changes made to e1ae7952eb.
2014-02-09 16:21:00 +00:00
nothinman 6f76066ab3 Merge pull request #756 from danielmartinez/aragones
Add Aragonese translation
2014-02-09 13:42:36 +00:00
nothinman adbf226de1 Merge pull request #726 from DanLipsitt/patch-1
Format README.md with subsections
2014-01-21 12:46:47 -08:00