Flemmli97 01f12e3efa Merge remote-tracking branch 'origin/1.19' into 1.19 ... # Conflicts: # common/build.gradle # common/src/main/java/io/github/flemmli97/flan/claim/Claim.java # common/src/main/java/io/github/flemmli97/flan/claim/ClaimStorage.java		2022-11-26 20:39:08 +01:00
..
java/io/github/flemmli97/flan	Merge remote-tracking branch 'origin/1.19' into 1.19	2022-11-26 20:39:08 +01:00
resources	removing static accessor cause they stop hotswapping	2022-11-26 19:48:42 +01:00