# Conflicts: # plugin/src/main/java/lol/pyr/znpcsplus/ZNpcsPlus.java # plugin/src/main/java/lol/pyr/znpcsplus/commands/property/PropertySetCommand.java # plugin/src/main/java/lol/pyr/znpcsplus/entity/EntityPropertyRegistryImpl.java # plugin/src/main/java/lol/pyr/znpcsplus/metadata/MetadataFactory.java # plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_12MetadataFactory.java # plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_8MetadataFactory.java |
||
---|---|---|
.. | ||
src/main | ||
build.gradle |