Skip to content

Commit

Permalink
Merge branch 'release/1.20.4' into dev/1.21.1
Browse files Browse the repository at this point in the history
# Conflicts:
#	gradle.properties
  • Loading branch information
SirEndii committed Dec 27, 2024
2 parents 4e3968d + 3dd955b commit 5993f6a
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 3 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ build
eclipse
runs/
server
run

# Files from Forge MDK
forge*changelog.txt
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]
## [1.20.4-0.7.43a] - 2024-12-27

First official Advanced Peripherals 1.20.4 alpha release. Please report any bug to github!

## [1.20.4-0.7.42a] - 2024-12-22

### Fixed
Expand Down
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -403,12 +403,12 @@ githubRelease {
tagName = "${minecraft_version}-${version}"
releaseName = "${minecraft_version}-${version}"
targetCommitish = "release/${minecraft_version}"
generateReleaseNotes = true
generateReleaseNotes = false
try {
//body = "${project.changelog.get("${minecraft_version}-${version}").withHeader(false).toText()}"
body = "${project.changelog.get("${minecraft_version}-${version}").withHeader(false).toText()}"
} catch (err) {
System.out.println(err)
//body = ""
body = ""
}
draft = false
prerelease = !release_type.equalsIgnoreCase("release")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ public static ChunkManager load(@NotNull CompoundTag data) {
return manager;
}

// Registered using the mod bus in the main class
public static void registerTicketController(RegisterTicketControllersEvent event) {
event.register(controller);
}
Expand Down Expand Up @@ -291,6 +292,7 @@ public void touch() {
public boolean isValid() {
return lastTouch + APConfig.PERIPHERALS_CONFIG.chunkLoadValidTime.get() * 20 >= tickCounter;
}

public @NotNull CompoundTag serialize() {
CompoundTag tag = new CompoundTag();
tag.putString(DIMENSION_NAME_TAG, dimensionName);
Expand Down

0 comments on commit 5993f6a

Please sign in to comment.