Merged 1.19.2 into 1.20.1 #360
Merged
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
* removed duplicate of `MOD_BUS.addListener(this::clientSetup);`
…tener Removed duplicate clientSetup listener in 1.19
Carry on does not properly handle the IMC events, there fore we have to call from init. Note: Does not work for Forge MC 1.18
Carry on mod support for Forge MC 1.19.2 #209
Blacklist items: * samplings * leaves * some 1.19 blocks
…and Added language entry for "ship too big" (#239) * Merge remote-tracking branch 'upstream/1.18.x/main' into 1.19.2/main * Added translation support for the "Ship is too big" message
…klist Expanded blacklist
…n odd ways (#315) * add kotlin for forge to build.gradle so forge can build * use ship rotation instead of buggy `aligningTo` * update shipAssembler to take a rotation and make snapRotation public * move logic into ShipAssembler * remove buggy aligningTo, demote alignTarget to a local * fix float comparisons * Removed unnecessary imports (millennIumAMbiguity) --------- Co-authored-by: millennIumAMbiguity <37588844+millennIumAMbiguity@users.noreply.github.com>
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.
No description provided.