Browse Source

Marlin 1.1.0 Release Candidate 3 - 01 December 2015

Richard Wackerbarth 9 years ago
parent
commit
5a54204f72
2 changed files with 12 additions and 7 deletions
  1. 3
    3
      Marlin/Default_Version.h
  2. 9
    4
      README.md

+ 3
- 3
Marlin/Default_Version.h View File

6
 // #error "You must specify the following parameters related to your distribution"
6
 // #error "You must specify the following parameters related to your distribution"
7
 
7
 
8
 #if true
8
 #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"
12
 // It might also be appropriate to define a location where additional information can be found
12
 // It might also be appropriate to define a location where additional information can be found
13
 #define SOURCE_CODE_URL  "http:// ..."
13
 #define SOURCE_CODE_URL  "http:// ..."
14
 #endif
14
 #endif

+ 9
- 4
README.md View File

2
 <img align="top" width=175 src="Documentation/Logo/Marlin%20Logo%20GitHub.png" />
2
 <img align="top" width=175 src="Documentation/Logo/Marlin%20Logo%20GitHub.png" />
3
  Additional documentation can be found in [our wiki](https://github.com/MarlinFirmware/Marlin/wiki/Main-Page).
3
  Additional documentation can be found in [our wiki](https://github.com/MarlinFirmware/Marlin/wiki/Main-Page).
4
 
4
 
5
-## Release Candidate -- Marlin 1.1.0-RC2 - 29 September 2015
5
+## Release Candidate -- Marlin 1.1.0-RC3 - 01 December 2015
6
 
6
 
7
 __Not for production use – use with caution!__
7
 __Not for production use – use with caution!__
8
 
8
 
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.
10
 
10
 
11
 [This branch, "RC"](https://github.com/MarlinFirmware/Marlin/tree/RC), is our current pre-release candidate.
11
 [This branch, "RC"](https://github.com/MarlinFirmware/Marlin/tree/RC), is our current pre-release candidate.
12
 
12
 
13
 Future development takes place in the [MarlinDev repository](https://github.com/MarlinFirmware/MarlinDev/).
13
 Future development takes place in the [MarlinDev repository](https://github.com/MarlinFirmware/MarlinDev/).
14
 
14
 
15
 ## Recent Changes
15
 ## 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
+
16
 RC2 - 29 Sep 2015
21
 RC2 - 29 Sep 2015
17
       File styling reverted
22
       File styling reverted
18
       LCD update frequency reduced
23
       LCD update frequency reduced
44
 
49
 
45
 The current Marlin dev team consists of:
50
 The current Marlin dev team consists of:
46
 
51
 
47
- - Scott Lahteine [@thinkyhead] - English
48
  - Andreas Hardtung [@AnHardt] - Deutsch, English
52
  - Andreas Hardtung [@AnHardt] - Deutsch, English
53
+ - Scott Lahteine [@thinkyhead] - English
49
  - [@Wurstnase] - Deutsch, English
54
  - [@Wurstnase] - Deutsch, English
50
  - F. Malpartida [@fmalpartida] - English, Spanish
55
  - F. Malpartida [@fmalpartida] - English, Spanish
51
  - [@CONSULitAS] - Deutsch, English
56
  - [@CONSULitAS] - Deutsch, English
67
 
72
 
68
 ## License
73
 ## License
69
 
74
 
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.
71
 
76
 
72
 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.
77
 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.
73
 
78
 

Loading…
Cancel
Save