Skip to content

Commit

Permalink
Merge branch 'refs/heads/1.19.4' into 1.18.2
Browse files Browse the repository at this point in the history
# Conflicts:
#	build.gradle.kts
#	gradle.properties
  • Loading branch information
senseiwells committed Aug 19, 2024
2 parents 00d6298 + 6a4f2ff commit 367bf34
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 6 deletions.
5 changes: 0 additions & 5 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ val carpetVersion: String by project
val voicechatVersion: String by project
val voicechatApiVersion: String by project
val permissionsVersion: String by project
val syncmaticaVersion: String by project

val releaseVersion = "${modVersion}+mc${mcVersion}"
version = releaseVersion
Expand All @@ -56,8 +55,6 @@ dependencies {
modCompileOnly("maven.modrinth:simple-voice-chat:fabric-${voicechatVersion}")
implementation("de.maxhenkel.voicechat:voicechat-api:${voicechatApiVersion}")

modCompileOnly("maven.modrinth:syncmatica:${syncmaticaVersion}")

// I've had some issues with ReplayStudio and slf4j (in dev env)
// Simplest workaround that I've found is just to unzip the
// jar and yeet the org.slf4j packages then rezip the jar.
Expand Down Expand Up @@ -125,9 +122,7 @@ tasks {
file = remapJar.get().archiveFile
changelog.set(
"""
- Fixed an issue with Carpet bots not recording entities properly
- Fixed an issue with `/replay view`
- Fixed an incompatibility with Syncmatica
- Added the ability to change the player's recording directory name
""".trimIndent()
)
Expand Down
1 change: 0 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ fabricVersion=0.77.0+1.18.2
carpetVersion=1.4.66
voicechatVersion=1.18.2-2.5.7
voicechatApiVersion=2.4.0
syncmaticaVersion=1.18.2-0.3.11

modVersion=1.1.2

Expand Down

0 comments on commit 367bf34

Please sign in to comment.