Auxilor dea28bf1e4 Merge remote-tracking branch 'origin/master' ...

# Conflicts:
#	eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/DiscoverRecipeListener.java
#	gradle.properties

2021-05-06 22:06:04 +01:00

..

core-plugin

Merge remote-tracking branch 'origin/master'

2021-05-06 22:06:04 +01:00

build.gradle

Updated eco version

2021-01-12 21:38:53 +00:00