Merge branch 'main' into heliodor

# 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
This commit is contained in:
okx-code
2024-11-15 21:51:36 +00:00
241 changed files with 17964 additions and 691 deletions

View File

@@ -27,3 +27,11 @@ GRANT ALL PRIVILEGES ON `essenceglue`.* TO 'mariadb'@'%';
GRANT ALL PRIVILEGES ON `exilepearl`.* TO 'mariadb'@'%';
GRANT ALL PRIVILEGES ON `realisticbiomes`.* TO 'mariadb'@'%';
GRANT ALL PRIVILEGES ON `heliodor`.* TO 'mariadb'@'%';
CREATE DATABASE pvp_civduties;
CREATE DATABASE pvp_civmodcore;
CREATE DATABASE pvp_kitpvp;
GRANT ALL PRIVILEGES ON `pvp_civduties`.* TO 'mariadb'@'%';
GRANT ALL PRIVILEGES ON `pvp_civmodcore`.* TO 'mariadb'@'%';
GRANT ALL PRIVILEGES ON `pvp_kitpvp`.* TO 'mariadb'@'%';