Skip to content

Commit

Permalink
Merge branch 'develop' into version/1.20.1
Browse files Browse the repository at this point in the history
# Conflicts:
#	CHANGELOG.md
#	gradle.properties
  • Loading branch information
Erdragh committed Feb 8, 2025
2 parents c4d7365 + f23f8a0 commit 8cc7ba6
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# 1.5.5
Update JetBrains' Exposed to prevent issues with Ledger

# 1.5.4
Fix wrong jar being published for Forge
Fix Forge jars published

# 1.5.3
- Unlink users on leave
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ org.gradle.jvmargs=-Xmx3G -XX:ThreadStackSize=4096 -XX:CompilerThreadStackSize=4
# Minecraft things
enabledPlatforms=fabric,neoforge

version=1.5.4
version=1.5.5
group=dev.erdragh.astralbot
modName=AstralBot
modId=astralbot
Expand Down
2 changes: 1 addition & 1 deletion gradle/exposed.versions.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[versions]
exposed = "0.55.0"
exposed = "0.59.0"

[libraries]
core = { group = "org.jetbrains.exposed", name = "exposed-core", version.ref = "exposed" }
Expand Down

0 comments on commit 8cc7ba6

Please sign in to comment.