Skip to content

Commit

Permalink
[Release] Bump version to v0.10.0
Browse files Browse the repository at this point in the history
LocationConditionDialog:
- Fix the "structure" field not exportable to JSON in 1.19+.

- Update copyright year to 2024.
- Update screenshots.
  • Loading branch information
IoeCmcomc committed Mar 23, 2024
1 parent ba66412 commit 44271bf
Show file tree
Hide file tree
Showing 12 changed files with 12 additions and 10 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright 2020-2022 IoeCmcomc
Copyright 2020-2024 IoeCmcomc

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<p align="center">
<img src="https://raw.githubusercontent.com/IoeCmcomc/MCDatapacker/master/resource/app/icon/favicon_big.png" width="150">
<p align="center">
<b>MCDatapacker is a Minecraft datapack creator and editor for Minecraft 1.15 – 1.20.2.</b>
<b>MCDatapacker is a Minecraft datapack creator and editor for Minecraft 1.15 – 1.20.4.</b>
</p>
</p>

Expand All @@ -17,7 +17,7 @@
MCDatapacker provides a unified interface for making and editing datapacks. It allows you to create new datapacks, open existing datapacks, manage files, and edit them quickly and conveniently.

## Features
- Create and open any datapacks from 1.15 to 1.20.2;
- Create and open any datapacks from 1.15 to 1.20.4;
- Add, rename, and delete files via the left-side tree view;
- Multi-tab interface;
- Code editor with syntax highlighting, error checking for function and JSON files, smart code completion for function files;
Expand Down Expand Up @@ -52,7 +52,7 @@ MCDatapacker provides a unified interface for making and editing datapacks. It a
<img src="https://raw.githubusercontent.com/IoeCmcomc/MCDatapacker/master/screenshots/Raw%20JSON%20text%20editor.png" width="30%"></img>

## Download
The program currently supports 1.15 - 1.20.2 data packs, and it run on Windows (tested on Windows 7 and Windows 11) and Linux (tested on Ubuntu 20.04.5).
The program currently supports 1.15 - 1.20.4 data packs, and it run on Windows (tested on Windows 7 and Windows 11) and Linux (tested on Ubuntu 20.04.5).

Warning: This program may contains errors. Use it with your own risk.

Expand Down
2 changes: 1 addition & 1 deletion build_templates/linux/mcdatapacker.desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ Name=MCDatapacker
StartupNotify=true
Terminal=false
Type=Application
X-AppImage-Version=0.9.0
X-AppImage-Version=0.10.0
Binary file modified screenshots/About MCDatapacker.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified screenshots/Loot table editor.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed screenshots/New file menus.png
Binary file not shown.
Binary file added screenshots/New file menus.png.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added screenshots/Predicate editor.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file modified screenshots/Startup screen.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 5 additions & 3 deletions src/locationconditiondialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -154,11 +154,13 @@ void LocationConditionDialog::fromJson(const QJsonObject &value) {
if (value.contains(QStringLiteral("dimension")))
setComboValueFrom(ui->dimensionCombo,
value[QStringLiteral("dimension")]);
if (value.contains(QStringLiteral("feature"))) {
if (Game::version() >= Game::v1_19) {
if (Game::version() >= Game::v1_19) {
if (value.contains(QStringLiteral("structure"))) {
setComboValueFrom(ui->featureCombo,
value[QStringLiteral("structure")]);
} else {
}
} else {
if (value.contains(QStringLiteral("feature"))) {
setComboValueFrom(ui->featureCombo,
value[QStringLiteral("feature")]);
}
Expand Down
4 changes: 2 additions & 2 deletions src/src.pro
Original file line number Diff line number Diff line change
Expand Up @@ -346,15 +346,15 @@ else: unix:!android: target.path = /opt/$${TARGET}/bin
!isEmpty(target.path): INSTALLS += target

VERSION_MAJOR = 0
VERSION_MINOR = 9
VERSION_MINOR = 10
VERSION_PATCH = 0

VERSION = $${VERSION_MAJOR}.$${VERSION_MINOR}.$${VERSION_PATCH}
QMAKE_TARGET_COMPANY = IoeCmcomc
QMAKE_TARGET = MCDatapacker
QMAKE_TARGET_PRODUCT = MCDatapacker
QMAKE_TARGET_DESCRIPTION = MCDatapacker - Minecraft datapack editor
QMAKE_TARGET_COPYRIGHT = \\251 2020 - 2023 IoeCmcomc
QMAKE_TARGET_COPYRIGHT = \\251 2020 - 2024 IoeCmcomc

DEFINES += APP_VERSION=\\\"$$VERSION\\\" \
APP_VERSION_MAJOR=$$VERSION_MAJOR \
Expand Down

0 comments on commit 44271bf

Please sign in to comment.