Merge remote-tracking branch 'morigin/rename-locking' into rename-locking

Browse Source

# Conflicts:
#	plugins/simpleadminhacks-paper/src/main/java/com/programmerdan/minecraft/simpleadminhacks/hacks/basic/NameLocker.java

...

This commit is contained in:

MrJeremyFisher

2026-01-05 02:14:57 -05:00

parent 295a96735f ef4bcec26c

commit 3179eec595

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available