Pyrbu 4e584b8d46 Merge branch 'modular-property-system' into upstream-modular-property-system ... # Conflicts: # plugin/src/main/java/lol/pyr/znpcsplus/entity/EntityPropertyRegistryImpl.java		2023-08-07 16:03:08 +02:00
..
src/main	Merge branch 'modular-property-system' into upstream-modular-property-system	2023-08-07 16:03:08 +02:00
build.gradle	extract spigot api as a common dependency so the versions always match	2023-07-12 20:41:43 +02:00