Skip to content

Commit

Permalink
Merge branch 'release/1.21.1' into dev/1.21.1
Browse files Browse the repository at this point in the history
# Conflicts:
#	CHANGELOG.md
  • Loading branch information
SirEndii committed Jan 21, 2025
2 parents 1a73f2f + 75312d7 commit a6be3d2
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@ 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.21.1-0.7.47a] - 2025-01-21

## Fixed:
### Fixed:
- Fixed that the colony integrator's `getCitizens` function would stop working when NPCs are idling
- Fixed errors with fuel ability functions from the automata turtles
- Fixed that automata turtles could break themselves
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ mod_id=advancedperipherals
# do not include mod_version/minecraft_version with equals sign anywhere else in the file (even in comments)
# also do not add space around the equal sign
# since we are using poor grep command to do automation :p
mod_version=0.7.46a
mod_version=0.7.47a
minecraft_version=1.21.1
mod_artifact_suffix=
neo_version=21.1.93
Expand Down

0 comments on commit a6be3d2

Please sign in to comment.