Merge remote-tracking branch 'origin/syntax-highlighter-unified' into syntax-highlighter-unified

Browse Source

# Conflicts:
#	src/main/java/noppes/npcs/config/GlyphCache.java

...

This commit is contained in:

bigguy345 committed 2026-03-12 21:49:50 +02:00

2 parents 71f0ee1973 4b9f2e3b47

commit bcd60d80ea

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