diff --git a/Multiverse-Core/worlds.yml b/Multiverse-Core/worlds.yml index e790238..302bf87 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: NORMAL - 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: NORMAL + 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 419905b..9f4dad7 100644 --- a/PermissionsEx/permissions.yml +++ b/PermissionsEx/permissions.yml @@ -252,6 +252,7 @@ users: options: name: Mr_Byzantine group: + - mod - builder - trusted - member @@ -462,6 +463,7 @@ users: - member c9468bea-0b2a-4cb7-9469-3ea1040d38fd: group: + - mod - member options: name: UnsafestFlea3 @@ -477,6 +479,8 @@ users: name: TheShyPig a37ac0d4-a6e9-4d4a-8531-d8de4d167edc: group: + - developer + - mod - member options: name: LadyVulcanOne @@ -506,6 +510,7 @@ users: name: Spike52055 e55c1999-b0f7-4112-ada2-a43ba1d8c661: group: + - developer - diamond - member options: @@ -729,3 +734,20 @@ users: - member options: name: TheBeastGamer135 + 4a365988-bc38-4a1d-8847-c2423b898db7: + group: + - member + options: + name: DorpsGek2002 + 6ff7b27f-ce0e-4861-b6f8-4e5abab30cd7: + group: + - member + options: + name: tibothedog + c006ba14-91ac-4679-ba77-5b06165b8f5f: + group: + - member + options: + name: DapperThief + xxxxsinxxxx: + group: [] diff --git a/PlotSquared/config/settings.yml b/PlotSquared/config/settings.yml index 16574e4..314bd18 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: "27 Aug 2018 00:00:00 GMT" -build: "https://ci.athion.net/job/PlotSquared/2026" -commit: "https://github.com/IntellectualSites/PlotSquared/commit/cd9d22c" +date: "12 Sep 2018 00:00:00 GMT" +build: "https://ci.athion.net/job/PlotSquared/2035" +commit: "https://github.com/IntellectualSites/PlotSquared/commit/4b8c434" platform: "Bukkit" # Show additional information in console debug: true diff --git a/PlotSquared/translations/style.yml b/PlotSquared/translations/style.yml index 9ead86b..d8c9a52 100755 --- a/PlotSquared/translations/style.yml +++ b/PlotSquared/translations/style.yml @@ -1,4 +1,4 @@ -version: PlotSquared-18.7.27-cd9d22c-2026 +version: PlotSquared-18.8.12-4b8c434-2035 color: '3': '8' '4': '3'