Merge pull request #110 from seionmoya/rework-resx

Rework resx
project-fika · Jan 7, 2025 · f632d2e · f632d2e
2 parents 881cb64 + e003892
commit f632d2e
Show file tree

Hide file tree

Showing 212 changed files with 168 additions and 159 deletions.
diff --git a/Documentation/fuyu-version-migration-guide.md b/Documentation/fuyu-version-migration-guide.md
@@ -28,10 +28,10 @@ The process is roughtly:
 #### 2. Updating existing database
 
 1. In `HTTP_DATA/Responses/`, copy-paste from each response that also exists in
-   `Fuyu.Backend.EFT/embedded/database/` into that folder. In case you got
+   `Fuyu.Backend.EFT/Resources/database/` into that folder. In case you got
    multiple dumps for the same file (exp. `client.items.json`), copy a single
    file.
-2. Delete the original files from `Fuyu.Backend.EFT/embedded/database/`
+2. Delete the original files from `Fuyu.Backend.EFT/Resources/database/`
    (the ones without a timestamp at the end of the file).
 3. Remove the timestamp from the filenames
 4. For locale files, change the last `.` to a `-`

diff --git a/Fuyu.Backend.Arena/Fuyu.Backend.Arena.csproj b/Fuyu.Backend.Arena/Fuyu.Backend.Arena.csproj
@@ -11,25 +11,25 @@
   </ItemGroup>
 
   <ItemGroup>
-    <EmbeddedResource Include="embedded/database/locales/client.languages.json" />
-    <EmbeddedResource Include="embedded/database/locales/client.locale-ch.json" />
-    <EmbeddedResource Include="embedded/database/locales/client.locale-cz.json" />
-    <EmbeddedResource Include="embedded/database/locales/client.locale-en.json" />
-    <EmbeddedResource Include="embedded/database/locales/client.locale-es.json" />
-    <EmbeddedResource Include="embedded/database/locales/client.locale-es-mx.json" />
-    <EmbeddedResource Include="embedded/database/locales/client.locale-fr.json" />
-    <EmbeddedResource Include="embedded/database/locales/client.locale-ge.json" />
-    <EmbeddedResource Include="embedded/database/locales/client.locale-hu.json" />
-    <EmbeddedResource Include="embedded/database/locales/client.locale-it.json" />
-    <EmbeddedResource Include="embedded/database/locales/client.locale-jp.json" />
-    <EmbeddedResource Include="embedded/database/locales/client.locale-kr.json" />
-    <EmbeddedResource Include="embedded/database/locales/client.locale-pl.json" />
-    <EmbeddedResource Include="embedded/database/locales/client.locale-po.json" />
-    <EmbeddedResource Include="embedded/database/locales/client.locale-ro.json" />
-    <EmbeddedResource Include="embedded/database/locales/client.locale-ru.json" />
-    <EmbeddedResource Include="embedded/database/locales/client.locale-sk.json" />
-    <EmbeddedResource Include="embedded/database/locales/client.locale-tu.json" />
-    <EmbeddedResource Include="embedded/database/client.game.token.issue.json" />
+    <EmbeddedResource Include="Resources/database/locales/client.languages.json" />
+    <EmbeddedResource Include="Resources/database/locales/client.locale-ch.json" />
+    <EmbeddedResource Include="Resources/database/locales/client.locale-cz.json" />
+    <EmbeddedResource Include="Resources/database/locales/client.locale-en.json" />
+    <EmbeddedResource Include="Resources/database/locales/client.locale-es.json" />
+    <EmbeddedResource Include="Resources/database/locales/client.locale-es-mx.json" />
+    <EmbeddedResource Include="Resources/database/locales/client.locale-fr.json" />
+    <EmbeddedResource Include="Resources/database/locales/client.locale-ge.json" />
+    <EmbeddedResource Include="Resources/database/locales/client.locale-hu.json" />
+    <EmbeddedResource Include="Resources/database/locales/client.locale-it.json" />
+    <EmbeddedResource Include="Resources/database/locales/client.locale-jp.json" />
+    <EmbeddedResource Include="Resources/database/locales/client.locale-kr.json" />
+    <EmbeddedResource Include="Resources/database/locales/client.locale-pl.json" />
+    <EmbeddedResource Include="Resources/database/locales/client.locale-po.json" />
+    <EmbeddedResource Include="Resources/database/locales/client.locale-ro.json" />
+    <EmbeddedResource Include="Resources/database/locales/client.locale-ru.json" />
+    <EmbeddedResource Include="Resources/database/locales/client.locale-sk.json" />
+    <EmbeddedResource Include="Resources/database/locales/client.locale-tu.json" />
+    <EmbeddedResource Include="Resources/database/client.game.token.issue.json" />
   </ItemGroup>
 
 </Project>
