Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/sb1.20' into Architectury-1.20.4
Browse files Browse the repository at this point in the history
# 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
Scarlet-Phonavis committed Jul 5, 2024
2 parents 251592f + 8635722 commit 78eb30d
Show file tree
Hide file tree
Showing 26 changed files with 1,226 additions and 933 deletions.
2 changes: 2 additions & 0 deletions common/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,6 @@ dependencies {

// Architectury API. This is optional, and you can comment it out if you don't need it.
modImplementation "dev.architectury:architectury:$rootProject.architectury_api_version"

api("com.electronwill.night-config:toml:$rootProject.nightconfig_version")
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package net.stonebound.simpleircbridge;

import net.stonebound.simpleircbridge.simpleircbridge.SimpleIRCBridgeCommon;

public final class SimpleIRCBridge {
public static final String MOD_ID = "simpleircbridge";

public static void init() {
new SimpleIRCBridgeCommon();
}
}
Loading

0 comments on commit 78eb30d

Please sign in to comment.