Greenlamp f81df957a5 Merge branch 'main' of github.com:Greenlamp2/pokerogue into feat/mapping_setting ... Conflicts: src/inputs-controller.ts src/system/settings.ts		2024-05-10 15:43:59 +02:00
..
audio	Add missing and updated biome art	2024-05-09 19:05:19 -04:00
battle-anims	…
fonts	…
images	Merge branch 'main' of github.com:Greenlamp2/pokerogue into feat/mapping_setting	2024-05-10 15:43:59 +02:00
.gitkeep	…
exp-sprites.json	…
logo128.png	…
logo512.png	…
manifest.webmanifest	…
service-worker.js	…
starter-colors.json	…
update-source-comments.py	…