Merge branch '1.15.x' into 1.16.x

# Conflicts:
#	src/main/java/com/vladmarica/betterpingdisplay/hud/CustomPlayerListHud.java
#	src/main/java/com/vladmarica/betterpingdisplay/hud/PlayerListHudUtil.java
#	src/main/resources/fabric.mod.json
This commit is contained in:
vladmarica 2020-10-28 00:23:08 -03:00
commit 9a15e38c6a
12 changed files with 226 additions and 51 deletions

View file

@ -8,9 +8,9 @@ org.gradle.jvmargs=-Xmx1G
loader_version=0.9.3+build.207
# Mod Properties
mod_version = 1.0.0
mod_version = 1.1.0
maven_group = com.vladmarica
archives_base_name = BetterPingDisplay
archives_base_name = BetterPingDisplay-Fabric
# Dependencies
# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api