Merge remote-tracking branch 'origin/master'

# Conflicts: # .idea/modules.xml # .idea/vcs.xml
first
2026-01-05 16:10:08 +08:00 · 2026-01-05 16:09:39 +08:00
2 changed files with 15 additions and 0 deletions
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="corretto-21" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
Author	SHA1	Message	Date
shuolol	6c9278e62f	Merge remote-tracking branch 'origin/master' # Conflicts: # .idea/modules.xml # .idea/vcs.xml	2026-01-05 16:10:08 +08:00
shuolol	61d401178b	first	2026-01-05 16:09:39 +08:00