Regular update

This commit is contained in:
Chromachine 2018-12-10 23:07:54 +00:00
parent c65eb9c406
commit b3a002a6cc
4 changed files with 22 additions and 7 deletions

0
.travis.yml Normal file → Executable file
View file

0
.yamllint Normal file → Executable file
View file

View file

@ -136,6 +136,7 @@ groups:
- donator - donator
- developer - developer
permissions: permissions:
- -essentials.god
- libsdisguises.* - libsdisguises.*
- plots.admin - plots.admin
- ChestShop.admin - ChestShop.admin
@ -250,7 +251,6 @@ users:
group: group:
- member - member
- Admins - Admins
- gold
- admin - admin
633d0de1-4a67-46ff-bd8a-004fa8ce4858: 633d0de1-4a67-46ff-bd8a-004fa8ce4858:
group: group:
@ -273,6 +273,7 @@ users:
options: options:
name: HasOkayInternet name: HasOkayInternet
group: group:
- diamond
- member - member
permissions: [] permissions: []
bd0c72e7-f5a6-49be-a407-ad69e72a3431: bd0c72e7-f5a6-49be-a407-ad69e72a3431:
@ -284,7 +285,6 @@ users:
name: NorbiPeti name: NorbiPeti
80f097d0-bb18-444c-ba0a-8d8e0a923622: 80f097d0-bb18-444c-ba0a-8d8e0a923622:
group: group:
- gold
- member - member
- admin - admin
- mod - mod
@ -298,7 +298,7 @@ users:
- member - member
423ab9b6-5518-4fa2-afc3-31143f169a75: 423ab9b6-5518-4fa2-afc3-31143f169a75:
options: options:
name: jaydotexe name: jarrxth
group: group:
- gold - gold
- member - member
@ -358,7 +358,7 @@ users:
- member - member
f67bee95-b84f-483d-af00-c6448f742780: f67bee95-b84f-483d-af00-c6448f742780:
options: options:
name: TitanZz name: SyK7
group: group:
- member - member
mod: mod:
@ -501,7 +501,6 @@ users:
e55c1999-b0f7-4112-ada2-a43ba1d8c661: e55c1999-b0f7-4112-ada2-a43ba1d8c661:
group: group:
- developer - developer
- diamond
- member - member
options: options:
name: xxxxxsinxxxxx name: xxxxxsinxxxxx
@ -509,7 +508,7 @@ users:
group: group:
- member - member
options: options:
name: rastard name: filthy_platypus
seleda: seleda:
group: [] group: []
6ec10875-d010-4d49-a56c-2c6db4b6c5eb: 6ec10875-d010-4d49-a56c-2c6db4b6c5eb:
@ -676,6 +675,7 @@ users:
name: willnutdude9 name: willnutdude9
6594d366-1c94-4856-8b5d-1261976ee773: 6594d366-1c94-4856-8b5d-1261976ee773:
group: group:
- gold
- member - member
options: options:
name: yewhotookAPUSH name: yewhotookAPUSH
@ -895,3 +895,18 @@ users:
name: MintCCookie name: MintCCookie
group: group:
- member - member
6c5e2ed0-cbaa-48fd-85b2-646a5e72ac79:
group:
- member
options:
name: RomanStream849
60119c87-3eca-4c0f-b03f-cd0ae3cd1723:
group:
- member
options:
name: Net_ShadowHunter
8de5662e-3029-4881-9822-91f567ef6718:
group:
- member
options:
name: SheepMaster69

View file

@ -1039,7 +1039,7 @@ war:
# +------------------------------------------------------+ # # +------------------------------------------------------+ #
############################################################ ############################################################
# This is started with /townyadmin toggle war # This is started with /townyadmnin toggle war
# In peace time War spoils are accumulated from towns and nations being # In peace time War spoils are accumulated from towns and nations being
# deleted with any money left in the bank. # deleted with any money left in the bank.