Skip to content

Commit

Permalink
Merge branch 'refs/heads/1.18.2' into 1.17.1
Browse files Browse the repository at this point in the history
  • Loading branch information
senseiwells committed Aug 23, 2024
2 parents 13c1b46 + 367bf34 commit ad2814f
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 7 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ You will only have access to a limited set of commands when viewing replays, the
- `/replay view speed <multiplier>` Sets the playback speed of the current replay.
- `/replay view restart` Restarts the playback of the current replay.
- `/replay view close` Closes the current replay and brings you back to the server.
- `/replay view progress <hide|show>` Hides or shows the progress bossbar.

If you disconnect while watching a replay, you will be brought back to the server when you login.

Expand Down
7 changes: 2 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,8 +122,8 @@ tasks {
file = remapJar.get().archiveFile
changelog.set(
"""
- Backported some fixes from 1.20.6
- This is the final version for 1.20.4
- Fixed an issue with `/replay view`
- Added the ability to change the player's recording directory name
""".trimIndent()
)
type = STABLE
Expand Down
3 changes: 1 addition & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ fabricVersion=0.46.1+1.17
carpetVersion=1.4.57+v220119
voicechatVersion=1.17.1-2.5.7
voicechatApiVersion=2.4.0
syncmaticaVersion=1.18.2-0.3.11

modVersion=1.1.1
modVersion=1.1.2

org.gradle.jvmargs=-Xmx4000m

0 comments on commit ad2814f

Please sign in to comment.