Geyser/core/src/main/java/org/geysermc/geyser
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
..
command Feature: Rework startup logic (#4377) 2024-02-14 12:50:50 +01:00
configuration Merge remote-tracking branch 'origin/master' into feature/floodgate-merge 2024-02-18 16:37:26 +01:00
dump Merge remote-tracking branch 'origin/master' into feature/floodgate-merge 2024-02-18 16:37:26 +01:00
entity Merge remote-tracking branch 'origin/master' into feature/floodgate-merge 2024-02-18 16:37:26 +01:00
erosion Project wide syntax/annotation cleanup (#4238) 2023-12-05 18:54:42 -05:00
event Merge remote-tracking branch 'origin/master' into feature/floodgate-merge 2024-02-18 16:37:26 +01:00
extension Merge remote-tracking branch 'origin/master' into feature/floodgate-merge 2024-02-18 16:37:26 +01:00
floodgate Fixed remaining merge issues 2024-02-25 22:25:44 +01:00
impl Feature: Camera/Input locking API (#4332) 2024-01-31 11:21:06 +01:00
inventory Fix virtual lecterns - again (#4494) 2024-03-14 10:27:49 +01:00
item Fix: Workaround for recipes involving custom items to show up in the recipe book (#4484) 2024-03-10 23:38:38 +01:00
level Add new village map icons (#4480) 2024-03-08 21:24:15 +00:00
network Merge remote-tracking branch 'origin/master' into feature/floodgate-merge 2024-03-18 16:38:52 +01:00
pack NeoForge Platform Support (#3781) 2024-02-23 17:58:39 +01:00
ping Catch UnknownHostExceptions in legacy ping passthrough pings (#4331) 2023-12-07 20:27:25 +01:00
registry Fix wooden slabs (#4489) 2024-03-13 02:05:41 -07:00
scoreboard Feature: Rework startup logic (#4377) 2024-02-14 12:50:50 +01:00
session Merge remote-tracking branch 'origin/master' into feature/floodgate-merge 2024-03-18 16:38:52 +01:00
skin Fixed remaining merge conflict issues 2024-02-18 19:02:55 +01:00
text Gracefully handle invalid stone cutter recipes (#4406) 2024-01-22 19:21:12 +01:00
translator Merge remote-tracking branch 'origin/master' into feature/floodgate-merge 2024-03-18 16:38:52 +01:00
util Merge remote-tracking branch 'origin/master' into feature/floodgate-merge 2024-03-18 16:38:52 +01:00
Constants.java Add support for custom blocks and skulls (#3505) 2023-08-21 16:04:08 -07:00
FloodgateKeyLoader.java Fix Floodgate autodetection 2023-04-26 21:11:26 -04:00
GeyserBootstrap.java Merge remote-tracking branch 'origin/master' into feature/floodgate-merge 2024-02-18 16:37:26 +01:00
GeyserImpl.java Merge remote-tracking branch 'origin/master' into feature/floodgate-merge 2024-02-25 20:12:43 +01:00
GeyserLogger.java Project wide syntax/annotation cleanup (#4238) 2023-12-05 18:54:42 -05:00