1
0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2024-11-30 07:17:59 +00:00
Commit Graph

1864 Commits

Author SHA1 Message Date
Richard Wackerbarth
ea05d60c13 USE_AUTOMATIC_VERSIONING hook 2015-08-03 17:38:40 -05:00
Richard Wackerbarth
0c9d142c4f Addons for Arduino IDE 1.6 2015-08-03 17:37:38 -05:00
Richard Wackerbarth
5db22a3da5 PlatformIO Addons 2015-08-03 17:37:00 -05:00
Richard Wackerbarth
ddf77aa68a Mac & Linux Addons 2015-08-03 17:36:38 -05:00
Scott Lahteine
5adb162204 Show "bed" instead of "9" on bed thermal error (PR#2584) 2015-08-03 16:17:24 -05:00
Richard Wackerbarth
6aeeb4e61f Typo 2015-08-01 18:38:56 -05:00
Richard Wackerbarth
559f4f1cba New Repository for Development
To separate future development from maintenance of
tagged releases, development has moved a companion
repository.

The repositories share a common ancestry and patches will be cross-posted.
2015-08-01 18:28:25 -05:00
daid
0b8858fc60 Update README.md
Small documentation fix, link was wrong.
2015-07-30 09:17:03 +02:00
Scott Lahteine
f874fc8b63 Remove usage restriction to comply with GPL
Discussion at #2541
2015-07-28 18:50:25 -07:00
Richard Wackerbarth
a7d4d04c33 Merge pull request #2429 from mkile/patch-1
Add some Russian translations
2015-07-13 09:38:41 -05:00
mkile
45dd199c28 Add some translations
Added some translations, corrected some.
2015-07-13 13:11:11 +05:00
Richard Wackerbarth
b1dc722c83 Merge Correct Dutch language (PR#2330) 2015-06-27 11:30:47 -05:00
Jaime van Kessel
04df544571 Update language.h
Updated Ultimaker URL
2015-06-27 11:27:10 -05:00
Jaime van Kessel
32d431fe63 Added correct dutch translation for calibrate. 2015-06-27 11:27:10 -05:00
Aerospacesmith
8375b82c2e Remove Azteeg X3 Pro conflict of Fan and Heater_1 (PR#2318)
Removes a default conflict on Azteeg X3 Pro boards with the Fan and second heater (Heater_1). Change sets fan to 8th heater terminal on board.
2015-06-27 11:27:09 -05:00
AnHardt
453cbfe550 THERMAL_RUNAWAY_PROTECTION for bed alone in Release (PR#2284)
Fix for #2253 - second issue

__Release__ branch!!!
2015-06-12 06:31:48 -05:00
AnHardt
1e7b286add Fix thermal_runaway_protection() (PR#2266)
THERMAL_RUNAWAY_PROTECTION_PERIOD was used instead of
THERMAL_RUNAWAY_PROTECTION_BED_PERIOD.

Fix for #2253
2015-06-11 11:30:09 -05:00
Scott Lahteine
4ccf7c5e9a Merge pull request #2196 from AnHardt/102
Update version strings to 1.0.2
2015-05-29 21:02:14 -07:00
AnHardt
788cb980fa Update for German developers languages. 2015-05-29 21:33:14 +02:00
AnHardt
eaeccf2699 Update version strings to 1.0.2
This is the minimal possible change.
Going over the Configuration.h would require to change them all.
2015-05-29 21:27:59 +02:00
Scott Lahteine
9f4201b96d Languages of devs not intended as links 2015-05-24 18:35:44 -07:00
Scott Lahteine
7824047422 Notes about the Release branch in its README.md 2015-05-24 18:34:21 -07:00
Scott Lahteine
de70315dc7 Merge pull request #2110 from YanFM/patch-1
Update language_pt.h
2015-05-18 05:27:56 -07:00
YanFM
fed690d9ac Update language_pt.h
I've changed a few words to better comprehension.
2015-05-18 08:18:32 -03:00
Scott Lahteine
df46297c6d More authors 2015-05-14 18:21:31 -07:00
Scott Lahteine
77fc28c761 Hardtung 2015-05-14 04:43:24 -07:00
Scott Lahteine
c411cb18d3 More active authors 2015-05-14 04:39:40 -07:00
AnHardt
5ce0bf057e Add Version in Configuration.h for Release-branch 2015-05-12 00:03:16 +02:00
Scott Lahteine
ac36cd7258 Add documentation logo graphics to Release 2015-05-09 16:15:10 -07:00
Scott Lahteine
0d8c6f8673 Show the latest README on the default branch 2015-05-09 16:11:49 -07:00
Steffen Vogel
da192c521f Merge pull request #1333 from andrewsil1/development
Fix grammar/typos in new Configuration.h option
2015-01-08 00:34:01 +01:00
Erik van der Zalm
0f5cccca4f Merge pull request #1334 from MarlinFirmware/revert-1311-Development
Revert "issue 968 for dev branch"
2015-01-07 23:41:10 +01:00
Erik van der Zalm
3a30d45c2e Revert "issue 968 for dev branch" 2015-01-07 23:40:17 +01:00
andrewsil1
269ec9f87f Fix grammar/typos in new Configuration.h option
(For the SLOW_PWM_HEATERS option)
2015-01-07 12:41:09 -08:00
Bo Herrmannsen
3d2b471c1a added link to google hangout 2015-01-07 21:05:28 +01:00
Steffen Vogel
72912851b8 Merge pull request #1331 from stv0g/Development
moved/renamed documentation stuff to top-level directory
2015-01-07 15:50:24 +01:00
Steffen Vogel
8d7bfd03d8 moved/renamed documentation stuff to top-level directory 2015-01-07 15:33:50 +01:00
Bo Herrmannsen
3c9e6b7b62 added link for pic to hex converter 2015-01-07 14:28:51 +01:00
Bo Herrmannsen
0e760274bd changed reprap logo to marlin logo 2015-01-07 14:27:51 +01:00
Bo Herrmannsen
b291a422e9 added square png version of logo
406*406 pixels
2015-01-07 13:00:37 +01:00
Bo Herrmannsen
8813978766 Merge pull request #1330 from avluis/feature-request
Update Marlin Firmware URL
2015-01-07 12:48:21 +01:00
Luis E Alvarado
7ae548cf34 Update Marlin Firmware URL 2015-01-07 05:26:47 -06:00
Erik van der Zalm
8f9067faa6 Added marlin logos. (Designed by Ahmet Cem TURAN) 2015-01-07 12:21:16 +01:00
Bo Herrmannsen
addf52fd4a Merge pull request #1328 from DinoMesina/development
Some corrections and new features
2015-01-06 23:52:32 +01:00
Bo Herrmannsen
e9ddd21aef Update README.md 2015-01-06 22:22:35 +01:00
DinoMesina
2d7d43b64c Merge pull request #1 from DinoMesina/master
Master
2015-01-06 21:59:51 +01:00
Dino Del Favero
5cfe13f240 Correct some mistakes 2015-01-06 21:55:08 +01:00
Bo Herrmannsen
9852252bca Update README.md 2015-01-06 21:52:57 +01:00
Bo Herrmannsen
1c33310363 Update README.md 2015-01-06 21:41:06 +01:00
Bo Herrmannsen
380c9abf16 removed note on Ramps
ramps do have power for the servos, the power comes from the power connector, not sure why this note was even made
2015-01-06 21:15:46 +01:00