diff --git a/...se/boop/client.account.customization.json → ...se/boop/client.account.customization.json b/...se/boop/client.account.customization.json → ...se/boop/client.account.customization.json
diff --git a/...d/database/boop/client.account.suits.json → ...s/database/boop/client.account.suits.json b/...d/database/boop/client.account.suits.json → ...s/database/boop/client.account.suits.json
diff --git a/...ed/database/boop/client.arena.armory.json → ...es/database/boop/client.arena.armory.json b/...ed/database/boop/client.arena.armory.json → ...es/database/boop/client.arena.armory.json
diff --git a/...d/database/boop/client.arena.presets.json → ...s/database/boop/client.arena.presets.json b/...d/database/boop/client.arena.presets.json → ...s/database/boop/client.arena.presets.json
diff --git a/...tabase/boop/client.arena.server.list.json → ...tabase/boop/client.arena.server.list.json b/...tabase/boop/client.arena.server.list.json → ...tabase/boop/client.arena.server.list.json
diff --git a/...ded/database/boop/client.builds.list.json → ...ces/database/boop/client.builds.list.json b/...ded/database/boop/client.builds.list.json → ...ces/database/boop/client.builds.list.json
diff --git a/...d/database/boop/client.customization.json → ...s/database/boop/client.customization.json b/...d/database/boop/client.customization.json → ...s/database/boop/client.customization.json
diff --git a/...ded/database/boop/client.friend.list.json → ...ces/database/boop/client.friend.list.json b/...ded/database/boop/client.friend.list.json → ...ces/database/boop/client.friend.list.json
diff --git a/...oop/client.friend.request.list.inbox.json → ...oop/client.friend.request.list.inbox.json b/...oop/client.friend.request.list.inbox.json → ...oop/client.friend.request.list.inbox.json
diff --git a/...op/client.friend.request.list.outbox.json → ...op/client.friend.request.list.outbox.json b/...op/client.friend.request.list.outbox.json → ...op/client.friend.request.list.outbox.json
diff --git a/...oop/client.game.custom.config.update.json → ...oop/client.game.custom.config.update.json b/...oop/client.game.custom.config.update.json → ...oop/client.game.custom.config.update.json
diff --git a/...abase/boop/client.game.custom.create.json → ...abase/boop/client.game.custom.create.json b/...abase/boop/client.game.custom.create.json → ...abase/boop/client.game.custom.create.json
diff --git a/...atabase/boop/client.game.custom.join.json → ...atabase/boop/client.game.custom.join.json b/...atabase/boop/client.game.custom.join.json → ...atabase/boop/client.game.custom.join.json
diff --git a/...atabase/boop/client.game.custom.list.json → ...atabase/boop/client.game.custom.list.json b/...atabase/boop/client.game.custom.list.json → ...atabase/boop/client.game.custom.list.json
diff --git a/.../boop/client.game.custom.player.move.json → .../boop/client.game.custom.player.move.json b/.../boop/client.game.custom.player.move.json → .../boop/client.game.custom.player.move.json
diff --git a/...abase/boop/client.game.custom.remove.json → ...abase/boop/client.game.custom.remove.json b/...abase/boop/client.game.custom.remove.json → ...abase/boop/client.game.custom.remove.json
diff --git a/.../database/boop/client.game.keepalive.json → .../database/boop/client.game.keepalive.json b/.../database/boop/client.game.keepalive.json → .../database/boop/client.game.keepalive.json
diff --git a/...base/boop/client.game.profile.create.json → ...base/boop/client.game.profile.create.json b/...base/boop/client.game.profile.create.json → ...base/boop/client.game.profile.create.json
diff --git a/...tabase/boop/client.game.profile.list.json → ...tabase/boop/client.game.profile.list.json b/...tabase/boop/client.game.profile.list.json → ...tabase/boop/client.game.profile.list.json
diff --git a/...lient.game.profile.nickname.reserved.json → ...lient.game.profile.nickname.reserved.json b/...lient.game.profile.nickname.reserved.json → ...lient.game.profile.nickname.reserved.json
diff --git a/...se/boop/client.game.version.validate.json → ...se/boop/client.game.version.validate.json b/...se/boop/client.game.version.validate.json → ...se/boop/client.game.version.validate.json
diff --git a/...mbedded/database/boop/client.globals.json → ...sources/database/boop/client.globals.json b/...mbedded/database/boop/client.globals.json → ...sources/database/boop/client.globals.json
diff --git a/...abase/boop/client.handbook.templates.json → ...abase/boop/client.handbook.templates.json b/...abase/boop/client.handbook.templates.json → ...abase/boop/client.handbook.templates.json
diff --git a/.../embedded/database/boop/client.items.json → ...Resources/database/boop/client.items.json b/.../embedded/database/boop/client.items.json → ...Resources/database/boop/client.items.json
diff --git a/...ded/database/boop/client.leaderboard.json → ...ces/database/boop/client.leaderboard.json b/...ded/database/boop/client.leaderboard.json → ...ces/database/boop/client.leaderboard.json
diff --git a/...edded/database/boop/client.locations.json → ...urces/database/boop/client.locations.json b/...edded/database/boop/client.locations.json → ...urces/database/boop/client.locations.json
diff --git a/...atabase/boop/client.mail.dialog.list.json → ...atabase/boop/client.mail.dialog.list.json b/...atabase/boop/client.mail.dialog.list.json → ...atabase/boop/client.mail.dialog.list.json
diff --git a/...dded/database/boop/client.match.exit.json → ...rces/database/boop/client.match.exit.json b/...dded/database/boop/client.match.exit.json → ...rces/database/boop/client.match.exit.json
diff --git a/...client.match.group.invite.cancel-all.json → ...client.match.group.invite.cancel-all.json b/...client.match.group.invite.cancel-all.json → ...client.match.group.invite.cancel-all.json
diff --git a/...dded/database/boop/client.match.join.json → ...rces/database/boop/client.match.join.json b/...dded/database/boop/client.match.join.json → ...rces/database/boop/client.match.join.json
diff --git a/.../boop/client.notifier.channel.create.json → .../boop/client.notifier.channel.create.json b/.../boop/client.notifier.channel.create.json → .../boop/client.notifier.channel.create.json
diff --git a/.../database/boop/client.profile.armory.json → .../database/boop/client.profile.armory.json b/.../database/boop/client.profile.armory.json → .../database/boop/client.profile.armory.json
diff --git a/...database/boop/client.profile.presets.json → ...database/boop/client.profile.presets.json b/...database/boop/client.profile.presets.json → ...database/boop/client.profile.presets.json
diff --git a/.../database/boop/client.profile.status.json → .../database/boop/client.profile.status.json b/.../database/boop/client.profile.status.json → .../database/boop/client.profile.status.json
diff --git a/...ase/boop/client.profile.template.get.json → ...ase/boop/client.profile.template.get.json b/...ase/boop/client.profile.template.get.json → ...ase/boop/client.profile.template.get.json
diff --git a/...dded/database/boop/client.quest.list.json → ...rces/database/boop/client.quest.list.json b/...dded/database/boop/client.quest.list.json → ...rces/database/boop/client.quest.list.json
diff --git a/...ent.repeatalbeQuests.activityPeriods.json → ...ent.repeatalbeQuests.activityPeriods.json b/...ent.repeatalbeQuests.activityPeriods.json → ...ent.repeatalbeQuests.activityPeriods.json
diff --git a/...bedded/database/boop/client.settings.json → ...ources/database/boop/client.settings.json b/...bedded/database/boop/client.settings.json → ...ources/database/boop/client.settings.json
diff --git a/...op/client.trading.api.traderSettings.json → ...op/client.trading.api.traderSettings.json b/...op/client.trading.api.traderSettings.json → ...op/client.trading.api.traderSettings.json
diff --git a/...ded/database/client.game.token.issue.json → ...ces/database/client.game.token.issue.json b/...ded/database/client.game.token.issue.json → ...ces/database/client.game.token.issue.json
diff --git a/...ed/database/locales/client.languages.json → ...es/database/locales/client.languages.json b/...ed/database/locales/client.languages.json → ...es/database/locales/client.languages.json
diff --git a/...ed/database/locales/client.locale-ch.json → ...es/database/locales/client.locale-ch.json b/...ed/database/locales/client.locale-ch.json → ...es/database/locales/client.locale-ch.json
diff --git a/...ed/database/locales/client.locale-cz.json → ...es/database/locales/client.locale-cz.json b/...ed/database/locales/client.locale-cz.json → ...es/database/locales/client.locale-cz.json
diff --git a/...ed/database/locales/client.locale-en.json → ...es/database/locales/client.locale-en.json b/...ed/database/locales/client.locale-en.json → ...es/database/locales/client.locale-en.json
diff --git a/...database/locales/client.locale-es-mx.json → ...database/locales/client.locale-es-mx.json b/...database/locales/client.locale-es-mx.json → ...database/locales/client.locale-es-mx.json
diff --git a/...ed/database/locales/client.locale-es.json → ...es/database/locales/client.locale-es.json b/...ed/database/locales/client.locale-es.json → ...es/database/locales/client.locale-es.json
diff --git a/...ed/database/locales/client.locale-fr.json → ...es/database/locales/client.locale-fr.json b/...ed/database/locales/client.locale-fr.json → ...es/database/locales/client.locale-fr.json
diff --git a/...ed/database/locales/client.locale-ge.json → ...es/database/locales/client.locale-ge.json b/...ed/database/locales/client.locale-ge.json → ...es/database/locales/client.locale-ge.json
diff --git a/...ed/database/locales/client.locale-hu.json → ...es/database/locales/client.locale-hu.json b/...ed/database/locales/client.locale-hu.json → ...es/database/locales/client.locale-hu.json
diff --git a/...ed/database/locales/client.locale-it.json → ...es/database/locales/client.locale-it.json b/...ed/database/locales/client.locale-it.json → ...es/database/locales/client.locale-it.json
diff --git a/...ed/database/locales/client.locale-jp.json → ...es/database/locales/client.locale-jp.json b/...ed/database/locales/client.locale-jp.json → ...es/database/locales/client.locale-jp.json
diff --git a/...ed/database/locales/client.locale-kr.json → ...es/database/locales/client.locale-kr.json b/...ed/database/locales/client.locale-kr.json → ...es/database/locales/client.locale-kr.json
diff --git a/...ed/database/locales/client.locale-pl.json → ...es/database/locales/client.locale-pl.json b/...ed/database/locales/client.locale-pl.json → ...es/database/locales/client.locale-pl.json
diff --git a/...ed/database/locales/client.locale-po.json → ...es/database/locales/client.locale-po.json b/...ed/database/locales/client.locale-po.json → ...es/database/locales/client.locale-po.json
diff --git a/...ed/database/locales/client.locale-ro.json → ...es/database/locales/client.locale-ro.json b/...ed/database/locales/client.locale-ro.json → ...es/database/locales/client.locale-ro.json
diff --git a/...ed/database/locales/client.locale-ru.json → ...es/database/locales/client.locale-ru.json b/...ed/database/locales/client.locale-ru.json → ...es/database/locales/client.locale-ru.json
diff --git a/...ed/database/locales/client.locale-sk.json → ...es/database/locales/client.locale-sk.json b/...ed/database/locales/client.locale-sk.json → ...es/database/locales/client.locale-sk.json
diff --git a/...ed/database/locales/client.locale-tu.json → ...es/database/locales/client.locale-tu.json b/...ed/database/locales/client.locale-tu.json → ...es/database/locales/client.locale-tu.json
diff --git a/...tabase/locales/client.menu.locale-ch.json → ...tabase/locales/client.menu.locale-ch.json b/...tabase/locales/client.menu.locale-ch.json → ...tabase/locales/client.menu.locale-ch.json
diff --git a/...tabase/locales/client.menu.locale-cz.json → ...tabase/locales/client.menu.locale-cz.json b/...tabase/locales/client.menu.locale-cz.json → ...tabase/locales/client.menu.locale-cz.json
diff --git a/...tabase/locales/client.menu.locale-en.json → ...tabase/locales/client.menu.locale-en.json b/...tabase/locales/client.menu.locale-en.json → ...tabase/locales/client.menu.locale-en.json
diff --git a/...ase/locales/client.menu.locale-es-mx.json → ...ase/locales/client.menu.locale-es-mx.json b/...ase/locales/client.menu.locale-es-mx.json → ...ase/locales/client.menu.locale-es-mx.json
diff --git a/...tabase/locales/client.menu.locale-es.json → ...tabase/locales/client.menu.locale-es.json b/...tabase/locales/client.menu.locale-es.json → ...tabase/locales/client.menu.locale-es.json
diff --git a/...tabase/locales/client.menu.locale-fr.json → ...tabase/locales/client.menu.locale-fr.json b/...tabase/locales/client.menu.locale-fr.json → ...tabase/locales/client.menu.locale-fr.json
diff --git a/...tabase/locales/client.menu.locale-ge.json → ...tabase/locales/client.menu.locale-ge.json b/...tabase/locales/client.menu.locale-ge.json → ...tabase/locales/client.menu.locale-ge.json
diff --git a/...tabase/locales/client.menu.locale-hu.json → ...tabase/locales/client.menu.locale-hu.json b/...tabase/locales/client.menu.locale-hu.json → ...tabase/locales/client.menu.locale-hu.json
diff --git a/...tabase/locales/client.menu.locale-it.json → ...tabase/locales/client.menu.locale-it.json b/...tabase/locales/client.menu.locale-it.json → ...tabase/locales/client.menu.locale-it.json
diff --git a/...tabase/locales/client.menu.locale-jp.json → ...tabase/locales/client.menu.locale-jp.json b/...tabase/locales/client.menu.locale-jp.json → ...tabase/locales/client.menu.locale-jp.json
diff --git a/...tabase/locales/client.menu.locale-kr.json → ...tabase/locales/client.menu.locale-kr.json b/...tabase/locales/client.menu.locale-kr.json → ...tabase/locales/client.menu.locale-kr.json
diff --git a/...tabase/locales/client.menu.locale-pl.json → ...tabase/locales/client.menu.locale-pl.json b/...tabase/locales/client.menu.locale-pl.json → ...tabase/locales/client.menu.locale-pl.json
diff --git a/...tabase/locales/client.menu.locale-po.json → ...tabase/locales/client.menu.locale-po.json b/...tabase/locales/client.menu.locale-po.json → ...tabase/locales/client.menu.locale-po.json
diff --git a/...tabase/locales/client.menu.locale-ro.json → ...tabase/locales/client.menu.locale-ro.json b/...tabase/locales/client.menu.locale-ro.json → ...tabase/locales/client.menu.locale-ro.json
diff --git a/...tabase/locales/client.menu.locale-ru.json → ...tabase/locales/client.menu.locale-ru.json b/...tabase/locales/client.menu.locale-ru.json → ...tabase/locales/client.menu.locale-ru.json
diff --git a/...tabase/locales/client.menu.locale-sk.json → ...tabase/locales/client.menu.locale-sk.json b/...tabase/locales/client.menu.locale-sk.json → ...tabase/locales/client.menu.locale-sk.json
diff --git a/...tabase/locales/client.menu.locale-tu.json → ...tabase/locales/client.menu.locale-tu.json b/...tabase/locales/client.menu.locale-tu.json → ...tabase/locales/client.menu.locale-tu.json
diff --git a/Fuyu.Backend.EFT/Fuyu.Backend.EFT.csproj b/Fuyu.Backend.EFT/Fuyu.Backend.EFT.csproj
diff --git a/Fuyu.Backend.EFT/embedded/database/README.md → ....Backend.EFT/Resources/database/README.md b/Fuyu.Backend.EFT/embedded/database/README.md → ....Backend.EFT/Resources/database/README.md
diff --git a/...d.EFT/embedded/database/bots/assault.json → ....EFT/Resources/database/bots/assault.json b/...d.EFT/embedded/database/bots/assault.json → ....EFT/Resources/database/bots/assault.json
diff --git a/....EFT/embedded/database/bots/bossboar.json → ...EFT/Resources/database/bots/bossboar.json b/....EFT/embedded/database/bots/bossboar.json → ...EFT/Resources/database/bots/bossboar.json
diff --git a/...mbedded/database/bots/bossboarsniper.json → ...sources/database/bots/bossboarsniper.json b/...mbedded/database/bots/bossboarsniper.json → ...sources/database/bots/bossboarsniper.json
diff --git a/...EFT/embedded/database/bots/bossbully.json → ...FT/Resources/database/bots/bossbully.json b/...EFT/embedded/database/bots/bossbully.json → ...FT/Resources/database/bots/bossbully.json
diff --git a/...FT/embedded/database/bots/bossgluhar.json → ...T/Resources/database/bots/bossgluhar.json b/...FT/embedded/database/bots/bossgluhar.json → ...T/Resources/database/bots/bossgluhar.json
diff --git a/...EFT/embedded/database/bots/bosskilla.json → ...FT/Resources/database/bots/bosskilla.json b/...EFT/embedded/database/bots/bosskilla.json → ...FT/Resources/database/bots/bosskilla.json
diff --git a/...FT/embedded/database/bots/bossknight.json → ...T/Resources/database/bots/bossknight.json b/...FT/embedded/database/bots/bossknight.json → ...T/Resources/database/bots/bossknight.json
diff --git a/...T/embedded/database/bots/bosskojaniy.json → .../Resources/database/bots/bosskojaniy.json b/...T/embedded/database/bots/bosskojaniy.json → .../Resources/database/bots/bosskojaniy.json
diff --git a/.../embedded/database/bots/bosskolontay.json → ...Resources/database/bots/bosskolontay.json b/.../embedded/database/bots/bosskolontay.json → ...Resources/database/bots/bosskolontay.json
diff --git a/.../embedded/database/bots/bosspartisan.json → ...Resources/database/bots/bosspartisan.json b/.../embedded/database/bots/bosspartisan.json → ...Resources/database/bots/bosspartisan.json
diff --git a/...T/embedded/database/bots/bosssanitar.json → .../Resources/database/bots/bosssanitar.json b/...T/embedded/database/bots/bosssanitar.json → .../Resources/database/bots/bosssanitar.json
diff --git a/...T/embedded/database/bots/bosstagilla.json → .../Resources/database/bots/bosstagilla.json b/...T/embedded/database/bots/bosstagilla.json → .../Resources/database/bots/bosstagilla.json
diff --git a/.../embedded/database/bots/bosszryachiy.json → ...Resources/database/bots/bosszryachiy.json b/.../embedded/database/bots/bosszryachiy.json → ...Resources/database/bots/bosszryachiy.json
diff --git a/...nd.EFT/embedded/database/bots/exusec.json → ...d.EFT/Resources/database/bots/exusec.json b/...nd.EFT/embedded/database/bots/exusec.json → ...d.EFT/Resources/database/bots/exusec.json
diff --git a/...bedded/database/bots/followerbigpipe.json → ...ources/database/bots/followerbigpipe.json b/...bedded/database/bots/followerbigpipe.json → ...ources/database/bots/followerbigpipe.json
diff --git a/...bedded/database/bots/followerbirdeye.json → ...ources/database/bots/followerbirdeye.json b/...bedded/database/bots/followerbirdeye.json → ...ources/database/bots/followerbirdeye.json
diff --git a/.../embedded/database/bots/followerboar.json → ...Resources/database/bots/followerboar.json b/.../embedded/database/bots/followerboar.json → ...Resources/database/bots/followerboar.json
diff --git a/...ded/database/bots/followerboarclose1.json → ...ces/database/bots/followerboarclose1.json b/...ded/database/bots/followerboarclose1.json → ...ces/database/bots/followerboarclose1.json
diff --git a/...ded/database/bots/followerboarclose2.json → ...ces/database/bots/followerboarclose2.json b/...ded/database/bots/followerboarclose2.json → ...ces/database/bots/followerboarclose2.json
diff --git a/...embedded/database/bots/followerbully.json → ...esources/database/bots/followerbully.json b/...embedded/database/bots/followerbully.json → ...esources/database/bots/followerbully.json
diff --git a/.../database/bots/followergluharassault.json → .../database/bots/followergluharassault.json b/.../database/bots/followergluharassault.json → .../database/bots/followergluharassault.json
diff --git a/...ed/database/bots/followergluharscout.json → ...es/database/bots/followergluharscout.json b/...ed/database/bots/followergluharscout.json → ...es/database/bots/followergluharscout.json
diff --git a/...database/bots/followergluharsecurity.json → ...database/bots/followergluharsecurity.json b/...database/bots/followergluharsecurity.json → ...database/bots/followergluharsecurity.json
diff --git a/...bedded/database/bots/followerkojaniy.json → ...ources/database/bots/followerkojaniy.json b/...bedded/database/bots/followerkojaniy.json → ...ources/database/bots/followerkojaniy.json
diff --git a/...atabase/bots/followerkolontayassault.json → ...atabase/bots/followerkolontayassault.json b/...atabase/bots/followerkolontayassault.json → ...atabase/bots/followerkolontayassault.json
diff --git a/...tabase/bots/followerkolontaysecurity.json → ...tabase/bots/followerkolontaysecurity.json b/...tabase/bots/followerkolontaysecurity.json → ...tabase/bots/followerkolontaysecurity.json
diff --git a/...bedded/database/bots/followersanitar.json → ...ources/database/bots/followersanitar.json b/...bedded/database/bots/followersanitar.json → ...ources/database/bots/followersanitar.json
diff --git a/...edded/database/bots/followerzryachiy.json → ...urces/database/bots/followerzryachiy.json b/...edded/database/bots/followerzryachiy.json → ...urces/database/bots/followerzryachiy.json
diff --git a/...nd.EFT/embedded/database/bots/gifter.json → ...d.EFT/Resources/database/bots/gifter.json b/...nd.EFT/embedded/database/bots/gifter.json → ...d.EFT/Resources/database/bots/gifter.json
diff --git a/...bedded/database/bots/infectedassault.json → ...ources/database/bots/infectedassault.json b/...bedded/database/bots/infectedassault.json → ...ources/database/bots/infectedassault.json
diff --git a/...embedded/database/bots/infectedcivil.json → ...esources/database/bots/infectedcivil.json b/...embedded/database/bots/infectedcivil.json → ...esources/database/bots/infectedcivil.json
diff --git a/...edded/database/bots/infectedlaborant.json → ...urces/database/bots/infectedlaborant.json b/...edded/database/bots/infectedlaborant.json → ...urces/database/bots/infectedlaborant.json
diff --git a/...T/embedded/database/bots/infectedpmc.json → .../Resources/database/bots/infectedpmc.json b/...T/embedded/database/bots/infectedpmc.json → .../Resources/database/bots/infectedpmc.json
diff --git a/....EFT/embedded/database/bots/marksman.json → ...EFT/Resources/database/bots/marksman.json b/....EFT/embedded/database/bots/marksman.json → ...EFT/Resources/database/bots/marksman.json
diff --git a/...d.EFT/embedded/database/bots/pmcbear.json → ....EFT/Resources/database/bots/pmcbear.json b/...d.EFT/embedded/database/bots/pmcbear.json → ....EFT/Resources/database/bots/pmcbear.json
diff --git a/...nd.EFT/embedded/database/bots/pmcbot.json → ...d.EFT/Resources/database/bots/pmcbot.json b/...nd.EFT/embedded/database/bots/pmcbot.json → ...d.EFT/Resources/database/bots/pmcbot.json
diff --git a/...d.EFT/embedded/database/bots/pmcusec.json → ....EFT/Resources/database/bots/pmcusec.json b/...d.EFT/embedded/database/bots/pmcusec.json → ....EFT/Resources/database/bots/pmcusec.json
diff --git a/...FT/embedded/database/bots/sectantoni.json → ...T/Resources/database/bots/sectantoni.json b/...FT/embedded/database/bots/sectantoni.json → ...T/Resources/database/bots/sectantoni.json
diff --git a/...ded/database/bots/sectantpredvestnik.json → ...ces/database/bots/sectantpredvestnik.json b/...ded/database/bots/sectantpredvestnik.json → ...ces/database/bots/sectantpredvestnik.json
diff --git a/...embedded/database/bots/sectantpriest.json → ...esources/database/bots/sectantpriest.json b/...embedded/database/bots/sectantpriest.json → ...esources/database/bots/sectantpriest.json
diff --git a/...mbedded/database/bots/sectantprizrak.json → ...sources/database/bots/sectantprizrak.json b/...mbedded/database/bots/sectantprizrak.json → ...sources/database/bots/sectantprizrak.json
diff --git a/...mbedded/database/bots/sectantwarrior.json → ...sources/database/bots/sectantwarrior.json b/...mbedded/database/bots/sectantwarrior.json → ...sources/database/bots/sectantwarrior.json
diff --git a/...FT/embedded/database/bots/shooterbtr.json → ...T/Resources/database/bots/shooterbtr.json b/...FT/embedded/database/bots/shooterbtr.json → ...T/Resources/database/bots/shooterbtr.json
diff --git a/...ded/database/client.achievement.list.json → ...ces/database/client.achievement.list.json b/...ded/database/client.achievement.list.json → ...ces/database/client.achievement.list.json
diff --git a/...atabase/client.achievement.statistic.json → ...atabase/client.achievement.statistic.json b/...atabase/client.achievement.statistic.json → ...atabase/client.achievement.statistic.json
diff --git a/...embedded/database/client.builds.list.json → ...esources/database/client.builds.list.json b/...embedded/database/client.builds.list.json → ...esources/database/client.builds.list.json
diff --git a/...bedded/database/client.customization.json → ...ources/database/client.customization.json b/...bedded/database/client.customization.json → ...ources/database/client.customization.json
diff --git a/...atabase/client.customization.storage.json → ...atabase/client.customization.storage.json b/...atabase/client.customization.storage.json → ...atabase/client.customization.storage.json
diff --git a/...EFT/embedded/database/client.globals.json → ...FT/Resources/database/client.globals.json b/...EFT/embedded/database/client.globals.json → ...FT/Resources/database/client.globals.json
diff --git a/...d/database/client.handbook.templates.json → ...s/database/client.handbook.templates.json b/...d/database/client.handbook.templates.json → ...s/database/client.handbook.templates.json
diff --git a/...bedded/database/client.hideout.areas.json → ...ources/database/client.hideout.areas.json b/...bedded/database/client.hideout.areas.json → ...ources/database/client.hideout.areas.json
diff --git a/...ent.hideout.customization.offer.list.json → ...ent.hideout.customization.offer.list.json b/...ent.hideout.customization.offer.list.json → ...ent.hideout.customization.offer.list.json
diff --git a/...se/client.hideout.production.recipes.json → ...se/client.hideout.production.recipes.json b/...se/client.hideout.production.recipes.json → ...se/client.hideout.production.recipes.json
diff --git a/...ded/database/client.hideout.qte.list.json → ...ces/database/client.hideout.qte.list.json b/...ded/database/client.hideout.qte.list.json → ...ces/database/client.hideout.qte.list.json
diff --git a/...ded/database/client.hideout.settings.json → ...ces/database/client.hideout.settings.json b/...ded/database/client.hideout.settings.json → ...ces/database/client.hideout.settings.json
diff --git a/...d.EFT/embedded/database/client.items.json → ....EFT/Resources/database/client.items.json b/...d.EFT/embedded/database/client.items.json → ....EFT/Resources/database/client.items.json
diff --git a/...ed/database/client.localGame.weather.json → ...es/database/client.localGame.weather.json b/...ed/database/client.localGame.weather.json → ...es/database/client.localGame.weather.json
diff --git a/...T/embedded/database/client.locations.json → .../Resources/database/client.locations.json b/...T/embedded/database/client.locations.json → .../Resources/database/client.locations.json
diff --git a/...bedded/database/client.prestige.list.json → ...ources/database/client.prestige.list.json b/...bedded/database/client.prestige.list.json → ...ources/database/client.prestige.list.json
diff --git a/.../embedded/database/client.quest.list.json → ...Resources/database/client.quest.list.json b/.../embedded/database/client.quest.list.json → ...Resources/database/client.quest.list.json
diff --git a/...FT/embedded/database/client.settings.json → ...T/Resources/database/client.settings.json b/...FT/embedded/database/client.settings.json → ...T/Resources/database/client.settings.json
diff --git a/...se/client.trading.api.traderSettings.json → ...se/client.trading.api.traderSettings.json b/...se/client.trading.api.traderSettings.json → ...se/client.trading.api.traderSettings.json
diff --git a/...EFT/embedded/database/client.weather.json → ...FT/Resources/database/client.weather.json b/...EFT/embedded/database/client.weather.json → ...FT/Resources/database/client.weather.json
diff --git a/...s/quest/icon/65899d03adeac0191c51e880.jpg → ...s/quest/icon/65899d03adeac0191c51e880.jpg b/...s/quest/icon/65899d03adeac0191c51e880.jpg → ...s/quest/icon/65899d03adeac0191c51e880.jpg
diff --git a/...rader/avatar/579dc571d53a0658a154fbec.png → ...rader/avatar/579dc571d53a0658a154fbec.png b/...rader/avatar/579dc571d53a0658a154fbec.png → ...rader/avatar/579dc571d53a0658a154fbec.png
diff --git a/...rader/avatar/59b91ca086f77469a81232e4.jpg → ...rader/avatar/59b91ca086f77469a81232e4.jpg b/...rader/avatar/59b91ca086f77469a81232e4.jpg → ...rader/avatar/59b91ca086f77469a81232e4.jpg
diff --git a/...rader/avatar/59b91cab86f77469aa5343ca.jpg → ...rader/avatar/59b91cab86f77469aa5343ca.jpg b/...rader/avatar/59b91cab86f77469aa5343ca.jpg → ...rader/avatar/59b91cab86f77469aa5343ca.jpg
diff --git a/...rader/avatar/59b91cb486f77469a81232e5.jpg → ...rader/avatar/59b91cb486f77469a81232e5.jpg b/...rader/avatar/59b91cb486f77469a81232e5.jpg → ...rader/avatar/59b91cb486f77469a81232e5.jpg
diff --git a/...rader/avatar/59b91cbd86f77469aa5343cb.jpg → ...rader/avatar/59b91cbd86f77469aa5343cb.jpg b/...rader/avatar/59b91cbd86f77469aa5343cb.jpg → ...rader/avatar/59b91cbd86f77469aa5343cb.jpg
diff --git a/...rader/avatar/5a7c2ebb86f7746e324a06ab.jpg → ...rader/avatar/5a7c2ebb86f7746e324a06ab.jpg b/...rader/avatar/5a7c2ebb86f7746e324a06ab.jpg → ...rader/avatar/5a7c2ebb86f7746e324a06ab.jpg
diff --git a/...rader/avatar/5ac3b86a86f77461491d1ad8.jpg → ...rader/avatar/5ac3b86a86f77461491d1ad8.jpg b/...rader/avatar/5ac3b86a86f77461491d1ad8.jpg → ...rader/avatar/5ac3b86a86f77461491d1ad8.jpg
diff --git a/...rader/avatar/5c06531a86f7746319710e1b.jpg → ...rader/avatar/5c06531a86f7746319710e1b.jpg b/...rader/avatar/5c06531a86f7746319710e1b.jpg → ...rader/avatar/5c06531a86f7746319710e1b.jpg
diff --git a/...rader/avatar/638f541a29ffd1183d187f57.png → ...rader/avatar/638f541a29ffd1183d187f57.png b/...rader/avatar/638f541a29ffd1183d187f57.png → ...rader/avatar/638f541a29ffd1183d187f57.png
diff --git a/...rader/avatar/656f0f98d80a697f855d34b1.png → ...rader/avatar/656f0f98d80a697f855d34b1.png b/...rader/avatar/656f0f98d80a697f855d34b1.png → ...rader/avatar/656f0f98d80a697f855d34b1.png
diff --git a/...ed/database/locales/client.languages.json → ...es/database/locales/client.languages.json b/...ed/database/locales/client.languages.json → ...es/database/locales/client.languages.json
diff --git a/...ed/database/locales/client.locale-ch.json → ...es/database/locales/client.locale-ch.json b/...ed/database/locales/client.locale-ch.json → ...es/database/locales/client.locale-ch.json
diff --git a/...ed/database/locales/client.locale-cz.json → ...es/database/locales/client.locale-cz.json b/...ed/database/locales/client.locale-cz.json → ...es/database/locales/client.locale-cz.json
diff --git a/...ed/database/locales/client.locale-en.json → ...es/database/locales/client.locale-en.json b/...ed/database/locales/client.locale-en.json → ...es/database/locales/client.locale-en.json
diff --git a/...database/locales/client.locale-es-mx.json → ...database/locales/client.locale-es-mx.json b/...database/locales/client.locale-es-mx.json → ...database/locales/client.locale-es-mx.json
diff --git a/...ed/database/locales/client.locale-es.json → ...es/database/locales/client.locale-es.json b/...ed/database/locales/client.locale-es.json → ...es/database/locales/client.locale-es.json
diff --git a/...ed/database/locales/client.locale-fr.json → ...es/database/locales/client.locale-fr.json b/...ed/database/locales/client.locale-fr.json → ...es/database/locales/client.locale-fr.json
diff --git a/...ed/database/locales/client.locale-ge.json → ...es/database/locales/client.locale-ge.json b/...ed/database/locales/client.locale-ge.json → ...es/database/locales/client.locale-ge.json
diff --git a/...ed/database/locales/client.locale-hu.json → ...es/database/locales/client.locale-hu.json b/...ed/database/locales/client.locale-hu.json → ...es/database/locales/client.locale-hu.json
diff --git a/...ed/database/locales/client.locale-it.json → ...es/database/locales/client.locale-it.json b/...ed/database/locales/client.locale-it.json → ...es/database/locales/client.locale-it.json
diff --git a/...ed/database/locales/client.locale-jp.json → ...es/database/locales/client.locale-jp.json b/...ed/database/locales/client.locale-jp.json → ...es/database/locales/client.locale-jp.json
diff --git a/...ed/database/locales/client.locale-kr.json → ...es/database/locales/client.locale-kr.json b/...ed/database/locales/client.locale-kr.json → ...es/database/locales/client.locale-kr.json
diff --git a/...ed/database/locales/client.locale-pl.json → ...es/database/locales/client.locale-pl.json b/...ed/database/locales/client.locale-pl.json → ...es/database/locales/client.locale-pl.json
diff --git a/...ed/database/locales/client.locale-po.json → ...es/database/locales/client.locale-po.json b/...ed/database/locales/client.locale-po.json → ...es/database/locales/client.locale-po.json
diff --git a/...ed/database/locales/client.locale-ro.json → ...es/database/locales/client.locale-ro.json b/...ed/database/locales/client.locale-ro.json → ...es/database/locales/client.locale-ro.json
diff --git a/...ed/database/locales/client.locale-ru.json → ...es/database/locales/client.locale-ru.json b/...ed/database/locales/client.locale-ru.json → ...es/database/locales/client.locale-ru.json
diff --git a/...ed/database/locales/client.locale-sk.json → ...es/database/locales/client.locale-sk.json b/...ed/database/locales/client.locale-sk.json → ...es/database/locales/client.locale-sk.json
diff --git a/...ed/database/locales/client.locale-tu.json → ...es/database/locales/client.locale-tu.json b/...ed/database/locales/client.locale-tu.json → ...es/database/locales/client.locale-tu.json
diff --git a/...tabase/locales/client.menu.locale-ch.json → ...tabase/locales/client.menu.locale-ch.json b/...tabase/locales/client.menu.locale-ch.json → ...tabase/locales/client.menu.locale-ch.json
diff --git a/...tabase/locales/client.menu.locale-cz.json → ...tabase/locales/client.menu.locale-cz.json b/...tabase/locales/client.menu.locale-cz.json → ...tabase/locales/client.menu.locale-cz.json
diff --git a/...tabase/locales/client.menu.locale-en.json → ...tabase/locales/client.menu.locale-en.json b/...tabase/locales/client.menu.locale-en.json → ...tabase/locales/client.menu.locale-en.json
diff --git a/...ase/locales/client.menu.locale-es-mx.json → ...ase/locales/client.menu.locale-es-mx.json b/...ase/locales/client.menu.locale-es-mx.json → ...ase/locales/client.menu.locale-es-mx.json
diff --git a/...tabase/locales/client.menu.locale-es.json → ...tabase/locales/client.menu.locale-es.json b/...tabase/locales/client.menu.locale-es.json → ...tabase/locales/client.menu.locale-es.json
diff --git a/...tabase/locales/client.menu.locale-fr.json → ...tabase/locales/client.menu.locale-fr.json b/...tabase/locales/client.menu.locale-fr.json → ...tabase/locales/client.menu.locale-fr.json
diff --git a/...tabase/locales/client.menu.locale-ge.json → ...tabase/locales/client.menu.locale-ge.json b/...tabase/locales/client.menu.locale-ge.json → ...tabase/locales/client.menu.locale-ge.json
diff --git a/...tabase/locales/client.menu.locale-hu.json → ...tabase/locales/client.menu.locale-hu.json b/...tabase/locales/client.menu.locale-hu.json → ...tabase/locales/client.menu.locale-hu.json
diff --git a/...tabase/locales/client.menu.locale-it.json → ...tabase/locales/client.menu.locale-it.json b/...tabase/locales/client.menu.locale-it.json → ...tabase/locales/client.menu.locale-it.json
diff --git a/...tabase/locales/client.menu.locale-jp.json → ...tabase/locales/client.menu.locale-jp.json b/...tabase/locales/client.menu.locale-jp.json → ...tabase/locales/client.menu.locale-jp.json
diff --git a/...tabase/locales/client.menu.locale-kr.json → ...tabase/locales/client.menu.locale-kr.json b/...tabase/locales/client.menu.locale-kr.json → ...tabase/locales/client.menu.locale-kr.json
diff --git a/...tabase/locales/client.menu.locale-pl.json → ...tabase/locales/client.menu.locale-pl.json b/...tabase/locales/client.menu.locale-pl.json → ...tabase/locales/client.menu.locale-pl.json
diff --git a/...tabase/locales/client.menu.locale-po.json → ...tabase/locales/client.menu.locale-po.json b/...tabase/locales/client.menu.locale-po.json → ...tabase/locales/client.menu.locale-po.json
diff --git a/...tabase/locales/client.menu.locale-ro.json → ...tabase/locales/client.menu.locale-ro.json b/...tabase/locales/client.menu.locale-ro.json → ...tabase/locales/client.menu.locale-ro.json
diff --git a/...tabase/locales/client.menu.locale-ru.json → ...tabase/locales/client.menu.locale-ru.json b/...tabase/locales/client.menu.locale-ru.json → ...tabase/locales/client.menu.locale-ru.json
diff --git a/...tabase/locales/client.menu.locale-sk.json → ...tabase/locales/client.menu.locale-sk.json b/...tabase/locales/client.menu.locale-sk.json → ...tabase/locales/client.menu.locale-sk.json
diff --git a/...tabase/locales/client.menu.locale-tu.json → ...tabase/locales/client.menu.locale-tu.json b/...tabase/locales/client.menu.locale-tu.json → ...tabase/locales/client.menu.locale-tu.json
diff --git a/...T/embedded/database/locations/bigmap.json → .../Resources/database/locations/bigmap.json b/...T/embedded/database/locations/bigmap.json → .../Resources/database/locations/bigmap.json
diff --git a/...dded/database/locations/factory4_day.json → ...rces/database/locations/factory4_day.json b/...dded/database/locations/factory4_day.json → ...rces/database/locations/factory4_day.json
diff --git a/...ed/database/locations/factory4_night.json → ...es/database/locations/factory4_night.json b/...ed/database/locations/factory4_night.json → ...es/database/locations/factory4_night.json
diff --git a/...edded/database/locations/interchange.json → ...urces/database/locations/interchange.json b/...edded/database/locations/interchange.json → ...urces/database/locations/interchange.json
diff --git a/...bedded/database/locations/laboratory.json → ...ources/database/locations/laboratory.json b/...bedded/database/locations/laboratory.json → ...ources/database/locations/laboratory.json
diff --git a/...bedded/database/locations/lighthouse.json → ...ources/database/locations/lighthouse.json b/...bedded/database/locations/lighthouse.json → ...ources/database/locations/lighthouse.json
diff --git a/...bedded/database/locations/rezervbase.json → ...ources/database/locations/rezervbase.json b/...bedded/database/locations/rezervbase.json → ...ources/database/locations/rezervbase.json
diff --git a/.../embedded/database/locations/sandbox.json → ...Resources/database/locations/sandbox.json b/.../embedded/database/locations/sandbox.json → ...Resources/database/locations/sandbox.json
diff --git a/...mbedded/database/locations/shoreline.json → ...sources/database/locations/shoreline.json b/...mbedded/database/locations/shoreline.json → ...sources/database/locations/shoreline.json
diff --git a/...ded/database/locations/tarkovstreets.json → ...ces/database/locations/tarkovstreets.json b/...ded/database/locations/tarkovstreets.json → ...ces/database/locations/tarkovstreets.json
diff --git a/...FT/embedded/database/locations/woods.json → ...T/Resources/database/locations/woods.json b/...FT/embedded/database/locations/woods.json → ...T/Resources/database/locations/woods.json
diff --git a/...dded/database/profiles/player.savage.json → ...rces/database/profiles/player.savage.json b/...dded/database/profiles/player.savage.json → ...rces/database/profiles/player.savage.json
diff --git a/...atabase/profiles/player.unheard-bear.json → ...atabase/profiles/player.unheard-bear.json b/...atabase/profiles/player.unheard-bear.json → ...atabase/profiles/player.unheard-bear.json
diff --git a/...atabase/profiles/player.unheard-usec.json → ...atabase/profiles/player.unheard-usec.json b/...atabase/profiles/player.unheard-usec.json → ...atabase/profiles/player.unheard-usec.json
diff --git a/...mbedded/database/traderavatars/rimuru.jpg → ...sources/database/traderavatars/rimuru.jpg b/...mbedded/database/traderavatars/rimuru.jpg → ...sources/database/traderavatars/rimuru.jpg
diff --git a/...mbedded/database/traderavatars/rimuru.png → ...sources/database/traderavatars/rimuru.png b/...mbedded/database/traderavatars/rimuru.png → ...sources/database/traderavatars/rimuru.png
diff --git a/Fuyu.Common/Fuyu.Common.csproj b/Fuyu.Common/Fuyu.Common.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;netstandard2.1</TargetFrameworks>
+    <TargetFrameworks>net8.0;netstandard2.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Fuyu.Common/IO/Resx.cs b/Fuyu.Common/IO/Resx.cs
@@ -62,10 +62,7 @@ public static Stream GetStream(string id, string path)
             }
 
             // find target
