Merge branch 'main' into breaking_changes

# Conflicts:
#	Adjuster.py
#	Gui.py
#	MultiClient.py
#	setup.py
#	worlds/alttp/AdjusterMain.py
#	worlds/alttp/Main.py
This commit is contained in:
Fabian Dill
2021-02-21 20:15:07 +01:00
23 changed files with 424 additions and 404 deletions
+2 -2
View File
@@ -1,7 +1,7 @@
{% extends 'tablepage.html' %}
{% block head %}
{{ super() }}
<title>Multiworld Tracker for Room {{ room.id }}</title>
<title>Multiworld Tracker</title>
<link rel="stylesheet" type="text/css" href="{{ static_autoversion("styles/tracker.css") }}"/>
<script type="application/ecmascript" src="{{ static_autoversion("assets/jquery.scrollsync.js") }}"></script>
<script type="application/ecmascript" src="{{ static_autoversion("assets/tracker.js") }}"></script>
@@ -151,7 +151,7 @@
{% endfor %}
{% for team, hints in hints.items() %}
<div class="table-wrapper">
<table class="table non-unique-item-table">
<table class="table non-unique-item-table" data-order='[[5, "asc"], [0, "asc"]]'>
<thead>
<tr>
<th>Finder</th>