Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/recode/3.0.0' into recode/3.0.0
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/main/java/de/florianmichael/viafabricplus/ViaFabricPlus.java
  • Loading branch information
RaphiMC committed Nov 26, 2023
2 parents a4794e3 + 4bcb2bc commit 7494a22
Showing 1 changed file with 2 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import de.florianmichael.viafabricplus.protocolhack.ProtocolHack;
import de.florianmichael.viafabricplus.save.SaveManager;
import de.florianmichael.viafabricplus.settings.SettingsManager;
import net.fabricmc.loader.api.FabricLoader;
import de.florianmichael.viafabricplus.util.ClassLoaderPriorityUtil;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
Expand Down Expand Up @@ -60,7 +61,7 @@ public class ViaFabricPlus {
private static final ViaFabricPlus instance = new ViaFabricPlus();

private final Logger logger = LogManager.getLogger("ViaFabricPlus");
private final File directory = new File("ViaFabricPlus");
private final File directory = FabricLoader.getInstance().getConfigDir().resolve("viafabricplus").toFile();

private SettingsManager settingsManager;
private SaveManager saveManager;
Expand Down

0 comments on commit 7494a22

Please sign in to comment.