Skip to content

Commit 67f4a39

Browse files
committed
Merge remote-tracking branch 'origin/master'
2 parents fd4d6b1 + 7b0c2fb commit 67f4a39

File tree

762 files changed

+2625
-3100
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

762 files changed

+2625
-3100
lines changed

.editorconfig

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
[*]
2+
charset = utf-8
3+
indent_size = 4
4+
indent_style = space
5+
insert_final_newline = false
6+
tab_width = 4
7+
8+
[*.java]
9+
ij_java_class_count_to_use_import_on_demand = 999999
10+
ij_java_names_count_to_use_import_on_demand = 999999
11+
ij_java_imports_layout = *,|,$*
12+
ij_java_generate_final_locals = true
13+
ij_java_generate_final_parameters = true

.github/FUNDING.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
github: kennytv
2+
patreon: kennytv

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ body:
2323
attributes:
2424
label: Console Error
2525
description: |
26-
If you encounter warnings/errors in your console, **paste them with https://paste.gg/ and put the paste link here**.
26+
If you encounter warnings/errors in your console, **paste them with https://mclo.gs/ and put the paste link here**.
2727
If the error is small/less than 10 lines, you may put it directly into this field.
2828
value: |
2929
```
30-
Put the paste.gg link or text here.
30+
Put the mclo.gs link or text here.
3131
```
3232
placeholder: Please do not remove the grave accents; simply replace the line of text in the middle.
3333
validations:

.github/workflows/gradle.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ jobs:
1414
uses: actions/checkout@v4
1515
- name: Validate Gradle Wrapper
1616
uses: gradle/wrapper-validation-action@v1
17-
- name: Set up JDK 11
18-
uses: actions/setup-java@v3
17+
- name: Set up JDK 17
18+
uses: actions/setup-java@v4
1919
with:
2020
distribution: 'temurin'
21-
java-version: 11
21+
java-version: 17
2222
check-latest: true
2323
- name: Build with Gradle
2424
run: ./gradlew build

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Validate Gradle Wrapper
1616
uses: gradle/wrapper-validation-action@v1
1717
- name: Set up JDK 17
18-
uses: actions/setup-java@v3
18+
uses: actions/setup-java@v4
1919
with:
2020
distribution: 'temurin'
2121
java-version: 17

.idea/copyright/viaversion_gpl.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/copyright/viaversion_mit.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/scopes/ViaVersion_API.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

adventure/build.gradle.kts

Lines changed: 0 additions & 25 deletions
This file was deleted.

api-legacy/src/main/java/us/myles/ViaVersion/api/Via.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
3-
* Copyright (C) 2016-2023 ViaVersion and contributors
3+
* Copyright (C) 2016-2024 ViaVersion and contributors
44
*
55
* Permission is hereby granted, free of charge, to any person obtaining a copy
66
* of this software and associated documentation files (the "Software"), to deal

0 commit comments

Comments
 (0)