Pyrbu f30bb1a6df Merge branch 'modular-property-system' into 2.X ... # Conflicts: # plugin/src/main/java/lol/pyr/znpcsplus/ZNpcsPlus.java # plugin/src/main/java/lol/pyr/znpcsplus/conversion/citizens/CitizensImporter.java # plugin/src/main/java/lol/pyr/znpcsplus/entity/EntityPropertyRegistryImpl.java # plugin/src/main/java/lol/pyr/znpcsplus/storage/yaml/YamlStorage.java # plugin/src/main/java/lol/pyr/znpcsplus/util/Viewable.java		2023-09-13 02:15:30 +02:00
..
java/lol/pyr/znpcsplus	Merge branch 'modular-property-system' into 2.X	2023-09-13 02:15:30 +02:00