diff --git a/PermissionsEx/permissions.yml b/PermissionsEx/permissions.yml index 44ad4b9..e70f00b 100644 --- a/PermissionsEx/permissions.yml +++ b/PermissionsEx/permissions.yml @@ -423,7 +423,7 @@ users: - member 70696a72-45a3-424c-82ed-769df0c6802b: options: - name: drox_stryder + name: cedricvh27 group: - member 88ecfbb1-8756-4cf8-8b58-da72eda642a3: @@ -682,3 +682,28 @@ users: - member options: name: yewhotookAPUSH + c6852596-a0dd-4920-95f8-7933eca750b7: + group: + - member + options: + name: TheNr24 + fa4789ef-b51b-410e-81fa-862c1a325b3b: + group: + - member + options: + name: Undersea_Ellie + cbdc0fef-6aee-4562-9253-e322fb4e049e: + group: + - member + options: + name: moertymoertan + 4c1cf4ce-784c-467b-9814-e6aaf3b466c0: + group: + - member + options: + name: Prop42 + 813917c1-bb5f-4e1d-9ddc-f634f6277d42: + group: + - member + options: + name: Vivian_Vitella diff --git a/PlotSquared/config/settings.yml b/PlotSquared/config/settings.yml index 4a4d844..16574e4 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: "6 Aug 2018 00:00:00 GMT" -build: "https://ci.athion.net/job/PlotSquared/2021" -commit: "https://github.com/IntellectualSites/PlotSquared/commit/ae1e58c" +date: "27 Aug 2018 00:00:00 GMT" +build: "https://ci.athion.net/job/PlotSquared/2026" +commit: "https://github.com/IntellectualSites/PlotSquared/commit/cd9d22c" platform: "Bukkit" # Show additional information in console debug: true diff --git a/PlotSquared/translations/style.yml b/PlotSquared/translations/style.yml index 97925f7..9ead86b 100755 --- a/PlotSquared/translations/style.yml +++ b/PlotSquared/translations/style.yml @@ -1,4 +1,4 @@ -version: PlotSquared-18.7.6-ae1e58c-2021 +version: PlotSquared-18.7.27-cd9d22c-2026 color: '3': '8' '4': '3' diff --git a/Server/server.properties b/Server/server.properties index e82ef15..030800e 100755 --- a/Server/server.properties +++ b/Server/server.properties @@ -1,5 +1,5 @@ #Minecraft server properties -#Sat Jul 14 12:01:34 UTC 2018 +#Wed Aug 01 12:01:40 UTC 2018 spawn-protection=16 server-name=Unknown Server generator-settings= @@ -28,6 +28,7 @@ spawn-npcs=true allow-flight=false level-name=world view-distance=15 +server-id=unnamed resource-pack= spawn-animals=true white-list=false diff --git a/Server/spigot.yml b/Server/spigot.yml index 060c129..38d9e1e 100755 --- a/Server/spigot.yml +++ b/Server/spigot.yml @@ -35,6 +35,13 @@ settings: attackDamage: max: 2048.0 debug: false +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 commands: tab-complete: 0 log: true @@ -46,13 +53,6 @@ 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: