Rebase pull for 'download'
This commit is contained in:
parent
2c5ef99288
commit
71d6fc6188
2 changed files with 49 additions and 49 deletions
|
@ -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: EASY
|
||||
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: EASY
|
||||
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'
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
#!/bin/bash
|
||||
git pull
|
||||
git pull --rebase
|
||||
|
||||
|
|
Loading…
Reference in a new issue