Tim203
|
ce56a96a89
|
Merge remote-tracking branch 'origin/master' into feature/floodgate-merge
|
2024-09-05 23:15:05 +02:00 |
|
Tim203
|
9f32ba81b1
|
Merge remote-tracking branch 'refs/remotes/origin/master' into feature/floodgate-merge
# 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
|
2024-05-09 18:04:56 +02:00 |
|
Tim203
|
120b367a41
|
Merge remote-tracking branch 'origin/master' into feature/floodgate-merge
# Conflicts:
# core/src/main/java/org/geysermc/geyser/session/GeyserSession.java
|
2024-03-18 16:38:52 +01:00 |
|
Tim203
|
d44b523acb
|
Isolated Velocity
|
2024-02-25 20:00:03 +01:00 |
|
Tim203
|
bc301fba60
|
Move platforms for isolation
|
2024-02-18 19:03:14 +01:00 |
|