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.

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

Godforge finale #3080

Merged
merged 112 commits into from
Sep 15, 2024
Merged

Godforge finale #3080

merged 112 commits into from
Sep 15, 2024

Conversation

GDCloudstrike
Copy link
Member

@GDCloudstrike GDCloudstrike added Affects Balance Change affecting balance. Requires admin approval before merging. new feature Add something new. Please explain in detail how it works. labels Sep 6, 2024
@Dream-Master Dream-Master requested a review from a team September 6, 2024 10:14
@Caedis
Copy link
Member

Caedis commented Sep 6, 2024

Make sure you reenable the multi outside of dev envs

@GDCloudstrike GDCloudstrike marked this pull request as ready for review September 14, 2024 01:43
CookieBrigade and others added 12 commits September 14, 2024 12:06
- fixed issues with upgrade line sync when completing/respecing upgrades
- fixed the panel not updating when you click another different button in the tree (havent figured out how to avoid repositioning the window yet but looking into it)
- fixed the indivudual upgrade window staying open when you close the upgrade tree window
# Conflicts:
#	src/main/java/bartworks/MainMod.java
Copy link
Contributor

@NotAPenguin0 NotAPenguin0 left a comment

Choose a reason for hiding this comment

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

Almost good to go

@Dream-Master Dream-Master merged commit dda786c into master Sep 15, 2024
5 checks passed
@Dream-Master Dream-Master deleted the godforge_finale branch September 15, 2024 17:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Affects Balance Change affecting balance. Requires admin approval before merging. new feature Add something new. Please explain in detail how it works.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants