Pyrbu 73d2ddbc0b Merge branch '2.X' into modular-property-system ... # Conflicts: # plugin/src/main/java/lol/pyr/znpcsplus/entity/EntityPropertyRegistryImpl.java # plugin/src/main/java/lol/pyr/znpcsplus/packets/V1_8PacketFactory.java # plugin/src/main/java/lol/pyr/znpcsplus/util/Viewable.java		2023-08-07 23:14:47 +02:00
..
pyr/znpcsplus	Merge branch '2.X' into modular-property-system	2023-08-07 23:14:47 +02:00