Merge remote-tracking branch 'origin/master' · NovaEngineering-Source/StellarCore@3277657 · GitHub

Commit

Merge remote-tracking branch 'origin/master'

Browse files

# Conflicts:
#	src/main/java/github/kasuminova/stellarcore/common/util/LinkedFakeArrayList.java
#	src/main/java/github/kasuminova/stellarcore/mixin/minecraft/MixinWorld.java

Loading branch information

KasumiNova committed Mar 26, 2024

2 parents e4b2174 + 27e5b2c commit 3277657