yrsegal@gmail.com 84b6448579 Merge branch 'main' of https://github.com/gamma-delta/HexMod into fix173+175 ... # Conflicts: # Fabric/src/main/java/at/petrak/hexcasting/fabric/FabricHexInitializer.kt		2022-07-25 13:07:38 -04:00
..
src	Merge branch 'main' of https://github.com/gamma-delta/HexMod into fix173+175	2022-07-25 13:07:38 -04:00
build.gradle	trinkets/curios integration	2022-07-25 10:56:23 -04:00
gradle.properties	trinkets/curios integration	2022-07-25 10:56:23 -04:00