From 8e2ae23d8979c20e4184d384cfb2846d75ba2c8d Mon Sep 17 00:00:00 2001 From: Chromachine Date: Sun, 27 May 2018 16:20:44 +0000 Subject: [PATCH] Remove Discord config file It doesn't have config options --- BlocksHub/config.yml | 18 ++++++++++++++ DiscordPlugin/config.yml | 45 ----------------------------------- FastAsyncWorldEdit/config.yml | 13 ++++++---- Towny/settings/config.yml | 16 ++++++------- update.sh | 2 +- 5 files changed, 35 insertions(+), 59 deletions(-) create mode 100644 BlocksHub/config.yml delete mode 100755 DiscordPlugin/config.yml diff --git a/BlocksHub/config.yml b/BlocksHub/config.yml new file mode 100644 index 0000000..4418084 --- /dev/null +++ b/BlocksHub/config.yml @@ -0,0 +1,18 @@ +BlocksHub: + version: 2 + disabledBridges: {} +# - CoreProtect +# - Factions +# - GriefPrevention +# - HawkEye +# - LogBlock +# - Prism +# - Residence +# - Residence 4.6 +# - Towny +# - WorldGuard + worlds: + - world + - world_nether + - world_the_end + - world.* \ No newline at end of file diff --git a/DiscordPlugin/config.yml b/DiscordPlugin/config.yml deleted file mode 100755 index fe95e88..0000000 --- a/DiscordPlugin/config.yml +++ /dev/null @@ -1,45 +0,0 @@ -# -# +------------------------------------------------------+ # -# | Notes | # -# +------------------------------------------------------+ # -lastannouncementtime: 1526407945 -lastseentime: 1526407945 -test: false -gameroles: -- Minecraft -- Overwatch -- CAH -- Golf -- Civ -- Chivalry -- WoW -- Terraria -- GMOD -- Insurgency -- GW2 -- DnD -- Battlefield -- Titanfall -- AoE -- Factorio -- CSGO -- TF2 -- Helldivers -- R6Siege -- Hearthstone -- LoL -- Rust -- Starbound -- Halo -- FTB -- Rocket League -- GTA V -- Guns of Icarus -- The Forest -- Mass Effect -- For Honor -- PUBG -- Vanilla WoW -- HOI4 -- Lethal League -serverup: true diff --git a/FastAsyncWorldEdit/config.yml b/FastAsyncWorldEdit/config.yml index b1484e4..d2c30f3 100644 --- a/FastAsyncWorldEdit/config.yml +++ b/FastAsyncWorldEdit/config.yml @@ -1,15 +1,18 @@ # These first 6 aren't configurable issues: "https://github.com/boy0001/FastAsyncWorldedit/issues" wiki: "https://github.com/boy0001/FastAsyncWorldedit/wiki/" -date: "29 May 2018 00:00:00 GMT" -build: "https://ci.athion.net/job/FastAsyncWorldEdit/1096" -commit: "https://github.com/boy0001/FastAsyncWorldedit/commit/d32bcaa" +date: "25 Jun 2018 00:00:00 GMT" +build: "https://ci.athion.net/job/FastAsyncWorldEdit/1138" +commit: "https://github.com/boy0001/FastAsyncWorldedit/commit/4049014" platform: "bukkit" # Options: de, ru, tr # Create a PR to contribute a translation: https://github.com/boy0001/FastAsyncWorldedit/new/master/core/src/main/resources language: '' # Enable or disable automatic updates -update: false +# - true = update automatically in the background +# - confirm = prompt an admin to confirm each update +# - false = do not update the plugin +update: "false" # Send anonymous usage statistics metrics: true # Set true to enable WorldEdit restrictions per region (e.g. PlotSquared or WorldGuard). @@ -99,7 +102,7 @@ experimental: # - Set your server view distance to 1 (spigot.yml, server.properties) # - Based on tps and player movement # - Please provide feedback - dynamic-chunk-rendering: false + dynamic-chunk-rendering: -1 # [SAFE] Allows brushes to be persistent persistent-brushes: false # [SAFE] Enable CUI without needing the mod installed (Requires ProtocolLib) diff --git a/Towny/settings/config.yml b/Towny/settings/config.yml index 444f77e..f6e7c42 100755 --- a/Towny/settings/config.yml +++ b/Towny/settings/config.yml @@ -1,9 +1,9 @@ version: # This is the current version of Towny. Please do not edit. - version: 0.90.0.0 + version: 0.92.0.0 # This is for showing the changelog on updates. Please do not edit. - last_run_version: 0.90.0.0 + last_run_version: 0.92.0.0 # Minimum required version of CraftBukkit. Please do not edit. bukkit_version: '2918' @@ -474,7 +474,7 @@ plugin: # Enable using_questioner if you are using questioner to send/receive invites to towns/nations. # See http://code.google.com/a/eclipselabs.org/p/towny/wiki/Questioner for more info. using_questioner: - enable: 'true' + enable: 'false' # The command to accept invitations. accept: accept # The command to refuse invitations. @@ -560,7 +560,7 @@ protection: # 54 - chest ...etc switch_ids: DISPENSER,NOTE_BLOCK,CHEST,FURNACE,BURNING_FURNACE,WOODEN_DOOR,ACACIA_DOOR,DARK_OAK_DOOR,JUNGLE_DOOR,BIRCH_DOOR,SPRUCE_DOOR,LEVER,STONE_PLATE,IRON_DOOR_BLOCK,WOOD_PLATE,STONE_BUTTON,TRAP_DOOR,JUKEBOX,DIODE_BLOCK_OFF,DIODE_BLOCK_ON,FENCE_GATE,SPRUCE_FENCE_GATE,BIRCH_FENCE_GATE,JUNGLE_FENCE_GATE,DARK_OAK_FENCE_GATE,ACACIA_FENCE_GATE,TRAPPED_CHEST,GOLD_PLATE,IRON_PLATE,REDSTONE_COMPARATOR_OFF,REDSTONE_COMPARATOR_ON,BEACON,HOPPER,DROPPER,MINECART,STORAGE_MINECART,POWERED_MINECART,CARROT_STICK,EXPLOSIVE_MINECART,HOPPER_MINECART,WHITE_SHULKER_BOX,ORANGE_SHULKER_BOX,MAGENTA_SHULKER_BOX,LIGHT_BLUE_SHULKER_BOX,YELLOW_SHULKER_BOX,LIME_SHULKER_BOX,PINK_SHULKER_BOX,GRAY_SHULKER_BOX,SILVER_SHULKER_BOX,CYAN_SHULKER_BOX,PURPLE_SHULKER_BOX,BLUE_SHULKER_BOX,BROWN_SHULKER_BOX,GREEN_SHULKER_BOX,RED_SHULKER_BOX,BLACK_SHULKER_BOX - # permitted entities hhttps://hub.spigotmc.org/javadocs/bukkit/org/bukkit/entity/LivingEntity.html + # permitted entities https://hub.spigotmc.org/javadocs/bukkit/org/bukkit/entity/LivingEntity.htmll # Animals, Chicken, Cow, Creature, Creeper, Flying, Ghast, Giant, Monster, Pig, # PigZombie, Sheep, Skeleton, Slime, Spider, Squid, WaterMob, Wolf, Zombie, Shulker # Husk, Stray, SkeletonHorse, ZombieHorse, Vex, Vindicator, Evoker, Endermite, PolarBear @@ -658,9 +658,9 @@ notification: # If set to true MC's Title and Subtitle feature will be used when crossing into a town. # Could be seen as intrusive/distracting, so false by default. using_titles: 'false' - - - + + + ############################################################ # +------------------------------------------------------+ # # | Default Town/Plot flags | # @@ -981,7 +981,7 @@ war: # | Unsupported / Buggy | # # +------------------------------------------------------+ # ############################################################ - + enemy: # If false, players won't be able to place war flags, effectively disabling warzones. allow_attacks: 'false' diff --git a/update.sh b/update.sh index 3cbda35..315e0c4 100755 --- a/update.sh +++ b/update.sh @@ -4,7 +4,7 @@ git rm --cached -rfq '*/*' # Unstage everything in folders in case a plugin got readarray -t plugins < plugins.txt # -t removes trailing newlines for i in "${plugins[@]}" do - if [ -d $i ]; then + if [ -d $i -a $i != "DiscordPlugin" ]; then find $i -name "config.yml" -exec git add -f '{}' \; # All files are ignored, need to force add fi done