Transfer to master #6
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
- Moved them from world gen features to map gen features - While this does mean they only generate on planets, I say that overall it's a win - The biome is unlikely to be used outside of planets, and it means they can generate over biome chunk borders well
…in a correct place
…-observatory-crash Fix observatory crash in SMP Accidentally rolled back in 37f1355
…-fix Re-implement pull request Advanced-Rocketry#2306 from CallMeFoxie/fix-observatory-crash
…ocketry#2369) This is the cause behind dimMapped Worlds not receiving there skyboxes when relogging/teleporting to the world
* List to List<string> WorldCommand fix. * 'java.lang.ArrayIndexOutOfBoundsException: 0' on advancedrocketry command fix * commands to lower case fix * Fix ar_tabr_commands_fix branch, improve command input/output, cleanup * Cancel planet generation if we can't parse star ID --------- Co-authored-by: tabr <tabr@xaker.ru> Co-authored-by: Sílfryí Kalsandryn <silfryikalsandryn@protonmail.com>
…PlanetIcons, moved line in StellarBody (Advanced-Rocketry#2339) * Small fixes -Frigid and snowball planets spawn cold biomes now. -Setting the LEO explicitly will now work properly instead of just setting the LEO to the atmosphere LEO. * Move line of code in StellarBody Seemed to be in the wrong place.
…Advanced-Rocketry#2316) * Remove MC version from mod version * Fix Chemical Reactor NPE and other recipe bugs * Bump mod patch version * Apply changes suggested in code review Moving special recipe processing to LV was the only change I didn't apply, but I now have the Chemical Reactor reloading just the special armor recipes, to prevent problems with CraftTweaker and XML recipes. * Only regenerate Chemical Reactor recipes that haven't been removed * Improve command output text
Transfer in the changes from "slava"
"Stable" branch, a very old thing, merged in to maintain it's useage
Integrate in the changes from Silfry-1.12
revert changes from the merge that are extraneus and/ or detrimental
This integrates other 1.12 branches, and 1 that shoulda been merged via another branch, but, oh well.
Transfer in the master branch. Probally causeing major damage in the process, but, eh
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.
Transfer 1.12 to master branch