IzzelAliz c538046c1a Merge branch 'master' into refactor/1.15 ... # Conflicts: # arclight-common/src/main/java/io/izzel/arclight/common/bridge/server/management/PlayerListBridge.java # arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/ItemStackMixin.java # arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/management/PlayerListMixin.java # arclight-common/src/main/java/io/izzel/arclight/common/mod/ArclightConnector.java # arclight-common/src/main/resources/META-INF/accesstransformer.cfg # arclight-common/src/main/resources/mixins.arclight.core.json # arclight-forge-1.14/build.gradle # arclight-forge-1.14/src/main/java/io/izzel/arclight/server/Main.java # settings.gradle		2020-06-15 19:40:19 +08:00
..
java/io/izzel/arclight	Merge branch 'master' into refactor/1.15	2020-06-15 19:40:19 +08:00
resources	Various fix	2020-06-15 19:22:10 +08:00