Fixing incorrect pull from github of old entries in config.yml

Author: Dev7ex

multiworld-bukkit/src/main/resources/config.yml

@@ -57,160 +57,7 @@ settings:
     weather-enabled: true
     # Disables the whitelist feature, allowing any player to join the world without needing to be added to a whitelist
     whitelist-enabled: false
-<<<<<<< Updated upstream
-
-messages:
-  general:
-    invalid-seed: '%prefix% §cPlease enter a number!'
-    invalid-generator: '%prefix% §cThis generator does not exist'
-    update-message-player: '%prefix% §7There is a new update available. §8[§bhttps://www.spigotmc.org/resources/multiworld.92559§8]'
-    update-message-version-player: '%prefix% §7Current Version: §b%current_version% §7New Version §b%new_version%'
-    world-not-exists: '%prefix% §cThe specified world does not exist!'
-    world-not-loaded: '%prefix% §cThe specified world is not loaded!'
-    world-already-exists: '%prefix% §cThe specified world already exists!'
-    world-type-not-exists: '%prefix% §cThe specified WorldType does not exist'
-    world-folder-not-exists: '%prefix% §cNo world folder could be found!'
-    world-whitelist-block-trespassing: '%prefix% §7You are not on the whitelist of this world!'
-  commands:
-    back:
-      usage: '%prefix% §cUsage: /world back'
-      world-not-exists: '%prefix% §cThere is no world you can go!'
-      sender-already-there: '%prefix% §cYou are already in the world §b%world_name%'
-    backup:
-      usage: '%prefix% §cUsage: /world backup <World>'
-      starting: '%prefix% §7A backup of the world §b%world_name% is created...'
-      finished: '%prefix% §7The backup of the world §b%world_name% §7has been successfully created!'
-    clone:
-      usage: '%prefix% §cUsage: /world clone <World> <Name>'
-      starting: '%prefix% §7The world §b%world_name% §7will be copied...'
-      finished: '%prefix% §7The world §b%world_name% §7has been successfully copied!'
-    create:
-      usage: '%prefix% §cUsage: /world create <Name> <-g | -s | -t> <Generator | Seed | WorldType>'
-      starting: '%prefix% §7The world §b%world_name% §7will be created...'
-      finished: '%prefix% §7The world §b%world_name% §7was created successfully!'
-    delete:
-      usage: '%prefix% §cUsage: /world delete <World>'
-      world-cannot-deleted: '%prefix% §cThe specified world may not be deleted!'
-      starting: '%prefix% §7The world §b%world_name% §7will be deleted...'
-      finished: '%prefix% §7The world §b%world_name% §7has been successfully deleted!'
-    flag:
-      usage: '%prefix% §cUsage: /world flag <World> <Flag> <Value>'
-      not-existing: '%prefix% §cThis flag does not exist'
-      value-not-existing: '%prefix% §cThis value does not exist for the flag §b%flag%'
-      successfully-set: '%prefix% §7The flag §b%flag% §7was set to §b%value%§7!'
-    gamerule:
-      usage: '%prefix% §cUsage: /world flag <World> <Gamerule> <Value>'
-      not-existing: '%prefix% §cThis GameRule does not exist'
-      value-not-existing: '%prefix% §cThis value does not exist for the GameRule §b%gamerule%'
-      successfully-set: '%prefix% §7The GameRule §b%gamerule% §7was set to §b%value%§7!'
-    help:
-      message:
-        - ''
-        - '§f§m                    §r§r %prefix% §f§m                    '
-        - ''
-        - '§7» §7/world §bback'
-        - '§7» §7/world §bbackup §7<World>'
-        - '§7» §7/world §bclone §7<World> <Name>'
-        - '§7» §7/world §bcreate §7<Name> <-g | -s | -t> <Generator | Seed | WorldType>'
-        - '§7» §7/world §bdelete §7<World>'
-        - '§7» §7/world §bflag §7<World> <Property> <Value>'
-        - '§7» §7/world §bgamerule §7<World> <GameRule> <Value>'
-        - '§7» §7/world §bhelp'
-        - '§7» §7/world §bimport §7<World> <WorldType>'
-        - '§7» §7/world §binfo §7<World>'
-        - '§7» §7/world §blist'
-        - '§7» §7/world §blink §7<World> <Nether | End> <Welt>'
-        - '§7» §7/world §bload §7<World>'
-        - '§7» §7/world §breload'
-        - '§7» §7/world §bteleport §7<Player> <World>'
-        - '§7» §7/world §bunload §7<World>'
-        - '§7» §7/world §bwhitelist §7<World> <Enable | Disable | Add | Remove | List> <Name>'
-        - ''
-        - '§f§m                    §r§r %prefix% §f§m                    '
-        - ''
-    import:
-      usage: '%prefix% §cUsage: /world import <Name> <WorldType | Generator>'
-      world-already-imported: '%prefix% §7The world §b%world_name% §7is already imported!'
-      starting: '%prefix% §7The world §b%world_name% §7will import...'
-      finished: '%prefix% §7The world §b%world_name% §7was successfully imported!'
-    info:
-      usage: '%prefix% §cUsage: /world info <World>'
-      message:
-        - ''
-        - '§f§m               §r§r §b%world_name% §f§m               '
-        - ''
-        - '§7» Creator: §b%world_creator_name%'
-        - '§7» Created at: §b%creation_timestamp%'
-        - '§7» Load-Auto: §b%load_auto%'
-        - '§7» Loaded: §b%loaded%'
-        - '§7» WorldType: §b%world_type%'
-        - '§7» Environment: §b%environment%'
-        - '§7» Difficulty: §b%difficulty%'
-        - '§7» GameMode: §b%gamemode%'
-        - '§7» Pvp: §b%pvp_enabled%'
-        - '§7» Receive-Achievements: §b%receive_achievements%'
-        - '§7» Spawn-Monster: §b%spawn_monsters%'
-        - '§7» Spawn-Animals: §b%spawn_animals%'
-        - '§7» Spawn-Entities: §b%spawn_entities%'
-        - '§7» Normal-World: §b%normal_world%'
-        - '§7» Nether-World: §b%nether_world%'
-        - '§7» End-World: §b%end_world%'
-        - '§7» End-Portal-Accessible: §b%end-portal-accessible%'
-        - '§7» Nether-Portal-Accessible: §b%nether-portal-accessible%'
-        - '§7» Whitelist: §b%whitelist_enabled%'
-        - ''
-        - '§f§m               §r§r §b%world_name% §f§m               '
-        - ''
-    list:
-      usage: '%prefix% §cUsage: /world list'
-      message: '%prefix% §aWorlds: %world_names%'
-    link:
-      usage: '%prefix% §cUsage: /world link <World> <End | Nether> <World>'
-      environment-not-exists: '%prefix% §cThe specified environment does not exist!'
-      successfully-set: '%prefix% §7You have connected the portal of the environment §b%environment_name% §7in the world §b%world_name% §7with the world §b%target_world_name%'
-    load:
-      usage: '%prefix% §cUsage: /world load <Name>'
-      world-already-loaded: '%prefix% §7The world §b%world_name% §7is already loaded!'
-      starting: '%prefix% §7The world §b%world_name% §7will loaded...'
-      finished: '%prefix% §7The world §b%world_name% §7was successfully loaded!'
-    reload:
-      usage: '%prefix% §cUsage: /world reload'
-      message: '%prefix% §7The configurations has been reloaded!'
-    teleport:
-      usage: '%prefix% §cUsage: /world teleport <Player> <World>'
-      message: '%prefix% §a%player_name% §7is teleported to the world §b%world_name% §7!'
-      sender-already-there: '%prefix% §7You are already in the world §b%world_name%'
-      target-already-there: '%prefix% §7The player §a%player_name% §7is already in the world §b%world_name%'
-      nether-not-accessible: '%prefix% §cYou cant enter the Nether via the command!'
-      end-not-accessible: '%prefix% §cYou cant enter the end via the command!'
-    unload:
-      usage: '%prefix% §cUsage: /world unload <World>'
-      world-cannot-unloaded: '%prefix% §cThe specified world must not be unloaded!'
-      starting: '%prefix% §7The world §b%world_name% §7will be unloaded...'
-      finished: '%prefix% §7The world §b%world_name% §7was successfully unloaded!'
-      chunk-starting: '%prefix% §7The chunks in §b%world_name% §7are unloaded...'
-      chunk-finished: '%prefix% §7The chunks in §b%world_name% §7were successfully unloaded!'
-      chunk-teleport: '%prefix% §7The world you were in will be unloaded. You will be teleported!'
-    whitelist:
-      usage: '%prefix% §cUsage: /world whitelist <World> <On | Off | Add | List | Remove> <Player>'
-      add:
-        already-added: '%prefix% §7The player %player_name% §7is already §7on the whitelist!'
-        successfully-added: '%prefix% §7You have added %player_name% §7to the whitelist of world §b%world_name%'
-      list:
-        empty: '%prefix% §7The whitelist for world §b%world_name% §7is empty'
-        message: '%prefix% §7Whitelist: %player_names%'
-      disable:
-        already-disabled: '%prefix% §7World whitelist §b%world_name% §7is already disabled!'
-        successfully-disabled: '%prefix% §7You have disabled the whitelist in the world §b%world_name%§7!'
-      enable:
-        already-enabled: '%prefix% §7The world whitelist §b%world_name% §7is already activated!'
-        successfully-enabled: '%prefix% §7You have activated the whitelist in the world §b%world_name% §7!'
-      remove:
-        already-removed: '%prefix% §7The player %player_name% §7is §cnot §7on the whitelist!'
-        successfully-removed: '%prefix% §7You have %player_name% §7removed from the §b%world_name% §7whitelist'
-=======
   # The time format in which information is displayed
   time-format: dd.MM.yyyy HH:mm:ss
   # Should MultiWorld connect the worlds with each other via the registered data?
-  world-link-enabled: true
->>>>>>> Stashed changes
+  world-link-enabled: true