-
Notifications
You must be signed in to change notification settings - Fork 104
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.
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
Small fix for MixinTrackBlockOutline #973
Closed
xiewuzhiying
wants to merge
177
commits into
ValkyrienSkies:1.18.x/main
from
xiewuzhiying:1.20.1/small_fix
Closed
Small fix for MixinTrackBlockOutline #973
xiewuzhiying
wants to merge
177
commits into
ValkyrienSkies:1.18.x/main
from
xiewuzhiying:1.20.1/small_fix
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
# Conflicts: # common/src/main/java/org/valkyrienskies/mod/mixin/client/world/MixinClientLevel.java # common/src/main/java/org/valkyrienskies/mod/mixin/entity/MixinEntity.java # common/src/main/java/org/valkyrienskies/mod/mixin/server/command/MixinCommands.java # common/src/main/java/org/valkyrienskies/mod/mixin/server/network/MixinServerGamePacketListenerImpl.java # common/src/main/java/org/valkyrienskies/mod/mixin/server/world/MixinChunkMap.java # common/src/main/kotlin/org/valkyrienskies/mod/common/item/ShipAssemblerItem.kt # common/src/main/kotlin/org/valkyrienskies/mod/common/item/ShipCreatorItem.kt # fabric/src/main/java/org/valkyrienskies/mod/fabric/mixin/world/level/block/FireMixin.java # gradle.properties # quilt/build.gradle # quilt/src/main/java/org/valkyrienskies/mod/quilt/mixin/world/level/block/FireMixin.java # quilt/src/main/resources/quilt.mod.json
# Conflicts: # common/src/main/java/org/valkyrienskies/mod/mixin/client/MixinMinecraft.java # common/src/main/java/org/valkyrienskies/mod/mixin/client/multiplayer/MixinClientPacketListener.java # common/src/main/java/org/valkyrienskies/mod/mixin/feature/entity_collision/MixinEntity.java # common/src/main/java/org/valkyrienskies/mod/mixin/mod_compat/vanilla_renderer/MixinLevelRendererVanilla.java # common/src/main/java/org/valkyrienskies/mod/mixin/server/MixinPlayerList.java # common/src/main/java/org/valkyrienskies/mod/mixin/server/network/MixinServerGamePacketListenerImpl.java # common/src/main/java/org/valkyrienskies/mod/mixin/server/world/MixinChunkMap$TrackedEntity.java # common/src/main/kotlin/org/valkyrienskies/mod/compat/clothconfig/VSClothConfig.kt # fabric/build.gradle # fabric/src/main/resources/fabric.mod.json # forge/src/main/java/org/valkyrienskies/mod/forge/mixin/world/level/block/FireMixin.java # gradle.properties
# Conflicts: # common/src/main/kotlin/org/valkyrienskies/mod/common/item/ShipCreatorItem.kt # fabric/build.gradle # forge/src/main/kotlin/org/valkyrienskies/mod/forge/common/ValkyrienSkiesModForge.kt
# Conflicts: # common/src/main/java/org/valkyrienskies/mod/mixin/server/world/MixinChunkMap.java # common/src/main/kotlin/org/valkyrienskies/mod/common/item/ShipCreatorItem.kt
… should log on still in the ship, not in the middle of nowhere (ValkyrienSkies#937) * Added basic implementation of teleporting disconnected players back onto ships * Removed print statements * Extracted MAX_ONBOARD_TICKS from magic number * Moved MAX_ONBOARD_TICKS to a config option, and added the ability for reconnected player teleportation to be disabled --------- Authored-by: m-doescode <[email protected]>
* emf compat * fix server
* Compat fix for twilight forest * Add mixins to prevent structure generation --------- Co-authored-by: StewStrong <[email protected]>
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.
Two places where
remap = true
was missing.