Merge branch 'main' into dev

# Conflicts:
#	gradle.properties
This commit is contained in:
FlorianMichael 2024-03-05 20:17:32 +01:00
commit cf999c38ab
No known key found for this signature in database
GPG Key ID: C2FB87E71C425126
3 changed files with 4 additions and 3 deletions

3
.github/FUNDING.yml vendored
View File

@ -1 +1,2 @@
custom: ['https://viaversion.com/donate', 'https://creeper123123321.github.io/#donate']
custom: ['https://viaversion.com/donate', 'https://creeper123123321.github.io/#donate', 'https://florianmichael.de/donate']
github: FlorianMichael

View File

@ -2,7 +2,7 @@
org.gradle.jvmargs=-Xms32M -Xmx4G -XX:+UseG1GC -XX:+UseStringDeduplication
loader_version=0.15.7
viaver_version=4.10.0-24w07a-SNAPSHOT
viaver_version=4.10.0-24w09a-SNAPSHOT
yaml_version=2.2
publish_mc_versions=1.20.4, 1.19.4, 1.18.2, 1.17.1, 1.16.5, 1.15.2, 1.14.4, 1.12.2, 1.8.9

View File

@ -14,7 +14,7 @@
"depends": {
"fabricloader": ">=0.14.0",
"minecraft": ["1.8.9", "1.12.2", "1.14.4", "1.15.2", "1.16.5", "1.17.1", "1.18.2", "1.19.4", ">=1.20.3"],
"viaversion": ">=4.9.1"
"viaversion": ">=4.9.3"
},
"breaks": {
"viafabricplus": "*"