Commit Graph

11 Commits

Author SHA1 Message Date
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
IzzelAliz
64d1d5eab1 Various fix 2020-06-15 19:22:10 +08:00
IzzelAliz
427548b2b1 Random stuff 2020-06-14 18:03:54 +08:00
IzzelAliz
b1a5121a37 Items 2020-06-14 17:05:42 +08:00
IzzelAliz
4f0e52fb69 Entities 2020-06-14 14:49:42 +08:00
IzzelAliz
620c83cbe4 Store progress 2020-06-13 14:37:28 +08:00
IzzelAliz
eb065aa667 Print logo on startup. 2020-06-10 15:30:11 +08:00
IzzelAliz
089216b6a6 New i18n/config system. Close #4. 2020-06-09 21:22:16 +08:00
IzzelAliz
be9ed9abe6 Containers and entity 2020-06-02 22:32:43 +08:00
IzzelAliz
c652025fed All the blocks 2020-06-01 18:33:33 +08:00
IzzelAliz
2a77837767 Refactor: common project, preparing for 1.15 development 2020-05-30 18:49:15 +08:00