Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/releases/1.21' into releases/1.21
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/main/java/dev/anvilcraft/rg/RollingGate.java
#	src/main/java/dev/anvilcraft/rg/api/RGRuleManager.java
  • Loading branch information
Gu-ZT committed Sep 17, 2024
2 parents 83eab2c + ce7ca85 commit 1c6675b
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/main/java/dev/anvilcraft/rg/RollingGate.java
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
@Mod(RollingGate.MODID)
public class RollingGate implements RGAdditional {
public static final String MODID = "rolling_gate";
private static final Logger LOGGER = LogUtils.getLogger();
public static final Logger LOGGER = LogUtils.getLogger();
private static final RGRuleManager RULE_MANAGER = new RGRuleManager();
private static final LevelResource RULE_PATH = new LevelResource("rolling_gate.json");

Expand Down

0 comments on commit 1c6675b

Please sign in to comment.