diff --git a/ChestShopNotifier/config.yml b/ChestShopNotifier/config.yml index ae44c8b..45dc108 100755 --- a/ChestShopNotifier/config.yml +++ b/ChestShopNotifier/config.yml @@ -17,7 +17,7 @@ debugging: database: host: 'localhost' port: 3306 - dbname: 'chestshop_notifier' + dbname: 'chestshop_notifier?useSSL=false' username: 'chestshop' password: 'NOPE' diff --git a/Jobs/generalConfig.yml b/Jobs/generalConfig.yml index cb7e331..7db35a2 100755 --- a/Jobs/generalConfig.yml +++ b/Jobs/generalConfig.yml @@ -3,13 +3,15 @@ # to broadcast a message to the server when a user goes up a skill level. # It also allows admins to set the maximum number of jobs a player can have at # any one time. -# + # Default language. # Example: en, ru # File in locale folder with same name should exist. Example: messages_ru.yml locale-language: en storage: + # storage method, can be MySQL or sqlite method: SqLite +# Requires Mysql. mysql-username: jobsreborn mysql-password: 'NOPE' mysql-hostname: localhost:3306 diff --git a/Multiverse-Core/worlds.yml b/Multiverse-Core/worlds.yml index 5849993..dba7abf 100755 --- a/Multiverse-Core/worlds.yml +++ b/Multiverse-Core/worlds.yml @@ -95,54 +95,6 @@ worlds: generator: TerrainControl playerLimit: '-1' allowFlight: 'true' - world: - ==: MVWorld - hidden: 'false' - alias: world - color: WHITE - style: NORMAL - pvp: 'true' - scale: '1.0' - respawnWorld: '' - allowWeather: 'true' - difficulty: EASY - spawning: &id007 - ==: MVSpawnSettings - animals: - ==: MVSpawnSubSettings - spawn: 'true' - spawnrate: '-1' - exceptions: [] - monsters: - ==: MVSpawnSubSettings - spawn: 'true' - spawnrate: '-1' - exceptions: [] - entryfee: &id008 - ==: MVEntryFee - amount: '0.0' - currency: '-1' - hunger: 'true' - autoHeal: 'true' - adjustSpawn: 'false' - portalForm: ALL - gameMode: SURVIVAL - keepSpawnInMemory: 'false' - spawnLocation: - ==: MVSpawnLocation - x: 1385.2648659554345 - y: 71.04026167783364 - z: -32.50617928137268 - pitch: 90.0 - yaw: 91.80102 - autoLoad: 'true' - bedRespawn: 'true' - worldBlacklist: &id009 [] - environment: NORMAL - seed: '7008642968894271479' - generator: TerrainControl - playerLimit: '-1' - allowFlight: 'true' world_the_end: ==: MVWorld hidden: 'false' @@ -191,6 +143,54 @@ worlds: generator: 'null' playerLimit: '-1' allowFlight: 'true' + world: + ==: MVWorld + hidden: 'false' + alias: world + color: WHITE + style: NORMAL + pvp: 'true' + scale: '1.0' + respawnWorld: '' + allowWeather: 'true' + difficulty: EASY + spawning: &id007 + ==: MVSpawnSettings + animals: + ==: MVSpawnSubSettings + spawn: 'true' + spawnrate: '-1' + exceptions: [] + monsters: + ==: MVSpawnSubSettings + spawn: 'true' + spawnrate: '-1' + exceptions: [] + entryfee: &id008 + ==: MVEntryFee + amount: '0.0' + currency: '-1' + hunger: 'true' + autoHeal: 'true' + adjustSpawn: 'false' + portalForm: ALL + gameMode: SURVIVAL + keepSpawnInMemory: 'false' + spawnLocation: + ==: MVSpawnLocation + x: 1385.2648659554345 + y: 71.04026167783364 + z: -32.50617928137268 + pitch: 90.0 + yaw: 91.80102 + autoLoad: 'true' + bedRespawn: 'true' + worldBlacklist: &id009 [] + environment: NORMAL + seed: '7008642968894271479' + generator: TerrainControl + playerLimit: '-1' + allowFlight: 'true' test: ==: MVWorld hidden: 'false' diff --git a/PermissionsEx/permissions.yml b/PermissionsEx/permissions.yml index 7bc7ad8..b0ba5bb 100644 --- a/PermissionsEx/permissions.yml +++ b/PermissionsEx/permissions.yml @@ -97,7 +97,6 @@ groups: - limitedcreative.nolimit.break - limitedcreative.nolimit.use - limitedcreative.nolimit.interact - - limitedcreative.nolimit.chest donator: inheritance: - member @@ -637,3 +636,13 @@ users: - member options: name: Lodish + c7bd9ab4-c38d-4927-9d9c-19e7704e79d7: + group: + - member + options: + name: FinaBean + 0de2ee9c-2e88-456a-b5ef-890b037c4f5d: + group: + - member + options: + name: AnonymousDev diff --git a/PlotSquared/config/settings.yml b/PlotSquared/config/settings.yml index d748bcd..6e0becb 100755 --- a/PlotSquared/config/settings.yml +++ b/PlotSquared/config/settings.yml @@ -1,9 +1,9 @@ # These first 4 aren't configurable issues: "https://github.com/IntellectualSites/PlotSquared/issues" wiki: "https://github.com/IntellectualSites/PlotSquared/wiki" -date: "18 Jul 2018 00:00:00 GMT" -build: "https://ci.athion.net/job/PlotSquared/2012" -commit: "https://github.com/IntellectualSites/PlotSquared/commit/d454602" +date: "20 Jul 2018 00:00:00 GMT" +build: "https://ci.athion.net/job/PlotSquared/2014" +commit: "https://github.com/IntellectualSites/PlotSquared/commit/df6914f" platform: "Bukkit" # Show additional information in console debug: true diff --git a/PlotSquared/config/worlds.yml b/PlotSquared/config/worlds.yml index 6f99dce..c98ec2d 100755 --- a/PlotSquared/config/worlds.yml +++ b/PlotSquared/config/worlds.yml @@ -51,3 +51,4 @@ worlds: natural_mob_spawning: false mob_spawner_spawning: false flags: {} + mob_damage: false diff --git a/PlotSquared/translations/style.yml b/PlotSquared/translations/style.yml index f516450..adf47a3 100755 --- a/PlotSquared/translations/style.yml +++ b/PlotSquared/translations/style.yml @@ -1,4 +1,4 @@ -version: PlotSquared-18.6.18-d454602-2012 +version: PlotSquared-18.6.20-df6914f-2014 color: '3': '8' '4': '3' diff --git a/WorldGuard/worlds/DXL_Edit_1/config.yml b/WorldGuard/worlds/DXL_Edit_1/config.yml new file mode 100644 index 0000000..1782911 --- /dev/null +++ b/WorldGuard/worlds/DXL_Edit_1/config.yml @@ -0,0 +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. +# + +{}