_OfTeN_ 620e1d3042 Merge remote-tracking branch 'origin/develop' into develop ...

# Conflicts:
#	eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/EcoSpigotPlugin.kt
#	eco-core/core-plugin/src/main/resources/config.yml

2023-07-30 20:39:00 +03:00

..

src/main

Merge remote-tracking branch 'origin/develop' into develop

2023-07-30 20:39:00 +03:00

build.gradle.kts

Merge remote-tracking branch 'origin/dependabot/gradle/org.javassist-javassist-3.29.2-GA'

2023-07-05 14:51:57 +01:00