NikitaCartes 1c15f9ea98 Merge branch 'archi-snapshot' into architectury ... # Conflicts: # common/src/main/java/org/samo_lego/simpleauth/event/AuthEventHandler.java # common/src/main/java/org/samo_lego/simpleauth/mixin/MixinServerPlayNetworkHandler.java # common/src/main/java/org/samo_lego/simpleauth/mixin/MixinServerPlayerEntity.java # common/src/main/java/org/samo_lego/simpleauth/storage/PlayerCache.java		2021-06-24 00:22:28 +03:00
..
src/main	Merge branch 'archi-snapshot' into architectury	2021-06-24 00:22:28 +03:00
build.gradle	Update gradle	2021-06-23 16:55:25 +03:00