Skip to content

Commit

Permalink
Merge branch 'master' into heighten_level
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/db/data_providers/creature_fetcher.rs
#	src/models/creature/creature_component/creature_spellcaster.rs
#	src/models/creature/items/spellcaster_entry.rs
  • Loading branch information
RakuJa committed Feb 19, 2025
2 parents 504d981 + 4feafd9 commit 169adcb
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 169adcb

Please sign in to comment.