From ad74e7e18dc8b7eaf478cfabf18907de89e55ed0 Mon Sep 17 00:00:00 2001 From: Chromachine Date: Sat, 23 Apr 2022 18:36:42 +0200 Subject: [PATCH] Final v5 update Before 1.16.5 -> 1.18.2 --- ButtonWebsiteModule/config.yml | 1 + Chroma-Chat/config.yml | 4 +- Chroma-Discord/config.yml | 6 +- FastAsyncWorldEdit/config.yml | 2 +- Jobs/schedule.yml | 134 +++++------ Jobs/shopItems.yml | 210 ++++++++--------- Multiverse-Core/worlds.yml | 124 +++++----- PlotSquared/config/commands.yml | 0 PlotSquared/config/settings.yml | 0 PlotSquared/config/worlds.yml | 0 .../plotworld/intersection.schematic | Bin .../plotworld/sideroad.schematic | Bin PlotSquared/scripts/automerge.js | 0 PlotSquared/templates/bridge.template | Bin PlotSquared/templates/skyblock.template | Bin PlotSquared/templates/town.template | Bin ProtocolLib/config.yml | 58 ++--- Server/ScreenSetup.sh | 0 Server/bukkit.yml | 0 Server/paper.yml | 0 Server/run.sh | 0 Server/server.properties | 0 Server/spigot.yml | 0 SimpleBackupReloaded/config.yml | 31 --- Towny/settings/applyPatch.sh | 0 Towny/settings/config.yml | 2 +- Towny/settings/townyperms.yml | 222 +++++++++--------- WorldGuard/worlds/.raw/config.yml | 20 +- WorldGuard/worlds/flatworld/config.yml | 20 +- WorldGuard/worlds/plotworld/config.yml | 20 +- WorldGuard/worlds/v1/config.yml | 20 +- WorldGuard/worlds/v2/config.yml | 20 +- WorldGuard/worlds/v3/config.yml | 20 +- WorldGuard/worlds/v4/config.yml | 20 +- WorldGuard/worlds/world/config.yml | 20 +- WorldGuard/worlds/world_nether/config.yml | 20 +- WorldGuard/worlds/world_the_end/config.yml | 20 +- WorldGuard/worlds/worldhub/config.yml | 20 +- dynmap/configuration.txt | 14 +- update.sh | 4 +- 40 files changed, 501 insertions(+), 531 deletions(-) create mode 100644 ButtonWebsiteModule/config.yml mode change 100755 => 100644 PlotSquared/config/commands.yml mode change 100755 => 100644 PlotSquared/config/settings.yml mode change 100755 => 100644 PlotSquared/config/worlds.yml mode change 100755 => 100644 PlotSquared/schematics/GEN_ROAD_SCHEMATIC/plotworld/intersection.schematic mode change 100755 => 100644 PlotSquared/schematics/GEN_ROAD_SCHEMATIC/plotworld/sideroad.schematic mode change 100755 => 100644 PlotSquared/scripts/automerge.js mode change 100755 => 100644 PlotSquared/templates/bridge.template mode change 100755 => 100644 PlotSquared/templates/skyblock.template mode change 100755 => 100644 PlotSquared/templates/town.template mode change 100755 => 100644 Server/ScreenSetup.sh mode change 100755 => 100644 Server/bukkit.yml mode change 100755 => 100644 Server/paper.yml mode change 100755 => 100644 Server/run.sh mode change 100755 => 100644 Server/server.properties mode change 100755 => 100644 Server/spigot.yml delete mode 100644 SimpleBackupReloaded/config.yml mode change 100755 => 100644 Towny/settings/applyPatch.sh mode change 100755 => 100644 Towny/settings/config.yml diff --git a/ButtonWebsiteModule/config.yml b/ButtonWebsiteModule/config.yml new file mode 100644 index 0000000..e530a55 --- /dev/null +++ b/ButtonWebsiteModule/config.yml @@ -0,0 +1 @@ +http-port: 8099 diff --git a/Chroma-Chat/config.yml b/Chroma-Chat/config.yml index 2e0929c..1deca7f 100644 --- a/Chroma-Chat/config.yml +++ b/Chroma-Chat/config.yml @@ -20,8 +20,8 @@ components: # The amount of town colors allowed. If more than one is used (or nation colors are enabled), players can change how many letters to be in a specific color using /u ncolor. colorCount: 1 towncolors: - seedshire: - - Blue + tmp: + - Gold liria: - DarkPurple nationcolors: diff --git a/Chroma-Discord/config.yml b/Chroma-Discord/config.yml index 36386f1..4f6a2fa 100644 --- a/Chroma-Discord/config.yml +++ b/Chroma-Discord/config.yml @@ -4,7 +4,7 @@ global: # The (bot) channel to use for Discord commands like /role. commandChannel: 209720707188260864 # The prefix to use with Discord commands like /role. It only works in the bot channel. - prefix: '|' + prefix: / # The invite link to show by /discord invite. If empty, it defaults to the first invite if the bot has access. inviteLink: https://discord.gg/gxmTS8N # The role that allows using mod-only Discord commands. @@ -95,8 +95,8 @@ components: enabled: true # Automatically unpins all messages except the last few. Set to 0 or >50 to disable keepPinned: 40 - lastAnnouncementTime: 1609457770 - lastSeenTime: 1609457770 + lastAnnouncementTime: 1641005950 + lastSeenTime: 1641005950 # Channel to post new posts. channel: 125813020357165056 # The subreddit to pull the posts from diff --git a/FastAsyncWorldEdit/config.yml b/FastAsyncWorldEdit/config.yml index 0a1c378..1464964 100644 --- a/FastAsyncWorldEdit/config.yml +++ b/FastAsyncWorldEdit/config.yml @@ -1,7 +1,7 @@ # These first 6 aren't configurable issues: "https://github.com/IntellectualSites/FastAsyncWorldEdit/issues" wiki: "https://wiki.intellectualsites.com/FastAsyncWorldEdit/index" -date: "Thu Feb 18 00:00:00 UTC 2021" +date: "Thu Feb 18 00:00:00 GMT 2021" build: "https://ci.athion.net/job/FastAsyncWorldEdit-1.16/566" commit: "https://github.com/IntellectualSites/FastAsyncWorldEdit/commit/ff094a9b" platform: "Bukkit" diff --git a/Jobs/schedule.yml b/Jobs/schedule.yml index 1c31258..96adaeb 100644 --- a/Jobs/schedule.yml +++ b/Jobs/schedule.yml @@ -1,68 +1,68 @@ -# Enabled - with this false this schedule will be ignored -# From and Until is in 24 hours format with : signs to separate minutes and seconds -# Exp and Money determines how big is boost, to reset it. keep it at 1.0. so if you use 2.0 that means all money/exp is doubled -# Days variables: Monday, Tuesday, Wednesday, Thursday, Friday, Saturday, Sunday, All -# Jobs can be any of your settup job or use All to give for all jobs at once -# BroadcastOnStart or BroadcastOnStop - set it false to disable message when boost starts/stops -# MessageOnStart or MessageOnStop - optional messages, if not given, then message from locale file will be shown -# BroadcastInterval - how often in minutes to broadcast message about money/exp boost for jobs -# BroadcastMessage - message to show every x minutes - -Boost: - NightBoost: - Enabled: false - From: '23:00:00' - Until: '07:00:00' - Exp: 2.0 - Money: 2.0 - Days: - - All - Jobs: - - All - BroadcastOnStart: true - MessageOnStart: - - '&e***********************************************' - - '&e* All jobs got 2x rate for exp and money!' - - '&e* For limited time only!' - - '&e***********************************************' - BroadcastOnStop: true - MessageOnStop: - - '&e***********************************************' - - '&e* Boost time for jobs have beed stoped' - - '&e* All rates reseted to original ones' - - '&e***********************************************' - BroadcastInterval: 15 - BroadcastMessage: - - '&e******************************************************' - - '&e* 2x boost time for all jobs is activated until [until] *' - - '&e******************************************************' - ShortMoneyBoost: - Enabled: false - From: '07:00:00' - Until: '08:00:00' - Exp: 1.0 - Money: 2.0 - Days: - - Sunday - - Saturday - Jobs: - - Miner - - Woodcutter - BroadcastOnStart: true - MessageOnStart: - - '&e***********************************************' - - '&e* Miner and Woodcutter got 2x rate for money!' - - '&e* Until 8AM!' - - '&e***********************************************' - BroadcastOnStop: true - MessageOnStop: - - '&e***********************************************' - - '&e* Boost time for Miner and Woodcutter have beed stoped' - - '&e* Money rates reseted to original ones' - - '&e***********************************************' - BroadcastInterval: 15 - BroadcastMessage: - - '&e******************************************************' - - '&e* 2x money boost time for Miner and Woodcutter jobs' - - '&e* Is activated until [until]' +# Enabled - with this false this schedule will be ignored +# From and Until is in 24 hours format with : signs to separate minutes and seconds +# Exp and Money determines how big is boost, to reset it. keep it at 1.0. so if you use 2.0 that means all money/exp is doubled +# Days variables: Monday, Tuesday, Wednesday, Thursday, Friday, Saturday, Sunday, All +# Jobs can be any of your settup job or use All to give for all jobs at once +# BroadcastOnStart or BroadcastOnStop - set it false to disable message when boost starts/stops +# MessageOnStart or MessageOnStop - optional messages, if not given, then message from locale file will be shown +# BroadcastInterval - how often in minutes to broadcast message about money/exp boost for jobs +# BroadcastMessage - message to show every x minutes + +Boost: + NightBoost: + Enabled: false + From: '23:00:00' + Until: '07:00:00' + Exp: 2.0 + Money: 2.0 + Days: + - All + Jobs: + - All + BroadcastOnStart: true + MessageOnStart: + - '&e***********************************************' + - '&e* All jobs got 2x rate for exp and money!' + - '&e* For limited time only!' + - '&e***********************************************' + BroadcastOnStop: true + MessageOnStop: + - '&e***********************************************' + - '&e* Boost time for jobs have beed stoped' + - '&e* All rates reseted to original ones' + - '&e***********************************************' + BroadcastInterval: 15 + BroadcastMessage: + - '&e******************************************************' + - '&e* 2x boost time for all jobs is activated until [until] *' + - '&e******************************************************' + ShortMoneyBoost: + Enabled: false + From: '07:00:00' + Until: '08:00:00' + Exp: 1.0 + Money: 2.0 + Days: + - Sunday + - Saturday + Jobs: + - Miner + - Woodcutter + BroadcastOnStart: true + MessageOnStart: + - '&e***********************************************' + - '&e* Miner and Woodcutter got 2x rate for money!' + - '&e* Until 8AM!' + - '&e***********************************************' + BroadcastOnStop: true + MessageOnStop: + - '&e***********************************************' + - '&e* Boost time for Miner and Woodcutter have beed stoped' + - '&e* Money rates reseted to original ones' + - '&e***********************************************' + BroadcastInterval: 15 + BroadcastMessage: + - '&e******************************************************' + - '&e* 2x money boost time for Miner and Woodcutter jobs' + - '&e* Is activated until [until]' - '&e******************************************************' \ No newline at end of file diff --git a/Jobs/shopItems.yml b/Jobs/shopItems.yml index ab97cd2..e9b1b59 100644 --- a/Jobs/shopItems.yml +++ b/Jobs/shopItems.yml @@ -1,106 +1,106 @@ -Items: - SuperPickAxe: - # (REQUIRED) Item price in Jobs Points - Price: 10000.0 - Icon: - # (REQUIRED) Icon item - Id: diamond_pickaxe - # (Optional - Default: 1) Icon item amount - Amount: 1 - # (Optional) Icon name. Supports usual color codes - Name: "&eBest pick axe ever!" - # (Optional) Icon lore. Supports usual color codes - Lore: - - "&6Efficiency V" - - "&6Unbreaking III" - - "&eAnd one tasty apple!" - # (Optional - default: false) Hides icon if player don't have permission to get this item - HideWithoutPermission: true - # (Optional) When you want to use Player Head material with skin then use this - #CustomHead: - # PlayerName: playerName - # Using the current player (if have job) who opened the gui. The PlayerName string is ignoring if this exist. - # UseCurrentPlayer: true - # (Optional) List of permissions required to buy this item - RequiredPermission: - - jobs.item.pickaxe - # (Optional) List of jobs and levels to buy this item - RequiredJobLevels: - - Miner-50 - - Woodcutter-10 - # (Optional) Total level from all jobs player currently in - RequiredTotalLevels: 100 - # (Optional) Performs commands on item purchase - # use 'msg ' at start of command to send nice message to player - # all other commands will be performed normally as they would be executed from console - # use [player] variable to include buyers name - PerformCommands: - - "msg &eThanks for buying this super pick axe!" - # (Optional) Gives items by defined criteria - GiveItems: - # Can be any word - PickAxe: - # (Required) Item name - Id: diamond_pickaxe - # (Optional - Default: 1) Item amount - Amount: 1 - # (Optional) Item name - Name: "&eSuper PickAxe" - # (Optional) Item lore - Lore: - - "&eUber pickAxe" - # (Optional) Item enchants - Enchants: - - DIG_SPEED=5 - - DURABILITY=3 - # Can be any word - Apple: - # (Required) Item name - Id: apple - WoodenShovel: - Price: 100.0 - Icon: - Id: wooden_shovel - Name: "&eWooden shovel" - HideWithoutPermission: true - RequiredPermission: - - jobs.item.shovel - RequiredJobLevels: - - Digger-5 - PerformCommands: - - "msg &eThanks [player] for buying this shovel!" - - "give [player] wooden_shovel 1" - LureEnchantBook: - Price: 100.0 - Icon: - Id: enchanted_book - Name: "&eEnchant book" - Lore: - - "&eContains Lure 3 enchant" - HideWithoutPermission: true - RequiredPermission: - - jobs.item.LureBook - RequiredJobLevels: - - Fisherman-100 - PerformCommands: - - "msg &eThanks [player] for buying this book!" - GiveItems: - Book: - Id: enchanted_book - Enchants: - - LURE=3 - Elytra: - Price: 100000.0 - Icon: - Id: elytra - Name: "&eAngel wings" - HideWithoutPermission: true - RequiredPermission: - - jobs.item.elytra - PerformCommands: - - "msg &eThanks [player] for buying Angel Wings!" - # (Optional) Gives items by defined criteria - GiveItems: - Elytra: - Id: elytra +Items: + SuperPickAxe: + # (REQUIRED) Item price in Jobs Points + Price: 10000.0 + Icon: + # (REQUIRED) Icon item + Id: diamond_pickaxe + # (Optional - Default: 1) Icon item amount + Amount: 1 + # (Optional) Icon name. Supports usual color codes + Name: "&eBest pick axe ever!" + # (Optional) Icon lore. Supports usual color codes + Lore: + - "&6Efficiency V" + - "&6Unbreaking III" + - "&eAnd one tasty apple!" + # (Optional - default: false) Hides icon if player don't have permission to get this item + HideWithoutPermission: true + # (Optional) When you want to use Player Head material with skin then use this + #CustomHead: + # PlayerName: playerName + # Using the current player (if have job) who opened the gui. The PlayerName string is ignoring if this exist. + # UseCurrentPlayer: true + # (Optional) List of permissions required to buy this item + RequiredPermission: + - jobs.item.pickaxe + # (Optional) List of jobs and levels to buy this item + RequiredJobLevels: + - Miner-50 + - Woodcutter-10 + # (Optional) Total level from all jobs player currently in + RequiredTotalLevels: 100 + # (Optional) Performs commands on item purchase + # use 'msg ' at start of command to send nice message to player + # all other commands will be performed normally as they would be executed from console + # use [player] variable to include buyers name + PerformCommands: + - "msg &eThanks for buying this super pick axe!" + # (Optional) Gives items by defined criteria + GiveItems: + # Can be any word + PickAxe: + # (Required) Item name + Id: diamond_pickaxe + # (Optional - Default: 1) Item amount + Amount: 1 + # (Optional) Item name + Name: "&eSuper PickAxe" + # (Optional) Item lore + Lore: + - "&eUber pickAxe" + # (Optional) Item enchants + Enchants: + - DIG_SPEED=5 + - DURABILITY=3 + # Can be any word + Apple: + # (Required) Item name + Id: apple + WoodenShovel: + Price: 100.0 + Icon: + Id: wooden_shovel + Name: "&eWooden shovel" + HideWithoutPermission: true + RequiredPermission: + - jobs.item.shovel + RequiredJobLevels: + - Digger-5 + PerformCommands: + - "msg &eThanks [player] for buying this shovel!" + - "give [player] wooden_shovel 1" + LureEnchantBook: + Price: 100.0 + Icon: + Id: enchanted_book + Name: "&eEnchant book" + Lore: + - "&eContains Lure 3 enchant" + HideWithoutPermission: true + RequiredPermission: + - jobs.item.LureBook + RequiredJobLevels: + - Fisherman-100 + PerformCommands: + - "msg &eThanks [player] for buying this book!" + GiveItems: + Book: + Id: enchanted_book + Enchants: + - LURE=3 + Elytra: + Price: 100000.0 + Icon: + Id: elytra + Name: "&eAngel wings" + HideWithoutPermission: true + RequiredPermission: + - jobs.item.elytra + PerformCommands: + - "msg &eThanks [player] for buying Angel Wings!" + # (Optional) Gives items by defined criteria + GiveItems: + Elytra: + Id: elytra \ No newline at end of file diff --git a/Multiverse-Core/worlds.yml b/Multiverse-Core/worlds.yml index a1462af..5b21fff 100644 --- a/Multiverse-Core/worlds.yml +++ b/Multiverse-Core/worlds.yml @@ -1,51 +1,4 @@ worlds: - world_the_end: - ==: MVWorld - hidden: 'false' - alias: world_the_end - color: WHITE - style: NORMAL - pvp: 'true' - scale: '16.0' - respawnWorld: world - allowWeather: 'true' - difficulty: NORMAL - spawning: - ==: MVSpawnSettings - animals: - ==: MVSpawnSubSettings - spawn: 'true' - spawnrate: '-1' - exceptions: [] - monsters: - ==: MVSpawnSubSettings - spawn: 'true' - spawnrate: '-1' - exceptions: [] - entryfee: - ==: MVEntryFee - amount: '0.0' - hunger: 'true' - autoHeal: 'true' - adjustSpawn: 'true' - portalForm: ALL - gameMode: SURVIVAL - keepSpawnInMemory: 'false' - spawnLocation: - ==: MVSpawnLocation - x: 0.0 - y: 62.0 - z: 0.0 - pitch: 0.0 - yaw: 0.0 - autoLoad: 'true' - bedRespawn: 'true' - worldBlacklist: [] - environment: THE_END - seed: '1923020019' - generator: 'null' - playerLimit: '-1' - allowFlight: 'true' world: ==: MVWorld hidden: 'false' @@ -93,6 +46,53 @@ worlds: generator: 'null' playerLimit: '-1' allowFlight: 'true' + world_the_end: + ==: MVWorld + hidden: 'false' + alias: world_the_end + color: WHITE + style: NORMAL + pvp: 'true' + scale: '16.0' + respawnWorld: world + allowWeather: 'true' + difficulty: NORMAL + spawning: + ==: MVSpawnSettings + animals: + ==: MVSpawnSubSettings + spawn: 'true' + spawnrate: '-1' + exceptions: [] + monsters: + ==: MVSpawnSubSettings + spawn: 'true' + spawnrate: '-1' + exceptions: [] + entryfee: + ==: MVEntryFee + amount: '0.0' + hunger: 'true' + autoHeal: 'true' + adjustSpawn: 'true' + portalForm: ALL + gameMode: SURVIVAL + keepSpawnInMemory: 'false' + spawnLocation: + ==: MVSpawnLocation + x: 0.0 + y: 62.0 + z: 0.0 + pitch: 0.0 + yaw: 0.0 + autoLoad: 'true' + bedRespawn: 'true' + worldBlacklist: [] + environment: THE_END + seed: '1923020019' + generator: 'null' + playerLimit: '-1' + allowFlight: 'true' world_nether: ==: MVWorld hidden: 'false' @@ -187,16 +187,16 @@ worlds: generator: PlotSquared playerLimit: '-1' allowFlight: 'true' - worldhub: + flatworld: ==: MVWorld hidden: 'false' - alias: worldhub + alias: flatworld color: WHITE style: NORMAL pvp: 'true' scale: '1.0' respawnWorld: '' - allowWeather: 'false' + allowWeather: 'true' difficulty: NORMAL spawning: ==: MVSpawnSettings @@ -207,7 +207,7 @@ worlds: exceptions: [] monsters: ==: MVSpawnSubSettings - spawn: 'false' + spawn: 'true' spawnrate: '-1' exceptions: [] entryfee: @@ -221,16 +221,16 @@ worlds: keepSpawnInMemory: 'false' spawnLocation: ==: MVSpawnLocation - x: 162.5 + x: -256.0 y: 4.0 - z: -95.5 + z: -96.0 pitch: 0.0 yaw: 0.0 autoLoad: 'true' bedRespawn: 'true' worldBlacklist: [] environment: NORMAL - seed: '-5692829584426207714' + seed: '4622440486943241231' generator: 'null' playerLimit: '-1' allowFlight: 'true' @@ -281,16 +281,16 @@ worlds: generator: 'null' playerLimit: '-1' allowFlight: 'true' - flatworld: + worldhub: ==: MVWorld hidden: 'false' - alias: flatworld + alias: worldhub color: WHITE style: NORMAL pvp: 'true' scale: '1.0' respawnWorld: '' - allowWeather: 'true' + allowWeather: 'false' difficulty: NORMAL spawning: ==: MVSpawnSettings @@ -301,7 +301,7 @@ worlds: exceptions: [] monsters: ==: MVSpawnSubSettings - spawn: 'true' + spawn: 'false' spawnrate: '-1' exceptions: [] entryfee: @@ -315,16 +315,16 @@ worlds: keepSpawnInMemory: 'false' spawnLocation: ==: MVSpawnLocation - x: -256.0 + x: 162.5 y: 4.0 - z: -96.0 + z: -95.5 pitch: 0.0 yaw: 0.0 autoLoad: 'true' bedRespawn: 'true' worldBlacklist: [] environment: NORMAL - seed: '4622440486943241231' + seed: '-5692829584426207714' generator: 'null' playerLimit: '-1' allowFlight: 'true' @@ -432,7 +432,7 @@ worlds: scale: '1.0' respawnWorld: '' allowWeather: 'false' - difficulty: EASY + difficulty: PEACEFUL spawning: ==: MVSpawnSettings animals: diff --git a/PlotSquared/config/commands.yml b/PlotSquared/config/commands.yml old mode 100755 new mode 100644 diff --git a/PlotSquared/config/settings.yml b/PlotSquared/config/settings.yml old mode 100755 new mode 100644 diff --git a/PlotSquared/config/worlds.yml b/PlotSquared/config/worlds.yml old mode 100755 new mode 100644 diff --git a/PlotSquared/schematics/GEN_ROAD_SCHEMATIC/plotworld/intersection.schematic b/PlotSquared/schematics/GEN_ROAD_SCHEMATIC/plotworld/intersection.schematic old mode 100755 new mode 100644 diff --git a/PlotSquared/schematics/GEN_ROAD_SCHEMATIC/plotworld/sideroad.schematic b/PlotSquared/schematics/GEN_ROAD_SCHEMATIC/plotworld/sideroad.schematic old mode 100755 new mode 100644 diff --git a/PlotSquared/scripts/automerge.js b/PlotSquared/scripts/automerge.js old mode 100755 new mode 100644 diff --git a/PlotSquared/templates/bridge.template b/PlotSquared/templates/bridge.template old mode 100755 new mode 100644 diff --git a/PlotSquared/templates/skyblock.template b/PlotSquared/templates/skyblock.template old mode 100755 new mode 100644 diff --git a/PlotSquared/templates/town.template b/PlotSquared/templates/town.template old mode 100755 new mode 100644 diff --git a/ProtocolLib/config.yml b/ProtocolLib/config.yml index 65fe2d9..04224b2 100644 --- a/ProtocolLib/config.yml +++ b/ProtocolLib/config.yml @@ -1,30 +1,30 @@ -global: - # Settings for the automatic version updater - auto updater: - notify: true - download: false - - # Number of seconds to wait until a new update is downloaded - delay: 43200 # 12 hours - - metrics: true - - # Automatically compile structure modifiers - background compiler: true - - # Disable version checking for the given Minecraft version. Backup your world first! - ignore version check: - - # Override the starting injecting method - injection method: - - # Whether or not to enable the filter command - debug: false - - # Whether or not to print a stack trace for every warning - detailed error: false - - # The engine used by the filter command - script engine: JavaScript - +global: + # Settings for the automatic version updater + auto updater: + notify: true + download: false + + # Number of seconds to wait until a new update is downloaded + delay: 43200 # 12 hours + + metrics: true + + # Automatically compile structure modifiers + background compiler: true + + # Disable version checking for the given Minecraft version. Backup your world first! + ignore version check: + + # Override the starting injecting method + injection method: + + # Whether or not to enable the filter command + debug: false + + # Whether or not to print a stack trace for every warning + detailed error: false + + # The engine used by the filter command + script engine: JavaScript + suppressed reports: \ No newline at end of file diff --git a/Server/ScreenSetup.sh b/Server/ScreenSetup.sh old mode 100755 new mode 100644 diff --git a/Server/bukkit.yml b/Server/bukkit.yml old mode 100755 new mode 100644 diff --git a/Server/paper.yml b/Server/paper.yml old mode 100755 new mode 100644 diff --git a/Server/run.sh b/Server/run.sh old mode 100755 new mode 100644 diff --git a/Server/server.properties b/Server/server.properties old mode 100755 new mode 100644 diff --git a/Server/spigot.yml b/Server/spigot.yml old mode 100755 new mode 100644 diff --git a/SimpleBackupReloaded/config.yml b/SimpleBackupReloaded/config.yml deleted file mode 100644 index 4ea7147..0000000 --- a/SimpleBackupReloaded/config.yml +++ /dev/null @@ -1,31 +0,0 @@ -# The time of day to make backups (makes sense with daily backups) -start-time: '10:00' -backup-interval-hours: 24.0 -backup-worlds: -- world -- world_nether -- world_the_end -- worldhub -- flatworld -- plotworld -backup-file: backups/ -backup-date-format: yyyy-MM-dd-HH-mm-ss -backup-empty-server: false -disable-zipping: false -broadcast-message: true -backup-message: '[Backup]' -custom-backup-message: Backup starting -custom-backup-message-end: Backup completed -backup-completed-hook: '' -backup-prefix: '' -delete-schedule: - intervals: - - 2d - interval-frequencies: - - 0 -backup-folders: -- TBMC -- plugins/Towny/data -- plugins/Towny/settings -- plugins/WorldGuard/worlds -- plugins/ButtonPresents diff --git a/Towny/settings/applyPatch.sh b/Towny/settings/applyPatch.sh old mode 100755 new mode 100644 diff --git a/Towny/settings/config.yml b/Towny/settings/config.yml old mode 100755 new mode 100644 index d80ccb8..cea5626 --- a/Towny/settings/config.yml +++ b/Towny/settings/config.yml @@ -708,7 +708,7 @@ plugin: dbname: towny table_prefix: towny_ username: root - password: 'NOPE' + password: NOPE flags: ?verifyServerCertificate=false&useSSL=false&useUnicode=true&characterEncoding=utf-8 # Modifiable settings to control the connection pooling. diff --git a/Towny/settings/townyperms.yml b/Towny/settings/townyperms.yml index a229c54..46abb75 100644 --- a/Towny/settings/townyperms.yml +++ b/Towny/settings/townyperms.yml @@ -1,111 +1,111 @@ -# This file contains custom permission sets which will be assigned to your players -# depending on their current status. -# -# This is all managed by towny and pushed directly to CraftBukkits SuperPerms. -# These will be in addition to any you manually assign in your specific permission plugin. -# -# You may assign any Permission nodes here, including those from other plugins. -# You may also create any custom ranks you require. - - -# The 'nomad' permission set covers players not in any town -nomad: - - towny.command.towny.map - - towny.command.towny.prices - - towny.command.towny.tree - - towny.command.towny.time - - towny.command.towny.universe - - towny.command.towny.version - - towny.command.towny.war - - towny.command.town.online - - towny.command.town.here - - towny.command.town.new - - towny.command.town.join - - towny.command.town.list - - towny.command.plot.perm - - towny.command.nation.list - - towny.town.resident - - towny.town.spawn.public - - towny.chat.general - - towny.command.nation.townlist - - towny.command.nation.allylist - - towny.command.nation.enemylist - -# This section of permissions covers players who are members of a town. -towns: - default: - # 'default' is the permission set which is auto assigned to any normal town member - - towny.command.resident.* - - towny.command.plot.claim - - towny.command.plot.unclaim - - towny.command.plot.forsale - - towny.command.plot.notforsale - - towny.command.plot.toggle.* - - towny.command.plot.set.perm - - towny.command.plot.set.reset - - towny.command.town.online - - towny.command.town.leave - - towny.command.town.deposit - - towny.town.spawn.town - - towny.chat.town - mayor: - # Mayors get these permissions in addition to the default set. - - towny.tax_exempt - - towny.command.towny.top - - towny.command.town.* - - towny.command.plot.* - - towny.claimed.owntown.* - - towny.command.nation.new - - towny.command.nation.leave - - towny.outlaw.jailer - - towny.command.nation.join - - ranks: - # Ranks contain additional permissions residents will be - # granted if they are assigned that specific rank. - assistant: - - towny.tax_exempt - - towny.command.town.claim.* - - towny.command.town.invite.add - - towny.command.plot.* - - towny.command.town.toggle.public - - towny.claimed.owntown.switch.* - # assistants are able to grant VIP and helper rank - - towny.command.town.rank.vip - - towny.command.town.rank.helper - - towny.outlaw.jailer - helper: - - towny.claimed.townowned.switch.* - donator: - # Currently only an example rank holder with no extra permissions - vip: - # Currently only an example rank holder with no extra permissions - # Sheriff rank is able to jail other town members. - sheriff: - - towny.command.town.toggle.jail - - towny.outlaw.jailer - -# This section of permissions covers players who are members of any town in a nation. -nations: - default: - # All nation members get these permissions. - - towny.command.nation.online - - towny.command.nation.deposit - - towny.command.nation.spawn - - towny.nation.spawn.nation - - towny.nation.spawn.ally - - towny.town.spawn.nation - - towny.town.spawn.ally - - towny.chat.nation - king: - # Kings get these permissions in addition to the default set. - - towny.command.nation.* - - ranks: - assistant: - - towny.command.nation.rank.helper - - towny.command.nation.invite.add - - towny.command.nation.ally.* - - towny.command.nation.enemy - helper: - - towny.command.nation.add +# This file contains custom permission sets which will be assigned to your players +# depending on their current status. +# +# This is all managed by towny and pushed directly to CraftBukkits SuperPerms. +# These will be in addition to any you manually assign in your specific permission plugin. +# +# You may assign any Permission nodes here, including those from other plugins. +# You may also create any custom ranks you require. + + +# The 'nomad' permission set covers players not in any town +nomad: + - towny.command.towny.map + - towny.command.towny.prices + - towny.command.towny.tree + - towny.command.towny.time + - towny.command.towny.universe + - towny.command.towny.version + - towny.command.towny.war + - towny.command.town.online + - towny.command.town.here + - towny.command.town.new + - towny.command.town.join + - towny.command.town.list + - towny.command.plot.perm + - towny.command.nation.list + - towny.town.resident + - towny.town.spawn.public + - towny.chat.general + - towny.command.nation.townlist + - towny.command.nation.allylist + - towny.command.nation.enemylist + +# This section of permissions covers players who are members of a town. +towns: + default: + # 'default' is the permission set which is auto assigned to any normal town member + - towny.command.resident.* + - towny.command.plot.claim + - towny.command.plot.unclaim + - towny.command.plot.forsale + - towny.command.plot.notforsale + - towny.command.plot.toggle.* + - towny.command.plot.set.perm + - towny.command.plot.set.reset + - towny.command.town.online + - towny.command.town.leave + - towny.command.town.deposit + - towny.town.spawn.town + - towny.chat.town + mayor: + # Mayors get these permissions in addition to the default set. + - towny.tax_exempt + - towny.command.towny.top + - towny.command.town.* + - towny.command.plot.* + - towny.claimed.owntown.* + - towny.command.nation.new + - towny.command.nation.leave + - towny.outlaw.jailer + - towny.command.nation.join + + ranks: + # Ranks contain additional permissions residents will be + # granted if they are assigned that specific rank. + assistant: + - towny.tax_exempt + - towny.command.town.claim.* + - towny.command.town.invite.add + - towny.command.plot.* + - towny.command.town.toggle.public + - towny.claimed.owntown.switch.* + # assistants are able to grant VIP and helper rank + - towny.command.town.rank.vip + - towny.command.town.rank.helper + - towny.outlaw.jailer + helper: + - towny.claimed.townowned.switch.* + donator: + # Currently only an example rank holder with no extra permissions + vip: + # Currently only an example rank holder with no extra permissions + # Sheriff rank is able to jail other town members. + sheriff: + - towny.command.town.toggle.jail + - towny.outlaw.jailer + +# This section of permissions covers players who are members of any town in a nation. +nations: + default: + # All nation members get these permissions. + - towny.command.nation.online + - towny.command.nation.deposit + - towny.command.nation.spawn + - towny.nation.spawn.nation + - towny.nation.spawn.ally + - towny.town.spawn.nation + - towny.town.spawn.ally + - towny.chat.nation + king: + # Kings get these permissions in addition to the default set. + - towny.command.nation.* + + ranks: + assistant: + - towny.command.nation.rank.helper + - towny.command.nation.invite.add + - towny.command.nation.ally.* + - towny.command.nation.enemy + helper: + - towny.command.nation.add diff --git a/WorldGuard/worlds/.raw/config.yml b/WorldGuard/worlds/.raw/config.yml index 1782911..c76c62f 100644 --- a/WorldGuard/worlds/.raw/config.yml +++ b/WorldGuard/worlds/.raw/config.yml @@ -1,12 +1,12 @@ -# -# WorldGuard's world configuration file -# -# This is a world configuration file. Anything placed into here will only -# affect this world. If you don't put anything in this file, then the -# settings will be inherited from the main configuration file. -# -# If you see {} below, that means that there are NO entries in this file. -# Remove the {} and add your own entries. -# +# +# WorldGuard's world configuration file +# +# This is a world configuration file. Anything placed into here will only +# affect this world. If you don't put anything in this file, then the +# settings will be inherited from the main configuration file. +# +# If you see {} below, that means that there are NO entries in this file. +# Remove the {} and add your own entries. +# {} diff --git a/WorldGuard/worlds/flatworld/config.yml b/WorldGuard/worlds/flatworld/config.yml index af4fd26..d293d19 100644 --- a/WorldGuard/worlds/flatworld/config.yml +++ b/WorldGuard/worlds/flatworld/config.yml @@ -1,13 +1,13 @@ -# -# WorldGuard's world configuration file -# -# This is a world configuration file. Anything placed into here will only -# affect this world. If you don't put anything in this file, then the -# settings will be inherited from the main configuration file. -# -# If you see {} below, that means that there are NO entries in this file. -# Remove the {} and add your own entries. -# +# +# WorldGuard's world configuration file +# +# This is a world configuration file. Anything placed into here will only +# affect this world. If you don't put anything in this file, then the +# settings will be inherited from the main configuration file. +# +# If you see {} below, that means that there are NO entries in this file. +# Remove the {} and add your own entries. +# regions: titles-always-use-default-times: true diff --git a/WorldGuard/worlds/plotworld/config.yml b/WorldGuard/worlds/plotworld/config.yml index af4fd26..d293d19 100644 --- a/WorldGuard/worlds/plotworld/config.yml +++ b/WorldGuard/worlds/plotworld/config.yml @@ -1,13 +1,13 @@ -# -# WorldGuard's world configuration file -# -# This is a world configuration file. Anything placed into here will only -# affect this world. If you don't put anything in this file, then the -# settings will be inherited from the main configuration file. -# -# If you see {} below, that means that there are NO entries in this file. -# Remove the {} and add your own entries. -# +# +# WorldGuard's world configuration file +# +# This is a world configuration file. Anything placed into here will only +# affect this world. If you don't put anything in this file, then the +# settings will be inherited from the main configuration file. +# +# If you see {} below, that means that there are NO entries in this file. +# Remove the {} and add your own entries. +# regions: titles-always-use-default-times: true diff --git a/WorldGuard/worlds/v1/config.yml b/WorldGuard/worlds/v1/config.yml index af4fd26..d293d19 100644 --- a/WorldGuard/worlds/v1/config.yml +++ b/WorldGuard/worlds/v1/config.yml @@ -1,13 +1,13 @@ -# -# WorldGuard's world configuration file -# -# This is a world configuration file. Anything placed into here will only -# affect this world. If you don't put anything in this file, then the -# settings will be inherited from the main configuration file. -# -# If you see {} below, that means that there are NO entries in this file. -# Remove the {} and add your own entries. -# +# +# WorldGuard's world configuration file +# +# This is a world configuration file. Anything placed into here will only +# affect this world. If you don't put anything in this file, then the +# settings will be inherited from the main configuration file. +# +# If you see {} below, that means that there are NO entries in this file. +# Remove the {} and add your own entries. +# regions: titles-always-use-default-times: true diff --git a/WorldGuard/worlds/v2/config.yml b/WorldGuard/worlds/v2/config.yml index af4fd26..d293d19 100644 --- a/WorldGuard/worlds/v2/config.yml +++ b/WorldGuard/worlds/v2/config.yml @@ -1,13 +1,13 @@ -# -# WorldGuard's world configuration file -# -# This is a world configuration file. Anything placed into here will only -# affect this world. If you don't put anything in this file, then the -# settings will be inherited from the main configuration file. -# -# If you see {} below, that means that there are NO entries in this file. -# Remove the {} and add your own entries. -# +# +# WorldGuard's world configuration file +# +# This is a world configuration file. Anything placed into here will only +# affect this world. If you don't put anything in this file, then the +# settings will be inherited from the main configuration file. +# +# If you see {} below, that means that there are NO entries in this file. +# Remove the {} and add your own entries. +# regions: titles-always-use-default-times: true diff --git a/WorldGuard/worlds/v3/config.yml b/WorldGuard/worlds/v3/config.yml index af4fd26..d293d19 100644 --- a/WorldGuard/worlds/v3/config.yml +++ b/WorldGuard/worlds/v3/config.yml @@ -1,13 +1,13 @@ -# -# WorldGuard's world configuration file -# -# This is a world configuration file. Anything placed into here will only -# affect this world. If you don't put anything in this file, then the -# settings will be inherited from the main configuration file. -# -# If you see {} below, that means that there are NO entries in this file. -# Remove the {} and add your own entries. -# +# +# WorldGuard's world configuration file +# +# This is a world configuration file. Anything placed into here will only +# affect this world. If you don't put anything in this file, then the +# settings will be inherited from the main configuration file. +# +# If you see {} below, that means that there are NO entries in this file. +# Remove the {} and add your own entries. +# regions: titles-always-use-default-times: true diff --git a/WorldGuard/worlds/v4/config.yml b/WorldGuard/worlds/v4/config.yml index af4fd26..d293d19 100644 --- a/WorldGuard/worlds/v4/config.yml +++ b/WorldGuard/worlds/v4/config.yml @@ -1,13 +1,13 @@ -# -# WorldGuard's world configuration file -# -# This is a world configuration file. Anything placed into here will only -# affect this world. If you don't put anything in this file, then the -# settings will be inherited from the main configuration file. -# -# If you see {} below, that means that there are NO entries in this file. -# Remove the {} and add your own entries. -# +# +# WorldGuard's world configuration file +# +# This is a world configuration file. Anything placed into here will only +# affect this world. If you don't put anything in this file, then the +# settings will be inherited from the main configuration file. +# +# If you see {} below, that means that there are NO entries in this file. +# Remove the {} and add your own entries. +# regions: titles-always-use-default-times: true diff --git a/WorldGuard/worlds/world/config.yml b/WorldGuard/worlds/world/config.yml index af4fd26..d293d19 100644 --- a/WorldGuard/worlds/world/config.yml +++ b/WorldGuard/worlds/world/config.yml @@ -1,13 +1,13 @@ -# -# WorldGuard's world configuration file -# -# This is a world configuration file. Anything placed into here will only -# affect this world. If you don't put anything in this file, then the -# settings will be inherited from the main configuration file. -# -# If you see {} below, that means that there are NO entries in this file. -# Remove the {} and add your own entries. -# +# +# WorldGuard's world configuration file +# +# This is a world configuration file. Anything placed into here will only +# affect this world. If you don't put anything in this file, then the +# settings will be inherited from the main configuration file. +# +# If you see {} below, that means that there are NO entries in this file. +# Remove the {} and add your own entries. +# regions: titles-always-use-default-times: true diff --git a/WorldGuard/worlds/world_nether/config.yml b/WorldGuard/worlds/world_nether/config.yml index af4fd26..d293d19 100644 --- a/WorldGuard/worlds/world_nether/config.yml +++ b/WorldGuard/worlds/world_nether/config.yml @@ -1,13 +1,13 @@ -# -# WorldGuard's world configuration file -# -# This is a world configuration file. Anything placed into here will only -# affect this world. If you don't put anything in this file, then the -# settings will be inherited from the main configuration file. -# -# If you see {} below, that means that there are NO entries in this file. -# Remove the {} and add your own entries. -# +# +# WorldGuard's world configuration file +# +# This is a world configuration file. Anything placed into here will only +# affect this world. If you don't put anything in this file, then the +# settings will be inherited from the main configuration file. +# +# If you see {} below, that means that there are NO entries in this file. +# Remove the {} and add your own entries. +# regions: titles-always-use-default-times: true diff --git a/WorldGuard/worlds/world_the_end/config.yml b/WorldGuard/worlds/world_the_end/config.yml index af4fd26..d293d19 100644 --- a/WorldGuard/worlds/world_the_end/config.yml +++ b/WorldGuard/worlds/world_the_end/config.yml @@ -1,13 +1,13 @@ -# -# WorldGuard's world configuration file -# -# This is a world configuration file. Anything placed into here will only -# affect this world. If you don't put anything in this file, then the -# settings will be inherited from the main configuration file. -# -# If you see {} below, that means that there are NO entries in this file. -# Remove the {} and add your own entries. -# +# +# WorldGuard's world configuration file +# +# This is a world configuration file. Anything placed into here will only +# affect this world. If you don't put anything in this file, then the +# settings will be inherited from the main configuration file. +# +# If you see {} below, that means that there are NO entries in this file. +# Remove the {} and add your own entries. +# regions: titles-always-use-default-times: true diff --git a/WorldGuard/worlds/worldhub/config.yml b/WorldGuard/worlds/worldhub/config.yml index af4fd26..d293d19 100644 --- a/WorldGuard/worlds/worldhub/config.yml +++ b/WorldGuard/worlds/worldhub/config.yml @@ -1,13 +1,13 @@ -# -# WorldGuard's world configuration file -# -# This is a world configuration file. Anything placed into here will only -# affect this world. If you don't put anything in this file, then the -# settings will be inherited from the main configuration file. -# -# If you see {} below, that means that there are NO entries in this file. -# Remove the {} and add your own entries. -# +# +# WorldGuard's world configuration file +# +# This is a world configuration file. Anything placed into here will only +# affect this world. If you don't put anything in this file, then the +# settings will be inherited from the main configuration file. +# +# If you see {} below, that means that there are NO entries in this file. +# Remove the {} and add your own entries. +# regions: titles-always-use-default-times: true diff --git a/dynmap/configuration.txt b/dynmap/configuration.txt index 9a842a9..bde49b3 100644 --- a/dynmap/configuration.txt +++ b/dynmap/configuration.txt @@ -21,17 +21,17 @@ deftemplatesuffix: vlowres #disabled # mysql: MySQL database, at hostname:port in database, accessed via userid with password storage: # Filetree storage (standard tree of image files for maps) - type: filetree + type: mysql # SQLite db for map storage (uses dbfile as storage location) #type: sqlite #dbfile: dynmap.db # MySQL DB for map storage (at 'hostname':'port' with flags "flags" in database 'database' using user 'userid' password 'password' and table prefix 'prefix') #type: mysql - #hostname: localhost - #port: 3306 - #database: dynmap - #userid: dynmap - #password: dynmap + hostname: na05-sql.pebblehost.com + port: 3306 + database: 'NOPE' + userid: 'NOPE' + password: 'NOPE' #prefix: "" #flags: "?allowReconnect=true" @@ -315,7 +315,7 @@ exportpath: export webserver-bindaddress: 0.0.0.0 # The TCP-port the webserver will listen on. -webserver-port: 9123 +webserver-port: 8143 # Maximum concurrent session on internal web server - limits resources used in Bukkit server max-sessions: 30 diff --git a/update.sh b/update.sh index 0a1109f..ee2c0cc 100755 --- a/update.sh +++ b/update.sh @@ -10,7 +10,7 @@ done find . -path './Movecraft/types/*.craft' -exec git add -f '{}' \; git add -f 'dynmap/configuration.txt' 'dynmap/worlds.txt' 'dynmap/templates/custom-normal-vlowres.txt' 'dynmap/templates/custom-nether-vlowres.txt' 'dynmap/templates/custom-the_end-vlowres.txt' git add -f 'MythicMobs/*' ':!:MythicMobs/SavedData/*' -git add -f ':(glob)Jobs/*.yml' ':!:Jobs/furnaceBrewingStands.yml' +git add -f ':(glob)Jobs/*.yml' ':!:Jobs/furnaceBrewingStands.yml' ':!:Jobs/blockOwnerShips.yml' git add -f 'Towny/settings/*' ':!:Towny/settings/*.rej' ':!:Towny/settings/english.yml' git add -f 'PlotSquared/*' ':!:PlotSquared/*storage*' ':!:PlotSquared/translations*' ':!:PlotSquared/user_cache.db' #git add -f 'PermissionsEx/permissions.yml' @@ -23,5 +23,5 @@ git add -f 'Factions/config' git add -f update.sh download.sh -sudo -H git commit -S && git push #sudo -H needed for GPG signing +git commit -S && git push #sudo -H needed for GPG signing