Pyrbu 3ebd0070b8 Merge remote-tracking branch 'alexdev03/2.X' into alexdev032.X ... # Conflicts: # plugin/src/main/java/lol/pyr/znpcsplus/npc/NpcImpl.java		2024-02-16 17:31:13 +01:00
..
src/main	Merge remote-tracking branch 'alexdev03/2.X' into alexdev032.X	2024-02-16 17:31:13 +01:00
build.gradle	revert packetevents update	2024-02-16 17:25:37 +01:00