Skip to content

Commit d89816b

Browse files
committed
Merge branch 'main' into vanish-improvement
2 parents 3796ab3 + af4de6a commit d89816b

29 files changed

Lines changed: 626 additions & 260 deletions

.github/workflows/release.yml

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ on:
66

77
permissions:
88
contents: write
9-
pages: write
10-
id-token: write
119

1210
concurrency:
1311
group: "pages"
@@ -31,7 +29,7 @@ jobs:
3129
java-version: '17'
3230
distribution: 'temurin'
3331

34-
- name: Set release version
32+
- name: Get release version from tag
3533
run: |
3634
TAG=${{ github.event.release.tag_name }}
3735
echo "VERSION=${TAG#v}" >> $GITHUB_OUTPUT
@@ -54,8 +52,8 @@ jobs:
5452
with:
5553
token: ${{ secrets.MODRINTH_TOKEN }}
5654
project: ${{ github.event.repository.custom_properties.modrinth_id }}
57-
name: ${{ github.event.release.name == github.event.release.tag_name && format('BankAccounts {0}', github.event.release.name) || github.event.release.name }}
58-
version: ${{ github.event.release.tag_name }}
55+
name: ${{ github.event.release.name == github.event.release.tag_name && format('CloudnodeMSG {0}', steps.version.outputs.VERSION) || github.event.release.name }}
56+
version: ${{ steps.version.outputs.VERSION }}
5957
changelog: ${{ github.event.release.body }}
6058
loaders: paper
6159
dependencies: |-
@@ -67,18 +65,3 @@ jobs:
6765
1.20.x
6866
1.21.x
6967
files: target/CloudnodeMSG-${{ steps.version.outputs.VERSION }}.jar
70-
71-
- name: Generate Javadoc
72-
run: mvn -B javadoc:javadoc --file pom.xml
73-
74-
- name: Setup Pages
75-
uses: actions/configure-pages@v4
76-
77-
- name: Upload artifact
78-
uses: actions/upload-pages-artifact@v3
79-
with:
80-
path: target/site/apidocs
81-
82-
- name: Deploy to GitHub Pages
83-
id: deployment
84-
uses: actions/deploy-pages@v4

.gitignore

Lines changed: 2 additions & 113 deletions
Original file line numberDiff line numberDiff line change
@@ -1,113 +1,2 @@
1-
# User-specific stuff
2-
.idea/
3-
4-
*.iml
5-
*.ipr
6-
*.iws
7-
8-
# IntelliJ
9-
out/
10-
11-
# Compiled class file
12-
*.class
13-
14-
# Log file
15-
*.log
16-
17-
# BlueJ files
18-
*.ctxt
19-
20-
# Package Files #
21-
*.jar
22-
*.war
23-
*.nar
24-
*.ear
25-
*.zip
26-
*.tar.gz
27-
*.rar
28-
29-
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
30-
hs_err_pid*
31-
32-
*~
33-
34-
# temporary files which can be created if a process still has a handle open of a deleted file
35-
.fuse_hidden*
36-
37-
# KDE directory preferences
38-
.directory
39-
40-
# Linux trash folder which might appear on any partition or disk
41-
.Trash-*
42-
43-
# .nfs files are created when an open file is removed but is still being accessed
44-
.nfs*
45-
46-
# General
47-
.DS_Store
48-
.AppleDouble
49-
.LSOverride
50-
51-
# Icon must end with two \r
52-
Icon
53-
54-
# Thumbnails
55-
._*
56-
57-
# Files that might appear in the root of a volume
58-
.DocumentRevisions-V100
59-
.fseventsd
60-
.Spotlight-V100
61-
.TemporaryItems
62-
.Trashes
63-
.VolumeIcon.icns
64-
.com.apple.timemachine.donotpresent
65-
66-
# Directories potentially created on remote AFP share
67-
.AppleDB
68-
.AppleDesktop
69-
Network Trash Folder
70-
Temporary Items
71-
.apdisk
72-
73-
# Windows thumbnail cache files
74-
Thumbs.db
75-
Thumbs.db:encryptable
76-
ehthumbs.db
77-
ehthumbs_vista.db
78-
79-
# Dump file
80-
*.stackdump
81-
82-
# Folder config file
83-
[Dd]esktop.ini
84-
85-
# Recycle Bin used on file shares
86-
$RECYCLE.BIN/
87-
88-
# Windows Installer files
89-
*.cab
90-
*.msi
91-
*.msix
92-
*.msm
93-
*.msp
94-
95-
# Windows shortcuts
96-
*.lnk
97-
98-
target/
99-
100-
pom.xml.tag
101-
pom.xml.releaseBackup
102-
pom.xml.versionsBackup
103-
pom.xml.next
104-
105-
release.properties
106-
dependency-reduced-pom.xml
107-
buildNumber.properties
108-
.mvn/timing.properties
109-
.mvn/wrapper/maven-wrapper.jar
110-
.flattened-pom.xml
111-
112-
# Common working directory
113-
run/
1+
target
2+
server

.idea/.gitignore

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/artifacts/CloudnodeMSG.xml

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)