1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2026-03-13 08:39:43 +00:00

resolved conflicts introduced by merging zenorogue/hyperrogue#21

This commit is contained in:
Zeno Rogue
2018-06-12 23:28:06 +02:00
19 changed files with 36 additions and 62 deletions

View File

@@ -1988,7 +1988,7 @@ namespace linepatterns {
dialog::addColorItem(among(patterns[numpat].id, patVine, patPower) && gp::on ? XLAT("Goldberg") + (patterns[numpat].id == patVine ? " " : ""): XLAT(patterns[numpat].lpname), patterns[numpat].color, 'a'+numpat);
dialog::addBreak(50);
dialog::addItem(XLAT("exit menu"), 'v');
dialog::addItem(XLAT("go back"), ' ');
dialog::addBreak(50);
dialog::addInfo("change the alpha parameter to show the lines");