Skip to content

Commit

Permalink
merge dev aftermath (couldn't bring another 8 hour rebase over me)
Browse files Browse the repository at this point in the history
  • Loading branch information
FireInstall committed Feb 27, 2024
1 parent 94ef118 commit 1c9326c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ public enum MgMenuLangKey implements LangKey {
MENU_MINIGAME_MECHANIC_SETTINGS_NAME("menu.minigame.mechanic.settings.name"),
MENU_MINIGAME_MULTIPLAYERONLY_DESCRIPTION("menu.minigame.multiplayerOnly.description"),
MENU_MINIGAME_OBJECTIVEDESCRIPTION_NAME("menu.minigame.objectiveDescription.name"),
MENU_MINIGAME_PLAYERRECORDER_NAME("menu.minigame.playerRecorder.name"),
MENU_MINIGAME_PLAYERS_MAX_NAME("menu.minigame.players.max.name"),
MENU_MINIGAME_PLAYERS_MIN_NAME("menu.minigame.players.min.name"),
MENU_MINIGAME_PLAYERS_SINGLEPLAYER_CAPPED_NAME("menu.minigame.players.singleplayer.capped.name"),
Expand Down
5 changes: 3 additions & 2 deletions Minigames/src/main/resources/messages.properties
Original file line number Diff line number Diff line change
Expand Up @@ -495,6 +495,7 @@ menu.minigame.mechanic.name=Game Mechanic
menu.minigame.mechanic.settings.name=Game Mechanic Settings
menu.minigame.multiplayerOnly.description=Multiplayer Only
menu.minigame.objectiveDescription.name=Objective Description
menu.minigame.playerRecorder.name=Activate Player Block Recorder
menu.minigame.playerSettings.name=Player Settings
menu.minigame.players.max.name=Max. Players
menu.minigame.players.min.name=Min. Players
Expand Down Expand Up @@ -625,14 +626,14 @@ menu.team.defaultWin.name=Default Winning Team
menu.team.gameAutobalanceMsg.description=Message sent to all players<newline>when someone is<newline>auto-balanced.<newline>Use <team>/<player> for team/player name
menu.team.gameAutobalanceMsg.name=Autobalance Broadcast Message
menu.team.maxPlayers=Max Players
menu.teams.name=Teams
menu.team.nameVisibility.alwaysVisible=Always visible
menu.team.nameVisibility.hideOtherTeam=Hide for other teams
menu.team.nameVisibility.hideOwnTeam=Hide for own team
menu.team.nameVisibility.name=NameTag Visibility
menu.team.nameVisibility.neverVisible=Never visible
menu.team.options.name=Team Options
menu.teamAdd.name=Add Team
menu.teams.name=Teams
menu.time.startWait.name=Start Wait Time
menu.timeWeather.name=Time and Weather Settings
menu.timeWeather.time.name=Time of Day
Expand Down Expand Up @@ -820,14 +821,14 @@ player.team.assign.joinAnnounce=<player> has joined <team>
player.team.assign.joinTeam=You have joined <team>
player.team.autobalance.minigameMsg=<player> has been auto-balanced to <team>
player.team.autobalance.plyMsg=You have been auto-balanced to <team>
position=<x>, <y>, <z>
preset.info.noInfo=No information given on this preset.
preset.load.error.notFound=Failed to load preset: <preset>.yml was not found in the presets folder!
preset.load.success=Loaded the <preset> preset to <minigame>
quantifier.none=<gray>None</gray>
region.describe=<region> from <postion1> to <postion2> (<number>)
region.error.noRegenRegion=No region by the name '<region>' exists.
region.error.noSelection=You have not made a selection!
position=<x>, <y>, <z>
region.regenRegion.created=Created a new regen region in <minigame> called <region>, <number> / <max>
region.regenRegion.error.limit=Error: the limit of Blocks of all regen areas together has been reached +(<number> / <max>). Please contact an admin if necessary.
region.regenRegion.updated=Updated regen region in <minigame> called <region> with a new area <number> / <max>
Expand Down

0 comments on commit 1c9326c

Please sign in to comment.