Skip to content

Commit 67a2a58

Browse files
authored
🔀 Merge #522: 🔖 version/1.10.2
2 parents feeb236 + 4d0863d commit 67a2a58

51 files changed

Lines changed: 1770 additions & 1216 deletions

Some content is hidden

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

.scripts/plugins/releaseNoteTemplates/discord_release_notes_template

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@
66

77
## How to Install
88

9-
For now, you can download and install the latest build of AJ [here](https://builds.animated-java.dev/latest) or install it via this link:
10-
https://builds.animated-java.dev/latest/download/animated_java.js
11-
Once [this PR](https://github.com/JannisX11/blockbench-plugins/pull/{pr_number}) has been merged, you can install the latest release of AJ from the Blockbench plugin list.
12-
[Follow this tutorial](https://animated-java.github.io/docs/getting-started/installing-animated-java) if you don't know how to install plugins in Blockbench.
9+
Download `animated_java.js` from the [release page](<https://github.com/Animated-Java/animated-java/releases/tag/v1.10.1>), then [Follow this tutorial](<https://animated-java.dev/docs/getting-started/installing#advanced-installation-url>)
10+
11+
Once [this PR](<https://github.com/JannisX11/blockbench-plugins/pull/930>) has been merged, you can install the latest release of AJ directly from the Blockbench plugin list.
1312

1413
-# {pings}

.scripts/plugins/releaseNoteTemplates/github_release_notes_template

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
## How to Install
66

7-
For now, you can download and install the latest build of AJ [here](https://builds.animated-java.dev/latest) or install it via this link:
8-
https://builds.animated-java.dev/latest/download/animated_java.js
9-
Once [this PR](https://github.com/JannisX11/blockbench-plugins/pull/{pr_number}) has been merged, you can install the latest release of AJ from the Blockbench plugin list.
10-
[Follow this tutorial](https://animated-java.github.io/docs/getting-started/installing-animated-java) if you don't know how to install plugins in Blockbench.
7+
Download `animated_java.js` from the [release page](https://github.com/Animated-Java/animated-java/releases/tag/v1.10.1), then [Follow this tutorial](https://animated-java.dev/docs/getting-started/installing#advanced-installation-url)
8+
9+
Once [this PR](https://github.com/JannisX11/blockbench-plugins/pull/930) has been merged, you can install the latest release of AJ directly from the Blockbench plugin list.

TODO.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
- [ ] Add Variants to the UndoSystem (Blocked by vanilla Blockbench not supporting custom undo actions).
66
- [ ] Add an option to generate a `damage_flash` variant for mob-type entities.
77
- [ ] Add a fix for 360 rotation snap by using `set_frame` instead of `apply_frame` for the first frame of the animation.
8+
- [ ] Add a toggle for node custom names.
89

910
# Data Pack Compiler
1011

bun.lock

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

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"title": "Animated Java",
55
"icon": "icon.svg",
66
"description": "Effortlessly craft complex animations for Minecraft: Java Edition",
7-
"version": "1.10.1",
7+
"version": "1.10.2",
88
"min_blockbench_version": "5.1.4",
99
"variant": "desktop",
1010
"tags": [
16.7 KB
Loading

src/constants.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ export const PACKAGE: typeof PACKAGEJSON = PACKAGEJSON
44

55
let cachedFsModule: ScopedFS | null = null
66
export function getFsModule() {
7-
debugger
87
cachedFsModule ??= requireNativeModule('fs', {
98
message: localize('require.fs'),
109
optional: false,

src/dialogs/blueprintSettings/blueprintSettings.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ import {
77
OPEN_DOCUMENTATION,
88
} from '../../interface/animatedJavaBarItem'
99
import { updateAllCubeOutlines } from '../../mods/cube'
10+
import { VanillaBlockDisplay } from '../../outliner/vanillaBlockDisplay'
11+
import { VanillaItemDisplay } from '../../outliner/vanillaItemDisplay'
1012
import { createScopedTranslator } from '../../util/lang'
1113
import FooterComponent from './footer.svelte'
1214
import DatapackComponent from './pages/datapack.svelte'
@@ -81,6 +83,9 @@ export function openBlueprintSettings() {
8183
disableKeybinds: true,
8284
buttons: [tl('dialog.close')],
8385
onClose: () => {
86+
VanillaBlockDisplay.forceUpdateAll()
87+
VanillaItemDisplay.forceUpdateAll()
88+
VanillaItemDisplay.forceUpdateAll()
8489
updateRotationConstraints()
8590
updateAllCubeOutlines()
8691
Canvas.updateAll()

src/dialogs/blueprintSettings/pages/general.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<script lang="ts">
22
import type {} from '@blockbench-types/generated/uv/uv_size'
33
import { onDestroy } from 'svelte'
4-
import DataPackIcon from '../../../assets/icons/impulse_command_block.png'
4+
import DataPackIcon from '../../../assets/icons/command_block.webp'
55
import PluginIcon from '../../../assets/icons/papermc.svg'
66
import { getDefaultProjectSettings } from '../../../formats/blueprint'
77
import {

src/dialogs/displayEntityConfig/displayEntityConfig.svelte

Lines changed: 0 additions & 259 deletions
This file was deleted.

0 commit comments

Comments
 (0)