Skip to content

Commit 5a54204

Browse files
committed
Marlin 1.1.0 Release Candidate 3 - 01 December 2015
1 parent bb4efcf commit 5a54204

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

Marlin/Default_Version.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
// #error "You must specify the following parameters related to your distribution"
77

88
#if true
9-
#define SHORT_BUILD_VERSION "1.1.0-RC2"
10-
#define DETAILED_BUILD_VERSION "1.1.0-RC2 From Archive"
11-
#define STRING_DISTRIBUTION_DATE "2015-09-28 12:00"
9+
#define SHORT_BUILD_VERSION "1.1.0-RC3"
10+
#define DETAILED_BUILD_VERSION "1.1.0-RC3 From Archive"
11+
#define STRING_DISTRIBUTION_DATE "2015-12-01 12:00"
1212
// It might also be appropriate to define a location where additional information can be found
1313
#define SOURCE_CODE_URL "http:// ..."
1414
#endif

README.md

+9-4
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,22 @@
22
<img align="top" width=175 src="Documentation/Logo/Marlin%20Logo%20GitHub.png" />
33
Additional documentation can be found in [our wiki](https://github.com/MarlinFirmware/Marlin/wiki/Main-Page).
44

5-
## Release Candidate -- Marlin 1.1.0-RC2 - 29 September 2015
5+
## Release Candidate -- Marlin 1.1.0-RC3 - 01 December 2015
66

77
__Not for production use – use with caution!__
88

9-
For the latest tagged version of Marlin (currently 1.0.2 – January 2015) you should switch to the [Release branch](https://github.com/MarlinFirmware/Marlin/tree/Release).
9+
Previously tagged versions of Marlin are not recommended. However, the latest patches to the Marlin 1.0 series can be found in the [1.0.x](https://github.com/MarlinFirmware/Marlin/tree/1.0.x) branch.
1010

1111
[This branch, "RC"](https://github.com/MarlinFirmware/Marlin/tree/RC), is our current pre-release candidate.
1212

1313
Future development takes place in the [MarlinDev repository](https://github.com/MarlinFirmware/MarlinDev/).
1414

1515
## Recent Changes
16+
RC3 - 01 Dec 2015
17+
A number of language sensitive strings have been revised
18+
Formatting of the LCD display has been improved to handle negative coordinates better
19+
Various compiler-related issues have been corrected
20+
1621
RC2 - 29 Sep 2015
1722
File styling reverted
1823
LCD update frequency reduced
@@ -44,8 +49,8 @@ __Google Hangout:__ <a href="https://plus.google.com/hangouts/_/gxn3wrea5gdhoo22
4449

4550
The current Marlin dev team consists of:
4651

47-
- Scott Lahteine [@thinkyhead] - English
4852
- Andreas Hardtung [@AnHardt] - Deutsch, English
53+
- Scott Lahteine [@thinkyhead] - English
4954
- [@Wurstnase] - Deutsch, English
5055
- F. Malpartida [@fmalpartida] - English, Spanish
5156
- [@CONSULitAS] - Deutsch, English
@@ -67,7 +72,7 @@ More features have been added by:
6772

6873
## License
6974

70-
Marlin is published under the [GPL license](/Documentation/COPYING.md) because we believe in open development. The GPL comes with both rights and obligations. Whether you use Marlin firmware as the driver for your open or closed-source product, you must keep Marlin open, and you must provide your compatible Marlin source code to end users upon request. The most straightforward way to comply with the Marlin license is to make a fork of Marlin on Github, perform your modifications, and direct users to your modified fork.
75+
Marlin is published under the [GPL license](/LICENSE) because we believe in open development. The GPL comes with both rights and obligations. Whether you use Marlin firmware as the driver for your open or closed-source product, you must keep Marlin open, and you must provide your compatible Marlin source code to end users upon request. The most straightforward way to comply with the Marlin license is to make a fork of Marlin on Github, perform your modifications, and direct users to your modified fork.
7176

7277
While we can't prevent the use of this code in products (3D printers, CNC, etc.) that are closed source or crippled by a patent, we would prefer that you choose another firmware or, better yet, make your own.
7378

0 commit comments

Comments
 (0)