-
-            // NOTE: replacing ".Resources" is, ideally, a temporary solution
-            // -- nexus4880, 2024-12-11
-            var target = $"{assembly.GetName().Name.Replace(".Resources", string.Empty)}.embedded.{path}";
+            var target = $"{assembly.GetName().Name}.Resources.{path}";
 
             foreach (var fullpath in fullpaths)
             {

diff --git a/Fuyu.Common/README.md b/Fuyu.Common/README.md
@@ -86,11 +86,11 @@ public class Program
 
 A simple wrapper around loading embedded files from assemblies.
 
-It assumes the file is located in the `embedded/` folder of your csproj.
+It assumes the file is located in the `Resources/` folder of your csproj.
 
 ```xml
   <ItemGroup>
-    <EmbeddedResource Include="embedded/path/to/file.txt" />
+    <EmbeddedResource Include="Resources/path/to/file.txt" />
   </ItemGroup>
 ```
 

diff --git a/Fuyu.DependencyInjection/Fuyu.DependencyInjection.csproj b/Fuyu.DependencyInjection/Fuyu.DependencyInjection.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-	<TargetFrameworks>net8.0;netstandard2.1</TargetFrameworks>
+	<TargetFrameworks>net8.0;netstandard2.0</TargetFrameworks>
   </PropertyGroup>
 </Project>
diff --git a/Fuyu.Modding/Fuyu.Modding.csproj b/Fuyu.Modding/Fuyu.Modding.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net8.0;netstandard2.1</TargetFrameworks>
+    <TargetFrameworks>net8.0;netstandard2.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" />

diff --git a/Fuyu.Modding/ModManager.cs b/Fuyu.Modding/ModManager.cs
@@ -37,6 +37,16 @@ public static ModManager Instance
             }
         }
 
