Skip to content
This repository was archived by the owner on Aug 22, 2023. It is now read-only.

Commit 7b8293a

Browse files
committed
Merge branch 'main' into 'feat/fo-dir'
1 parent 27a135d commit 7b8293a

21 files changed

Lines changed: 552 additions & 261 deletions

.github/workflows/ci.yml

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,13 @@ jobs:
6666
if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true'
6767
run: pipx run poetry install --no-interaction --no-root
6868
- name: Shorten commit SHA
69-
uses: benjlevesque/short-sha@v2.1
69+
uses: benjlevesque/short-sha@v2.2
7070
id: short-sha
7171
- name: Build
7272
run: |
7373
source .venv/bin/activate
7474
pip install pyside6
75-
pyside6-rcc vanilla_installer/assets/fonts.qrc -o vanilla_installer/fonts.py
75+
pyside6-rcc vanilla_installer/assets/fonts/fonts.qrc -o vanilla_installer/fonts.py
7676
pipx run poetry build --no-interaction
7777
- name: Get normalized branch name
7878
run: |
@@ -94,14 +94,13 @@ jobs:
9494
shell: pwsh
9595
steps:
9696
- uses: actions/checkout@v3
97-
# nuitka currently only supports Python <=3.10 right now
98-
- name: Set up Python 3.10
97+
- name: Set up Python 3.11
9998
uses: actions/setup-python@v4
10099
id: setup-python
101100
with:
102-
python-version: "3.10"
101+
python-version: "3.11"
103102
- name: Shorten commit SHA
104-
uses: benjlevesque/short-sha@v2.1
103+
uses: benjlevesque/short-sha@v2.2
105104
id: short-sha
106105
- name: Cache
107106
uses: actions/cache@v3
@@ -127,7 +126,7 @@ jobs:
127126
./.venv/Scripts/activate.ps1
128127
# pip install nuitka minecraft_launcher_lib PySide6 click tomli darkdetect
129128
echo '__version__ = "${{ env.BRANCH }}+${{ steps.short-sha.outputs.sha }}"' | Out-File vanilla_installer/__init__.py
130-
pyside6-rcc vanilla_installer/assets/fonts.qrc -o vanilla_installer/fonts.py
129+
pyside6-rcc vanilla_installer/assets/fonts/fonts.qrc -o vanilla_installer/fonts.py
131130
python -m nuitka --standalone --onefile --windows-icon-from-ico=media/icon.ico --output-dir=build --include-package=minecraft_launcher_lib,PySide6,click,tomli,darkdetect -o "Vanilla Installer-GUI ${{ env.BRANCH }}+${{ steps.short-sha.outputs.sha }}.exe" --enable-plugin=pyside6 --include-data-dir=vanilla_installer/assets=assets/ --disable-console --nofollow-import-to=PySide6.examples vanilla_installer/gui.py --assume-yes-for-downloads
132131
- name: Upload built executable
133132
uses: actions/upload-artifact@v3
@@ -145,12 +144,12 @@ jobs:
145144
shell: pwsh
146145
steps:
147146
- uses: actions/checkout@v3
148-
- name: Set up Python 3.10
147+
- name: Set up Python 3.11
149148
uses: actions/setup-python@v4
150149
with:
151-
python-version: "3.10"
150+
python-version: "3.11"
152151
- name: Shorten commit SHA
153-
uses: benjlevesque/short-sha@v2.1
152+
uses: benjlevesque/short-sha@v2.2
154153
id: short-sha
155154
- name: Cache
156155
uses: actions/cache@v3
@@ -161,7 +160,7 @@ jobs:
161160
uses: actions/cache@v3
162161
with:
163162
path: .venv
164-
key: ci-build-venv-cli-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}
163+
key: ci-build-venv-cli-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-1
165164
- name: Get normalized branch name
166165
shell: bash
167166
run: |

.github/workflows/git-repo-sync.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77

88
jobs:
99
sync-bitbucket:
10+
if: github.repository_owner == 'Fabulously-Optimized'
1011
runs-on: ubuntu-22.04
1112
name: Git Repo Sync - BitBucket
1213
steps:

