From baf5b7830b9c58ae8b750ab921c1e04edde6689b Mon Sep 17 00:00:00 2001
From: Christian 'ketura' McCarty <hyperlink.teltura@gmail.com>
Date: Thu, 3 Nov 2022 20:57:57 -0500
Subject: [PATCH] Updated changelog.  Altered the hall 504 error hiding to be a
 console log

---
 .../src/main/web/includes/info/changeLog.html | 20 ++++++++++++++++++-
 .../src/main/web/js/gemp-022/hallUi.js        |  3 ++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/includes/info/changeLog.html b/gemp-lotr/gemp-lotr-async/src/main/web/includes/info/changeLog.html
index c24d43ac9..1d50d5b4f 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/includes/info/changeLog.html
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/includes/info/changeLog.html
@@ -1,10 +1,28 @@
 <div class="article"><pre style="white-space: pre-wrap;">
-<b>Most recent update</b>
+<b>2022 November 04</b>
+- Fixed the merchant not permitting the purchasing of foils
+- Fixed the merchant requiring you to do everything twice for it to register
+- Fixed various errors in merchant operations
+   
+<b>2022 November 04 - Hobbit Fixes by Phallen</b>
 - The Hobbit's "Bilbo, Master of Riddles" is now properly strength +2 when skirmishing Smaug
 - Added "The Hobbit Draft Game" to the game hall, which allows decks to be constructed for The Hobbit across all of its expansions
 - "The Hobbit Draft Game" is also available in the deckbuilder to properly validate decks in the format
 - Added remaining cultures for The Hobbit to the deckbuilder, and set them to only appear when "The Hobbit Sets" or one of its expansions is selected
 
+<b>2022 November 03</b>
+- Fixed some players not being able to create tables
+- Fixed player gold count being incorrect; added 200 to everyone's totals for the trouble (not that it matters)
+- Fixed decks with foil or tengwar cards not showing up properly in the deck sharing view
+
+<b>2022 November 02</b>
+COLLECTION SYSTEM OVERHAUL
+- major back-end rewrite of the collection system, which is now stored in the database properly
+- As a result, collections can now be modified if errors occur
+- Thus, the Isildur/Gimli snafu has finally been repaired, and 4x copies of each card have been issued to the correct players.  Anyone who put the Gimli Masterwork into a deck should check and make sure it's not Isildur.
+- Added *tons* of logging to all operations.  As a result, mysterious bugs are now far easier to track down for the future.
+- Improved the ability for moderators to track suspicious league cheaters
+
 <b>2022 September 12</b>
 - Revamped several back-end systems to be hot-reloadable. What this means is, any future changes to formats, packs, draft or sealed events, or card definitions can all be pushed and updated without requiring a server restart, even mid-game. Certain bugfixes should be deployed much faster now! 
 - Major overhaul to the sealed event and pack definition systems; look out for new Sealed event types coming soon!
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/hallUi.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/hallUi.js
index 989614355..10c7dca06 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/hallUi.js
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/hallUi.js
@@ -37,7 +37,8 @@ var GempLotrHallUI = Class.extend({
 						return;
 					} 
 					else if (xhr.status == 504) {
-						return
+						console.log("HTTP error communicating with server: " + xhr.status);
+						return;
 					}
 					else if (xhr.status != 504) {
 						that.chat.appendMessage("The game hall had a problem communicating with the server (" + xhr.status + "), no new updates will be displayed.", "warningMessage");