+        private string GetResourcePath(string resourceRootPath, string resourcePath)
+        {
+            return resourcePath
+                .Replace(resourceRootPath + "\\", string.Empty) // exp. Fuyu/Mods/Launcher
+                .Replace("../", string.Empty)                   // relative path ./
+                .Replace("./", string.Empty)                    // relative path ./
+                .Replace("\\", ".")                             // windows \
+                .Replace("/", ".");                             // unix /
+        }
+
         private CSharpCompilation CreateCompilation(
             string assemblyName,
             IEnumerable<SyntaxTree> syntaxTrees,
@@ -153,10 +163,11 @@ private void ProcessSourceFiles(string directory)
                 syntaxTrees.Add(syntaxTree);
             }
 
-            var resourcePaths = VFS.GetFiles(Path.Combine(directory, "res"), "*.*", SearchOption.AllDirectories);
+            var resourceRootPath = Path.Combine(directory, "res");
+            var resourcePaths = VFS.GetFiles(resourceRootPath, "*.*", SearchOption.AllDirectories);
             var resources = resourcePaths.Select(resourcePath =>
             {
-                var fileName = $"{assemblyName}.embedded.{Path.GetFileName(resourcePath)}";
+                var fileName= $"{assemblyName}.Resources.{GetResourcePath(resourceRootPath, resourcePath)}";
 
                 return new ResourceDescription(
                     fileName,
@@ -291,11 +302,12 @@ private async Task UnloadMod(Mod mod)
         private Assembly GenerateResourceAssembly(Assembly sourceAssembly)
         {
             var assemblyName = sourceAssembly.GetName().Name;
+            var resourceRootPath = Path.Combine(Path.GetDirectoryName(sourceAssembly.Location), "res");
             string[] resourcePaths;
 
             try
             {
-                resourcePaths = VFS.GetFiles(Path.Combine(Path.GetDirectoryName(sourceAssembly.Location), "res"), "*.*", SearchOption.AllDirectories);
+                resourcePaths = VFS.GetFiles(resourceRootPath, "*.*", SearchOption.AllDirectories);
             }
             catch (DirectoryNotFoundException)
             {
@@ -309,7 +321,7 @@ private Assembly GenerateResourceAssembly(Assembly sourceAssembly)
 
             var resources = resourcePaths.Select(resourcePath =>
             {
-                var fileName = $"{assemblyName}.embedded.{Path.GetFileName(resourcePath)}";
+                var fileName = $"{assemblyName}.Resources.{GetResourcePath(resourceRootPath, resourcePath)}";
 
                 return new ResourceDescription(
                     fileName,

diff --git a/Tests/Fuyu.Tests.Common/Fuyu.Tests.Common.csproj b/Tests/Fuyu.Tests.Common/Fuyu.Tests.Common.csproj
@@ -15,7 +15,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <EmbeddedResource Include="embedded/test.txt" />
+    <EmbeddedResource Include="Resources/test.txt" />
   </ItemGroup>
 
   <Target Name="PostClean" AfterTargets="Clean">

diff --git a/Tests/Fuyu.Tests.Common/embedded/test.txt → Tests/Fuyu.Tests.Common/Resources/test.txt b/Tests/Fuyu.Tests.Common/embedded/test.txt → Tests/Fuyu.Tests.Common/Resources/test.txt