3930 Commits (042a6a0a37c46989f8b89df5d49ff484489fbd4a)
 

Author SHA1 Message Date
ErikZalm a7e40b2903 Merge pull request #276 from setar/Marlin_v1
12 years ago
ErikZalm 23b0f8ed4b Merge pull request #279 from MaikStohn/Marlin_v1
12 years ago
MaikStohn 6ed02c86be Fixed wrong code (will not even compile when EXTRUDERS>2)
12 years ago
Sergey Taranenko 2a67363e27 Fix ‘prog_uchar’ definition in LiquidCrystalRus.cpp
12 years ago
Sergey Taranenko 205304ddee Merge git://github.com/ErikZalm/Marlin into Marlin_v1
12 years ago
Erik vd Zalm 58bca87c72 fix LCD temp bed artifacts on power up ' B022/0.) -> B022/000 '
12 years ago
Erik vd Zalm febeb43197 Revert "fix LCD temp bed artifacts on power up ' B022/0.) -> B022/000 '"
12 years ago
Sergey Taranenko 8178dec4c3 Fix num of digits on LCD for E and Z axis.
12 years ago
ErikZalm 70f57a6844 Merge pull request #273 from setar/Marlin_v1
12 years ago
ErikZalm ff14199e58 Merge pull request #270 from jothan/Marlin_v1
12 years ago
ErikZalm bfdf0932c1 Merge pull request #274 from DanieleSdei/Marlin_v1
12 years ago
Daniele Sdei 695938ba3f Italian language support
12 years ago
Sergey Taranenko cb02c2f9d8 fix LCD temp bed artifacts on power up ' B022/0.) -> B022/000 '
12 years ago
Jonathan Bastien-Filiatrault e4a5e333ef Generalize.
12 years ago
Jonathan Bastien-Filiatrault e10d3136c8 Create an explicit rule for building applet/Marlin.cpp.
12 years ago
ErikZalm 9f089756b7 Merge pull request #265 from setar/Marlin_v1
12 years ago
ErikZalm 654387297f Merge pull request #268 from brupje/Marlin_v1
12 years ago
brupje 326423719f Add support for Megatronics
12 years ago
brupje d07b6e93d5 Add support for Megatronics
12 years ago
Sergey Taranenko efcc28d347 Fix check for include LiquidCrystalRus.h
12 years ago
Sergey Taranenko cfc193cdac Enables support the Cyrillic alphabet for LCD
12 years ago
Sergey Taranenko 24bcc9647d Added Russian translation
12 years ago
ErikZalm bc27d809fb Merge pull request #262 from markfinn/bedpid-clean3
12 years ago
Mark Finn bf7e453d02 Unwanted artifacts from unclean merge of bed-pid tree
12 years ago
ErikZalm 36a746d7d5 Merge pull request #244 from markfinn/pidbed
12 years ago
tonokip ca811156a0 Merge pull request #1 from johnnyr/patch-1
12 years ago
ErikZalm 50daf27e5a Merge pull request #255 from elgambitero/Marlin_v1
12 years ago
elgambitero df09e2adce Spanish updated
12 years ago
elgambitero ddf6603d81 Spanish language updated. Bug fixes on dialogs.
12 years ago
elgambitero 4bf8b1aeee fesfas
12 years ago
drakelive be1e099f1b Union whit Erick version
12 years ago
elgambitero 7afd202b89 New dialogs translated to spanish. Bug fixes.
12 years ago
elgambitero ebc4601185 Some new dialogs translated to Spanish
12 years ago
drakelive c8ea9b0e58 Merge branch 'Marlin_v1' of https://github.com/Drakelive/Marlin
12 years ago
drakelive ca7ca4572e primo commit
12 years ago
ErikZalm c0aad4c28a Merge pull request #254 from ZetaPhoenix/Marlin_v1_bugfix
12 years ago
johnnyr 8016f058bc fix max endstop pins
12 years ago
Mark Finn d197f8504b clean up and changes from testing
12 years ago
Mark Finn eb06a886c4 missed
12 years ago
Mark Finn 04631d2250 cleanup for pull
12 years ago
Mark Finn 0a5ad3ab85 move comment to correct place
12 years ago
ZetaPhoenix 8ac5b29e02 Changes to M119 response for easier visual comparison
12 years ago
ErikZalm 0a31ccb1d1 Merge pull request #251 from ZetaPhoenix/Marlin_v1_bugfix
12 years ago
ZetaPhoenix c6caa45ae2 Limit Switch locations based on MIN/MAX limits and homing direction
12 years ago
ZetaPhoenix dc566d654f fixes #246
12 years ago
ErikZalm ba898faa7d Merge pull request #249 from gwelchc/patch-2
12 years ago
ErikZalm 0152ee71a5 Merge pull request #248 from gwelchc/patch-1
12 years ago
ErikZalm 348d543425 Merge pull request #245 from andrey-vasilyev/patch-1
12 years ago
G. W. C. 6ccbfeb80c Update Marlin/Marlin.pde
12 years ago
G. W. C. c433142abf Update Marlin/ultralcd.pde
12 years ago