merge: resolve conflicts between master and feature/rules-command
- keep master's rename Localchat -> MSNexus (msnexus id, environment: server) - keep master's AntiAbuse/StealthCommand/StealthStorage/ChatLogger/ChatHandler (error handling, alert cooldown, atomic stealth.json save, **italic**, @mentions) - keep feature's /rules command (RulesCommand/RulesData/RulesLoader), wired into MSNexus - re-apply feature's clickable/hoverable sender name from buildFormattedName - fix stale org.examp.john.Localchat references in rules/* - drop dead client PlayerTabOverlayMixin (mod is server-only, spectator revert kept) - remove build artifacts out/ and RulesCommand.class from git, ignore them
This commit is contained in:
+7
-4
@@ -1,4 +1,7 @@
|
||||
build/**
|
||||
run/**
|
||||
.idea/**
|
||||
.gradle/**
|
||||
build/
|
||||
run/
|
||||
out/
|
||||
/org/
|
||||
*.class
|
||||
.idea/
|
||||
.gradle/
|
||||
|
||||
Reference in New Issue
Block a user