Skip to content

Commit

Permalink
Merge branch 'version/1.20.1' into version/1.19.2
Browse files Browse the repository at this point in the history
# Conflicts:
#	gradle.properties
  • Loading branch information
Erdragh committed Feb 8, 2025
2 parents fbbb0da + 8cc7ba6 commit 51544f6
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
@@ -1,7 +1,7 @@
kotlin.code.style=official
org.gradle.jvmargs=-Xmx3G -XX:ThreadStackSize=4096 -XX:CompilerThreadStackSize=4096

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 51544f6

Please sign in to comment.