1.16.5 Merge of 2.1.0 Update Candidate #2148
Merged
Conversation
This file contains hidden or 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
- Clean up fuel loader _massively_ - Clean up rocket assembling machine massively - Add in nuclear thermal rockets in place of the warp cores on rockets. - They have a core block which can support many engines, and an engine to themselves - The engines are less powerful than advanced engines, but much more powerful than basic engines - Engines have the same fuel consumption as a single side of a bipropellant engine - Stats are 35 thrust per engine, 1 mB/t ; and 1000 thrust max per core
Fixed a typo (Aaluminide => Aluminide)
…erge Update en_us.json
…ketry#1999 - Fixes display for stars if you _somehow_ warp to one - Fixes stations not being reset, maybe - Fixes star display in selector window if you somehow select one.
Solve potential NPE
2 tasks
Fix most of the compile errors
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Tentative merge of #2108 into the 1.16.5 version
It still contains compile errors, but no merge conflicts
Some places have functions with unmapped names that I cannot identify, but no longer exist - fixing those will need to come last
Requires its sister LV PR