Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Add Garden Page in PV #1263

Merged
merged 42 commits into from
Aug 4, 2024
Merged

Add Garden Page in PV #1263

merged 42 commits into from
Aug 4, 2024

Conversation

CalMWolfs
Copy link
Contributor

@CalMWolfs CalMWolfs commented Jul 21, 2024 •
edited by NopoTheGamer
Loading

CalMWolfs and others added 30 commits July 21, 2024 21:05
@CalMWolfs
start
5e44e9c
@CalMWolfs
Merge branch 'NotEnoughUpdates:master' into garden-page
afa0dc7
@CalMWolfs
repo stuff
4e680b9
@NopoTheGamer
background
9a8afa6
@NopoTheGamer
background 2
27ace99
@CalMWolfs
:)
42c9fb3
@NopoTheGamer
plots
f694191
@NopoTheGamer
add barn skin to plots
589458b
@CalMWolfs
crop upgrades
3865171
@CalMWolfs
Merge remote-tracking branch 'origin/garden-page' into garden-page
a667733
@NopoTheGamer
add garden level bar
78e91a8
@NopoTheGamer
finish garden level bar
2123761
@CalMWolfs
crop milestone
1f2bee1
@NopoTheGamer
Merge remote-tracking branch 'CalMWolfs/garden-page' into fork/CalMWo…
a05a8aa 
…lfs/garden-page

# Conflicts:
#	src/main/kotlin/io/github/moulberry/notenoughupdates/miscfeatures/profileviewer/GardenPage.kt
@NopoTheGamer
add copper
0d744a4
@NopoTheGamer
fix copper render
85c31e4
@NopoTheGamer
Merge branch 'refs/heads/master' into fork/CalMWolfs/garden-page
2ef62bd
@NopoTheGamer
polish garden xp bar
44d574f
@NopoTheGamer
polish polish garden xp bar
51e9647
@CalMWolfs
update enum
1bfa696
@NopoTheGamer
add barn skin tooltip
570408c
@NopoTheGamer
add crop upgrades tooltip
fe053a8
@CalMWolfs
gift for nopo
d485e81
@CalMWolfs
Merge remote-tracking branch 'origin/garden-page' into garden-page
26c11dd 
# Conflicts:
#	src/main/kotlin/io/github/moulberry/notenoughupdates/miscfeatures/profileviewer/GardenPage.kt
@CalMWolfs
fixing
7774d02
@NopoTheGamer
bar
aaf10a7
@CalMWolfs
abcdefg hijklmnop qrs tuv wzy and z
2ac0f59
@NopoTheGamer
Merge remote-tracking branch 'CalMWolfs/garden-page' into fork/CalMWo…
0561c77 
…lfs/garden-page
@NopoTheGamer
compost upgrades
f559e88
@NopoTheGamer
move
1f9b9b5
@NopoTheGamer NopoTheGamer marked this pull request as ready for review July 28, 2024 08:18
@nea89o
Copy link
Member

nea89o commented Aug 3, 2024

image
Is there a reason to right align these things here? I think if we right align them we should at least place them properly int he middle of that area

@nea89o
Copy link
Member

nea89o commented Aug 3, 2024

image
This block clips into the progress bar

nea89o
nea89o requested changes Aug 3, 2024
View reviewed changes
Copy link
Member

@nea89o nea89o left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

.

@CalMWolfs CalMWolfs requested a review from nea89o August 4, 2024 07:53
@nea89o nea89o merged commit 3ce20a6 into NotEnoughUpdates:master Aug 4, 2024
6 checks passed
@CalMWolfs CalMWolfs deleted the garden-page branch August 4, 2024 14:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nea89o nea89o nea89o approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@CalMWolfs @nea89o @NopoTheGamer