Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: pineapplemachine/mwde
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.2
Choose a base ref
...
head repository: pineapplemachine/mwde
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Aug 25, 2018

  1. Copy the full SHA
    1449862 View commit details

Commits on Aug 26, 2018

  1. Copy the full SHA
    e68378b View commit details
Showing with 3 additions and 1 deletion.
  1. +1 −1 src/info_string.py
  2. +2 −0 web/index.html
2 changes: 1 addition & 1 deletion src/info_string.py
Original file line number Diff line number Diff line change
@@ -94,7 +94,7 @@ def pretty_info_string(
rank_name = es.get_faction_rank_name(
player_faction_name, player_faction_rank
)
conditions.append("- If player rank in faction %s is %s%s" % (
conditions.append("- If player rank in faction %s is at least %s%s" % (
player_faction_name.decode("latin-1", "ignore"),
pretty_number(config, player_faction_rank),
" (%s)" % rank_name.decode("latin-1", "ignore") if rank_name else ""
2 changes: 2 additions & 0 deletions web/index.html
Original file line number Diff line number Diff line change
@@ -433,6 +433,8 @@ <h2>
</p>
<li>
<a href="https://www.pineapplemachine.com/files/mwde/release/Morrowind%20Dialog%20Explorer%20v1.0.zip">Download Morrowind Dialog Explorer v1.0</a>
</li>
<li>
<a href="https://www.pineapplemachine.com/files/mwde/release/Morrowind%20Dialog%20Explorer%20v1.1.zip">Download Morrowind Dialog Explorer v1.1</a>
</li>
</div>