Reverted old ore generation algorithm and applied the latest changes from the main branch #657
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
Bumps the dependencies group with 2 updates: [actions/checkout](https://github.com/actions/checkout) and [actions/upload-artifact](https://github.com/actions/upload-artifact). Updates `actions/checkout` from 4.2.0 to 4.2.2 - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](actions/checkout@v4.2.0...v4.2.2) Updates `actions/upload-artifact` from 4.4.0 to 4.5.0 - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](actions/upload-artifact@v4.4.0...v4.5.0) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies ... Signed-off-by: dependabot[bot] <[email protected]>
…ependabot/github_actions/dependencies-fbfbf083d1 Bump the dependencies group with 2 updates
Signed-off-by: Pyritie <[email protected]>
Signed-off-by: Pyritie <[email protected]>
Signed-off-by: Pyritie <[email protected]>
- Added ore indicators for everything - Buffed naquadah and tetrahedrite veins because those sound like the biggest bottlenecks of late game players because there's no other planets Signed-off-by: Pyritie <[email protected]>
Signed-off-by: Pyritie <[email protected]>
Bumps the dependencies group with 1 update: [actions/upload-artifact](https://github.com/actions/upload-artifact). Updates `actions/upload-artifact` from 4.4.3 to 4.5.0 - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](actions/upload-artifact@v4.4.3...v4.5.0) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies ... Signed-off-by: dependabot[bot] <[email protected]>
…ependabot/github_actions/dependencies-16239e05d6 Bump actions/upload-artifact from 4.4.3 to 4.5.0 in the dependencies group
Fixed oilsands, added missing english strings, added indicators for all ores
This reverts commit d567189.
This reverts commit b1e1e8a
# Conflicts: # .github/ISSUE_TEMPLATE/BUG_REPORT.yml # .github/PULL_REQUEST_TEMPLATE.md # .github/README.md # .github/workflows/build.yml # .pakku/server-overrides/user_jvm_args.txt # kubejs/assets/tfg/lang/en_us.json # kubejs/server_scripts/tfc/tags.js
Xikaro
added
1. Type: Feature
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.
What is the new behavior?
This PR reverts the new ore generation algorithm due to its current issues, which cannot be resolved on our side. Additionally, the latest changes and fixes from the main branch have been merged into this branch, with all conflicts resolved.
Implementation Details
Reverted the new ore generation algorithm because it lacks the necessary configurability to fix its issues, such as setting an offset for layers in the GTCE algorithm. Implementing a fix would require forking and maintaining a custom version of GTCE, which is not ideal.
Merged the latest changes from the main branch including enhancements for the old generation algorithm introduced by @Pyritie
Potential Compatibility Issues
No significant compatibility issues are expected
I am shitcommitter, please squash & merge :)