Auxilor
|
187ac8163d
|
Merge branch 'master' into develop
# Conflicts:
# eco-api/src/main/java/com/willfp/eco/internal/config/AbstractConfig.java
# eco-api/src/main/java/com/willfp/eco/internal/config/ConfigSection.java
# eco-api/src/main/java/com/willfp/eco/internal/config/ConfigWrapper.java
# eco-api/src/main/java/com/willfp/eco/util/SerializationUtils.java
# eco-api/src/main/java/com/willfp/eco/util/config/Config.java
# eco-api/src/main/java/com/willfp/eco/util/config/StaticOptionalConfig.java
# eco-api/src/main/java/com/willfp/eco/util/serialization/Deserializer.java
# eco-api/src/main/java/com/willfp/eco/util/serialization/EcoSerializable.java
# eco-api/src/main/java/com/willfp/eco/util/serialization/NoRegisteredDeserializerException.java
|
2021-04-03 10:49:02 +01:00 |
|