Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/1.19-forge' into 1.19-forge
Browse files Browse the repository at this point in the history
# Conflicts:
#	build.gradle
#	gradle/wrapper/gradle-wrapper.properties
#	src/main/java/org/teacon/slides/Registries.java
#	src/main/java/org/teacon/slides/SlideShow.java
#	src/main/java/org/teacon/slides/projector/ProjectorBlock.java
#	src/main/java/org/teacon/slides/projector/ProjectorBlockEntity.java
#	src/main/java/org/teacon/slides/projector/ProjectorContainerMenu.java
#	src/main/java/org/teacon/slides/projector/ProjectorItem.java
#	src/main/java/org/teacon/slides/projector/ProjectorScreen.java
#	src/main/java/org/teacon/slides/renderer/ProjectorWorldRender.java
#	src/main/java/org/teacon/slides/renderer/Slide.java
#	src/main/resources/META-INF/mods.toml
  • Loading branch information
ustc-zzzz committed Mar 26, 2023
2 parents 02c6cb7 + 7d21d39 commit 5df4d76
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 5df4d76

Please sign in to comment.