mirror of
https://gitlab.com/cable-mc/cobblemon.git
synced 2026-11-17 05:38:53 -05:00
# Conflicts: # common/src/main/resources/data/cobblemon/species/generation1/aerodactyl.json # common/src/main/resources/data/cobblemon/species/generation1/charizard.json # common/src/main/resources/data/cobblemon/species/generation1/lapras.json # common/src/main/resources/data/cobblemon/species/generation4/bidoof.json # common/src/main/resources/data/cobblemon/species/generation4/gliscor.json