mirror of
https://github.com/pagefaultgames/pokerogue.git
synced 2025-07-29 19:52:27 +02:00
Merge and fix conflicts
This commit is contained in:
parent
34d2109534
commit
45d36567ec
@ -1,6 +1,6 @@
|
|||||||
import { allMoves } from "#app/data/move.js";
|
import { allMoves } from "#app/data/move";
|
||||||
import { StatusEffect } from "#app/enums/status-effect.js";
|
import { StatusEffect } from "#app/enums/status-effect";
|
||||||
import { CommandPhase } from "#app/phases/command-phase.js";
|
import { CommandPhase } from "#app/phases/command-phase";
|
||||||
import { Abilities } from "#enums/abilities";
|
import { Abilities } from "#enums/abilities";
|
||||||
import { Moves } from "#enums/moves";
|
import { Moves } from "#enums/moves";
|
||||||
import { Species } from "#enums/species";
|
import { Species } from "#enums/species";
|
||||||
|
Loading…
Reference in New Issue
Block a user