GeyserMC/Geyser
GeyserMC/Geyser
4
4
Fork 3
mirror of https://github.com/GeyserMC/Geyser.git synced 2024-08-14 23:57:35 +00:00
Code Issues 103 Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/master' into feature/floodgate-merge

Browse source 
# Conflicts:
#	bootstrap/bungeecord/base/build.gradle.kts
#	bootstrap/spigot/base/build.gradle.kts
#	bootstrap/spigot/base/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotInjector.java
#	bootstrap/velocity/base/build.gradle.kts
#	core/build.gradle.kts
#	core/src/main/java/org/geysermc/geyser/GeyserImpl.java
#	core/src/main/java/org/geysermc/geyser/dump/DumpInfo.java
#	core/src/main/java/org/geysermc/geyser/entity/type/FireworkEntity.java
#	core/src/main/java/org/geysermc/geyser/network/netty/LocalSession.java
#	core/src/main/java/org/geysermc/geyser/session/GeyserSession.java
#	core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaCustomPayloadTranslator.java
#	core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaLoginTranslator.java
#	gradle.properties
#	gradle/libs.versions.toml
#	settings.gradle.kts
This commit is contained in:
Tim203 2024-05-09 18:04:56 +02:00
commit 9f32ba81b1
No known key found for this signature in database
503 changed files with 19812 additions and 4402 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gradle.properties
View file

@ -8,4 +8,4 @@ org.gradle.vfs.watch=false
group=org.geysermc
id=geyser
version=3.0.0-SNAPSHOT
description=Allows for players from Minecraft: Bedrock Edition to join Minecraft: Java Edition servers.
description=Allows for players from Minecraft: Bedrock Edition to join Minecraft: Java Edition servers.