diff --git a/.gitignore b/.gitignore
index 7553bfeb6..0c4db656d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,4 +21,5 @@ export/*
!.vscode/extensions.json
leakertrack.txt
crash-dialog/build
-crash-built/
\ No newline at end of file
+crash-built/
+.DS_Store
\ No newline at end of file
diff --git a/.idea/lore-engine.iml b/.idea/lore-engine.iml
new file mode 100644
index 000000000..d6ebd4805
--- /dev/null
+++ b/.idea/lore-engine.iml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 000000000..639900d13
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 000000000..5bdc1df17
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 000000000..35eb1ddfb
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 000000000..80848dcda
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,51 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1706418167162
+
+
+ 1706418167162
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Project.xml b/Project.xml
index 98ec7907e..83d8f0cca 100644
--- a/Project.xml
+++ b/Project.xml
@@ -3,7 +3,9 @@
-
+
+
+
@@ -233,5 +235,7 @@
-
+
+
+
diff --git a/art/iconMac-debug.png b/art/iconMac-debug.png
new file mode 100644
index 000000000..4b037b087
Binary files /dev/null and b/art/iconMac-debug.png differ
diff --git a/art/iconMac.png b/art/iconMac.png
new file mode 100644
index 000000000..9dac40436
Binary files /dev/null and b/art/iconMac.png differ
diff --git a/source/ClientPrefs.hx b/source/ClientPrefs.hx
index ffc480a42..f05ab6001 100644
--- a/source/ClientPrefs.hx
+++ b/source/ClientPrefs.hx
@@ -414,7 +414,7 @@ class ClientPrefs {
checkForUpdates = FlxG.save.data.checkForUpdates;
}
var save:FlxSave = new FlxSave();
- save.bind('controls_v2', 'ninjamuffin99');
+ save.bind('controls_v2', CoolUtil.getSavePath());
if(save != null && save.data.customControls != null) {
var loadedControls:Map> = save.data.customControls;
for (control => keys in loadedControls) {
diff --git a/source/Main.hx b/source/Main.hx
index cd8c742e8..00e3b5fb7 100644
--- a/source/Main.hx
+++ b/source/Main.hx
@@ -108,7 +108,7 @@ class Main extends Sprite
#end
ClientPrefs.loadDefaultKeys();
- FlxG.save.bind('funkin', 'ninjamuffin99');
+ FlxG.save.bind('funkin', CoolUtil.getSavePath());
ClientPrefs.loadPrefs();
if (ClientPrefs.aspectRatio != '16:9') { // not a function to ensure you can't call it from the game
var _height:Int;
diff --git a/source/Paths.hx b/source/Paths.hx
index 5620e0d25..4824b5d25 100644
--- a/source/Paths.hx
+++ b/source/Paths.hx
@@ -410,7 +410,7 @@ class Paths
#if MODS_ALLOWED
inline static public function mods(key:String = '') {
- return #if mac '././' + #end 'mods/' + key;
+ return 'mods/' + key;
}
inline static public function modsFont(key:String) {
diff --git a/source/lore/FPS.hx b/source/lore/FPS.hx
index 562ea464c..70d55ccd1 100644
--- a/source/lore/FPS.hx
+++ b/source/lore/FPS.hx
@@ -124,7 +124,7 @@ class FPS extends TextField
if (ClientPrefs.showMem) { templateText += '${memThing}{memory}'; if (ClientPrefs.showLore) templateText += "\n"; }
if (ClientPrefs.showLore) { templateText += '${loreThing}${(MainMenuState.loreEngineVersion.endsWith(".0") ? MainMenuState.loreEngineVersion.replace(".0", "") : MainMenuState.loreEngineVersion) + MainMenuState.versionSuffix}'; }
#if debug if (templateText != "") templateText += " "; templateText += '(debug)'; #end
- if (MainMenuState.isNotFinal && MainMenuState.commitHash != "") { if (templateText != "") templateText += " "; templateText += '(${MainMenuState.commitHash.substr(0, 6)})'; }
+ #if !HIDE_HASH if (MainMenuState.isNotFinal && MainMenuState.commitHash != "") { if (templateText != "") templateText += " "; templateText += '(${MainMenuState.commitHash.substr(0, 6)})'; } #end
set_visibility(ClientPrefs.showFPS);
set_rainbowEnabled(ClientPrefs.rainbowFPS);
updatePosition();