bridge 1c927c6b32 Merge remote-tracking branch 'upstream/2.X' into 2.X ... # Conflicts: # build.gradle # gradle/wrapper/gradle-wrapper.properties # plugin/build.gradle		2025-07-27 00:45:57 +02:00
..
src/main/java/lol/pyr/znpcsplus	Merge remote-tracking branch 'upstream/2.X' into 2.X	2025-07-27 00:45:57 +02:00
build.gradle	move annotations dependency to main gradle file because both subprojects use it	2024-12-15 10:46:05 +01:00