mirror of
https://github.com/Geniusay/ChopperBot.git
synced 2026-06-04 13:50:47 +08:00
Merge remote-tracking branch 'origin/master' into gitubranch
# Conflicts: # CHANGELOG.md
This commit is contained in:
4
.idea/compiler.xml
generated
4
.idea/compiler.xml
generated
@@ -15,14 +15,15 @@
|
||||
<module name="SectionWorkModule" />
|
||||
<module name="PublishModule" />
|
||||
<module name="VideoSectionModule" />
|
||||
<module name="doc" />
|
||||
<module name="SectionModule" />
|
||||
<module name="LiveRecordModule" />
|
||||
<module name="BarrageModule" />
|
||||
<module name="HotModule" />
|
||||
</profile>
|
||||
</annotationProcessing>
|
||||
<bytecodeTargetLevel>
|
||||
<module name="Console" target="11" />
|
||||
<module name="doc" target="11" />
|
||||
</bytecodeTargetLevel>
|
||||
</component>
|
||||
<component name="JavacSettings">
|
||||
@@ -33,6 +34,7 @@
|
||||
<module name="CreeperModule" options="-parameters" />
|
||||
<module name="FileModule" options="-parameters" />
|
||||
<module name="HotModule" options="-parameters" />
|
||||
<module name="LiveRecordModule" options="-parameters" />
|
||||
<module name="PublishModule" options="-parameters" />
|
||||
<module name="SectionModule" options="-parameters" />
|
||||
<module name="SectionWorkModule" options="-parameters" />
|
||||
|
||||
1
.idea/encodings.xml
generated
1
.idea/encodings.xml
generated
@@ -9,6 +9,7 @@
|
||||
<file url="file://$PROJECT_DIR$/FileModule/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/FileModule/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/HotModule/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/LiveRecordModule/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/PublishModule/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/SectionModule/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/SectionWorkModule/src/main/java" charset="UTF-8" />
|
||||
|
||||
20
LiveRecordModule/pom.xml
Normal file
20
LiveRecordModule/pom.xml
Normal file
@@ -0,0 +1,20 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<parent>
|
||||
<artifactId>ChopperBot</artifactId>
|
||||
<groupId>org.example</groupId>
|
||||
<version>1.0-SNAPSHOT</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<artifactId>LiveRecordModule</artifactId>
|
||||
|
||||
<properties>
|
||||
<maven.compiler.source>11</maven.compiler.source>
|
||||
<maven.compiler.target>11</maven.compiler.target>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
</properties>
|
||||
|
||||
</project>
|
||||
Reference in New Issue
Block a user