mirror of
https://gitlab.com/cable-mc/cobblemon.git
synced 2026-11-18 14:18:54 -05:00
# Conflicts: # common/src/main/resources/data/cobblemon/species/generation1/golem.json # common/src/main/resources/data/cobblemon/species/generation1/graveler.json # common/src/main/resources/data/cobblemon/species/generation5/braviary.json # common/src/main/resources/data/cobblemon/species/generation5/rufflet.json # common/src/main/resources/data/cobblemon/species/generation5/sandile.json # common/src/main/resources/data/cobblemon/species/generation7/araquanid.json # common/src/main/resources/data/cobblemon/species/generation7/dewpider.json