Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'refs/heads/1.20' into 1.21
# Conflicts: # client/src/main/java/folk/sisby/switchy/SwitchyClientServer.java # client/src/main/java/folk/sisby/switchy/client/SwitchyClientReceivers.java # client/src/main/java/folk/sisby/switchy/client/api/SwitchyClientApi.java # compat-ui/build.gradle # compat/build.gradle # compat/src/main/java/folk/sisby/switchy/modules/ApoliModule.java # compat/src/main/java/folk/sisby/switchy/modules/PehkuiModule.java # core/src/main/java/folk/sisby/switchy/api/module/SwitchyModuleInfo.java # core/src/main/java/folk/sisby/switchy/util/Feedback.java
- Loading branch information