Tim203
|
05eb054559
|
Merge remote-tracking branch 'origin/master' into feature/floodgate-merge
|
2023-09-24 10:44:56 +02:00 |
|
Konicai
|
40775149f5
|
NMS adapter for spigot 1.20 (#3911)
|
2023-06-28 00:31:03 -04:00 |
|
Kas-tle
|
f3cc93c94e
|
Relocate org.yaml for bungee and spigot (#3820)
* Relocate org.yaml
* Spigot did the same for yaml sadly
|
2023-06-07 13:22:36 -05:00 |
|
Tim203
|
d14a20845d
|
Some additional merge changes
|
2023-05-05 18:22:31 +02:00 |
|
Tim203
|
6ca53f5bf3
|
Merge remote-tracking branch 'origin/feature/floodgate-merge'
# Conflicts:
# bootstrap/bungeecord/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeePlugin.java
# bootstrap/fabric/src/main/java/org/geysermc/geyser/platform/fabric/GeyserFabricMod.java
# bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotPlugin.java
# bootstrap/sponge/src/main/java/org/geysermc/geyser/platform/sponge/GeyserSpongePlugin.java
# bootstrap/standalone/src/main/java/org/geysermc/geyser/platform/standalone/GeyserStandaloneBootstrap.java
# bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityPlugin.java
# core/build.gradle.kts
# core/src/main/java/org/geysermc/geyser/GeyserImpl.java
# core/src/main/java/org/geysermc/geyser/command/defaults/VersionCommand.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/bedrock/BedrockCommandRequestTranslator.java
# core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockNetworkStackLatencyTranslator.java
# core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaCustomPayloadTranslator.java
# core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/JavaBlockUpdateTranslator.java
# gradle/libs.versions.toml
|
2023-05-05 12:09:20 +02:00 |
|
Camotoy
|
8083f70435
|
KQueue no longer needs to be shaded in on Spigot/Fabric
|
2023-04-06 19:54:22 -04:00 |
|
Camotoy
|
e2535108e6
|
Folia support and preparations for future changes
|
2023-03-30 15:44:55 -04:00 |
|
Camotoy
|
323394d2b5
|
Clean up jar file classes a bit
|
2023-03-26 13:20:53 -04:00 |
|
Camotoy
|
1c49036e3a
|
Proof-of-concept for Geyser-Floodgate merge
|
2022-11-06 21:32:55 -05:00 |
|
SupremeMortal
|
7edde43141
|
Initial fabric merger
|
2022-10-03 21:11:07 +01:00 |
|
SupremeMortal
|
e491cf8a17
|
Use Gradle's dependency catalogue feature (#3305)
Move all of our dependencies to a single catalogue file to make maintenance of them easier.
|
2022-09-26 11:43:17 -04:00 |
|
Kas-tle
|
f1642d81dc
|
Fix comment
|
2022-08-24 13:41:24 +00:00 |
|
Kas-tle
|
dc29d997fd
|
Exclude from relocation, not inclusion
|
2022-08-24 05:18:12 +00:00 |
|
Kas-tle
|
e35f3785b2
|
Resolve fallout
|
2022-08-24 04:53:13 +00:00 |
|
Kas-tle
|
0335c8263c
|
Address @Camotoy's review
|
2022-07-13 16:20:42 +00:00 |
|
Kas-tle
|
d1fbb909a5
|
fixed java 16 thanks to @davchoo
|
2022-07-12 17:09:48 +00:00 |
|
Kas-tle
|
2dbd39c5a4
|
Per review by @Camotoy
|
2022-07-12 16:33:57 +00:00 |
|
Kas-tle
|
bca6359f7e
|
1.19.10 fallout
|
2022-07-12 05:29:39 +00:00 |
|
ImDaBigBoss
|
4e2f74481b
|
Updated to 1.19
|
2022-06-08 14:09:14 +02:00 |
|
Camotoy
|
1ebc3fd8f6
|
Merge branch 'master' of https://github.com/GeyserMC/Geyser into feature/extensions
|
2022-04-07 19:22:46 -04:00 |
|
RednedEpic
|
f53c3b71c0
|
Update dependencies
|
2022-03-19 20:46:30 -05:00 |
|
RednedEpic
|
6321ecc166
|
Initial move to gradle
|
2022-02-27 16:38:55 -06:00 |
|