github/Skyblocker.git/src/main/resources/assets/skyblocker/tabhud/standard/garden.json, branch feat/centerednavbuttons Unnamed repository; edit this file 'description' to name the repository. Merge branch 'master' of https://github.com/SkyblockerMod/Skyblocker into json-tabhud 2023-08-06T13:46:54+00:00 msg-programs msgdoesstuff@gmail.com 2023-08-06T13:46:54+00:00 11c921b7fa882d26a1ac8640fae121f43727984a # Conflicts: # src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java # src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHud.java # src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/main/GardenScreen.java # src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/util/PlayerLocator.java Pull upstream changes 
# Conflicts:
#	src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java
#	src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHud.java
#	src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/main/GardenScreen.java
#	src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/util/PlayerLocator.java

Pull upstream changes
Load layout from resoure packs, see details. 2023-07-27T20:15:42+00:00 msg-programs msgdoesstuff@gmail.com 2023-07-27T20:14:54+00:00 393ec5f59d16296248fe1994d02ced699a725fcb Use resource pack logic to load the layouts. Finally delete the old screen defs, replace with builtin layout JSON files. Include a top-aligned layout as a builtin resource pack. Implement more possibilites for the layout to support said pack. 
Use resource pack logic to load the layouts.
Finally delete the old screen defs, replace with builtin layout JSON files.
Include a top-aligned layout as a builtin resource pack.
Implement more possibilites for the layout to support said pack.