Commit Graph

67 Commits

Author SHA1 Message Date
RednedEpic 09297a467c Update submodules 2020-04-22 23:51:22 -05:00
DoctorMacc b0a8b9219a Add effects support and block break particles/place sounds
Co-authored-by: RednedEpic <redned235@gmail.com>
2020-04-22 23:40:49 -05:00
RednedEpic 3e15d21931 Merge branch 'master' into sound-master 2020-04-22 18:18:13 -05:00
RednedEpic 987edbb217 Nitpicks and add serverbound sound packet translator 2020-04-22 18:17:34 -05:00
RednedEpic 0a5312fff2 Update mappings submodule 2020-04-15 15:02:12 -05:00
RednedEpic 605c9ef4db Merge branch 'master' into inventory 2020-04-11 22:46:25 -05:00
rtm516 1ef50cbb95 Added automatic en_us download and extraction from JAR 2020-04-09 14:36:32 +01:00
rtm516 70a71b2ee8 Updated mappings commit 2020-04-09 00:23:21 +01:00
rtm516 2cd5472ff0 Started work on the locale fetching and loading system 2020-04-08 21:11:56 +01:00
rtm516 49df48fcf0 Fixed some strings getting missed 2020-04-05 22:47:03 +01:00
rtm516 845c914492 Moved loading and added default locale config option 2020-04-05 02:58:23 +01:00
BuildTools 7cbb0388e2 Update mappings submodule 2020-03-27 16:16:33 -04:00
RednedEpic 6b22bcec2b Merge branch 'master' into inventory 2020-03-04 21:35:20 -06:00
RednedEpic 41a24ca6ab Merge branch 'master' into plugin 2020-02-16 13:25:37 -06:00
AJ Ferguson b1a0ed3e91 Merge remote-tracking branch 'remotes/upstream/master' into inventory
# Conflicts:
#	connector/src/main/java/org/geysermc/connector/network/translators/TranslatorsInit.java
#	connector/src/main/java/org/geysermc/connector/utils/Toolbox.java
2020-02-12 21:58:09 -09:00
SupremeMortal f9cd88eaa2
Merge branch 'master' of https://github.com/GeyserMC/Geyser into feature/direct-block-mapping
 Conflicts:
	connector/src/main/java/org/geysermc/connector/utils/Toolbox.java
2020-02-09 22:53:57 +00:00
SupremeMortal c9f33f8344
Pull in new submodule changes 2020-02-09 21:22:39 +00:00
OnlyBMan 4dff067faa Add biomes 2020-02-05 21:10:34 -05:00
AJ Ferguson 5e5aeed578 Merge remote-tracking branch 'remotes/upstream/master' into inventory 2020-01-30 12:08:39 -09:00
Redned c4857c6a54 Merge branch 'master' into plugin 2020-01-25 23:03:47 -06:00
RednedEpic ed322029f3 Update hybrid mode reference to 'floodgate' in config.yml 2020-01-18 17:53:56 -06:00
RednedEpic 5c7755b772 Shade netty into Bukkit jar 2020-01-18 16:38:40 -06:00
AJ Ferguson 9f7cba1915 Fix build error caused by mappings submodule 2020-01-08 19:48:03 -09:00
RednedEpic 814da2453c Implement sheep colors and shearing (Closes #126) 2020-01-08 20:26:44 -06:00
RednedEpic 2fc591e341 Merge Floodgate changes 2020-01-03 23:58:58 -06:00
RednedEpic 0c24ffc629 Merge branch 'master' into plugin 2020-01-03 23:25:00 -06:00
AJ Ferguson 8061e2d76d Merge remote-tracking branch 'remotes/upstream/master' into inventory
# Conflicts:
#	connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaBlockChangeTranslator.java
#	connector/src/main/java/org/geysermc/connector/utils/Toolbox.java
2019-12-23 16:58:59 -09:00
AJ Ferguson a4279d1f34 Fix bubble columns 2019-12-21 14:14:20 -09:00
AJ Ferguson 20595a6e03 Exclude Edu items from creative 2019-12-21 01:35:34 -09:00
AJ Ferguson d06f963b67 Block states and fix waterlogged blocks 2019-12-20 20:05:20 -09:00
RednedEpic 3cc2d4775e Update bedrock assets
1.14 blocks are still somewhat buggy and break with the latest runtime_block_states file, so the old one is being used for the time being. Bedrock players should have no problems joining java servers in 1.15, but new blocks won't show up for now.
2019-12-10 21:01:56 -06:00
RednedEpic bb4dfeadf6 Update item and block mappings for 1.15 2019-12-10 20:42:51 -06:00
Tim203 9527709c59 Merge branch 'master' of https://github.com/GeyserMC/Geyser
 Conflicts:
	common/pom.xml
	connector/src/main/java/org/geysermc/connector/utils/SkinUtils.java
2019-12-10 20:52:42 +01:00
RednedEpic fe6b0e8afa Update mappings submodule 2019-12-03 18:43:52 -06:00
Tim203 7d645fbf16 First Flootgate commit 2019-11-30 13:34:45 +01:00
RednedEpic c91e8e1958 Update mappings to use new submodule 2019-11-29 20:34:51 -06:00
AJ Ferguson 02569ea9d8 Update stonecutter mappings 2019-11-29 16:43:55 -09:00
RednedEpic 1cfeb01e38 Update wood mappings 2019-11-28 10:35:06 -06:00
AJ Ferguson 0fe1a302a3 Update mappings 2019-11-20 17:28:40 -09:00
RednedEpic 21ddf8af1e Update block palette 2019-11-09 11:14:31 -06:00
Redned 5fee344743 Fix block palette 2019-11-02 15:50:04 -05:00
RednedEpic 0e2f64b95a Start on 1.13 changes (not functional yet)
Cached palette still needs fixing, therefore this build actually does nothing yet.
2019-10-30 21:14:23 -05:00
Redned 6b0c45b6c1
Set 'auth-type' to online by default 2019-10-21 19:23:39 -05:00
RednedEpic 3c9fab9fc4 Merge branch 'remapper' into master 2019-10-11 19:24:08 -05:00
AJ Ferguson 2261cfe76a Update blocks.json 2019-10-10 12:49:18 -08:00
RednedEpic a125967ec3 Implement new remapper 2019-10-09 19:11:50 -05:00
Tim203 5eb7565b0a Third party capes, rotation fixed, wait for the client and updated protocol lib 2019-10-02 22:45:29 +02:00
Tim203 0b193c04e7 Players spawn, player skins, scoreboard, bossbar and updated protocol lib 2019-09-25 23:52:28 +02:00
Nicolas Znamenski 550d94c4c3 Changed the thread pool size to be part of the config. 2019-09-22 18:08:12 -04:00
RednedEpic 0bcf4aa7ec Fix metrics, remove JSONSimple dependency 2019-09-21 11:00:13 -05:00