Merge remote-tracking branch 'origin/1.20.x' into 1.20.x · TwelveIterationMods/Balm@fbb836f · GitHub

Commit

Merge remote-tracking branch 'origin/1.20.x' into 1.20.x

Browse files

# Conflicts:
#	forge/src/main/java/net/blay09/mods/balm/forge/ForgeBalm.java
#	forge/src/main/java/net/blay09/mods/balm/forge/world/ForgeBalmWorldGen.java

Loading branch information

BlayTheNinth committed Sep 16, 2023

2 parents 03ee012 + 60cbc5c commit fbb836f