[created by mistake, please ignore] Merge upstream v1.13

tmewett / BrogueCE

Brogue: Community Edition - a community-lead fork of the much-loved minimalist roguelike game

https://sites.google.com/site/broguegame/

GNU Affero General Public License v3.0

1.03k stars 109 forks source link

[created by mistake, please ignore] Merge upstream v1.13 #645

Closed HomebrewHomunculus closed 10 months ago

HomebrewHomunculus commented 10 months ago

Merged changes from Brogue CE https://github.com/tmewett/BrogueCE/commit/dfd321ed82b104ed141323baefc6fef1c7b60315 which should match tag v1.13:

git fetch upstream git merge ebcf1b1a82a07957125ecd1f51f6ca691d8f00a2

Then fixed some merge conflicts.

Also, removed fungible/stackable keys and free keys. (I didn't like the keys much anyway, and they were easily removed by just taking the upstream's version of that code, so this was the path of least resistance.)

HomebrewHomunculus commented 10 months ago

Sorry, created by mistake with wrong base repository, meant to be into my own fork... closing.

(correct PR here.)