diff --git a/Essentials/config.yml b/Essentials/config.yml index 08822c4..0d5dae7 100755 --- a/Essentials/config.yml +++ b/Essentials/config.yml @@ -168,7 +168,8 @@ list: debug: false remove-god-on-disconnect: false auto-afk: 300 -auto-afk-kick: 600 +# auto-afk-kick: 600 +auto-afk-kick: -1 freeze-afk-players: false disable-item-pickup-while-afk: true cancel-afk-on-interact: false diff --git a/Multiverse-Core/worlds.yml b/Multiverse-Core/worlds.yml index 302bf87..e790238 100755 --- a/Multiverse-Core/worlds.yml +++ b/Multiverse-Core/worlds.yml @@ -95,54 +95,6 @@ worlds: generator: TerrainControl playerLimit: '-1' allowFlight: 'true' - world_the_end: - ==: MVWorld - hidden: 'false' - alias: world_the_end - color: WHITE - style: NORMAL - pvp: 'true' - scale: '16.0' - respawnWorld: '' - 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' - currency: '-1' - hunger: 'true' - autoHeal: 'true' - adjustSpawn: 'true' - portalForm: ALL - gameMode: SURVIVAL - keepSpawnInMemory: 'true' - spawnLocation: - ==: MVSpawnLocation - x: -4.710357902146693 - y: 59.0 - z: 0.6541565622183771 - pitch: 2.5500019 - yaw: -91.005165 - autoLoad: 'true' - bedRespawn: 'true' - worldBlacklist: [] - environment: THE_END - seed: '2133291894169730654' - generator: 'null' - playerLimit: '-1' - allowFlight: 'true' world: ==: MVWorld hidden: 'false' @@ -191,6 +143,54 @@ worlds: generator: TerrainControl playerLimit: '-1' allowFlight: 'true' + world_the_end: + ==: MVWorld + hidden: 'false' + alias: world_the_end + color: WHITE + style: NORMAL + pvp: 'true' + scale: '16.0' + respawnWorld: '' + 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' + currency: '-1' + hunger: 'true' + autoHeal: 'true' + adjustSpawn: 'true' + portalForm: ALL + gameMode: SURVIVAL + keepSpawnInMemory: 'true' + spawnLocation: + ==: MVSpawnLocation + x: -4.710357902146693 + y: 59.0 + z: 0.6541565622183771 + pitch: 2.5500019 + yaw: -91.005165 + autoLoad: 'true' + bedRespawn: 'true' + worldBlacklist: [] + environment: THE_END + seed: '2133291894169730654' + generator: 'null' + playerLimit: '-1' + allowFlight: 'true' test: ==: MVWorld hidden: 'false' diff --git a/PermissionsEx/permissions.yml b/PermissionsEx/permissions.yml index 25b7e94..44ad4b9 100644 --- a/PermissionsEx/permissions.yml +++ b/PermissionsEx/permissions.yml @@ -119,6 +119,7 @@ groups: inheritance: - trusted permissions: + - worldguard.teleport.own.* - essentials.sethome.multiple.builder - essentials.bigtree - essentials.fly @@ -281,7 +282,8 @@ users: f48bf937-cb2f-4cae-ad75-c835ae563903: options: name: HasOkayInternet - group: [] + group: + - member permissions: [] bd0c72e7-f5a6-49be-a407-ad69e72a3431: group: @@ -306,7 +308,7 @@ users: - member 423ab9b6-5518-4fa2-afc3-31143f169a75: options: - name: FlamingoJay + name: __Flamingo group: - member 7ede6d55-357d-45d2-8dd1-613e287f174a: @@ -382,6 +384,7 @@ users: options: name: FigyTuna group: + - member - admin permissions: [] 38865e2e-8582-4ef3-8142-59a222168b09: @@ -659,3 +662,23 @@ users: - member options: name: Jackster03 + cffc1536-35ac-44c7-b5a0-a85a2c5e1404: + group: + - member + options: + name: Koiiev + b10d87c6-d2e3-4307-8b3a-48365291aca7: + group: + - member + options: + name: RedsToad + 9bb4dab3-6f1f-4e18-bda2-72bc9f0701a4: + group: + - member + options: + name: willnutdude9 + 6594d366-1c94-4856-8b5d-1261976ee773: + group: + - member + options: + name: yewhotookAPUSH diff --git a/PlotSquared/config/settings.yml b/PlotSquared/config/settings.yml index 955a33d..4a4d844 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: "23 Jul 2018 00:00:00 GMT" -build: "https://ci.athion.net/job/PlotSquared/2017" -commit: "https://github.com/IntellectualSites/PlotSquared/commit/79e1ea9" +date: "6 Aug 2018 00:00:00 GMT" +build: "https://ci.athion.net/job/PlotSquared/2021" +commit: "https://github.com/IntellectualSites/PlotSquared/commit/ae1e58c" platform: "Bukkit" # Show additional information in console debug: true diff --git a/PlotSquared/translations/style.yml b/PlotSquared/translations/style.yml index 2eae594..97925f7 100755 --- a/PlotSquared/translations/style.yml +++ b/PlotSquared/translations/style.yml @@ -1,4 +1,4 @@ -version: PlotSquared-18.6.23-79e1ea9-2017 +version: PlotSquared-18.7.6-ae1e58c-2021 color: '3': '8' '4': '3' diff --git a/Server/server.properties b/Server/server.properties index a40e7d3..e82ef15 100755 --- a/Server/server.properties +++ b/Server/server.properties @@ -1,5 +1,5 @@ #Minecraft server properties -#Sun Jul 01 12:01:29 UTC 2018 +#Sat Jul 14 12:01:34 UTC 2018 spawn-protection=16 server-name=Unknown Server generator-settings= @@ -35,7 +35,7 @@ generate-structures=true online-mode=true max-build-height=256 level-seed= -prevent-proxy-connections=true use-native-transport=true -motd=Welcome to Chromagaming\nThank you to all of our patrons\! +prevent-proxy-connections=true enable-rcon=false +motd=Welcome to Chromagaming\nThank you to all of our patrons\! diff --git a/Server/spigot.yml b/Server/spigot.yml index 9098904..060c129 100755 --- a/Server/spigot.yml +++ b/Server/spigot.yml @@ -11,13 +11,6 @@ # Forums: http://www.spigotmc.org/ config-version: 11 -messages: - whitelist: You are not whitelisted on this server! - unknown-command: Unknown command. Type "/help" for help. - server-full: The server is full! - outdated-client: Outdated client! Please use {0} - outdated-server: Outdated server! I'm still on {0} - restart: Server is restarting settings: save-user-cache-on-stop-only: false bungeecord: false @@ -53,6 +46,13 @@ commands: - summon - testforblock - tellraw +messages: + whitelist: You are not whitelisted on this server! + unknown-command: Unknown command. Type "/help" for help. + server-full: The server is full! + outdated-client: Outdated client! Please use {0} + outdated-server: Outdated server! I'm still on {0} + restart: Server is restarting advancements: disable-saving: false disabled: