Skip to content

Commit e730e56

Browse files
committed
Merge branch 'dev'
2 parents 29c557e + 7161342 commit e730e56

327 files changed

Lines changed: 7 additions & 27 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

LICENSE

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,4 @@
1-
The font is licensed under SIL OFL Version 1.1.
2-
3-
The support code is licensed under Berkeley Software Distribution license.
4-
5-
---
6-
---
7-
8-
Copyright (c) 2015-2019 Renzhi Li (a.k.a. Belleve Invis, belleve@typeof.net).
9-
10-
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
11-
* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
12-
* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
13-
* Neither the name of Belleve Invis nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
14-
15-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BELLEVE INVIS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
16-
17-
-----------------------
18-
19-
---
20-
21-
Copyright 2015-2019, Renzhi Li (a.k.a. Belleve Invis, belleve@typeof.net).
1+
Copyright 2015-2021, Renzhi Li (aka. Belleve Invis, belleve@typeof.net).
222
Portions Copyright © 2014, 2015 Adobe Systems Incorporated (http://www.adobe.com/), with Reserved Font Name 'Source'.
233
Portions Copyright 2012 Google Inc.
244

@@ -45,7 +25,7 @@ with others.
4525

4626
The OFL allows the licensed fonts to be used, studied, modified and
4727
redistributed freely as long as they are not sold by themselves. The
48-
fonts, including any derivative works, can be bundled, embedded,
28+
fonts, including any derivative works, can be bundled, embedded,
4929
redistributed and/or sold with any software provided that any reserved
5030
names are not used by derivative works. The fonts and derivatives,
5131
however, cannot be released under any other type of license. The
@@ -120,7 +100,7 @@ not met.
120100

121101

122102
DISCLAIMER
123-
103+
124104
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
125105
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
126106
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@
238238
"HC": ["en_US", "zh_HK"],
239239
"CL": ["en_US", "zh_TW"]
240240
},
241-
"copyright": "Copyright 2015-2020, Renzhi Li (a.k.a. Belleve Invis, belleve@typeof.net). Portions Copyright © 2014-2019 Adobe Systems Incorporated (http://www.adobe.com/), with Reserved Font Name 'Source'. Portions Copyright 2017-2020 Rasmus Andersson. Portions Copyright 2017, 2018 MoneMizuno.",
241+
"copyright": "Copyright 2015-2021 Renzhi Li (aka. Belleve Invis, belleve@typeof.net). Portions Copyright © 2014-2019 Adobe Systems Incorporated (http://www.adobe.com/), with Reserved Font Name 'Source'. Portions Copyright 2017-2020 Rasmus Andersson. Portions Copyright 2017, 2018 MoneMizuno.",
242242
"shsSourceMap": {
243243
"defaultRegion": "SourceHanSans",
244244
"region": {

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "sarasa-gothic",
3-
"version": "0.16.3",
3+
"version": "0.16.4",
44
"main": "./run",
55
"scripts": {
66
"build": "verda -f verdafile.js",
@@ -25,8 +25,8 @@
2525
"which": "^2.0.2"
2626
},
2727
"devDependencies": {
28-
"eslint": "^7.15.0",
29-
"eslint-config-prettier": "^7.0.0",
28+
"eslint": "^7.16.0",
29+
"eslint-config-prettier": "^7.1.0",
3030
"prettier": "^2.2.1"
3131
},
3232
"engines": {

0 commit comments

Comments
 (0)