mirror of
https://github.com/CivMC/Civ.git
synced 2026-07-18 00:20:44 +00:00
263fc3627c
# Conflicts: # ansible/build.gradle.kts # ansible/files/paper-config/plugins/FactoryMod/config.yml # containers/provisioning/mariadb/docker-entrypoint-initdb.d/0100_create_databases.sql # plugins/finale-paper/src/main/java/com/github/maxopoly/finale/ConfigParser.java # plugins/finale-paper/src/main/java/com/github/maxopoly/finale/Finale.java # plugins/finale-paper/src/main/java/com/github/maxopoly/finale/listeners/WeaponModificationListener.java # plugins/finale-paper/src/main/resources/config.yml # plugins/heliodor-paper/src/main/java/net/civmc/heliodor/HeliodorPlugin.java # plugins/heliodor-paper/src/main/java/net/civmc/heliodor/HeliodorRecipeGiver.java # plugins/heliodor-paper/src/main/resources/config.yml # plugins/heliodor-paper/src/main/resources/plugin.yml # settings.gradle.kts