-
Notifications
You must be signed in to change notification settings - Fork 25
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged in ShotrayWW's fish fixes and updated forecasting to 1.6 #39
Open
Vindeflei
wants to merge
42
commits into
KhloeLeclair:main
Choose a base branch
from
Vindeflei:main
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
I removed the GamePath hardcoding, planning to revert this commit before making a pull request to not mess up creator's builds.
Since those two projects are not found, I removed them from the solution to get rid of the "Cannot find csproj" error.
Update files that begin with Mod
"Middle" became "VCenter", "Center" became "HCenter", and now "Center" is between "HCenter" and "VCenter"
Removed Mods Paths lines from common.targets so the mods would build in my Steam folder
Fixed a bug where fish were displaying as catchable in all seasons on their details page, despite being only available in certain seasons.
This reverts commit aa42d21.
Since ShotrayWW just commented out the entire files, it didn't conflict with the fixes I already did for the new 1.6 things (Bookseller, new crops, green rain) Also did some spacing shenanigans because I'm weird about that.
To match KhloeLeclair/StardewMods main
To match KhloeLeclair/StardewMods main
To match KhloeLeclair/StardewMods main
To match KhloeLeclair/StardewMods main
To match KhloeLeclair/StardewMods main
Thanks for mentioning me. I also hope you can solve The problem that all types of farms be listed in fishing locations. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fish fixes taken from #35 because they managed to fix the bug I was having with season displaying!! They also contributed all of the changes in the translation files. Please check their pull request for info regarding those changes, and please merge that one first so them commenting out the Random Forecast pages can be reversed with my PR.
I changed "InventoryHelper.CreateItemById" to "ItemRegistry.Create" everywhere it still showed up, since that was one of the big things that changed, though I didn't have to mess with the SpriteHelper since you already merged that stuff in. (Yay!) Also some cases of Common.GameStateQuery which has since been removed because Stardew itself has GameStateQuery now.
Also I reflexively changed some of the spacing when the tabbing didn't line up which seems to have made the NoticesManager diff confused, that's why that one is so long, I'm so sorry. A few of these file changes might just be nothing but spacing. ^_^;