Skip to content

Commit

Permalink
Merge branch 'Dev' into dev-fenhl
Browse files Browse the repository at this point in the history
  • Loading branch information
fenhl committed Dec 12, 2024
2 parents 9ff9f92 + e180707 commit 6315d85
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ Differences between `dev-fenhl` and [`Dev-R`](https://github.com/Roman971/OoT-Ra
* Bug fixes:
* Fix precompleted dungeon rewards not accounting for boss entrance randomizer ([#2330](https://github.com/OoTRandomizer/OoT-Randomizer/pull/2330))
* Blue warps setting time of day even on repeated use is now in logic ([#2304](https://github.com/OoTRandomizer/OoT-Randomizer/pull/2304))
* The randomizer no longer silently ignores the `Decompress` or `Compress` program failing ([#2229](https://github.com/OoTRandomizer/OoT-Randomizer/pull/2229))
* A trade item obtained from a skipped location is no longer lost upon obtaining a different item from the same trade quest ([#2217](https://github.com/OoTRandomizer/OoT-Randomizer/pull/2217))
* The heart piece in Gerudo Fortress now behaves correctly when already at 20 hearts, and is considered in glitched logic (part of [#2179](https://github.com/OoTRandomizer/OoT-Randomizer/pull/2179))

Expand Down Expand Up @@ -216,6 +215,7 @@ issue. You should always Hard Reset to avoid this issue entirely.
* Fix importing settings from older versions on web.
* Fix a Mac-specific issue when loading track .meta files.
* Fix an error in the easy bite fishing hack.
* The randomizer no longer ignores errors when decompressing the base rom or compressing the randomized rom.

#### New Speedups
* The first text box from each carpenter in the Thieves' Hideout is skipped.
Expand Down
4 changes: 2 additions & 2 deletions version.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
__version__ = '8.2.37'
__version__ = '8.2.38'

# This is a supplemental version number for branches based off of main dev.
supplementary_version = 3
supplementary_version = 1

# Pick a unique identifier byte for your fork if you are intending to have a long-lasting branch.
# This will be 0x00 for main releases and 0x01 for main dev.
Expand Down

0 comments on commit 6315d85

Please sign in to comment.