diff --git a/ButtonPresents/config.yml b/ButtonPresents/config.yml index 03c24fd..7b22124 100644 --- a/ButtonPresents/config.yml +++ b/ButtonPresents/config.yml @@ -10,3 +10,9 @@ components: TownyFactionsComponent: enabled: true distance: 5 + PortalLimitComponent: + enabled: true + worlds: + - v1 + - v2 + - v3 diff --git a/Chroma-Chat/config.yml b/Chroma-Chat/config.yml index edef924..abd792b 100644 --- a/Chroma-Chat/config.yml +++ b/Chroma-Chat/config.yml @@ -9,9 +9,9 @@ components: useNationColors: true colorCount: 1 towncolors: - badlands: - - Blue - acoralis: + praxis: + - DarkRed + liria: - DarkPurple nationcolors: {} FlairComponent: diff --git a/ChromaCore/config.yml b/ChromaCore/config.yml index 2ab1a14..d3aa1d7 100644 --- a/ChromaCore/config.yml +++ b/ChromaCore/config.yml @@ -20,6 +20,8 @@ components: mod: enabled: true IDs: [] + displayName: §9MOD§f + color: Blue dev: enabled: true IDs: [] @@ -51,6 +53,8 @@ components: nc: enabled: true IDs: [] + displayName: §6NC§f + color: Gold rp: enabled: true IDs: [] diff --git a/Jobs/actionBarBossbar.yml b/Jobs/actionBarBossbar.yml index 299fa3e..6c42e0c 100644 --- a/Jobs/actionBarBossbar.yml +++ b/Jobs/actionBarBossbar.yml @@ -1,11 +1,17 @@ bossBar: thewindmillman: true TheShyPig: true + creepachu: true Deoplo: true + Alisolarflare: true + Ghostise: true actionBar: thewindmillman: true DubbleBerger: true TheShyPig: true + creepachu: true Deoplo: true + NorbiPeti: true Alisolarflare: true + Ghostise: true Mr_Byzantine: true diff --git a/Multiverse-Core/worlds.yml b/Multiverse-Core/worlds.yml index fe20b0e..e628d5e 100644 --- a/Multiverse-Core/worlds.yml +++ b/Multiverse-Core/worlds.yml @@ -7,7 +7,7 @@ worlds: style: NORMAL pvp: 'true' scale: '16.0' - respawnWorld: '' + respawnWorld: world allowWeather: 'true' difficulty: NORMAL spawning: @@ -42,7 +42,7 @@ worlds: bedRespawn: 'true' worldBlacklist: [] environment: THE_END - seed: '8872996547829555513' + seed: '1923020019' generator: 'null' playerLimit: '-1' allowFlight: 'true' @@ -80,16 +80,16 @@ worlds: keepSpawnInMemory: 'true' spawnLocation: ==: MVSpawnLocation - x: -1.855832015452347 - y: 68.0 - z: -243.82117945714978 - pitch: 14.249999 - yaw: -0.59997934 + x: -32270.5 + y: 67.0 + z: -8198.5 + pitch: 20.6998 + yaw: -1.3500259 autoLoad: 'true' bedRespawn: 'true' worldBlacklist: [] environment: NORMAL - seed: '8872996547829555513' + seed: '1923020019' generator: 'null' playerLimit: '-1' allowFlight: 'true' @@ -101,7 +101,7 @@ worlds: style: NORMAL pvp: 'true' scale: '8.0' - respawnWorld: '' + respawnWorld: world allowWeather: 'true' difficulty: NORMAL spawning: @@ -136,7 +136,7 @@ worlds: bedRespawn: 'true' worldBlacklist: [] environment: NETHER - seed: '8872996547829555513' + seed: '1923020019' generator: 'null' playerLimit: '-1' allowFlight: 'true' @@ -170,7 +170,7 @@ worlds: autoHeal: 'true' adjustSpawn: 'true' portalForm: ALL - gameMode: SURVIVAL + gameMode: ADVENTURE keepSpawnInMemory: 'true' spawnLocation: ==: MVSpawnLocation diff --git a/PlotSquared/config/commands.yml b/PlotSquared/config/commands.yml index 5db525f..381d904 100644 --- a/PlotSquared/config/commands.yml +++ b/PlotSquared/config/commands.yml @@ -528,6 +528,12 @@ toggle: usage: '' description: Toggle plot chat confirmation: false + time: + aliases: + - time + usage: '' + description: Toggle plot time settings + confirmation: false help: aliases: - help diff --git a/PlotSquared/config/settings.yml b/PlotSquared/config/settings.yml index 0a956e2..db8c735 100644 --- a/PlotSquared/config/settings.yml +++ b/PlotSquared/config/settings.yml @@ -2,9 +2,9 @@ issues: "https://github.com/IntellectualSites/PlotSquared/issues" suggestion: "https://github.com/IntellectualSites/PlotSquaredSuggestions" wiki: "https://github.com/IntellectualSites/PlotSquared/wiki" -date: "27 Jul 2019 00:00:00 GMT" -build: "https://ci.athion.net/job/PlotSquared/298" -commit: "https://github.com/IntellectualSites/PlotSquared/commit/2468456" +date: "8 Oct 2019 00:00:00 GMT" +build: "https://ci.athion.net/job/PlotSquared-Releases/353" +commit: "https://github.com/IntellectualSites/PlotSquared/commit/4f789d" platform: "Bukkit" # Show additional information in console debug: true @@ -52,7 +52,7 @@ enabled-components: kill-road-vehicles: false # Notify a player of any missed comments upon plot entry comment-notifier: false - # Let player's claim entire worlds with PlotSquared + # Let players claim entire worlds with PlotSquared worlds: false # Actively purge invalid database entries database-purger: false diff --git a/PlotSquared/scripts/fixborders.js b/PlotSquared/scripts/fixborders.js new file mode 100644 index 0000000..1becaeb --- /dev/null +++ b/PlotSquared/scripts/fixborders.js @@ -0,0 +1,10 @@ +/* +Fixes border around plots +/plot debugexec runasync fixborder.js +*/ +var plots = PS.sortPlotsByTemp(PS.getPlots()); +PS.class.static.log("Attempting to fix border for " + plots.size() + " plots"); +for (var i = 0; i < plots.size(); i++) { + var plot = plots.get(i); + plot.setComponent("border", "%s0"); +} diff --git a/Towny/settings/config.yml b/Towny/settings/config.yml index 1cac368..4eb15c1 100644 --- a/Towny/settings/config.yml +++ b/Towny/settings/config.yml @@ -1,8 +1,8 @@ version: # This is the current version of Towny. Please do not edit. - version: 0.94.0.0 + version: 0.94.0.12 # This is for showing the changelog on updates. Please do not edit. - last_run_version: 0.94.0.0 + last_run_version: 0.94.0.12 # The language file you wish to use language: english.yml @@ -339,7 +339,7 @@ global_town_settings: speed: 3s enable: 'true' # Allow towns to claim outposts (a townblock not connected to town). - allow_outposts: 'true' + allow_outposts: 'false' # When set to true outposts can be limited by the townOutpostLimit value of the Town Levels and # the nationBonusOutpostLimit value in the Nation Levels. In this way nations can be made to be # the only way of receiving outposts, or as an incentive to receive more outposts. Towns which are @@ -481,6 +481,8 @@ global_nation_settings: default: # If set to true, any newly made nation will have their spawn set to public. public: 'false' + # If set to true, any newly made nation will have open status and any town may join without an invite. + open: 'false' ############################################################ @@ -609,6 +611,9 @@ protection: # Remove living entities within a town's boundaries, if the town has the mob removal flag set. town_mob_removal_entities: Monster,Flying,Slime,Shulker,ZombieHorse + # Whether the town mob removal should remove THE_KILLER_BUNNY type rabbits. + town_mob_removal_killer_bunny: 'true' + # Prevent the spawning of villager babies in towns. town_prevent_villager_breeding: 'false' # Disable creatures triggering stone pressure plates @@ -887,6 +892,12 @@ economy: price_outpost: '1500.0' # The price for a town to expand one townblock. price_claim_townblock: '6.25' + # How much every additionally claimed townblock increases in cost. Set to 1 to deactivate this. 1.3 means +30% to every bonus claim block cost. + price_claim_townblock_increase: '1.0' + # The amount refunded to a town when they unclaim a townblock. + # Warning: do not set this higher than the cose to claim a townblock. + # It is advised that you do not set this to the same price as claiming either, otherwise towns will get around using outposts to claim far away. + price_claim_townblock_refund: '0.0' # How much it costs a player to buy extra blocks. price_purchased_bonus_townblock: '75.0' # How much every extra bonus block costs more. Set to 1 to deactivate this. 1.2 means +20% to every bonus claim block cost. @@ -944,6 +955,11 @@ economy: # The server's daily charge on each nation. If a nation fails to pay this upkeep # all of it's member town are kicked and the Nation is removed. price_nation_upkeep: '250.0' + # Uses total number of towns in the nation to determine upkeep instead of nation level (Number of Residents) + # calculated by (number of towns in nation X price_nation_upkeep). + nation_pertown_upkeep: 'false' + # If set to true, the per-town-upkeep system will be modified by the Nation Levels' upkeep modifiers. + nation_pertown_upkeep_affected_by_nation_level_modifier: 'false' # The server's daily charge on each town. If a town fails to pay this upkeep # all of it's residents are kicked and the town is removed. price_town_upkeep: '5.0' @@ -952,6 +968,11 @@ economy: town_plotbased_upkeep: 'true' # If set to true, the plot-based-upkeep system will be modified by the Town Levels' upkeep modifiers. town_plotbased_upkeep_affected_by_town_level_modifier: 'true' + # The server's daily charge on a town which has claimed more townblocks than it is allowed. + price_town_overclaimed_upkeep_penalty: '0.0' + # Uses total number of plots that the town is overclaimed by, to determine the price_town_overclaimed_upkeep_penalty cost. + # If set to true the penalty is calculated (# of plots overclaimed X price_town_overclaimed_upkeep_penalty). + price_town_overclaimed_upkeep_penalty_plotbased: 'false' # If enabled and you set a negative upkeep for the town # any funds the town gains via upkeep at a new day # will be shared out between the plot owners. diff --git a/dynmap/worlds.txt b/dynmap/worlds.txt index a4abfc7..2e6d71c 100644 --- a/dynmap/worlds.txt +++ b/dynmap/worlds.txt @@ -6,6 +6,15 @@ # Deleting this file will result in a fresh copy being produced by dynmap.jar on the next startup. # worlds: +- name: world_nether + enabled: false +- name: world_the_end + enabled: false +- name: world + center: + x: -32271 + y: 64 + z: -8199 # Worlds can be handled by templates, based on world type # You can override the properties of the template by specifying them in this section # for example 'Title: "My Awesome World"'