Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: Victor-IX/Blender-Launcher-V2
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v2.3.2
Choose a base ref
...
head repository: Victor-IX/Blender-Launcher-V2
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref
  • 3 commits
  • 6 files changed
  • 1 contributor

Commits on Nov 27, 2024

  1. Bump version

    Victor-IX committed Nov 27, 2024
    Copy the full SHA
    cb833fb View commit details

Commits on Nov 29, 2024

  1. simple run script

    Victor-IX committed Nov 29, 2024
    Copy the full SHA
    193690d View commit details
  2. Copy the full SHA
    b11b183 View commit details
Showing with 21 additions and 10 deletions.
  1. +6 −1 build_style.py
  2. +3 −3 docs/mkdocs/index.md
  3. +1 −1 pyproject.toml
  4. +6 −0 run.ps1
  5. +1 −1 source/main.py
  6. +4 −4 version.txt
7 changes: 6 additions & 1 deletion build_style.py
Original file line number Diff line number Diff line change
@@ -10,4 +10,9 @@
outfile.write(style.read_text())
outfile.write("\n")

os.system("pyrcc5 source/resources/resources.qrc -o source/resources_rc.py")
exit_code = os.system("pyrcc5 source/resources/resources.qrc -o source/resources_rc.py")

if exit_code == 0:
print("Style build was successful!")
else:
print("Style build failed.")
6 changes: 3 additions & 3 deletions docs/mkdocs/index.md
Original file line number Diff line number Diff line change
@@ -4,9 +4,9 @@

![Blender Launcher Logo](imgs/bl_logo.png)

[:fontawesome-brands-windows: Get for Windows](https://github.com/Victor-IX/Blender-Launcher-V2/releases/download/v2.3.1/Blender_Launcher_v2.3.1_Windows_x64.zip){: .md-button .md-button--primary style="display: inline-block; float: left; width: 24.7%; text-align: center;"}
[:fontawesome-brands-linux: Get for Linux](https://github.com/Victor-IX/Blender-Launcher-V2/releases/download/v2.3.1/Blender_Launcher_v2.3.1_Linux_x64.zip){: .md-button .md-button--primary style="display: inline-block; float: left; margin-left: 0.5%; width: 24.7%; text-align: center;"}
[:fontawesome-brands-ubuntu: Get for Ubuntu](https://github.com/Victor-IX/Blender-Launcher-V2/releases/download/v2.3.1/Blender_Launcher_v2.3.1_Ubuntu_x64.zip){: .md-button .md-button--primary style="display: inline-block; float: left; margin-left: 0.5%; width: 24.7%; text-align: center;"}
[:fontawesome-brands-windows: Get for Windows](https://github.com/Victor-IX/Blender-Launcher-V2/releases/download/v2.3.2/Blender_Launcher_v2.3.2_Windows_x64.zip){: .md-button .md-button--primary style="display: inline-block; float: left; width: 24.7%; text-align: center;"}
[:fontawesome-brands-linux: Get for Linux](https://github.com/Victor-IX/Blender-Launcher-V2/releases/download/v2.3.2/Blender_Launcher_v2.3.2_Linux_x64.zip){: .md-button .md-button--primary style="display: inline-block; float: left; margin-left: 0.5%; width: 24.7%; text-align: center;"}
[:fontawesome-brands-ubuntu: Get for Ubuntu](https://github.com/Victor-IX/Blender-Launcher-V2/releases/download/v2.3.2/Blender_Launcher_v2.3.2_Ubuntu_x64.zip){: .md-button .md-button--primary style="display: inline-block; float: left; margin-left: 0.5%; width: 24.7%; text-align: center;"}
[:fontawesome-solid-download: All Releases](https://github.com/Victor-IX/Blender-Launcher-V2/releases){: .md-button .md-button--primary style="display: inline-block; float: right; width: 24.45%; text-align: center;"}

<br/>
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[project]
name = "Blender-Launcher-V2"
version = "2.3.1"
version = "2.3.2"
description = ""
authors = []
dependencies = [
6 changes: 6 additions & 0 deletions run.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
& ./.venv/Scripts/python.exe ./build_style.py
if ($args -contains "-debug") {
& ./.venv/Scripts/python.exe ./source/main.py -debug
} else {
& ./.venv/Scripts/python.exe ./source/main.py
}
2 changes: 1 addition & 1 deletion source/main.py
Original file line number Diff line number Diff line change
@@ -36,7 +36,7 @@ def format(self, record):
return f"{log_color}{message}{RESET_COLOR}"


version = Version(2, 3, 1,
version = Version(2, 3, 2,
# prerelease="rc.2",
)

8 changes: 4 additions & 4 deletions version.txt
Original file line number Diff line number Diff line change
@@ -6,8 +6,8 @@ VSVersionInfo(
ffi=FixedFileInfo(
# filevers and prodvers should be always a tuple with four items: (1, 2, 3, 4)
# Set not needed items to zero 0.
filevers=(2, 3, 1, 0),
prodvers=(2, 3, 1, 0),
filevers=(2, 3, 2, 0),
prodvers=(2, 3, 2, 0),
# Contains a bitmask that specifies the valid bits 'flags'r
mask=0x0,
# Contains a bitmask that specifies the Boolean attributes of the file.
@@ -31,11 +31,11 @@ VSVersionInfo(
u'04090000',
[StringStruct(u'CompanyName', u'Victor Chedeville'),
StringStruct(u'FileDescription', u'Blender Launcher'),
StringStruct(u'FileVersion', u'2.3.1'),
StringStruct(u'FileVersion', u'2.3.2'),
StringStruct(u'LegalCopyright', u'GPLv3 © 2024 Victor Chedeville'),
StringStruct(u'OriginalFilename', u'Blender Launcher.exe'),
StringStruct(u'ProductName', u'Blender Launcher'),
StringStruct(u'ProductVersion', u'2.3.1')])
StringStruct(u'ProductVersion', u'2.3.2')])
]),
VarFileInfo([VarStruct(u'Translation', [1033, 1200])])
]