README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ However, you have to manually install updates.
3535

3636
**Requirements**: Ability to download a file and double-click it.
3737

38-
**Downsides**: No easy updating
38+
**Downsides**: No easy updating.
3939

4040
**Recommended for**: People that aren't too well versed in technology, and probably don't care about updating VI.
4141

@@ -110,5 +110,3 @@ See [here](https://github.com/Fabulously-Optimized/vanilla-installer/graphs/cont
110110
<!-- prettier-ignore-end -->
111111

112112
<!-- ALL-CONTRIBUTORS-LIST:END -->
113-
114-
![Contribution Overview](https://orbit.onlix.me/contribview/Fabulously-Optimized/vanilla-installer#15/11/2022)

poetry.lock

Lines changed: 155 additions & 167 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
[tool.poetry]
22
name = "vanilla-installer"
3-
version = "0.2.1"
3+
version = "0.2.2"
44
description = "An installer of Fabulously Optimized for the vanilla launcher."
55
authors = [
66
"osfanbuff63 <osfanbuff63@osfanbuff63.tech>",
7-
"nsde <mail@onlix.me>"
7+
"nsde <mail@onlix.me>",
8+
"Kichura <blobfox.coffee/@Kichura>"
89
]
910
documentation = "https://fabulously-optimized.gitbook.io/vanilla-installer"
1011
homepage = "https://fabulously-optimized.gitbook.io/vanilla-installer"
@@ -22,26 +23,24 @@ requests = "^2.28.2"
2223
tomli = "^2.0.1"
2324
darkdetect = {version = "^0.8.0", optional = true}
2425
minecraft-launcher-lib = "^5.3"
25-
pyside6 = {version = "^6.4.3", optional = true}
26+
pyside6 = {version = "^6.5.0", optional = true}
2627
asyncclick = "^8.1.3.4"
2728
anyio = "^3.6.2" # asyncclick seems to bug without anyio, despite being a dep
28-
tomlkit = "^0.11.6"
29+
tomlkit = "^0.11.7"
2930

3031
[tool.poetry.group.dev.dependencies]
31-
pylint = "^2.17.1"
32-
black = "^23.1.0"
33-
isort = "^5.11.4"
34-
32+
pylint = "^2.17.2"
33+
black = "^23.3.0"
34+
isort = "^5.12.0"
3535

3636
[tool.poetry.group.ci.dependencies]
3737
flake8 = "^6.0.0"
3838

39-
4039
[tool.poetry.group.compile.dependencies]
4140
nuitka = "^1.5"
4241
ordered-set = "^4.1.0"
4342
zstandard = "^0.20.0"
44-
imageio = "^2.26.0"
43+
imageio = "^2.27.0"
4544
# pyproject-appimage = {version = "^2.0", python = ">=3.9,<3.12"}
4645

4746
[tool.poetry.scripts]
@@ -58,7 +57,7 @@ gui = ["pyside6", "darkdetect"]
5857

5958
# [tool.pyproject-appimage]
6059
# script = "vanilla-installer"
61-
# output = "VanillaInstaller-v0.2.0.AppImage"
60+
# output = "VanillaInstaller-v0.2.2.AppImage"
6261

6362
[tool.isort]
6463
profile = "black"

vanilla_installer/__init__.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1-
# Copyright (C) Fabulously Optimized 2022
1+
# Copyright (C) Fabulously Optimized 2023
22
# Licensed under the MIT License. The full license text can be found at https://github.com/Fabulously-Optimized/vanilla-installer/blob/main/LICENSE.md.
3-
"""An installer of Fabulously Optimized for the vanilla launcher."""
4-
__version__ = "0.2.1"
3+
"""
4+
An installer of Fabulously Optimized for the vanilla launcher.
5+
"""
6+
7+
__version__ = "0.2.2"
58
__license__ = "MIT License"

vanilla_installer/__main__.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1-
# Copyright (C) Fabulously Optimized 2022
1+
# Copyright (C) Fabulously Optimized 2023
22
# Licensed under the MIT License. The full license text can be found at https://github.com/Fabulously-Optimized/vanilla-installer/blob/main/LICENSE.md.
3-
"""This module allows the Vanilla Installer CLI to be run with python -m."""
3+
"""
4+
This module allows the Vanilla Installer CLI to be run with python -m.
5+
"""
6+
47
from vanilla_installer import cli
58

69
cli.vanilla_installer()
File renamed without changes.
Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
Copyright (c) 2016-2020 The Inter Project Authors.
2+
"Inter" is trademark of Rasmus Andersson.
3+
https://github.com/rsms/inter
4+
5+
This Font Software is licensed under the SIL Open Font License, Version 1.1.
6+
This license is copied below, and is also available with a FAQ at:
7+
http://scripts.sil.org/OFL
8+
9+
-----------------------------------------------------------
10+
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
11+
-----------------------------------------------------------
12+
13+
PREAMBLE
14+
The goals of the Open Font License (OFL) are to stimulate worldwide
15+
development of collaborative font projects, to support the font creation
16+
efforts of academic and linguistic communities, and to provide a free and
17+
open framework in which fonts may be shared and improved in partnership
18+
with others.
19+
20+
The OFL allows the licensed fonts to be used, studied, modified and
21+
redistributed freely as long as they are not sold by themselves. The
22+
fonts, including any derivative works, can be bundled, embedded,
23+
redistributed and/or sold with any software provided that any reserved
24+
names are not used by derivative works. The fonts and derivatives,
25+
however, cannot be released under any other type of license. The
26+
requirement for fonts to remain under this license does not apply
27+
to any document created using the fonts or their derivatives.
28+
29+
DEFINITIONS
30+
"Font Software" refers to the set of files released by the Copyright
31+
Holder(s) under this license and clearly marked as such. This may
32+
include source files, build scripts and documentation.
33+
34+
"Reserved Font Name" refers to any names specified as such after the
35+
copyright statement(s).
36+
37+
"Original Version" refers to the collection of Font Software components as
38+
distributed by the Copyright Holder(s).
39+
40+
"Modified Version" refers to any derivative made by adding to, deleting,
41+
or substituting -- in part or in whole -- any of the components of the
42+
Original Version, by changing formats or by porting the Font Software to a
43+
new environment.
44+
45+
"Author" refers to any designer, engineer, programmer, technical
46+
writer or other person who contributed to the Font Software.
47+
48+
PERMISSION AND CONDITIONS
49+
Permission is hereby granted, free of charge, to any person obtaining
50+
a copy of the Font Software, to use, study, copy, merge, embed, modify,
51+
redistribute, and sell modified and unmodified copies of the Font
52+
Software, subject to the following conditions:
53+
54+
1) Neither the Font Software nor any of its individual components,
55+
in Original or Modified Versions, may be sold by itself.
56+
57+
2) Original or Modified Versions of the Font Software may be bundled,
58+
redistributed and/or sold with any software, provided that each copy
59+
contains the above copyright notice and this license. These can be
60+
included either as stand-alone text files, human-readable headers or
61+
in the appropriate machine-readable metadata fields within text or
62+
binary files as long as those fields can be easily viewed by the user.
63+
64+
3) No Modified Version of the Font Software may use the Reserved Font
65+
Name(s) unless explicit written permission is granted by the corresponding
66+
Copyright Holder. This restriction only applies to the primary font name as
67+
presented to the users.
68+
69+
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
70+
Software shall not be used to promote, endorse or advertise any
71+
Modified Version, except to acknowledge the contribution(s) of the
72+
Copyright Holder(s) and the Author(s) or with their explicit written
73+
permission.
74+
75+
5) The Font Software, modified or unmodified, in part or in whole,
76+
must be distributed entirely under this license, and must not be
77+
distributed under any other license. The requirement for fonts to
78+
remain under this license does not apply to any document created
79+
using the Font Software.
80+
81+
TERMINATION
82+
This license becomes null and void if any of the above conditions are
83+
not met.
84+
85+
DISCLAIMER
86+
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
87+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
88+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
89+
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
90+
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
91+
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
92+
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
93+
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
94+
OTHER DEALINGS IN THE FONT SOFTWARE.
Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
Copyright (c) 2019-07-29, Abbie Gonzalez (https://abbiecod.es|support@abbiecod.es),
2+
with Reserved Font Name OpenDyslexic.
3+
Copyright (c) 12/2012 - 2019
4+
This Font Software is licensed under the SIL Open Font License, Version 1.1.
5+
This license is copied below, and is also available with a FAQ at:
6+
http://scripts.sil.org/OFL
7+
8+
9+
-----------------------------------------------------------
10+
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
11+
-----------------------------------------------------------
12+
13+
PREAMBLE
14+
The goals of the Open Font License (OFL) are to stimulate worldwide
15+
development of collaborative font projects, to support the font creation
16+
efforts of academic and linguistic communities, and to provide a free and
17+
open framework in which fonts may be shared and improved in partnership
18+
with others.
19+
20+
The OFL allows the licensed fonts to be used, studied, modified and
21+
redistributed freely as long as they are not sold by themselves. The
22+
fonts, including any derivative works, can be bundled, embedded,
23+
redistributed and/or sold with any software provided that any reserved
24+
names are not used by derivative works. The fonts and derivatives,
25+
however, cannot be released under any other type of license. The
26+
requirement for fonts to remain under this license does not apply
27+
to any document created using the fonts or their derivatives.
28+
29+
DEFINITIONS
30+
"Font Software" refers to the set of files released by the Copyright
31+
Holder(s) under this license and clearly marked as such. This may
32+
include source files, build scripts and documentation.
33+
34+
"Reserved Font Name" refers to any names specified as such after the
35+
copyright statement(s).
36+
37+
"Original Version" refers to the collection of Font Software components as
38+
distributed by the Copyright Holder(s).
39+
40+
"Modified Version" refers to any derivative made by adding to, deleting,
41+
or substituting -- in part or in whole -- any of the components of the
42+
Original Version, by changing formats or by porting the Font Software to a
43+
new environment.
44+
45+
"Author" refers to any designer, engineer, programmer, technical
46+
writer or other person who contributed to the Font Software.
47+
48+
PERMISSION & CONDITIONS
49+
Permission is hereby granted, free of charge, to any person obtaining
50+
a copy of the Font Software, to use, study, copy, merge, embed, modify,
51+
redistribute, and sell modified and unmodified copies of the Font
52+
Software, subject to the following conditions:
53+
54+
1) Neither the Font Software nor any of its individual components,
55+
in Original or Modified Versions, may be sold by itself.
56+
57+
2) Original or Modified Versions of the Font Software may be bundled,
58+
redistributed and/or sold with any software, provided that each copy
59+
contains the above copyright notice and this license. These can be
60+
included either as stand-alone text files, human-readable headers or
61+
in the appropriate machine-readable metadata fields within text or
62+
binary files as long as those fields can be easily viewed by the user.
63+
64+
3) No Modified Version of the Font Software may use the Reserved Font
65+
Name(s) unless explicit written permission is granted by the corresponding
66+
Copyright Holder. This restriction only applies to the primary font name as
67+
presented to the users.
68+
69+
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
70+
Software shall not be used to promote, endorse or advertise any
71+
Modified Version, except to acknowledge the contribution(s) of the
72+
Copyright Holder(s) and the Author(s) or with their explicit written
73+
permission.
74+
75+
5) The Font Software, modified or unmodified, in part or in whole,
76+
must be distributed entirely under this license, and must not be
77+
distributed under any other license. The requirement for fonts to
78+
remain under this license does not apply to any document created
79+
using the Font Software.
80+
81+
TERMINATION
82+
This license becomes null and void if any of the above conditions are
83+
not met.
84+
85+
DISCLAIMER
86+
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
87+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
88+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
89+
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
90+
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
91+
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
92+
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
93+
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
94+
OTHER DEALINGS IN THE FONT SOFTWARE.

0 commit comments

Comments
 (0)