Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/sb1.20' into Architectury-1.20.4
# Conflicts: # common/build.gradle # common/src/main/java/net/stonebound/simpleircbridge/genericircbot/AbstractIRCBot.java # common/src/main/java/net/stonebound/simpleircbridge/genericircbot/IRCConnectionInfo.java # common/src/main/java/net/stonebound/simpleircbridge/genericircbot/IRCMethods.java # common/src/main/java/net/stonebound/simpleircbridge/genericircbot/IRCThread.java # common/src/main/java/net/stonebound/simpleircbridge/simpleircbridge/BridgeIRCBot.java # common/src/main/java/net/stonebound/simpleircbridge/simpleircbridge/GameEventHandler.java # common/src/main/java/net/stonebound/simpleircbridge/simpleircbridge/SIBConstants.java # common/src/main/java/net/stonebound/simpleircbridge/simpleircbridge/SIBUtil.java # common/src/main/java/net/stonebound/simpleircbridge/simpleircbridge/SimpleIRCBridgeCommon.java # common/src/main/java/net/stonebound/simpleircbridge/utils/IRCMinecraftConverter.java # common/src/main/java/net/stonebound/simpleircbridge/utils/MircColors.java # fabric/build.gradle # fabric/src/main/resources/fabric.mod.json # forge/build.gradle # gradle.properties # neoforge/src/main/java/net/stonebound/simpleircbridge/neoforge/SimpleIrcBridgeNeoForge.java # neoforge/src/main/resources/META-INF/mods.toml # quilt/build.gradle # quilt/src/main/resources/quilt.mod.json
- Loading branch information