mirror/Archipelago
1
0
Fork 1
mirror of https://github.com/ArchipelagoMW/Archipelago.git synced 2026-04-08 02:48:15 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflicts into player-tracker

Browse Source
This commit is contained in:
Chris Wilson
2022-08-15 21:37:44 -04:00
parent 053fb14495 ca83905d9f
commit c546dcd5ff
129 changed files with 1946 additions and 1137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
WebHostLib/tracker.py
View File

@@ -802,7 +802,7 @@ def getTracker(tracker: UUID):
for (team, player), data in multisave.get("video", []):
video[(team, player)] = data
return render_template("trackers/" + "multiworldTracker.html", inventory=inventory, get_item_name_from_id=get_item_name_from_id,
return render_template("trackers/" + "multiworldTracker.html", inventory=inventory, get_item_name_from_id=lookup_any_item_id_to_name,
lookup_id_to_name=Items.lookup_id_to_name, player_names=player_names,
tracking_names=tracking_names, tracking_ids=tracking_ids, room=room, icons=alttp_icons,
multi_items=multi_items, checks_done=checks_done, ordered_areas=ordered_areas,