CivMC/Civ
1
0
Fork 0
mirror of https://github.com/CivMC/Civ.git synced 2026-07-18 00:20:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into heliodor

Browse Source 
# 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
parent 1a0c8c8aa9 5d025ae58c
commit 263fc3627c
241 changed files with 17964 additions and 691 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/factorymod-paper/src/main/java/com/github/igotyou/FactoryMod/commands/FactoryMenu.java
View File

@@ -18,7 +18,7 @@ public class FactoryMenu extends BaseCommand {
@CommandAlias("fm")
@Syntax("[factory]")
@Description("Opens a GUI allowing you to browse through all factories")
@CommandCompletion("@FM_Factories")
@CommandCompletion("@FM_Factories @nothing")
public void execute(Player sender, @Optional String factoryName) {
if (factoryName == null) {
FactoryModGUI gui = new FactoryModGUI(sender);