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

Godforge hangover #3396

Merged
merged 58 commits into from
Nov 28, 2024
Merged

Godforge hangover #3396

merged 58 commits into from
Nov 28, 2024

Conversation

serenibyss
Copy link
Member

@serenibyss serenibyss commented Oct 21, 2024 •
edited
Loading

@serenibyss serenibyss added the bug fix Fix a bug. Please link it in the PR. label Oct 21, 2024
serenibyss and others added 27 commits October 21, 2024 16:17
@serenibyss
fix color interpolation on some cycle rate values
ae85124
@serenibyss
fix nbt issue with ring amount
0662f1b
@serenibyss
Merge branch 'master' into godforge-hangover
fa58703
@serenibyss
fix missed localization
ea8ff76
@serenibyss
fix render data defaults on break+replace
bf1449d
@serenibyss
update my custom preset, fix import
b3107b6
@serenibyss
spotless, cleanup
1f4dfc6
@serenibyss
cleanup multi tooltip code
eeb760d
@serenibyss
fix lang typo
7148c95
@GDCloudstrike
fix rainbow icon size
de04ec5
@GDCloudstrike
add my preset
d36e744
@serenibyss
update my star color icon
cd65ce4
@GDCloudstrike
add possible inputs window to exotic module
17444f4
@GDCloudstrike
fix display itemstacks changing stacksize
580a1ae
@GDCloudstrike
enable exotic module batch mode
0372af1
@serenibyss
fix screwdriver render disabling toggle
fcb5662
@serenibyss
improve nbt further, save formatting mode
b1bf7cc
@serenibyss
Merge branch 'master' into godforge-hangover
6b1af97
@GDCloudstrike
replace power switch with cosmetic menu
a87154b
@serenibyss
change default formatting mode to commas
171993c
@serenibyss
clean up exotic module modloaded checks
3282d56
@serenibyss
fix star size/spin render updating
ebe35ab
@serenibyss
move GodforgeMath class to godforge package
bc0cc15
@serenibyss
clean up upgrade tree ui window creation
0f390d2
@serenibyss
clean up readability further
97f2aeb
@serenibyss
start on upgrade refactor
7c07f9f
@serenibyss
cleanup, fix forward reference design issue
d55f27f
serenibyss and others added 23 commits November 2, 2024 01:12
@serenibyss
redo manual insertion window logic
f908638
@serenibyss
tiny cleanup
1fafc5e
@serenibyss
reformat file layout slightly
1dac7e0
@serenibyss
Merge branch 'master' into godforge-hangover
839363f
@serenibyss
clean up annotations
ad3822c
@GDCloudstrike
add full upgrade tree syncer
fd866c4
@GDCloudstrike
add base statistics window
899241a
@GDCloudstrike
fix nbt saving issue
08dc0e7
@GDCloudstrike
improve stored fuel text positioning
5e3dc4e
@GDCloudstrike
simplify grid line code
0addce2
@GDCloudstrike
add parameter descriptions
c7ee297
@GDCloudstrike
fix exoticizer ignoring input fluid amounts
f71d6fb
@GDCloudstrike
minor upgrade description change
94dc032
@serenibyss
Fix IMKG formula description
b667983
@serenibyss
reword IMKG description, fix SEFCP description
04c0aae
@serenibyss
move away from classicHatches() for multi parts
bb908e5
@serenibyss
improve window handling
8e6a1de
@GDCloudstrike
Merge branch 'master' into godforge-hangover
b1dfe17
@GDCloudstrike
add nei window for upgrade costs
b3479a0
@serenibyss
improve upgrade nei page text centering
bcf92b3
@serenibyss
allow manual insertion slots to open NEI on click
af909f8
@GDCloudstrike
remove breakdown tooltip (put on ice for now)
5bc3d23
@GDCloudstrike
Merge branch 'master' into godforge-hangover
a6ab9e9
@GDCloudstrike GDCloudstrike marked this pull request as ready for review November 28, 2024 14:51
@Dream-Master Dream-Master requested a review from a team November 28, 2024 16:54
NotAPenguin0
NotAPenguin0 approved these changes Nov 28, 2024
View reviewed changes
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.

The party must come to an end

@Dream-Master Dream-Master merged commit e41a088 into master Nov 28, 2024
5 checks passed
@Dream-Master Dream-Master deleted the godforge-hangover branch November 28, 2024 18:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@NotAPenguin0 NotAPenguin0 NotAPenguin0 approved these changes

Assignees
No one assigned
Labels
bug fix Fix a bug. Please link it in the PR.
Projects
None yet
Milestone
No milestone
4 participants
@serenibyss @NotAPenguin0 @Dream-Master @GDCloudstrike