mirror of
https://github.com/CivMC/Civ.git
synced 2026-07-18 00:20:44 +00:00
Merge branch 'main' into tabfix
This commit is contained in:
@@ -22,7 +22,7 @@ settings:
|
||||
environment: Production
|
||||
minecraft:
|
||||
<<: *default_minecraft
|
||||
civdocker_version: '1.27.1'
|
||||
civdocker_version: '2.0.0'
|
||||
auth:
|
||||
enabled: false # TODO: MOVE
|
||||
|
||||
@@ -31,7 +31,7 @@ settings:
|
||||
environment: Test
|
||||
minecraft:
|
||||
<<: *default_minecraft
|
||||
civdocker_version: '1.27.1'
|
||||
civdocker_version: '2.0.0'
|
||||
whitelist: true
|
||||
resources:
|
||||
<<: *default_minecraft_resources
|
||||
|
||||
Reference in New Issue
Block a user