Skip to content

Commit

Permalink
Merge pull request #413 from Querz/1.20
Browse files Browse the repository at this point in the history
release-2.2
  • Loading branch information
Querz authored Jun 7, 2023
2 parents 47d2002 + 6c15188 commit 4cc5634
Show file tree
Hide file tree
Showing 176 changed files with 5,083 additions and 1,585 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ To create the 'debug.log' file, follow these steps:
**Environment (please complete the following information):**
- OS: [e.g. Windows 10]
- Java version: [e.g. 17.0.1 and no, "newest version" is not a version]
- Version of MCA Selector [e.g. 2.1]
- Version of MCA Selector [e.g. 2.2]

**Additional context**
Add any other context about the problem here, e.g.:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:
- name: Upload assets
uses: AButler/[email protected]
with:
files: build/inno/Output/MCA_Selector_Setup.exe;build/libs/mcaselector-2.1.jar
files: build/inno/Output/MCA_Selector_Setup.exe;build/libs/mcaselector-2.2.jar
repo-token: ${{ secrets.GITHUB_TOKEN }}

- name: Checkout Wiki
Expand All @@ -78,7 +78,7 @@ jobs:
- name: Update Wiki
run: |
cd mcaselector-wiki
echo -n 2.1 > version.txt
echo -n 2.2 > version.txt
./update_version
shell: bash

Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2018 - 2022 Querz
Copyright (c) 2018 - 2023 Querz

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@

**MCA Selector modifies and deletes chunks in your Minecraft world. Please make backups of your world before using.**

[**Download Version <!--vs-->2.1<!--ve--> (Windows Installer)**](https://github.com/Querz/mcaselector/releases/download/2.1/MCA_Selector_Setup.exe)
[**Download Version <!--vs-->2.2<!--ve--> (Windows Installer)**](https://github.com/Querz/mcaselector/releases/download/2.2/MCA_Selector_Setup.exe)

[**Download Version <!--vs-->2.1<!--ve--> (Universal)**](https://github.com/Querz/mcaselector/releases/download/2.1/mcaselector-2.1.jar)
[**Download Version <!--vs-->2.2<!--ve--> (Universal)**](https://github.com/Querz/mcaselector/releases/download/2.2/mcaselector-2.2.jar)

---

Expand Down
12 changes: 5 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,20 +33,18 @@ repositories {
}

dependencies {
implementation 'com.github.Querz:NBT:f279a237fb'
implementation 'org.json:json:20220320'
implementation 'ar.com.hjg:pngj:2.1.0'
implementation 'com.github.Querz:NBT:3196993049'
implementation 'com.google.code.gson:gson:2.10.1'
implementation 'org.xerial:sqlite-jdbc:3.36.0.3'
implementation 'it.unimi.dsi:fastutil:8.5.8'
implementation 'org.apache.logging.log4j:log4j-api:2.17.2'
implementation 'org.apache.logging.log4j:log4j-core:2.17.2'
implementation 'commons-cli:commons-cli:1.5.0'
implementation 'me.tongfei:progressbar:0.9.3'
implementation 'org.codehaus.groovy:groovy-jsr223:3.0.11'

shadow 'com.github.Querz:NBT:f279a237fb'
shadow 'org.json:json:20220320'
shadow 'ar.com.hjg:pngj:2.1.0'

shadow 'com.github.Querz:NBT:3196993049'
shadow 'com.google.code.gson:gson:2.10.1'
shadow 'org.xerial:sqlite-jdbc:3.36.0.3'
shadow 'it.unimi.dsi:fastutil:8.5.8'
shadow 'org.apache.logging.log4j:log4j-api:2.17.2'
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version=2.1
version=2.2
application.name=MCA Selector
application.url=https://github.com/Querz/mcaselector
application.author=Querz
8 changes: 4 additions & 4 deletions installer/res/resource.rc
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,1,0,0
PRODUCTVERSION 2,1,0,0
FILEVERSION 2,2,0,0
PRODUCTVERSION 2,2,0,0
{
BLOCK "StringFileInfo"
{
BLOCK "040904b0"
{
VALUE "FileDescription", "MCA Selector\0"
VALUE "FileVersion", "2.1.0.0\0"
VALUE "FileVersion", "2.2.0.0\0"
VALUE "LegalCopyright", "© 2018-2022 Querz\0"
VALUE "OriginalFilename", "MCA Selector.exe\0"
VALUE "ProductName", "MCA Selector\0"
VALUE "ProductVersion", "2.1\0"
VALUE "ProductVersion", "2.2\0"
}
}
BLOCK "VarFileInfo"
Expand Down
Loading

0 comments on commit 4cc5634

Please sign in to comment.